--- tests/plugin.c	2009-07-04 17:57:24.937590507 +0200
+++ /tmp/plugin.c	2009-07-04 17:52:36.536603882 +0200
@@ -45,6 +45,7 @@
 };
 
 
+static gpointer my_plugin_test_parent_class = NULL;
 
 GType my_plugin_test_get_type (void);
 GType my_plugin_test_register_type (GTypeModule * module);
@@ -54,7 +55,6 @@
 MyPluginTest* my_plugin_test_new (gint foo);
 MyPluginTest* my_plugin_test_construct (GType object_type, gint foo);
 MyPluginTest* my_plugin_test_new (gint foo);
-static gpointer my_plugin_test_parent_class = NULL;
 char* fso_factory_function (FsoFrameworkSubsystem* subsystem, GError** error);
 void fso_register_function (GTypeModule* module);
 
@@ -82,7 +82,6 @@
 }
 
 
-static GType my_plugin_test_type_id = 0;
 GType my_plugin_test_get_type (void) {
 	return my_plugin_test_type_id;
 }
@@ -102,12 +101,13 @@
  * else your module will be unloaded immediately.
  **/
 char* fso_factory_function (FsoFrameworkSubsystem* subsystem, GError** error) {
+	char* result;
 	MyPluginTest* t;
-	char* _tmp0_;
 	g_return_val_if_fail (subsystem != NULL, NULL);
 	t = my_plugin_test_new (42);
-	_tmp0_ = NULL;
-	return (_tmp0_ = g_strdup ("test.plugin"), (t == NULL) ? NULL : (t = (g_object_unref (t), NULL)), _tmp0_);
+	result = g_strdup ("test.plugin");
+	(t == NULL) ? NULL : (t = (g_object_unref (t), NULL));
+	return result;
 }