Merge branch 'release/0.26.4-1'0.26.4-1

14 files changed, 3450 insertions, 3464 deletions

diff --git a/plugins/shotwell-data-imports/FSpotDatabase.c b/plugins/shotwell-data-imports/FSpotDatabase.c
index 9dd325a..617edb9 100644
--- a/plugins/shotwell-data-imports/FSpotDatabase.c
+++ b/plugins/shotwell-data-imports/FSpotDatabase.c
@@ -1,4 +1,4 @@
-/* FSpotDatabase.c generated by valac 0.34.7, the Vala compiler
+/* FSpotDatabase.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotDatabase.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -196,7 +196,7 @@ DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_const
 gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error);
 UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_version, const gchar* separator);
 UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator);
-static void data_imports_fspot_db_fspot_database_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_database_finalize (GObject * obj);
 
 
 /**
@@ -212,32 +212,32 @@ void data_imports_fspot_db_init (void) {
 DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct (GType object_type, GFile* db_file, GError** error) {
 	DataImportsFSpotDbFSpotDatabase * self = NULL;
 	gchar* filename = NULL;
-	GFile* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
 	gint res = 0;
 	sqlite3* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	sqlite3* _tmp5_ = NULL;
-	DataImportsFSpotDbFSpotMetaTable* _tmp6_ = NULL;
+	gint _tmp3_;
+	sqlite3* _tmp5_;
+	DataImportsFSpotDbFSpotMetaTable* _tmp6_;
 	gint64 _tmp7_ = 0LL;
-	DataImportsFSpotDbFSpotMetaTable* _tmp8_ = NULL;
-	gint64 _tmp9_ = 0LL;
+	DataImportsFSpotDbFSpotMetaTable* _tmp8_;
+	gint64 _tmp9_;
 	UtilsVersionNumber* _tmp10_ = NULL;
-	UtilsVersionNumber* _tmp11_ = NULL;
+	UtilsVersionNumber* _tmp11_;
 	DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp12_ = NULL;
-	sqlite3* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp14_ = NULL;
-	DataImportsFSpotDbFSpotPhotosTable* _tmp15_ = NULL;
-	sqlite3* _tmp16_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp17_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp18_ = NULL;
-	sqlite3* _tmp19_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp20_ = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp21_ = NULL;
-	sqlite3* _tmp22_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotRollsTable* _tmp24_ = NULL;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp12_;
+	sqlite3* _tmp13_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp14_;
+	DataImportsFSpotDbFSpotPhotosTable* _tmp15_;
+	sqlite3* _tmp16_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp17_;
+	DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp18_;
+	sqlite3* _tmp19_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp20_;
+	DataImportsFSpotDbFSpotTagsTable* _tmp21_;
+	sqlite3* _tmp22_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp23_;
+	DataImportsFSpotDbFSpotRollsTable* _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
 	g_return_val_if_fail (G_IS_FILE (db_file), NULL);
@@ -260,7 +260,7 @@ DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_construct
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
 	if (res != SQLITE_OK) {
 #line 263 "FSpotDatabase.c"
-		GError* _tmp4_ = NULL;
+		GError* _tmp4_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
 		_tmp4_ = g_error_new (DATABASE_ERROR, DATABASE_ERROR_ERROR, "Unable to open F-Spot database %s: %d", filename, res);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
@@ -453,9 +453,9 @@ DataImportsFSpotDbFSpotDatabase* data_imports_fspot_db_fspot_database_new (GFile
 static UtilsVersionNumber* data_imports_fspot_db_fspot_database_get_version (DataImportsFSpotDbFSpotDatabase* self, GError** error) {
 	UtilsVersionNumber* result = NULL;
 	gchar* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotMetaTable* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	UtilsVersionNumber* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotMetaTable* _tmp1_;
+	gchar* _tmp2_;
+	UtilsVersionNumber* _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE (self), NULL);
@@ -514,7 +514,7 @@ static void data_imports_fspot_db_fspot_database_instance_init (DataImportsFSpot
 }
 
 
-static void data_imports_fspot_db_fspot_database_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_database_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotDatabase * self;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabase.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE, DataImportsFSpotDbFSpotDatabase);
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
index ed13500..74516f1 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
+++ b/plugins/shotwell-data-imports/FSpotDatabaseBehavior.c
@@ -1,4 +1,4 @@
-/* FSpotDatabaseBehavior.c generated by valac 0.34.7, the Vala compiler
+/* FSpotDatabaseBehavior.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotDatabaseBehavior.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -340,7 +340,7 @@ DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry
 DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior);
 UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self);
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self);
-static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry* obj);
+static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj);
 GType data_imports_fspot_db_fspot_database_behavior_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
@@ -400,7 +400,7 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
-static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj);
 
 
 static gpointer _g_object_ref0 (gpointer self) {
@@ -412,10 +412,10 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry_construct (GType object_type, UtilsVersionNumber* version, DataImportsFSpotDbFSpotTableBehavior* behavior) {
 	DataImportsFSpotDbFSpotBehaviorEntry* self = NULL;
-	UtilsVersionNumber* _tmp0_ = NULL;
-	UtilsVersionNumber* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	UtilsVersionNumber* _tmp0_;
+	UtilsVersionNumber* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL);
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -453,8 +453,8 @@ DataImportsFSpotDbFSpotBehaviorEntry* data_imports_fspot_db_fspot_behavior_entry
 
 UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (DataImportsFSpotDbFSpotBehaviorEntry* self) {
 	UtilsVersionNumber* result = NULL;
-	UtilsVersionNumber* _tmp0_ = NULL;
-	UtilsVersionNumber* _tmp1_ = NULL;
+	UtilsVersionNumber* _tmp0_;
+	UtilsVersionNumber* _tmp1_;
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL);
 #line 19 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -471,8 +471,8 @@ UtilsVersionNumber* data_imports_fspot_db_fspot_behavior_entry_get_version (Data
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_behavior_entry_get_behavior (DataImportsFSpotDbFSpotBehaviorEntry* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_BEHAVIOR_ENTRY (self), NULL);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -529,7 +529,7 @@ static gchar* data_imports_fspot_db_value_fspot_behavior_entry_collect_value (GV
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (collect_values[0].v_pointer) {
 #line 532 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotBehaviorEntry* object;
+		DataImportsFSpotDbFSpotBehaviorEntry * object;
 		object = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -556,7 +556,7 @@ static gchar* data_imports_fspot_db_value_fspot_behavior_entry_collect_value (GV
 
 
 static gchar* data_imports_fspot_db_value_fspot_behavior_entry_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	DataImportsFSpotDbFSpotBehaviorEntry** object_p;
+	DataImportsFSpotDbFSpotBehaviorEntry ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (!object_p) {
@@ -608,7 +608,7 @@ gpointer data_imports_fspot_db_value_get_fspot_behavior_entry (const GValue* val
 
 
 void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpointer v_object) {
-	DataImportsFSpotDbFSpotBehaviorEntry* old;
+	DataImportsFSpotDbFSpotBehaviorEntry * old;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -639,7 +639,7 @@ void data_imports_fspot_db_value_set_fspot_behavior_entry (GValue* value, gpoint
 
 
 void data_imports_fspot_db_value_take_fspot_behavior_entry (GValue* value, gpointer v_object) {
-	DataImportsFSpotDbFSpotBehaviorEntry* old;
+	DataImportsFSpotDbFSpotBehaviorEntry * old;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY));
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -687,7 +687,7 @@ static void data_imports_fspot_db_fspot_behavior_entry_instance_init (DataImport
 }
 
 
-static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry* obj) {
+static void data_imports_fspot_db_fspot_behavior_entry_finalize (DataImportsFSpotDbFSpotBehaviorEntry * obj) {
 	DataImportsFSpotDbFSpotBehaviorEntry * self;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_BEHAVIOR_ENTRY, DataImportsFSpotDbFSpotBehaviorEntry);
@@ -716,7 +716,7 @@ GType data_imports_fspot_db_fspot_behavior_entry_get_type (void) {
 
 
 gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance) {
-	DataImportsFSpotDbFSpotBehaviorEntry* self;
+	DataImportsFSpotDbFSpotBehaviorEntry * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -727,7 +727,7 @@ gpointer data_imports_fspot_db_fspot_behavior_entry_ref (gpointer instance) {
 
 
 void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance) {
-	DataImportsFSpotDbFSpotBehaviorEntry* self;
+	DataImportsFSpotDbFSpotBehaviorEntry * self;
 	self = instance;
 #line 9 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
@@ -741,166 +741,166 @@ void data_imports_fspot_db_fspot_behavior_entry_unref (gpointer instance) {
 
 
 void data_imports_fspot_db_fspot_database_behavior_create_behavior_map (void) {
-	GeeHashMap* _tmp0_ = NULL;
+	GeeHashMap* _tmp0_;
 	GeeList* photos_list = NULL;
-	GeeArrayList* _tmp1_ = NULL;
-	gint* _tmp2_ = NULL;
-	gint* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	UtilsVersionNumber* _tmp4_ = NULL;
-	UtilsVersionNumber* _tmp5_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp6_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp7_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp8_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp9_ = NULL;
-	gint* _tmp10_ = NULL;
-	gint* _tmp11_ = NULL;
-	gint _tmp11__length1 = 0;
-	UtilsVersionNumber* _tmp12_ = NULL;
-	UtilsVersionNumber* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp14_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp15_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp17_ = NULL;
-	gint* _tmp18_ = NULL;
-	gint* _tmp19_ = NULL;
-	gint _tmp19__length1 = 0;
-	UtilsVersionNumber* _tmp20_ = NULL;
-	UtilsVersionNumber* _tmp21_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp22_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp24_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp25_ = NULL;
-	gint* _tmp26_ = NULL;
-	gint* _tmp27_ = NULL;
-	gint _tmp27__length1 = 0;
-	UtilsVersionNumber* _tmp28_ = NULL;
-	UtilsVersionNumber* _tmp29_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp31_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp32_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp33_ = NULL;
-	gint* _tmp34_ = NULL;
-	gint* _tmp35_ = NULL;
-	gint _tmp35__length1 = 0;
-	UtilsVersionNumber* _tmp36_ = NULL;
-	UtilsVersionNumber* _tmp37_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp38_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp39_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp40_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp41_ = NULL;
-	gint* _tmp42_ = NULL;
-	gint* _tmp43_ = NULL;
-	gint _tmp43__length1 = 0;
-	UtilsVersionNumber* _tmp44_ = NULL;
-	UtilsVersionNumber* _tmp45_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp46_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp47_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp48_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp49_ = NULL;
-	gint* _tmp50_ = NULL;
-	gint* _tmp51_ = NULL;
-	gint _tmp51__length1 = 0;
-	UtilsVersionNumber* _tmp52_ = NULL;
-	UtilsVersionNumber* _tmp53_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp54_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp55_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp56_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp57_ = NULL;
-	GeeMap* _tmp58_ = NULL;
+	GeeArrayList* _tmp1_;
+	gint* _tmp2_;
+	gint* _tmp3_;
+	gint _tmp3__length1;
+	UtilsVersionNumber* _tmp4_;
+	UtilsVersionNumber* _tmp5_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp6_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp7_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp8_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp9_;
+	gint* _tmp10_;
+	gint* _tmp11_;
+	gint _tmp11__length1;
+	UtilsVersionNumber* _tmp12_;
+	UtilsVersionNumber* _tmp13_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp14_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp15_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp17_;
+	gint* _tmp18_;
+	gint* _tmp19_;
+	gint _tmp19__length1;
+	UtilsVersionNumber* _tmp20_;
+	UtilsVersionNumber* _tmp21_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp22_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp23_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp24_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp25_;
+	gint* _tmp26_;
+	gint* _tmp27_;
+	gint _tmp27__length1;
+	UtilsVersionNumber* _tmp28_;
+	UtilsVersionNumber* _tmp29_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp30_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp31_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp32_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp33_;
+	gint* _tmp34_;
+	gint* _tmp35_;
+	gint _tmp35__length1;
+	UtilsVersionNumber* _tmp36_;
+	UtilsVersionNumber* _tmp37_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp38_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp39_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp40_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp41_;
+	gint* _tmp42_;
+	gint* _tmp43_;
+	gint _tmp43__length1;
+	UtilsVersionNumber* _tmp44_;
+	UtilsVersionNumber* _tmp45_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp46_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp47_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp48_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp49_;
+	gint* _tmp50_;
+	gint* _tmp51_;
+	gint _tmp51__length1;
+	UtilsVersionNumber* _tmp52_;
+	UtilsVersionNumber* _tmp53_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp54_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp55_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp56_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp57_;
+	GeeMap* _tmp58_;
 	GeeList* tags_list = NULL;
-	GeeArrayList* _tmp59_ = NULL;
-	gint* _tmp60_ = NULL;
-	gint* _tmp61_ = NULL;
-	gint _tmp61__length1 = 0;
-	UtilsVersionNumber* _tmp62_ = NULL;
-	UtilsVersionNumber* _tmp63_ = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp64_ = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp65_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp66_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp67_ = NULL;
-	GeeMap* _tmp68_ = NULL;
+	GeeArrayList* _tmp59_;
+	gint* _tmp60_;
+	gint* _tmp61_;
+	gint _tmp61__length1;
+	UtilsVersionNumber* _tmp62_;
+	UtilsVersionNumber* _tmp63_;
+	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp64_;
+	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp65_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp66_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp67_;
+	GeeMap* _tmp68_;
 	GeeList* photo_tags_list = NULL;
-	GeeArrayList* _tmp69_ = NULL;
-	gint* _tmp70_ = NULL;
-	gint* _tmp71_ = NULL;
-	gint _tmp71__length1 = 0;
-	UtilsVersionNumber* _tmp72_ = NULL;
-	UtilsVersionNumber* _tmp73_ = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp74_ = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp75_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp76_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp77_ = NULL;
-	GeeMap* _tmp78_ = NULL;
+	GeeArrayList* _tmp69_;
+	gint* _tmp70_;
+	gint* _tmp71_;
+	gint _tmp71__length1;
+	UtilsVersionNumber* _tmp72_;
+	UtilsVersionNumber* _tmp73_;
+	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp74_;
+	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp75_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp76_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp77_;
+	GeeMap* _tmp78_;
 	GeeList* photo_versions_list = NULL;
-	GeeArrayList* _tmp79_ = NULL;
-	gint* _tmp80_ = NULL;
-	gint* _tmp81_ = NULL;
-	gint _tmp81__length1 = 0;
-	UtilsVersionNumber* _tmp82_ = NULL;
-	UtilsVersionNumber* _tmp83_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp84_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp85_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp86_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp87_ = NULL;
-	gint* _tmp88_ = NULL;
-	gint* _tmp89_ = NULL;
-	gint _tmp89__length1 = 0;
-	UtilsVersionNumber* _tmp90_ = NULL;
-	UtilsVersionNumber* _tmp91_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp92_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp93_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp94_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp95_ = NULL;
-	gint* _tmp96_ = NULL;
-	gint* _tmp97_ = NULL;
-	gint _tmp97__length1 = 0;
-	UtilsVersionNumber* _tmp98_ = NULL;
-	UtilsVersionNumber* _tmp99_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp100_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp101_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp102_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp103_ = NULL;
-	gint* _tmp104_ = NULL;
-	gint* _tmp105_ = NULL;
-	gint _tmp105__length1 = 0;
-	UtilsVersionNumber* _tmp106_ = NULL;
-	UtilsVersionNumber* _tmp107_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp108_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp109_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp110_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp111_ = NULL;
-	gint* _tmp112_ = NULL;
-	gint* _tmp113_ = NULL;
-	gint _tmp113__length1 = 0;
-	UtilsVersionNumber* _tmp114_ = NULL;
-	UtilsVersionNumber* _tmp115_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp116_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp117_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp118_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp119_ = NULL;
-	GeeMap* _tmp120_ = NULL;
+	GeeArrayList* _tmp79_;
+	gint* _tmp80_;
+	gint* _tmp81_;
+	gint _tmp81__length1;
+	UtilsVersionNumber* _tmp82_;
+	UtilsVersionNumber* _tmp83_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp84_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp85_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp86_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp87_;
+	gint* _tmp88_;
+	gint* _tmp89_;
+	gint _tmp89__length1;
+	UtilsVersionNumber* _tmp90_;
+	UtilsVersionNumber* _tmp91_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp92_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp93_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp94_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp95_;
+	gint* _tmp96_;
+	gint* _tmp97_;
+	gint _tmp97__length1;
+	UtilsVersionNumber* _tmp98_;
+	UtilsVersionNumber* _tmp99_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp100_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp101_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp102_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp103_;
+	gint* _tmp104_;
+	gint* _tmp105_;
+	gint _tmp105__length1;
+	UtilsVersionNumber* _tmp106_;
+	UtilsVersionNumber* _tmp107_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp108_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp109_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp110_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp111_;
+	gint* _tmp112_;
+	gint* _tmp113_;
+	gint _tmp113__length1;
+	UtilsVersionNumber* _tmp114_;
+	UtilsVersionNumber* _tmp115_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp116_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp117_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp118_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp119_;
+	GeeMap* _tmp120_;
 	GeeList* rolls_list = NULL;
-	GeeArrayList* _tmp121_ = NULL;
-	gint* _tmp122_ = NULL;
-	gint* _tmp123_ = NULL;
-	gint _tmp123__length1 = 0;
-	UtilsVersionNumber* _tmp124_ = NULL;
-	UtilsVersionNumber* _tmp125_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp126_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp127_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp128_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp129_ = NULL;
-	gint* _tmp130_ = NULL;
-	gint* _tmp131_ = NULL;
-	gint _tmp131__length1 = 0;
-	UtilsVersionNumber* _tmp132_ = NULL;
-	UtilsVersionNumber* _tmp133_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp134_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp135_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp136_ = NULL;
-	DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_ = NULL;
-	GeeMap* _tmp138_ = NULL;
+	GeeArrayList* _tmp121_;
+	gint* _tmp122_;
+	gint* _tmp123_;
+	gint _tmp123__length1;
+	UtilsVersionNumber* _tmp124_;
+	UtilsVersionNumber* _tmp125_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp126_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp127_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp128_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp129_;
+	gint* _tmp130_;
+	gint* _tmp131_;
+	gint _tmp131__length1;
+	UtilsVersionNumber* _tmp132_;
+	UtilsVersionNumber* _tmp133_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp134_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp135_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp136_;
+	DataImportsFSpotDbFSpotBehaviorEntry* _tmp137_;
+	GeeMap* _tmp138_;
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	_tmp0_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, GEE_TYPE_LIST, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1445,10 +1445,10 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
 	DataImportsFSpotDbFSpotTableBehavior* behavior = NULL;
 	GeeList* behavior_list = NULL;
-	GeeMap* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gpointer _tmp2_ = NULL;
-	GeeList* _tmp3_ = NULL;
+	GeeMap* _tmp0_;
+	const gchar* _tmp1_;
+	gpointer _tmp2_;
+	GeeList* _tmp3_;
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (table_name != NULL, NULL);
 #line 146 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1470,12 +1470,12 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 1471 "FSpotDatabaseBehavior.c"
 		{
 			GeeList* _entry_list = NULL;
-			GeeList* _tmp4_ = NULL;
-			GeeList* _tmp5_ = NULL;
+			GeeList* _tmp4_;
+			GeeList* _tmp5_;
 			gint _entry_size = 0;
-			GeeList* _tmp6_ = NULL;
-			gint _tmp7_ = 0;
-			gint _tmp8_ = 0;
+			GeeList* _tmp6_;
+			gint _tmp7_;
+			gint _tmp8_;
 			gint _entry_index = 0;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 			_tmp4_ = behavior_list;
@@ -1496,19 +1496,19 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 			while (TRUE) {
 #line 1499 "FSpotDatabaseBehavior.c"
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gint _tmp11_ = 0;
+				gint _tmp9_;
+				gint _tmp10_;
+				gint _tmp11_;
 				DataImportsFSpotDbFSpotBehaviorEntry* entry = NULL;
-				GeeList* _tmp12_ = NULL;
-				gint _tmp13_ = 0;
-				gpointer _tmp14_ = NULL;
-				UtilsVersionNumber* _tmp15_ = NULL;
-				DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_ = NULL;
-				UtilsVersionNumber* _tmp17_ = NULL;
-				UtilsVersionNumber* _tmp18_ = NULL;
-				gint _tmp19_ = 0;
-				gboolean _tmp20_ = FALSE;
+				GeeList* _tmp12_;
+				gint _tmp13_;
+				gpointer _tmp14_;
+				UtilsVersionNumber* _tmp15_;
+				DataImportsFSpotDbFSpotBehaviorEntry* _tmp16_;
+				UtilsVersionNumber* _tmp17_;
+				UtilsVersionNumber* _tmp18_;
+				gint _tmp19_;
+				gboolean _tmp20_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 				_tmp9_ = _entry_index;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1548,8 +1548,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 				if (_tmp20_) {
 #line 1551 "FSpotDatabaseBehavior.c"
-					DataImportsFSpotDbFSpotBehaviorEntry* _tmp21_ = NULL;
-					DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL;
+					DataImportsFSpotDbFSpotBehaviorEntry* _tmp21_;
+					DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 					_tmp21_ = entry;
 #line 152 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1569,7 +1569,7 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 #line 1570 "FSpotDatabaseBehavior.c"
 		}
 	} else {
-		const gchar* _tmp23_ = NULL;
+		const gchar* _tmp23_;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp23_ = table_name;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1589,34 +1589,34 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_behavior_construct (GType object_type, UtilsVersionNumber* version, GError** error) {
 	DataImportsFSpotDbFSpotDatabaseBehavior * self = NULL;
-	UtilsVersionNumber* _tmp0_ = NULL;
-	UtilsVersionNumber* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	UtilsVersionNumber* _tmp0_;
+	UtilsVersionNumber* _tmp1_;
+	gint _tmp2_;
 	DataImportsFSpotDbFSpotTableBehavior* photos_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp8_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp9_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp10_ = NULL;
+	UtilsVersionNumber* _tmp8_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp9_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp10_;
 	DataImportsFSpotDbFSpotTableBehavior* tags_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp14_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp15_ = NULL;
+	UtilsVersionNumber* _tmp13_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp14_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp15_;
 	DataImportsFSpotDbFSpotTableBehavior* photo_tags_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp19_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp20_ = NULL;
+	UtilsVersionNumber* _tmp18_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp19_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp20_;
 	DataImportsFSpotDbFSpotTableBehavior* photo_versions_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp24_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp25_ = NULL;
+	UtilsVersionNumber* _tmp23_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp24_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp25_;
 	DataImportsFSpotDbFSpotTableBehavior* rolls_generic_behavior = NULL;
-	UtilsVersionNumber* _tmp28_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp29_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp30_ = NULL;
+	UtilsVersionNumber* _tmp28_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp29_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp30_;
 	gboolean _tmp33_ = FALSE;
 	gboolean _tmp34_ = FALSE;
 	gboolean _tmp35_ = FALSE;
 	gboolean _tmp36_ = FALSE;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp37_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp37_;
 	GError * _inner_error_ = NULL;
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (version), NULL);
@@ -1631,11 +1631,11 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp2_ >= 0) {
 #line 1633 "FSpotDatabaseBehavior.c"
-		UtilsVersionNumber* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
-		gchar* _tmp5_ = NULL;
-		GError* _tmp6_ = NULL;
-		GError* _tmp7_ = NULL;
+		UtilsVersionNumber* _tmp3_;
+		gchar* _tmp4_;
+		gchar* _tmp5_;
+		GError* _tmp6_;
+		GError* _tmp7_;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp3_ = version;
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1680,8 +1680,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp10_ != NULL) {
 #line 1682 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp11_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp12_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp11_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp12_;
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp11_ = photos_generic_behavior;
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1703,8 +1703,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp15_ != NULL) {
 #line 1705 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp16_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp17_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp16_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp17_;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp16_ = tags_generic_behavior;
 #line 168 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1726,8 +1726,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp20_ != NULL) {
 #line 1728 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp21_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp21_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp21_ = photo_tags_generic_behavior;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1749,8 +1749,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 173 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp25_ != NULL) {
 #line 1751 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp26_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp27_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp26_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp27_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp26_ = photo_versions_generic_behavior;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1772,8 +1772,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 176 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp30_ != NULL) {
 #line 1774 "FSpotDatabaseBehavior.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp31_ = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp32_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp31_;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp32_;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp31_ = rolls_generic_behavior;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1792,7 +1792,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp36_ = TRUE;
 #line 1793 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp38_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp38_;
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp38_ = self->priv->tags_behavior;
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1805,7 +1805,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp35_ = TRUE;
 #line 1806 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp39_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp39_;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp39_ = self->priv->photo_tags_behavior;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1818,7 +1818,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp34_ = TRUE;
 #line 1819 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp40_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp40_;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp40_ = self->priv->photo_versions_behavior;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1831,7 +1831,7 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 		_tmp33_ = TRUE;
 #line 1832 "FSpotDatabaseBehavior.c"
 	} else {
-		DataImportsFSpotDbFSpotTableBehavior* _tmp41_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp41_;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp41_ = self->priv->rolls_behavior;
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1841,11 +1841,11 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	if (_tmp33_) {
 #line 1843 "FSpotDatabaseBehavior.c"
-		UtilsVersionNumber* _tmp42_ = NULL;
-		gchar* _tmp43_ = NULL;
-		gchar* _tmp44_ = NULL;
-		GError* _tmp45_ = NULL;
-		GError* _tmp46_ = NULL;
+		UtilsVersionNumber* _tmp42_;
+		gchar* _tmp43_;
+		gchar* _tmp44_;
+		GError* _tmp45_;
+		GError* _tmp46_;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 		_tmp42_ = version;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1924,8 +1924,8 @@ DataImportsFSpotDbFSpotDatabaseBehavior* data_imports_fspot_db_fspot_database_be
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1942,8 +1942,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1960,8 +1960,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_tags_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 194 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1978,8 +1978,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photo_versions_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -1996,8 +1996,8 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_rolls_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_BEHAVIOR (self), NULL);
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -2013,10 +2013,10 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behav
 
 
 static void data_imports_fspot_db_fspot_database_behavior_class_init (DataImportsFSpotDbFSpotDatabaseBehaviorClass * klass) {
-	gint* _tmp0_ = NULL;
-	gint* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	UtilsVersionNumber* _tmp2_ = NULL;
+	gint* _tmp0_;
+	gint* _tmp1_;
+	gint _tmp1__length1;
+	UtilsVersionNumber* _tmp2_;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	data_imports_fspot_db_fspot_database_behavior_parent_class = g_type_class_peek_parent (klass);
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
@@ -2046,7 +2046,7 @@ static void data_imports_fspot_db_fspot_database_behavior_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_database_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotDatabaseBehavior * self;
 #line 31 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseBehavior.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_BEHAVIOR, DataImportsFSpotDbFSpotDatabaseBehavior);
diff --git a/plugins/shotwell-data-imports/FSpotDatabaseTable.c b/plugins/shotwell-data-imports/FSpotDatabaseTable.c
index 1583846..129b3c7 100644
--- a/plugins/shotwell-data-imports/FSpotDatabaseTable.c
+++ b/plugins/shotwell-data-imports/FSpotDatabaseTable.c
@@ -1,4 +1,4 @@
-/* FSpotDatabaseTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotDatabaseTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotDatabaseTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -117,16 +117,16 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table
 gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table);
 gchar** data_imports_fspot_db_fspot_table_behavior_list_columns (DataImportsFSpotDbFSpotTableBehavior* self, int* result_length1);
 GQuark database_error_quark (void);
-gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt** stmt, GError** error);
+gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error);
 void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
-static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable* obj);
+static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 DataImportsFSpotDbFSpotDatabaseTable* data_imports_fspot_db_fspot_database_table_construct (GType object_type, GType t_type, GBoxedCopyFunc t_dup_func, GDestroyNotify t_destroy_func, sqlite3* db) {
 	DataImportsFSpotDbFSpotDatabaseTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
+	sqlite3* _tmp0_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -155,11 +155,11 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 
 void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDbFSpotDatabaseTable* self, DataImportsFSpotDbFSpotTableBehavior* behavior) {
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	g_return_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self));
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -188,8 +188,8 @@ void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDb
 
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table_get_behavior (DataImportsFSpotDbFSpotDatabaseTable* self) {
 	DataImportsFSpotDbFSpotTableBehavior* result = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp1_;
 #line 25 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), NULL);
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -206,408 +206,408 @@ DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_table
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
 #line 221 "FSpotDatabaseTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 231 "FSpotDatabaseTable.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 241 "FSpotDatabaseTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 247 "FSpotDatabaseTable.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 258 "FSpotDatabaseTable.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 270 "FSpotDatabaseTable.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 274 "FSpotDatabaseTable.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 278 "FSpotDatabaseTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 282 "FSpotDatabaseTable.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 305 "FSpotDatabaseTable.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 314 "FSpotDatabaseTable.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 327 "FSpotDatabaseTable.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 333 "FSpotDatabaseTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 343 "FSpotDatabaseTable.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 355 "FSpotDatabaseTable.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 359 "FSpotDatabaseTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 365 "FSpotDatabaseTable.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 376 "FSpotDatabaseTable.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 391 "FSpotDatabaseTable.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 395 "FSpotDatabaseTable.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 399 "FSpotDatabaseTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 405 "FSpotDatabaseTable.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 417 "FSpotDatabaseTable.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 438 "FSpotDatabaseTable.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 442 "FSpotDatabaseTable.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 448 "FSpotDatabaseTable.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 455 "FSpotDatabaseTable.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
 #line 463 "FSpotDatabaseTable.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 501 "FSpotDatabaseTable.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 510 "FSpotDatabaseTable.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 526 "FSpotDatabaseTable.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 532 "FSpotDatabaseTable.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 546 "FSpotDatabaseTable.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 566 "FSpotDatabaseTable.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 581 "FSpotDatabaseTable.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 585 "FSpotDatabaseTable.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 593 "FSpotDatabaseTable.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 604 "FSpotDatabaseTable.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 613 "FSpotDatabaseTable.c"
 	}
@@ -617,15 +617,15 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataImportsFSpotDbFSpotDatabaseTable* self, gboolean with_table) {
 	gchar* result = NULL;
 	gchar** columns = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint columns_length1 = 0;
-	gint _columns_size_ = 0;
-	gboolean _tmp3_ = FALSE;
-	gchar** _tmp16_ = NULL;
-	gint _tmp16__length1 = 0;
-	gchar* _tmp17_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint columns_length1;
+	gint _columns_size_;
+	gboolean _tmp3_;
+	gchar** _tmp16_;
+	gint _tmp16__length1;
+	gchar* _tmp17_;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), NULL);
 #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -655,23 +655,23 @@ gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataIm
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 				while (TRUE) {
 #line 658 "FSpotDatabaseTable.c"
-					gint _tmp6_ = 0;
-					gchar** _tmp7_ = NULL;
-					gint _tmp7__length1 = 0;
-					gchar** _tmp8_ = NULL;
-					gint _tmp8__length1 = 0;
-					gint _tmp9_ = 0;
-					const gchar* _tmp10_ = NULL;
-					gchar** _tmp11_ = NULL;
-					gint _tmp11__length1 = 0;
-					gint _tmp12_ = 0;
-					const gchar* _tmp13_ = NULL;
-					gchar* _tmp14_ = NULL;
-					gchar* _tmp15_ = NULL;
+					gint _tmp6_;
+					gchar** _tmp7_;
+					gint _tmp7__length1;
+					gchar** _tmp8_;
+					gint _tmp8__length1;
+					gint _tmp9_;
+					const gchar* _tmp10_;
+					gchar** _tmp11_;
+					gint _tmp11__length1;
+					gint _tmp12_;
+					const gchar* _tmp13_;
+					gchar* _tmp14_;
+					gchar* _tmp15_;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 					if (!_tmp4_) {
 #line 674 "FSpotDatabaseTable.c"
-						gint _tmp5_ = 0;
+						gint _tmp5_;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 						_tmp5_ = i;
 #line 32 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -737,25 +737,25 @@ gchar* data_imports_fspot_db_fspot_database_table_get_joined_column_list (DataIm
 }
 
 
-gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt** stmt, GError** error) {
+gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error) {
 	sqlite3_stmt* _vala_stmt = NULL;
 	gint result = 0;
 	gchar* column_list = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* sql = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 	gint res = 0;
-	sqlite3* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	sqlite3* _tmp4_;
+	const gchar* _tmp5_;
 	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp15_;
+	gint _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	gint _tmp18_ = 0;
+	gint _tmp18_;
 	GError * _inner_error_ = NULL;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_DATABASE_TABLE (self), 0);
@@ -788,10 +788,10 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	if (_tmp8_ != SQLITE_OK) {
 #line 791 "FSpotDatabaseTable.c"
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gint _tmp12_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 		_tmp9_ = sql;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -846,7 +846,7 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	if (_tmp18_ != SQLITE_ROW) {
 #line 849 "FSpotDatabaseTable.c"
-		gint _tmp19_ = 0;
+		gint _tmp19_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 		_tmp19_ = res;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -860,11 +860,11 @@ gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFS
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	if (_tmp17_) {
 #line 863 "FSpotDatabaseTable.c"
-		const gchar* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		gchar* _tmp23_ = NULL;
-		gint _tmp24_ = 0;
+		const gchar* _tmp20_;
+		const gchar* _tmp21_;
+		gchar* _tmp22_;
+		gchar* _tmp23_;
+		gint _tmp24_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable)->table_name;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
@@ -950,7 +950,7 @@ static void data_imports_fspot_db_fspot_database_table_instance_init (DataImport
 }
 
 
-static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable* obj) {
+static void data_imports_fspot_db_fspot_database_table_finalize (ImportableDatabaseTable * obj) {
 	DataImportsFSpotDbFSpotDatabaseTable * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotDatabaseTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable);
diff --git a/plugins/shotwell-data-imports/FSpotImporter.c b/plugins/shotwell-data-imports/FSpotImporter.c
index c0fc03a..cc05c99 100644
--- a/plugins/shotwell-data-imports/FSpotImporter.c
+++ b/plugins/shotwell-data-imports/FSpotImporter.c
@@ -1,4 +1,4 @@
-/* FSpotImporter.c generated by valac 0.34.7, the Vala compiler
+/* FSpotImporter.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotImporter.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -422,21 +422,21 @@ static gint fspot_service_icon_pixbuf_set_length1;
 static GdkPixbuf** fspot_service_icon_pixbuf_set = NULL;
 static gint fspot_service_icon_pixbuf_set_length1 = 0;
 static gint _fspot_service_icon_pixbuf_set_size_ = 0;
-static SpitPluggableIface* fspot_service_spit_pluggable_parent_iface = NULL;
-static SpitDataImportsServiceIface* fspot_service_spit_data_imports_service_parent_iface = NULL;
+static SpitPluggableIface * fspot_service_spit_pluggable_parent_iface = NULL;
+static SpitDataImportsServiceIface * fspot_service_spit_data_imports_service_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_library_parent_class = NULL;
-static SpitDataImportsImportableLibraryIface* data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = NULL;
+static SpitDataImportsImportableLibraryIface * data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_item_parent_class = NULL;
-static SpitDataImportsImportableMediaItemIface* data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = NULL;
+static SpitDataImportsImportableMediaItemIface * data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_tag_parent_class = NULL;
-static SpitDataImportsImportableTagIface* data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = NULL;
+static SpitDataImportsImportableTagIface * data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_event_parent_class = NULL;
-static SpitDataImportsImportableEventIface* data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = NULL;
+static SpitDataImportsImportableEventIface * data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_importable_rating_parent_class = NULL;
-static SpitDataImportsImportableRatingIface* data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = NULL;
+static SpitDataImportsImportableRatingIface * data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = NULL;
 static gpointer data_imports_fspot_fspot_tags_cache_parent_class = NULL;
 static gpointer data_imports_fspot_fspot_data_importer_parent_class = NULL;
-static SpitDataImportsDataImporterIface* data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = NULL;
+static SpitDataImportsDataImporterIface * data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = NULL;
 
 GType fspot_service_get_type (void) G_GNUC_CONST;
 enum  {
@@ -456,7 +456,7 @@ static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (Spi
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host);
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host);
 GType data_imports_fspot_fspot_data_importer_get_type (void) G_GNUC_CONST;
-static void fspot_service_finalize (GObject* obj);
+static void fspot_service_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_SERVICE_NAME "F-Spot"
 #define DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE _ ("Welcome to the F-Spot library import service.\n" \
 "\n" \
@@ -489,7 +489,7 @@ DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_libr
 DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file);
 GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self);
 static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base);
-static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj);
 GType data_imports_fspot_fspot_importable_item_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
 GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST;
@@ -511,14 +511,14 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED 0
 static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url);
 static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_real_get_tags (SpitDataImportsImportableMediaItem* base, int* result_length1);
-static void _vala_array_add1 (SpitDataImportsImportableTag*** array, int* length, int* size, SpitDataImportsImportableTag* value);
+static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value);
 static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base);
 static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base);
 static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base);
 static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataImportsImportableMediaItem* base);
 static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base);
 static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base);
-static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTagPrivate))
 enum  {
@@ -536,13 +536,13 @@ gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpot
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self);
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row);
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row);
-static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEventPrivate))
 enum  {
 	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_DUMMY_PROPERTY
 };
 static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base);
-static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRatingPrivate))
 enum  {
 	DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_DUMMY_PROPERTY
@@ -550,7 +550,7 @@ enum  {
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base);
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base);
 static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base);
-static void data_imports_fspot_fspot_importable_rating_finalize (GObject* obj);
+static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj);
 GType data_imports_fspot_fspot_tags_cache_get_type (void) G_GNUC_CONST;
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
@@ -572,7 +572,7 @@ static gint64* _int64_dup (gint64* self);
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error);
 static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error);
 DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 tag_id, GError** error);
-static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj);
+static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj);
 #define DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporterPrivate))
 enum  {
 	DATA_IMPORTS_FSPOT_FSPOT_DATA_IMPORTER_DUMMY_PROPERTY
@@ -582,7 +582,7 @@ static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_s
 static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base);
 static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self);
 static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDataImporter* base);
-static void _vala_array_add2 (SpitDataImportsImportableLibrary*** array, int* length, int* size, SpitDataImportsImportableLibrary* value);
+static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value);
 static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library);
 static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDataImportsDataImporter* base, GFile* file);
 GType data_imports_fspot_db_fspot_database_get_type (void) G_GNUC_CONST;
@@ -595,26 +595,26 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot
 GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error);
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id);
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag);
-static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag*** array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value);
+static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value);
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_id (DataImportsFSpotDbFSpotRollsTable* self, gint64 roll_id, GError** error);
 GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error);
-static void _vala_array_add4 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
-static void _vala_array_add5 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
-static void _vala_array_add6 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
+static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
+static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
+static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value);
 void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count);
 static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self);
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag);
 #define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_EVENTS "stock_icon:emblem-event"
 #define DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_TABLE_STOCK_ICON_FAV "stock_icon:emblem-favorite"
-static void data_imports_fspot_fspot_data_importer_finalize (GObject* obj);
+static void data_imports_fspot_fspot_data_importer_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
 FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory) {
 	FSpotService * self = NULL;
-	GdkPixbuf** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
+	GdkPixbuf** _tmp0_;
+	gint _tmp0__length1;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (G_IS_FILE (resource_directory), NULL);
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -628,8 +628,8 @@ FSpotService* fspot_service_construct (GType object_type, GFile* resource_direct
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp0_ == NULL) {
 #line 617 "FSpotImporter.c"
-		gint _tmp1_ = 0;
-		GdkPixbuf** _tmp2_ = NULL;
+		gint _tmp1_;
+		GdkPixbuf** _tmp2_;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp2_ = resources_load_from_resource ("/org/gnome/Shotwell/Imports/" FSPOT_SERVICE_ICON_FILENAME, &_tmp1_);
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -658,9 +658,9 @@ FSpotService* fspot_service_new (GFile* resource_directory) {
 static gint fspot_service_real_get_pluggable_interface (SpitPluggable* base, gint min_host_interface, gint max_host_interface) {
 	FSpotService * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -718,7 +718,7 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	for (i = 0; i < length; i++) {
 #line 707 "FSpotImporter.c"
-		GdkPixbuf* _tmp0_ = NULL;
+		GdkPixbuf* _tmp0_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -733,18 +733,17 @@ static GdkPixbuf** _vala_array_dup1 (GdkPixbuf** self, int length) {
 
 static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo* info) {
 	FSpotService * self;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	GdkPixbuf** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
-	GdkPixbuf** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	GdkPixbuf** _tmp7_;
+	gint _tmp7__length1;
+	GdkPixbuf** _tmp8_;
+	gint _tmp8__length1;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -756,60 +755,58 @@ static void fspot_service_real_get_info (SpitPluggable* base, SpitPluggableInfo*
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*info).authors = _tmp0_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = _ ("Copyright 2016 Software Freedom Conservancy Inc.");
-#line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_strdup (_tmp1_);
+	_tmp1_ = g_strdup (_ ("Copyright 2016 Software Freedom Conservancy Inc."));
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).copyright);
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).copyright = _tmp2_;
+	(*info).copyright = _tmp1_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = g_strdup (RESOURCES_TRANSLATORS);
+	_tmp2_ = g_strdup (RESOURCES_TRANSLATORS);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).translators);
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).translators = _tmp3_;
+	(*info).translators = _tmp2_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = g_strdup (_VERSION);
+	_tmp3_ = g_strdup (_VERSION);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).version);
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).version = _tmp4_;
+	(*info).version = _tmp3_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = g_strdup (RESOURCES_WEBSITE_NAME);
+	_tmp4_ = g_strdup (RESOURCES_WEBSITE_NAME);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).website_name);
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).website_name = _tmp5_;
+	(*info).website_name = _tmp4_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp6_ = g_strdup (RESOURCES_WEBSITE_URL);
+	_tmp5_ = g_strdup (RESOURCES_WEBSITE_URL);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).website_url);
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).website_url = _tmp6_;
+	(*info).website_url = _tmp5_;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*info).is_license_wordwrapped = FALSE;
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp7_ = g_strdup (RESOURCES_LICENSE);
+	_tmp6_ = g_strdup (RESOURCES_LICENSE);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 ((*info).license);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).license = _tmp7_;
+	(*info).license = _tmp6_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8_ = fspot_service_icon_pixbuf_set;
+	_tmp7_ = fspot_service_icon_pixbuf_set;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp8__length1 = fspot_service_icon_pixbuf_set_length1;
+	_tmp7__length1 = fspot_service_icon_pixbuf_set_length1;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp9_ = (_tmp8_ != NULL) ? _vala_array_dup1 (_tmp8_, _tmp8__length1) : ((gpointer) _tmp8_);
+	_tmp8_ = (_tmp7_ != NULL) ? _vala_array_dup1 (_tmp7_, _tmp7__length1) : ((gpointer) _tmp7_);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp9__length1 = _tmp8__length1;
+	_tmp8__length1 = _tmp7__length1;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*info).icons = (_vala_array_free ((*info).icons, (*info).icons_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).icons = _tmp9_;
+	(*info).icons = _tmp8_;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	(*info).icons_length1 = _tmp9__length1;
-#line 799 "FSpotImporter.c"
+	(*info).icons_length1 = _tmp8__length1;
+#line 796 "FSpotImporter.c"
 }
 
 
@@ -817,15 +814,15 @@ static void fspot_service_real_activation (SpitPluggable* base, gboolean enabled
 	FSpotService * self;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
-#line 807 "FSpotImporter.c"
+#line 804 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (SpitDataImportsService* base, SpitDataImportsPluginHost* host) {
 	FSpotService * self;
 	SpitDataImportsDataImporter* result = NULL;
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	DataImportsFSpotFSpotDataImporter* _tmp1_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	DataImportsFSpotFSpotDataImporter* _tmp1_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_FSPOT_SERVICE, FSpotService);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -838,7 +835,7 @@ static SpitDataImportsDataImporter* fspot_service_real_create_data_importer (Spi
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter);
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 828 "FSpotImporter.c"
+#line 825 "FSpotImporter.c"
 }
 
 
@@ -847,7 +844,7 @@ static void fspot_service_class_init (FSpotServiceClass * klass) {
 	fspot_service_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = fspot_service_finalize;
-#line 837 "FSpotImporter.c"
+#line 834 "FSpotImporter.c"
 }
 
 
@@ -855,16 +852,16 @@ static void fspot_service_spit_pluggable_interface_init (SpitPluggableIface * if
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	fspot_service_spit_pluggable_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_pluggable_interface = (gint (*)(SpitPluggable*, gint, gint)) fspot_service_real_get_pluggable_interface;
+	iface->get_pluggable_interface = (gint (*) (SpitPluggable *, gint, gint)) fspot_service_real_get_pluggable_interface;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_id = (const gchar* (*)(SpitPluggable*)) fspot_service_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_id;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_pluggable_name = (const gchar* (*)(SpitPluggable*)) fspot_service_real_get_pluggable_name;
+	iface->get_pluggable_name = (const gchar* (*) (SpitPluggable *)) fspot_service_real_get_pluggable_name;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_info = (void (*)(SpitPluggable*, SpitPluggableInfo*)) fspot_service_real_get_info;
+	iface->get_info = (void (*) (SpitPluggable *, SpitPluggableInfo*)) fspot_service_real_get_info;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->activation = (void (*)(SpitPluggable*, gboolean)) fspot_service_real_activation;
-#line 854 "FSpotImporter.c"
+	iface->activation = (void (*) (SpitPluggable *, gboolean)) fspot_service_real_activation;
+#line 851 "FSpotImporter.c"
 }
 
 
@@ -872,8 +869,8 @@ static void fspot_service_spit_data_imports_service_interface_init (SpitDataImpo
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	fspot_service_spit_data_imports_service_parent_iface = g_type_interface_peek_parent (iface);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->create_data_importer = (SpitDataImportsDataImporter* (*)(SpitDataImportsService*, SpitDataImportsPluginHost*)) fspot_service_real_create_data_importer;
-#line 863 "FSpotImporter.c"
+	iface->create_data_importer = (SpitDataImportsDataImporter* (*) (SpitDataImportsService *, SpitDataImportsPluginHost*)) fspot_service_real_create_data_importer;
+#line 860 "FSpotImporter.c"
 }
 
 
@@ -881,13 +878,13 @@ static void fspot_service_instance_init (FSpotService * self) {
 }
 
 
-static void fspot_service_finalize (GObject* obj) {
+static void fspot_service_finalize (GObject * obj) {
 	FSpotService * self;
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_FSPOT_SERVICE, FSpotService);
 #line 7 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (fspot_service_parent_class)->finalize (obj);
-#line 877 "FSpotImporter.c"
+#line 874 "FSpotImporter.c"
 }
 
 
@@ -909,8 +906,8 @@ GType fspot_service_get_type (void) {
 
 DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_construct (GType object_type, GFile* db_file) {
 	DataImportsFSpotFSpotImportableLibrary * self = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (G_IS_FILE (db_file), NULL);
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -925,21 +922,21 @@ DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_libr
 	self->priv->db_file = _tmp1_;
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 915 "FSpotImporter.c"
+#line 912 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableLibrary* data_imports_fspot_fspot_importable_library_new (GFile* db_file) {
 #line 77 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_library_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, db_file);
-#line 922 "FSpotImporter.c"
+#line 919 "FSpotImporter.c"
 }
 
 
 GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpotFSpotImportableLibrary* self) {
 	GFile* result = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_LIBRARY (self), NULL);
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -950,40 +947,37 @@ GFile* data_imports_fspot_fspot_importable_library_get_db_file (DataImportsFSpot
 	result = _tmp1_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 940 "FSpotImporter.c"
+#line 937 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_library_real_get_display_name (SpitDataImportsImportableLibrary* base) {
 	DataImportsFSpotFSpotImportableLibrary * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
+	GFile* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
 #line 85 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp0_ = _ ("F-Spot library: %s");
-#line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp1_ = self->priv->db_file;
+	_tmp0_ = self->priv->db_file;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp2_ = g_file_get_path (_tmp1_);
+	_tmp1_ = g_file_get_path (_tmp0_);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp4_ = g_strdup_printf (_tmp0_, _tmp3_);
+	_tmp3_ = g_strdup_printf (_ ("F-Spot library: %s"), _tmp2_);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_g_free0 (_tmp3_);
+	_g_free0 (_tmp2_);
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	result = _tmp5_;
+	result = _tmp4_;
 #line 86 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 973 "FSpotImporter.c"
+#line 967 "FSpotImporter.c"
 }
 
 
@@ -994,7 +988,7 @@ static void data_imports_fspot_fspot_importable_library_class_init (DataImportsF
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableLibraryPrivate));
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_library_finalize;
-#line 984 "FSpotImporter.c"
+#line 978 "FSpotImporter.c"
 }
 
 
@@ -1002,19 +996,19 @@ static void data_imports_fspot_fspot_importable_library_spit_data_imports_import
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_library_spit_data_imports_importable_library_parent_iface = g_type_interface_peek_parent (iface);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_display_name = (gchar* (*)(SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_importable_library_real_get_display_name;
-#line 993 "FSpotImporter.c"
+	iface->get_display_name = (gchar* (*) (SpitDataImportsImportableLibrary *)) data_imports_fspot_fspot_importable_library_real_get_display_name;
+#line 987 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_library_instance_init (DataImportsFSpotFSpotImportableLibrary * self) {
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_LIBRARY_GET_PRIVATE (self);
-#line 1000 "FSpotImporter.c"
+#line 994 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_library_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableLibrary * self;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_LIBRARY, DataImportsFSpotFSpotImportableLibrary);
@@ -1022,7 +1016,7 @@ static void data_imports_fspot_fspot_importable_library_finalize (GObject* obj)
 	_g_object_unref0 (self->priv->db_file);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_library_parent_class)->finalize (obj);
-#line 1012 "FSpotImporter.c"
+#line 1006 "FSpotImporter.c"
 }
 
 
@@ -1047,17 +1041,17 @@ static DataImportsFSpotFSpotImportableTag** _vala_array_dup2 (DataImportsFSpotFS
 	result = g_new0 (DataImportsFSpotFSpotImportableTag*, length + 1);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	for (i = 0; i < length; i++) {
-#line 1037 "FSpotImporter.c"
-		DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
+#line 1031 "FSpotImporter.c"
+		DataImportsFSpotFSpotImportableTag* _tmp0_;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = _g_object_ref0 (self[i]);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		result[i] = _tmp0_;
-#line 1043 "FSpotImporter.c"
+#line 1037 "FSpotImporter.c"
 	}
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1047 "FSpotImporter.c"
+#line 1041 "FSpotImporter.c"
 }
 
 
@@ -1069,44 +1063,44 @@ static time_t* _time_t_dup (time_t* self) {
 	memcpy (dup, self, sizeof (time_t));
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return dup;
-#line 1059 "FSpotImporter.c"
+#line 1053 "FSpotImporter.c"
 }
 
 
 static gpointer __time_t_dup0 (gpointer self) {
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self ? _time_t_dup (self) : NULL;
-#line 1066 "FSpotImporter.c"
+#line 1060 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_construct (GType object_type, DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) {
 	DataImportsFSpotFSpotImportableItem * self = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp3_ = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp4_ = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp5_ = NULL;
-	DataImportsFSpotFSpotImportableTag** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	DataImportsFSpotFSpotImportableTag** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
-	DataImportsFSpotFSpotImportableEvent* _tmp8_ = NULL;
-	DataImportsFSpotFSpotImportableEvent* _tmp9_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp10_ = NULL;
-	time_t _tmp11_ = 0;
-	time_t* _tmp12_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp3_;
+	DataImportsFSpotDbFSpotRollRow* _tmp4_;
+	DataImportsFSpotDbFSpotRollRow* _tmp5_;
+	DataImportsFSpotFSpotImportableTag** _tmp6_;
+	gint _tmp6__length1;
+	DataImportsFSpotFSpotImportableTag** _tmp7_;
+	gint _tmp7__length1;
+	DataImportsFSpotFSpotImportableEvent* _tmp8_;
+	DataImportsFSpotFSpotImportableEvent* _tmp9_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp10_;
+	time_t _tmp11_;
+	time_t* _tmp12_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp13_;
+	gint _tmp14_;
 	gchar* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-	gchar* _tmp31_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+	gchar* _tmp31_;
 	const gchar* _tmp32_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp33_ = NULL;
-	gchar* _tmp38_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp33_;
+	gchar* _tmp38_;
 	gboolean _tmp39_ = FALSE;
-	const gchar* _tmp40_ = NULL;
+	const gchar* _tmp40_;
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_ROW (photo_row), NULL);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1181,10 +1175,10 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp14_ = _tmp13_->rating;
 #line 116 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp14_ > 0) {
-#line 1171 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
-		DataImportsFSpotFSpotImportableRating* _tmp17_ = NULL;
+#line 1165 "FSpotImporter.c"
+		DataImportsFSpotDbFSpotPhotoRow* _tmp15_;
+		gint _tmp16_;
+		DataImportsFSpotFSpotImportableRating* _tmp17_;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp15_ = photo_row;
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1195,46 +1189,46 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_g_object_unref0 (self->priv->rating);
 #line 117 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		self->priv->rating = _tmp17_;
-#line 1185 "FSpotImporter.c"
+#line 1179 "FSpotImporter.c"
 	} else {
-		gboolean _tmp18_ = FALSE;
+		gboolean _tmp18_;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp18_ = is_hidden;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (_tmp18_) {
-#line 1192 "FSpotImporter.c"
-			DataImportsFSpotFSpotImportableRating* _tmp19_ = NULL;
+#line 1186 "FSpotImporter.c"
+			DataImportsFSpotFSpotImportableRating* _tmp19_;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp19_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED);
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_g_object_unref0 (self->priv->rating);
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			self->priv->rating = _tmp19_;
-#line 1200 "FSpotImporter.c"
+#line 1194 "FSpotImporter.c"
 		} else {
-			gboolean _tmp20_ = FALSE;
+			gboolean _tmp20_;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp20_ = is_favorite;
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_tmp20_) {
-#line 1207 "FSpotImporter.c"
-				DataImportsFSpotFSpotImportableRating* _tmp21_ = NULL;
+#line 1201 "FSpotImporter.c"
+				DataImportsFSpotFSpotImportableRating* _tmp21_;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp21_ = data_imports_fspot_fspot_importable_rating_new (5);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (self->priv->rating);
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				self->priv->rating = _tmp21_;
-#line 1215 "FSpotImporter.c"
+#line 1209 "FSpotImporter.c"
 			} else {
-				DataImportsFSpotFSpotImportableRating* _tmp22_ = NULL;
+				DataImportsFSpotFSpotImportableRating* _tmp22_;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp22_ = data_imports_fspot_fspot_importable_rating_new (DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (self->priv->rating);
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				self->priv->rating = _tmp22_;
-#line 1224 "FSpotImporter.c"
+#line 1218 "FSpotImporter.c"
 			}
 		}
 	}
@@ -1242,10 +1236,10 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp24_ = photo_version_row;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp24_ != NULL) {
-#line 1232 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL;
-		GFile* _tmp26_ = NULL;
-		gchar* _tmp27_ = NULL;
+#line 1226 "FSpotImporter.c"
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
+		GFile* _tmp26_;
+		gchar* _tmp27_;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp25_ = photo_version_row;
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1256,11 +1250,11 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_g_free0 (_tmp23_);
 #line 127 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp23_ = _tmp27_;
-#line 1246 "FSpotImporter.c"
+#line 1240 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp28_ = NULL;
-		GFile* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp28_;
+		GFile* _tmp29_;
+		gchar* _tmp30_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp28_ = photo_row;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1271,7 +1265,7 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_g_free0 (_tmp23_);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp23_ = _tmp30_;
-#line 1261 "FSpotImporter.c"
+#line 1255 "FSpotImporter.c"
 	}
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp31_ = g_strdup (_tmp23_);
@@ -1283,26 +1277,26 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp33_ = photo_version_row;
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp33_ != NULL) {
-#line 1273 "FSpotImporter.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
+#line 1267 "FSpotImporter.c"
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp34_;
+		const gchar* _tmp35_;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp34_ = photo_version_row;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp35_ = _tmp34_->filename;
 #line 130 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp32_ = _tmp35_;
-#line 1282 "FSpotImporter.c"
+#line 1276 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL;
-		const gchar* _tmp37_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
+		const gchar* _tmp37_;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp36_ = photo_row;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp37_ = _tmp36_->filename;
 #line 131 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp32_ = _tmp37_;
-#line 1292 "FSpotImporter.c"
+#line 1286 "FSpotImporter.c"
 	}
 #line 129 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp38_ = g_strdup (_tmp32_);
@@ -1314,30 +1308,30 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 	_tmp40_ = self->priv->folder_path;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp40_ != NULL) {
-#line 1304 "FSpotImporter.c"
-		const gchar* _tmp41_ = NULL;
+#line 1298 "FSpotImporter.c"
+		const gchar* _tmp41_;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp41_ = self->priv->filename;
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp39_ = _tmp41_ != NULL;
-#line 1310 "FSpotImporter.c"
+#line 1304 "FSpotImporter.c"
 	} else {
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp39_ = FALSE;
-#line 1314 "FSpotImporter.c"
+#line 1308 "FSpotImporter.c"
 	}
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp39_) {
-#line 1318 "FSpotImporter.c"
+#line 1312 "FSpotImporter.c"
 		GFile* photo = NULL;
-		const gchar* _tmp42_ = NULL;
-		GFile* _tmp43_ = NULL;
-		GFile* _tmp44_ = NULL;
-		const gchar* _tmp45_ = NULL;
-		GFile* _tmp46_ = NULL;
-		GFile* _tmp47_ = NULL;
-		GFile* _tmp48_ = NULL;
-		gboolean _tmp49_ = FALSE;
+		const gchar* _tmp42_;
+		GFile* _tmp43_;
+		GFile* _tmp44_;
+		const gchar* _tmp45_;
+		GFile* _tmp46_;
+		GFile* _tmp47_;
+		GFile* _tmp48_;
+		gboolean _tmp49_;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp42_ = self->priv->folder_path;
 #line 137 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1360,11 +1354,11 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 		_tmp49_ = g_file_query_exists (_tmp48_, NULL);
 #line 140 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (!_tmp49_) {
-#line 1350 "FSpotImporter.c"
-			const gchar* _tmp50_ = NULL;
-			gchar* _tmp51_ = NULL;
-			const gchar* _tmp52_ = NULL;
-			gchar* _tmp53_ = NULL;
+#line 1344 "FSpotImporter.c"
+			const gchar* _tmp50_;
+			gchar* _tmp51_;
+			const gchar* _tmp52_;
+			gchar* _tmp53_;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp50_ = self->priv->folder_path;
 #line 141 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1381,41 +1375,41 @@ DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_co
 			_g_free0 (self->priv->filename);
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			self->priv->filename = _tmp53_;
-#line 1371 "FSpotImporter.c"
+#line 1365 "FSpotImporter.c"
 		}
 #line 135 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (photo);
-#line 1375 "FSpotImporter.c"
+#line 1369 "FSpotImporter.c"
 	}
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 (_tmp23_);
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 1381 "FSpotImporter.c"
+#line 1375 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableItem* data_imports_fspot_fspot_importable_item_new (DataImportsFSpotDbFSpotPhotoRow* photo_row, DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row, DataImportsFSpotDbFSpotRollRow* roll_row, DataImportsFSpotFSpotImportableTag** tags, int tags_length1, DataImportsFSpotFSpotImportableEvent* event, gboolean is_hidden, gboolean is_favorite) {
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_item_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, photo_row, photo_version_row, roll_row, tags, tags_length1, event, is_hidden, is_favorite);
-#line 1388 "FSpotImporter.c"
+#line 1382 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add1 (SpitDataImportsImportableTag*** array, int* length, int* size, SpitDataImportsImportableTag* value) {
+static void _vala_array_add1 (SpitDataImportsImportableTag** * array, int* length, int* size, SpitDataImportsImportableTag* value) {
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableTag*, *array, (*size) + 1);
-#line 1399 "FSpotImporter.c"
+#line 1393 "FSpotImporter.c"
 	}
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 1405 "FSpotImporter.c"
+#line 1399 "FSpotImporter.c"
 }
 
 
@@ -1423,13 +1417,13 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 	DataImportsFSpotFSpotImportableItem * self;
 	SpitDataImportsImportableTag** result = NULL;
 	SpitDataImportsImportableTag** importable_tags = NULL;
-	SpitDataImportsImportableTag** _tmp0_ = NULL;
-	gint importable_tags_length1 = 0;
-	gint _importable_tags_size_ = 0;
-	DataImportsFSpotFSpotImportableTag** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	SpitDataImportsImportableTag** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	SpitDataImportsImportableTag** _tmp0_;
+	gint importable_tags_length1;
+	gint _importable_tags_size_;
+	DataImportsFSpotFSpotImportableTag** _tmp1_;
+	gint _tmp1__length1;
+	SpitDataImportsImportableTag** _tmp6_;
+	gint _tmp6__length1;
 #line 147 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1444,7 +1438,7 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 	_tmp1_ = self->priv->tags;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp1__length1 = self->priv->tags_length1;
-#line 1434 "FSpotImporter.c"
+#line 1428 "FSpotImporter.c"
 	{
 		DataImportsFSpotFSpotImportableTag** tag_collection = NULL;
 		gint tag_collection_length1 = 0;
@@ -1456,19 +1450,19 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 		tag_collection_length1 = _tmp1__length1;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		for (tag_it = 0; tag_it < _tmp1__length1; tag_it = tag_it + 1) {
-#line 1446 "FSpotImporter.c"
-			DataImportsFSpotFSpotImportableTag* _tmp2_ = NULL;
+#line 1440 "FSpotImporter.c"
+			DataImportsFSpotFSpotImportableTag* _tmp2_;
 			DataImportsFSpotFSpotImportableTag* tag = NULL;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp2_ = _g_object_ref0 (tag_collection[tag_it]);
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			tag = _tmp2_;
-#line 1453 "FSpotImporter.c"
+#line 1447 "FSpotImporter.c"
 			{
-				SpitDataImportsImportableTag** _tmp3_ = NULL;
-				gint _tmp3__length1 = 0;
-				DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
-				SpitDataImportsImportableTag* _tmp5_ = NULL;
+				SpitDataImportsImportableTag** _tmp3_;
+				gint _tmp3__length1;
+				DataImportsFSpotFSpotImportableTag* _tmp4_;
+				SpitDataImportsImportableTag* _tmp5_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp3_ = importable_tags;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1481,7 +1475,7 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 				_vala_array_add1 (&importable_tags, &importable_tags_length1, &_importable_tags_size_, _tmp5_);
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (tag);
-#line 1471 "FSpotImporter.c"
+#line 1465 "FSpotImporter.c"
 			}
 		}
 	}
@@ -1493,21 +1487,21 @@ static SpitDataImportsImportableTag** data_imports_fspot_fspot_importable_item_r
 	if (result_length1) {
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*result_length1 = _tmp6__length1;
-#line 1483 "FSpotImporter.c"
+#line 1477 "FSpotImporter.c"
 	}
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _tmp6_;
 #line 151 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1489 "FSpotImporter.c"
+#line 1483 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_real_get_event (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	SpitDataImportsImportableEvent* result = NULL;
-	DataImportsFSpotFSpotImportableEvent* _tmp0_ = NULL;
-	SpitDataImportsImportableEvent* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableEvent* _tmp0_;
+	SpitDataImportsImportableEvent* _tmp1_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1518,15 +1512,15 @@ static SpitDataImportsImportableEvent* data_imports_fspot_fspot_importable_item_
 	result = _tmp1_;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1508 "FSpotImporter.c"
+#line 1502 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1537,15 +1531,15 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_folder_path (Spi
 	result = _tmp1_;
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1527 "FSpotImporter.c"
+#line 1521 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 162 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1556,7 +1550,7 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_filename (SpitDa
 	result = _tmp1_;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1546 "FSpotImporter.c"
+#line 1540 "FSpotImporter.c"
 }
 
 
@@ -1565,9 +1559,9 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI
 	gchar* result = NULL;
 	const gchar* _tmp0_ = NULL;
 	gboolean _tmp1_ = FALSE;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp8_ = NULL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp8_;
 #line 166 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1578,33 +1572,33 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI
 	if (_tmp3_ == NULL) {
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = TRUE;
-#line 1568 "FSpotImporter.c"
+#line 1562 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp4_;
+		const gchar* _tmp5_;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp4_ = self->priv->photo_row;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = _tmp4_->description;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = g_strcmp0 (_tmp5_, "") == 0;
-#line 1578 "FSpotImporter.c"
+#line 1572 "FSpotImporter.c"
 	}
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp1_) {
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = NULL;
-#line 1584 "FSpotImporter.c"
+#line 1578 "FSpotImporter.c"
 	} else {
-		DataImportsFSpotDbFSpotPhotoRow* _tmp6_ = NULL;
-		const gchar* _tmp7_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp6_;
+		const gchar* _tmp7_;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp6_ = self->priv->photo_row;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp7_ = _tmp6_->description;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp0_ = _tmp7_;
-#line 1594 "FSpotImporter.c"
+#line 1588 "FSpotImporter.c"
 	}
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp8_ = g_strdup (_tmp0_);
@@ -1612,15 +1606,15 @@ static gchar* data_imports_fspot_fspot_importable_item_real_get_title (SpitDataI
 	result = _tmp8_;
 #line 167 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1602 "FSpotImporter.c"
+#line 1596 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item_real_get_rating (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	SpitDataImportsImportableRating* result = NULL;
-	DataImportsFSpotFSpotImportableRating* _tmp0_ = NULL;
-	SpitDataImportsImportableRating* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableRating* _tmp0_;
+	SpitDataImportsImportableRating* _tmp1_;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1631,15 +1625,15 @@ static SpitDataImportsImportableRating* data_imports_fspot_fspot_importable_item
 	result = _tmp1_;
 #line 171 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1621 "FSpotImporter.c"
+#line 1615 "FSpotImporter.c"
 }
 
 
 static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (SpitDataImportsImportableMediaItem* base) {
 	DataImportsFSpotFSpotImportableItem * self;
 	time_t* result = NULL;
-	time_t* _tmp0_ = NULL;
-	time_t* _tmp1_ = NULL;
+	time_t* _tmp0_;
+	time_t* _tmp1_;
 #line 174 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -1650,46 +1644,46 @@ static time_t* data_imports_fspot_fspot_importable_item_real_get_exposure_time (
 	result = _tmp1_;
 #line 175 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 1640 "FSpotImporter.c"
+#line 1634 "FSpotImporter.c"
 }
 
 
 static gint string_index_of_char (const gchar* self, gunichar c, gint start_index) {
 	gint result = 0;
 	gchar* _result_ = NULL;
-	gint _tmp0_ = 0;
-	gunichar _tmp1_ = 0U;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1007 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gint _tmp0_;
+	gunichar _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1031 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, 0);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = start_index;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = c;
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = g_utf8_strchr (((gchar*) self) + _tmp0_, (gssize) -1, _tmp1_);
-#line 1008 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1032 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp2_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = _result_;
-#line 1010 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1034 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1665 "FSpotImporter.c"
-		gchar* _tmp4_ = NULL;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1659 "FSpotImporter.c"
+		gchar* _tmp4_;
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = _result_;
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gint) (_tmp4_ - ((gchar*) self));
-#line 1011 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1035 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1673 "FSpotImporter.c"
+#line 1667 "FSpotImporter.c"
 	} else {
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = -1;
-#line 1013 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1037 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1679 "FSpotImporter.c"
+#line 1673 "FSpotImporter.c"
 	}
 }
 
@@ -1697,180 +1691,180 @@ static gint string_index_of_char (const gchar* self, gunichar c, gint start_inde
 static gchar* string_slice (const gchar* self, glong start, glong end) {
 	gchar* result = NULL;
 	glong string_length = 0L;
-	gint _tmp0_ = 0;
-	gint _tmp1_ = 0;
-	glong _tmp2_ = 0L;
-	glong _tmp5_ = 0L;
+	gint _tmp0_;
+	gint _tmp1_;
+	glong _tmp2_;
+	glong _tmp5_;
 	gboolean _tmp8_ = FALSE;
-	glong _tmp9_ = 0L;
+	glong _tmp9_;
 	gboolean _tmp12_ = FALSE;
-	glong _tmp13_ = 0L;
-	glong _tmp16_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	gchar* _tmp21_ = NULL;
-#line 1328 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp13_;
+	glong _tmp16_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	gchar* _tmp21_;
+#line 1355 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = strlen (self);
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _tmp0_;
-#line 1329 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1356 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	string_length = (glong) _tmp1_;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = start;
-#line 1330 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1357 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_ < ((glong) 0)) {
-#line 1713 "FSpotImporter.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1707 "FSpotImporter.c"
+		glong _tmp3_;
+		glong _tmp4_;
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = string_length;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = start;
-#line 1331 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1358 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		start = _tmp3_ + _tmp4_;
-#line 1722 "FSpotImporter.c"
+#line 1716 "FSpotImporter.c"
 	}
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp5_ = end;
-#line 1333 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1360 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp5_ < ((glong) 0)) {
-#line 1728 "FSpotImporter.c"
-		glong _tmp6_ = 0L;
-		glong _tmp7_ = 0L;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1722 "FSpotImporter.c"
+		glong _tmp6_;
+		glong _tmp7_;
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = string_length;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = end;
-#line 1334 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1361 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		end = _tmp6_ + _tmp7_;
-#line 1737 "FSpotImporter.c"
+#line 1731 "FSpotImporter.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp9_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp9_ >= ((glong) 0)) {
-#line 1743 "FSpotImporter.c"
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1737 "FSpotImporter.c"
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = start;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = string_length;
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = _tmp10_ <= _tmp11_;
-#line 1752 "FSpotImporter.c"
+#line 1746 "FSpotImporter.c"
 	} else {
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp8_ = FALSE;
-#line 1756 "FSpotImporter.c"
+#line 1750 "FSpotImporter.c"
 	}
-#line 1336 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1363 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp8_, NULL);
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp13_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp13_ >= ((glong) 0)) {
-#line 1764 "FSpotImporter.c"
-		glong _tmp14_ = 0L;
-		glong _tmp15_ = 0L;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1758 "FSpotImporter.c"
+		glong _tmp14_;
+		glong _tmp15_;
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp14_ = end;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = _tmp14_ <= _tmp15_;
-#line 1773 "FSpotImporter.c"
+#line 1767 "FSpotImporter.c"
 	} else {
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = FALSE;
-#line 1777 "FSpotImporter.c"
+#line 1771 "FSpotImporter.c"
 	}
-#line 1337 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1364 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp12_, NULL);
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp16_ = start;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = end;
-#line 1338 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1365 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (_tmp16_ <= _tmp17_, NULL);
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = end;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = start;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = g_strndup (((gchar*) self) + _tmp18_, (gsize) (_tmp19_ - _tmp20_));
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp21_;
-#line 1339 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1366 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1799 "FSpotImporter.c"
+#line 1793 "FSpotImporter.c"
 }
 
 
 static gchar string_get (const gchar* self, glong index) {
 	gchar result = '\0';
-	glong _tmp0_ = 0L;
-	gchar _tmp1_ = '\0';
-#line 1086 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp0_;
+	gchar _tmp1_;
+#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = index;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 1087 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1817 "FSpotImporter.c"
+#line 1811 "FSpotImporter.c"
 }
 
 
 static glong string_strnlen (gchar* str, glong maxlen) {
 	glong result = 0L;
 	gchar* end = NULL;
-	gchar* _tmp0_ = NULL;
-	glong _tmp1_ = 0L;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	glong _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = maxlen;
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp2_ = memchr (_tmp0_, 0, (gsize) _tmp1_);
-#line 1295 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1322 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	end = _tmp2_;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = end;
-#line 1296 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1323 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ == NULL) {
-#line 1840 "FSpotImporter.c"
-		glong _tmp4_ = 0L;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1834 "FSpotImporter.c"
+		glong _tmp4_;
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = maxlen;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp4_;
-#line 1297 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1324 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1848 "FSpotImporter.c"
+#line 1842 "FSpotImporter.c"
 	} else {
-		gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp5_;
+		gchar* _tmp6_;
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = end;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str;
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (glong) (_tmp5_ - _tmp6_);
-#line 1299 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1326 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
-#line 1860 "FSpotImporter.c"
+#line 1854 "FSpotImporter.c"
 	}
 }
 
@@ -1879,133 +1873,133 @@ static gchar* string_substring (const gchar* self, glong offset, glong len) {
 	gchar* result = NULL;
 	glong string_length = 0L;
 	gboolean _tmp0_ = FALSE;
-	glong _tmp1_ = 0L;
-	glong _tmp8_ = 0L;
-	glong _tmp14_ = 0L;
-	glong _tmp17_ = 0L;
-	glong _tmp18_ = 0L;
-	glong _tmp19_ = 0L;
-	glong _tmp20_ = 0L;
-	glong _tmp21_ = 0L;
-	gchar* _tmp22_ = NULL;
-#line 1306 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	glong _tmp1_;
+	glong _tmp8_;
+	glong _tmp14_;
+	glong _tmp17_;
+	glong _tmp18_;
+	glong _tmp19_;
+	glong _tmp20_;
+	glong _tmp21_;
+	gchar* _tmp22_;
+#line 1333 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = offset;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_ >= ((glong) 0)) {
-#line 1884 "FSpotImporter.c"
-		glong _tmp2_ = 0L;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1878 "FSpotImporter.c"
+		glong _tmp2_;
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = len;
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = _tmp2_ >= ((glong) 0);
-#line 1890 "FSpotImporter.c"
+#line 1884 "FSpotImporter.c"
 	} else {
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp0_ = FALSE;
-#line 1894 "FSpotImporter.c"
+#line 1888 "FSpotImporter.c"
 	}
-#line 1308 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1335 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_) {
-#line 1898 "FSpotImporter.c"
-		glong _tmp3_ = 0L;
-		glong _tmp4_ = 0L;
-		glong _tmp5_ = 0L;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1892 "FSpotImporter.c"
+		glong _tmp3_;
+		glong _tmp4_;
+		glong _tmp5_;
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp3_ = offset;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = len;
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp5_ = string_strnlen ((gchar*) self, _tmp3_ + _tmp4_);
-#line 1310 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1337 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = _tmp5_;
-#line 1910 "FSpotImporter.c"
+#line 1904 "FSpotImporter.c"
 	} else {
-		gint _tmp6_ = 0;
-		gint _tmp7_ = 0;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gint _tmp6_;
+		gint _tmp7_;
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = strlen (self);
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp7_ = _tmp6_;
-#line 1312 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1339 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		string_length = (glong) _tmp7_;
-#line 1920 "FSpotImporter.c"
+#line 1914 "FSpotImporter.c"
 	}
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp8_ = offset;
-#line 1315 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1342 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp8_ < ((glong) 0)) {
-#line 1926 "FSpotImporter.c"
-		glong _tmp9_ = 0L;
-		glong _tmp10_ = 0L;
-		glong _tmp11_ = 0L;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1920 "FSpotImporter.c"
+		glong _tmp9_;
+		glong _tmp10_;
+		glong _tmp11_;
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp9_ = string_length;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp10_ = offset;
-#line 1316 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1343 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		offset = _tmp9_ + _tmp10_;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp11_ = offset;
-#line 1317 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1344 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp11_ >= ((glong) 0), NULL);
-#line 1940 "FSpotImporter.c"
+#line 1934 "FSpotImporter.c"
 	} else {
-		glong _tmp12_ = 0L;
-		glong _tmp13_ = 0L;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		glong _tmp12_;
+		glong _tmp13_;
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp12_ = offset;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp13_ = string_length;
-#line 1319 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1346 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		g_return_val_if_fail (_tmp12_ <= _tmp13_, NULL);
-#line 1950 "FSpotImporter.c"
+#line 1944 "FSpotImporter.c"
 	}
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp14_ = len;
-#line 1321 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1348 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp14_ < ((glong) 0)) {
-#line 1956 "FSpotImporter.c"
-		glong _tmp15_ = 0L;
-		glong _tmp16_ = 0L;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1950 "FSpotImporter.c"
+		glong _tmp15_;
+		glong _tmp16_;
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp15_ = string_length;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp16_ = offset;
-#line 1322 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1349 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp15_ - _tmp16_;
-#line 1965 "FSpotImporter.c"
+#line 1959 "FSpotImporter.c"
 	}
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp17_ = offset;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp18_ = len;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp19_ = string_length;
-#line 1324 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1351 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail ((_tmp17_ + _tmp18_) <= _tmp19_, NULL);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp20_ = offset;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp21_ = len;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp22_ = g_strndup (((gchar*) self) + _tmp20_, (gsize) _tmp21_);
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp22_;
-#line 1325 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1352 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
-#line 1985 "FSpotImporter.c"
+#line 1979 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFSpotFSpotImportableItem* self, const gchar* url) {
 	gchar* result = NULL;
 	GString* builder = NULL;
-	GString* _tmp0_ = NULL;
-	GString* _tmp49_ = NULL;
-	const gchar* _tmp50_ = NULL;
-	gchar* _tmp51_ = NULL;
+	GString* _tmp0_;
+	GString* _tmp49_;
+	const gchar* _tmp50_;
+	gchar* _tmp51_;
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_ITEM (self), NULL);
 #line 178 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2014,33 +2008,33 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 	_tmp0_ = g_string_new ("");
 #line 179 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	builder = _tmp0_;
-#line 2004 "FSpotImporter.c"
+#line 1998 "FSpotImporter.c"
 	{
 		gint idx = 0;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		idx = 0;
-#line 2009 "FSpotImporter.c"
+#line 2003 "FSpotImporter.c"
 		{
 			gboolean _tmp1_ = FALSE;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp1_ = TRUE;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			while (TRUE) {
-#line 2016 "FSpotImporter.c"
-				gint _tmp2_ = 0;
-				const gchar* _tmp3_ = NULL;
-				gint _tmp4_ = 0;
-				gint _tmp5_ = 0;
+#line 2010 "FSpotImporter.c"
+				gint _tmp2_;
+				const gchar* _tmp3_;
+				gint _tmp4_;
+				gint _tmp5_;
 				gint cidx = 0;
-				const gchar* _tmp6_ = NULL;
-				gint _tmp7_ = 0;
-				gint _tmp8_ = 0;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gint _tmp17_ = 0;
+				const gchar* _tmp6_;
+				gint _tmp7_;
+				gint _tmp8_;
+				gint _tmp9_;
+				gint _tmp10_;
+				gint _tmp17_;
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (!_tmp1_) {
-#line 2030 "FSpotImporter.c"
+#line 2024 "FSpotImporter.c"
 				}
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp1_ = FALSE;
@@ -2056,7 +2050,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 				if (!(_tmp2_ < _tmp5_)) {
 #line 180 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					break;
-#line 2046 "FSpotImporter.c"
+#line 2040 "FSpotImporter.c"
 				}
 #line 181 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp6_ = url;
@@ -2072,13 +2066,13 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 				_tmp10_ = idx;
 #line 182 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (_tmp9_ > _tmp10_) {
-#line 2062 "FSpotImporter.c"
-					GString* _tmp11_ = NULL;
-					const gchar* _tmp12_ = NULL;
-					gint _tmp13_ = 0;
-					gint _tmp14_ = 0;
-					gchar* _tmp15_ = NULL;
-					gchar* _tmp16_ = NULL;
+#line 2056 "FSpotImporter.c"
+					GString* _tmp11_;
+					const gchar* _tmp12_;
+					gint _tmp13_;
+					gint _tmp14_;
+					gchar* _tmp15_;
+					gchar* _tmp16_;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp11_ = builder;
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2095,17 +2089,17 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 					g_string_append (_tmp11_, _tmp16_);
 #line 183 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_free0 (_tmp16_);
-#line 2085 "FSpotImporter.c"
+#line 2079 "FSpotImporter.c"
 				}
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp17_ = cidx;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (_tmp17_ >= 0) {
-#line 2091 "FSpotImporter.c"
-					gint _tmp18_ = 0;
-					const gchar* _tmp19_ = NULL;
-					gint _tmp20_ = 0;
-					gint _tmp21_ = 0;
+#line 2085 "FSpotImporter.c"
+					gint _tmp18_;
+					const gchar* _tmp19_;
+					gint _tmp20_;
+					gint _tmp21_;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp18_ = cidx;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2116,19 +2110,19 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 					_tmp21_ = _tmp20_;
 #line 186 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_tmp18_ < (_tmp21_ - 2)) {
-#line 2106 "FSpotImporter.c"
+#line 2100 "FSpotImporter.c"
 						gchar c1 = '\0';
-						const gchar* _tmp22_ = NULL;
-						gint _tmp23_ = 0;
-						gchar _tmp24_ = '\0';
+						const gchar* _tmp22_;
+						gint _tmp23_;
+						gchar _tmp24_;
 						gchar c2 = '\0';
-						const gchar* _tmp25_ = NULL;
-						gint _tmp26_ = 0;
-						gchar _tmp27_ = '\0';
+						const gchar* _tmp25_;
+						gint _tmp26_;
+						gchar _tmp27_;
 						gboolean _tmp28_ = FALSE;
-						gchar _tmp29_ = '\0';
-						gboolean _tmp30_ = FALSE;
-						gint _tmp39_ = 0;
+						gchar _tmp29_;
+						gboolean _tmp30_;
+						gint _tmp39_;
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_tmp22_ = url;
 #line 187 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2151,31 +2145,31 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 						_tmp30_ = g_ascii_isxdigit (_tmp29_);
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						if (_tmp30_) {
-#line 2141 "FSpotImporter.c"
-							gchar _tmp31_ = '\0';
-							gboolean _tmp32_ = FALSE;
+#line 2135 "FSpotImporter.c"
+							gchar _tmp31_;
+							gboolean _tmp32_;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp31_ = c1;
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp32_ = g_ascii_isxdigit (_tmp31_);
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp28_ = _tmp32_;
-#line 2150 "FSpotImporter.c"
+#line 2144 "FSpotImporter.c"
 						} else {
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp28_ = FALSE;
-#line 2154 "FSpotImporter.c"
+#line 2148 "FSpotImporter.c"
 						}
 #line 189 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						if (_tmp28_) {
-#line 2158 "FSpotImporter.c"
+#line 2152 "FSpotImporter.c"
 							gint ccode = 0;
-							gchar _tmp33_ = '\0';
-							gint _tmp34_ = 0;
-							gchar _tmp35_ = '\0';
-							gint _tmp36_ = 0;
-							GString* _tmp37_ = NULL;
-							gint _tmp38_ = 0;
+							gchar _tmp33_;
+							gint _tmp34_;
+							gchar _tmp35_;
+							gint _tmp36_;
+							GString* _tmp37_;
+							gint _tmp38_;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_tmp33_ = c1;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2192,30 +2186,30 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 							_tmp38_ = ccode;
 #line 191 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							g_string_append_c (_tmp37_, (gchar) _tmp38_);
-#line 2182 "FSpotImporter.c"
+#line 2176 "FSpotImporter.c"
 						}
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_tmp39_ = cidx;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						idx = _tmp39_ + 3;
-#line 2188 "FSpotImporter.c"
+#line 2182 "FSpotImporter.c"
 					} else {
-						gint _tmp40_ = 0;
+						gint _tmp40_;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_tmp40_ = cidx;
 #line 195 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						idx = _tmp40_ + 1;
-#line 2195 "FSpotImporter.c"
+#line 2189 "FSpotImporter.c"
 					}
 				} else {
-					GString* _tmp41_ = NULL;
-					const gchar* _tmp42_ = NULL;
-					gint _tmp43_ = 0;
-					gchar* _tmp44_ = NULL;
-					gchar* _tmp45_ = NULL;
-					const gchar* _tmp46_ = NULL;
-					gint _tmp47_ = 0;
-					gint _tmp48_ = 0;
+					GString* _tmp41_;
+					const gchar* _tmp42_;
+					gint _tmp43_;
+					gchar* _tmp44_;
+					gchar* _tmp45_;
+					const gchar* _tmp46_;
+					gint _tmp47_;
+					gint _tmp48_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp41_ = builder;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2238,7 +2232,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 					_tmp48_ = _tmp47_;
 #line 199 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					idx = _tmp48_;
-#line 2228 "FSpotImporter.c"
+#line 2222 "FSpotImporter.c"
 				}
 			}
 		}
@@ -2255,7 +2249,7 @@ static gchar* data_imports_fspot_fspot_importable_item_decode_url (DataImportsFS
 	_g_string_free0 (builder);
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2245 "FSpotImporter.c"
+#line 2239 "FSpotImporter.c"
 }
 
 
@@ -2266,7 +2260,7 @@ static void data_imports_fspot_fspot_importable_item_class_init (DataImportsFSpo
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableItemPrivate));
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_item_finalize;
-#line 2256 "FSpotImporter.c"
+#line 2250 "FSpotImporter.c"
 }
 
 
@@ -2274,31 +2268,31 @@ static void data_imports_fspot_fspot_importable_item_spit_data_imports_importabl
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_item_spit_data_imports_importable_media_item_parent_iface = g_type_interface_peek_parent (iface);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_tags = (SpitDataImportsImportableTag** (*)(SpitDataImportsImportableMediaItem*, int*)) data_imports_fspot_fspot_importable_item_real_get_tags;
+	iface->get_tags = (SpitDataImportsImportableTag** (*) (SpitDataImportsImportableMediaItem *, int*)) data_imports_fspot_fspot_importable_item_real_get_tags;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_event = (SpitDataImportsImportableEvent* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_event;
+	iface->get_event = (SpitDataImportsImportableEvent* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_event;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_folder_path = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_folder_path;
+	iface->get_folder_path = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_folder_path;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_filename = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_filename;
+	iface->get_filename = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_filename;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_title = (gchar* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_title;
+	iface->get_title = (gchar* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_title;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_rating = (SpitDataImportsImportableRating* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_rating;
+	iface->get_rating = (SpitDataImportsImportableRating* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_rating;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_exposure_time = (time_t* (*)(SpitDataImportsImportableMediaItem*)) data_imports_fspot_fspot_importable_item_real_get_exposure_time;
-#line 2277 "FSpotImporter.c"
+	iface->get_exposure_time = (time_t* (*) (SpitDataImportsImportableMediaItem *)) data_imports_fspot_fspot_importable_item_real_get_exposure_time;
+#line 2271 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_item_instance_init (DataImportsFSpotFSpotImportableItem * self) {
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_ITEM_GET_PRIVATE (self);
-#line 2284 "FSpotImporter.c"
+#line 2278 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_item_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableItem * self;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_ITEM, DataImportsFSpotFSpotImportableItem);
@@ -2322,7 +2316,7 @@ static void data_imports_fspot_fspot_importable_item_finalize (GObject* obj) {
 	_g_free0 (self->priv->date_time);
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_item_parent_class)->finalize (obj);
-#line 2312 "FSpotImporter.c"
+#line 2306 "FSpotImporter.c"
 }
 
 
@@ -2342,10 +2336,10 @@ GType data_imports_fspot_fspot_importable_item_get_type (void) {
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) {
 	DataImportsFSpotFSpotImportableTag * self = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp2_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	DataImportsFSpotDbFSpotTagRow* _tmp1_;
+	DataImportsFSpotFSpotImportableTag* _tmp2_;
+	DataImportsFSpotFSpotImportableTag* _tmp3_;
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL);
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2370,21 +2364,21 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_cons
 	self->priv->parent = _tmp3_;
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2360 "FSpotImporter.c"
+#line 2354 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_new (DataImportsFSpotDbFSpotTagRow* row, DataImportsFSpotFSpotImportableTag* parent) {
 #line 210 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_tag_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, row, parent);
-#line 2367 "FSpotImporter.c"
+#line 2361 "FSpotImporter.c"
 }
 
 
 gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImportableTag* self) {
 	gint64 result = 0LL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	gint64 _tmp1_;
 #line 215 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), 0LL);
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2395,16 +2389,16 @@ gint64 data_imports_fspot_fspot_importable_tag_get_id (DataImportsFSpotFSpotImpo
 	result = _tmp1_;
 #line 216 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2385 "FSpotImporter.c"
+#line 2379 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImportsImportableTag* base) {
 	DataImportsFSpotFSpotImportableTag * self;
 	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2417,15 +2411,15 @@ static gchar* data_imports_fspot_fspot_importable_tag_real_get_name (SpitDataImp
 	result = _tmp2_;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2407 "FSpotImporter.c"
+#line 2401 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_real_get_parent (SpitDataImportsImportableTag* base) {
 	DataImportsFSpotFSpotImportableTag * self;
 	SpitDataImportsImportableTag* result = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	SpitDataImportsImportableTag* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	SpitDataImportsImportableTag* _tmp1_;
 #line 223 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2436,14 +2430,14 @@ static SpitDataImportsImportableTag* data_imports_fspot_fspot_importable_tag_rea
 	result = _tmp1_;
 #line 224 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2426 "FSpotImporter.c"
+#line 2420 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_fspot_parent (DataImportsFSpotFSpotImportableTag* self) {
 	DataImportsFSpotFSpotImportableTag* result = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp1_ = NULL;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	DataImportsFSpotFSpotImportableTag* _tmp1_;
 #line 227 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2454,15 +2448,15 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_importable_tag_get_
 	result = _tmp1_;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2444 "FSpotImporter.c"
+#line 2438 "FSpotImporter.c"
 }
 
 
 gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotFSpotImportableTag* self) {
 	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2475,15 +2469,15 @@ gchar* data_imports_fspot_fspot_importable_tag_get_stock_icon (DataImportsFSpotF
 	result = _tmp2_;
 #line 232 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2465 "FSpotImporter.c"
+#line 2459 "FSpotImporter.c"
 }
 
 
 gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpotImportableTag* self) {
 	gboolean result = FALSE;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), FALSE);
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2496,14 +2490,14 @@ gboolean data_imports_fspot_fspot_importable_tag_is_stock (DataImportsFSpotFSpot
 	result = _tmp2_;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2486 "FSpotImporter.c"
+#line 2480 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to_event (DataImportsFSpotFSpotImportableTag* self) {
 	DataImportsFSpotFSpotImportableEvent* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	DataImportsFSpotFSpotImportableEvent* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	DataImportsFSpotFSpotImportableEvent* _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_IMPORTABLE_TAG (self), NULL);
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2514,7 +2508,7 @@ DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_tag_to
 	result = _tmp1_;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2504 "FSpotImporter.c"
+#line 2498 "FSpotImporter.c"
 }
 
 
@@ -2525,7 +2519,7 @@ static void data_imports_fspot_fspot_importable_tag_class_init (DataImportsFSpot
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableTagPrivate));
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_tag_finalize;
-#line 2515 "FSpotImporter.c"
+#line 2509 "FSpotImporter.c"
 }
 
 
@@ -2533,21 +2527,21 @@ static void data_imports_fspot_fspot_importable_tag_spit_data_imports_importable
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_tag_spit_data_imports_importable_tag_parent_iface = g_type_interface_peek_parent (iface);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_name = (gchar* (*)(SpitDataImportsImportableTag*)) data_imports_fspot_fspot_importable_tag_real_get_name;
+	iface->get_name = (gchar* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_name;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_parent = (SpitDataImportsImportableTag* (*)(SpitDataImportsImportableTag*)) data_imports_fspot_fspot_importable_tag_real_get_parent;
-#line 2526 "FSpotImporter.c"
+	iface->get_parent = (SpitDataImportsImportableTag* (*) (SpitDataImportsImportableTag *)) data_imports_fspot_fspot_importable_tag_real_get_parent;
+#line 2520 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_tag_instance_init (DataImportsFSpotFSpotImportableTag * self) {
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_TAG_GET_PRIVATE (self);
-#line 2533 "FSpotImporter.c"
+#line 2527 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_tag_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableTag * self;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_TAG, DataImportsFSpotFSpotImportableTag);
@@ -2557,7 +2551,7 @@ static void data_imports_fspot_fspot_importable_tag_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->parent);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_tag_parent_class)->finalize (obj);
-#line 2547 "FSpotImporter.c"
+#line 2541 "FSpotImporter.c"
 }
 
 
@@ -2577,8 +2571,8 @@ GType data_imports_fspot_fspot_importable_tag_get_type (void) {
 
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_construct (GType object_type, DataImportsFSpotDbFSpotTagRow* row) {
 	DataImportsFSpotFSpotImportableEvent * self = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	DataImportsFSpotDbFSpotTagRow* _tmp1_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAG_ROW (row), NULL);
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2593,23 +2587,23 @@ DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_
 	self->priv->row = _tmp1_;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2583 "FSpotImporter.c"
+#line 2577 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableEvent* data_imports_fspot_fspot_importable_event_new (DataImportsFSpotDbFSpotTagRow* row) {
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_event_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, row);
-#line 2590 "FSpotImporter.c"
+#line 2584 "FSpotImporter.c"
 }
 
 
 static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataImportsImportableEvent* base) {
 	DataImportsFSpotFSpotImportableEvent * self;
 	gchar* result = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	const gchar* _tmp1_;
+	gchar* _tmp2_;
 #line 251 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent);
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2622,7 +2616,7 @@ static gchar* data_imports_fspot_fspot_importable_event_real_get_name (SpitDataI
 	result = _tmp2_;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2612 "FSpotImporter.c"
+#line 2606 "FSpotImporter.c"
 }
 
 
@@ -2633,7 +2627,7 @@ static void data_imports_fspot_fspot_importable_event_class_init (DataImportsFSp
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableEventPrivate));
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_event_finalize;
-#line 2623 "FSpotImporter.c"
+#line 2617 "FSpotImporter.c"
 }
 
 
@@ -2641,19 +2635,19 @@ static void data_imports_fspot_fspot_importable_event_spit_data_imports_importab
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_event_spit_data_imports_importable_event_parent_iface = g_type_interface_peek_parent (iface);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_name = (gchar* (*)(SpitDataImportsImportableEvent*)) data_imports_fspot_fspot_importable_event_real_get_name;
-#line 2632 "FSpotImporter.c"
+	iface->get_name = (gchar* (*) (SpitDataImportsImportableEvent *)) data_imports_fspot_fspot_importable_event_real_get_name;
+#line 2626 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_event_instance_init (DataImportsFSpotFSpotImportableEvent * self) {
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_EVENT_GET_PRIVATE (self);
-#line 2639 "FSpotImporter.c"
+#line 2633 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_event_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableEvent * self;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_EVENT, DataImportsFSpotFSpotImportableEvent);
@@ -2661,7 +2655,7 @@ static void data_imports_fspot_fspot_importable_event_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->row);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_event_parent_class)->finalize (obj);
-#line 2651 "FSpotImporter.c"
+#line 2645 "FSpotImporter.c"
 }
 
 
@@ -2681,8 +2675,8 @@ GType data_imports_fspot_fspot_importable_event_get_type (void) {
 
 DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_construct (GType object_type, gint rating_value) {
 	DataImportsFSpotFSpotImportableRating * self = NULL;
-	gint _tmp0_ = 0;
-	gint _tmp2_ = 0;
+	gint _tmp0_;
+	gint _tmp2_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = (DataImportsFSpotFSpotImportableRating*) g_object_new (object_type, NULL);
 #line 263 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2691,16 +2685,16 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin
 	if (_tmp0_ < -1) {
 #line 264 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		rating_value = -1;
-#line 2681 "FSpotImporter.c"
+#line 2675 "FSpotImporter.c"
 	} else {
-		gint _tmp1_ = 0;
+		gint _tmp1_;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = rating_value;
 #line 265 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (_tmp1_ > 5) {
 #line 266 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			rating_value = 5;
-#line 2690 "FSpotImporter.c"
+#line 2684 "FSpotImporter.c"
 		}
 	}
 #line 267 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2709,21 +2703,21 @@ DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_ratin
 	self->priv->rating_value = _tmp2_;
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2699 "FSpotImporter.c"
+#line 2693 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableRating* data_imports_fspot_fspot_importable_rating_new (gint rating_value) {
 #line 262 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_importable_rating_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, rating_value);
-#line 2706 "FSpotImporter.c"
+#line 2700 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (SpitDataImportsImportableRating* base) {
 	DataImportsFSpotFSpotImportableRating * self;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 270 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2732,14 +2726,14 @@ static gboolean data_imports_fspot_fspot_importable_rating_real_is_rejected (Spi
 	result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_REJECTED;
 #line 271 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2722 "FSpotImporter.c"
+#line 2716 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (SpitDataImportsImportableRating* base) {
 	DataImportsFSpotFSpotImportableRating * self;
 	gboolean result = FALSE;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 274 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2748,14 +2742,14 @@ static gboolean data_imports_fspot_fspot_importable_rating_real_is_unrated (Spit
 	result = _tmp0_ == DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_UNRATED;
 #line 275 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2738 "FSpotImporter.c"
+#line 2732 "FSpotImporter.c"
 }
 
 
 static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataImportsImportableRating* base) {
 	DataImportsFSpotFSpotImportableRating * self;
 	gint result = 0;
-	gint _tmp0_ = 0;
+	gint _tmp0_;
 #line 278 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2764,7 +2758,7 @@ static gint data_imports_fspot_fspot_importable_rating_real_get_value (SpitDataI
 	result = _tmp0_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 2754 "FSpotImporter.c"
+#line 2748 "FSpotImporter.c"
 }
 
 
@@ -2775,7 +2769,7 @@ static void data_imports_fspot_fspot_importable_rating_class_init (DataImportsFS
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotImportableRatingPrivate));
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_importable_rating_finalize;
-#line 2765 "FSpotImporter.c"
+#line 2759 "FSpotImporter.c"
 }
 
 
@@ -2783,29 +2777,29 @@ static void data_imports_fspot_fspot_importable_rating_spit_data_imports_importa
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_importable_rating_spit_data_imports_importable_rating_parent_iface = g_type_interface_peek_parent (iface);
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_rejected = (gboolean (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_is_rejected;
+	iface->is_rejected = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_rejected;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_unrated = (gboolean (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_is_unrated;
+	iface->is_unrated = (gboolean (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_is_unrated;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_value = (gint (*)(SpitDataImportsImportableRating*)) data_imports_fspot_fspot_importable_rating_real_get_value;
-#line 2778 "FSpotImporter.c"
+	iface->get_value = (gint (*) (SpitDataImportsImportableRating *)) data_imports_fspot_fspot_importable_rating_real_get_value;
+#line 2772 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_importable_rating_instance_init (DataImportsFSpotFSpotImportableRating * self) {
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_IMPORTABLE_RATING_GET_PRIVATE (self);
-#line 2785 "FSpotImporter.c"
+#line 2779 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_importable_rating_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_importable_rating_finalize (GObject * obj) {
 	DataImportsFSpotFSpotImportableRating * self;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_IMPORTABLE_RATING, DataImportsFSpotFSpotImportableRating);
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_importable_rating_parent_class)->finalize (obj);
-#line 2795 "FSpotImporter.c"
+#line 2789 "FSpotImporter.c"
 }
 
 
@@ -2826,7 +2820,7 @@ GType data_imports_fspot_fspot_importable_rating_get_type (void) {
 static gpointer _importable_database_table_ref0 (gpointer self) {
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self ? importable_database_table_ref (self) : NULL;
-#line 2816 "FSpotImporter.c"
+#line 2810 "FSpotImporter.c"
 }
 
 
@@ -2838,15 +2832,15 @@ static gint64* _int64_dup (gint64* self) {
 	memcpy (dup, self, sizeof (gint64));
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return dup;
-#line 2828 "FSpotImporter.c"
+#line 2822 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (GType object_type, DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) {
 	DataImportsFSpotFSpotTagsCache * self = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp1_ = NULL;
-	GeeHashMap* _tmp2_ = NULL;
+	DataImportsFSpotDbFSpotTagsTable* _tmp0_;
+	DataImportsFSpotDbFSpotTagsTable* _tmp1_;
+	GeeHashMap* _tmp2_;
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (tags_table), NULL);
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2867,25 +2861,25 @@ DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_construct (G
 	self->priv->tags_map = _tmp2_;
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 2857 "FSpotImporter.c"
+#line 2851 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotTagsCache* data_imports_fspot_fspot_tags_cache_new (DataImportsFSpotDbFSpotTagsTable* tags_table, GError** error) {
 #line 287 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_tags_cache_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, tags_table, error);
-#line 2864 "FSpotImporter.c"
+#line 2858 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag (DataImportsFSpotFSpotTagsCache* self, DataImportsFSpotDbFSpotTagRow* tag_row, GError** error) {
 	DataImportsFSpotFSpotImportableTag* result = NULL;
 	DataImportsFSpotFSpotImportableTag* tag = NULL;
-	GeeHashMap* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gpointer _tmp3_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
+	GeeHashMap* _tmp0_;
+	DataImportsFSpotDbFSpotTagRow* _tmp1_;
+	gint64 _tmp2_;
+	gpointer _tmp3_;
+	DataImportsFSpotFSpotImportableTag* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL);
@@ -2909,20 +2903,20 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 		result = tag;
 #line 295 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 2899 "FSpotImporter.c"
+#line 2893 "FSpotImporter.c"
 	} else {
 		DataImportsFSpotFSpotImportableTag* parent_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp5_ = NULL;
-		gint64 _tmp6_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp5_;
+		gint64 _tmp6_;
+		DataImportsFSpotFSpotImportableTag* _tmp7_;
 		DataImportsFSpotFSpotImportableTag* new_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp8_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp9_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp10_ = NULL;
-		GeeHashMap* _tmp11_ = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp12_ = NULL;
-		gint64 _tmp13_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp14_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp8_;
+		DataImportsFSpotFSpotImportableTag* _tmp9_;
+		DataImportsFSpotFSpotImportableTag* _tmp10_;
+		GeeHashMap* _tmp11_;
+		DataImportsFSpotDbFSpotTagRow* _tmp12_;
+		gint64 _tmp13_;
+		DataImportsFSpotFSpotImportableTag* _tmp14_;
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = tag_row;
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2941,7 +2935,7 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 				_g_object_unref0 (tag);
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 2931 "FSpotImporter.c"
+#line 2925 "FSpotImporter.c"
 			} else {
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (tag);
@@ -2951,7 +2945,7 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 				g_clear_error (&_inner_error_);
 #line 297 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 2941 "FSpotImporter.c"
+#line 2935 "FSpotImporter.c"
 			}
 		}
 #line 298 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -2980,27 +2974,27 @@ DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag
 		_g_object_unref0 (tag);
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 2970 "FSpotImporter.c"
+#line 2964 "FSpotImporter.c"
 	}
 #line 292 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (tag);
-#line 2974 "FSpotImporter.c"
+#line 2968 "FSpotImporter.c"
 }
 
 
 static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_get_tag_from_id (DataImportsFSpotFSpotTagsCache* self, gint64 tag_id, GError** error) {
 	DataImportsFSpotFSpotImportableTag* result = NULL;
-	gint64 _tmp0_ = 0LL;
+	gint64 _tmp0_;
 	DataImportsFSpotFSpotImportableTag* tag = NULL;
-	GeeHashMap* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gpointer _tmp3_ = NULL;
-	DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
+	GeeHashMap* _tmp1_;
+	gint64 _tmp2_;
+	gpointer _tmp3_;
+	DataImportsFSpotFSpotImportableTag* _tmp4_;
 	DataImportsFSpotDbFSpotTagRow* tag_row = NULL;
-	DataImportsFSpotDbFSpotTagsTable* _tmp5_ = NULL;
-	gint64 _tmp6_ = 0LL;
-	DataImportsFSpotDbFSpotTagRow* _tmp7_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp8_ = NULL;
+	DataImportsFSpotDbFSpotTagsTable* _tmp5_;
+	gint64 _tmp6_;
+	DataImportsFSpotDbFSpotTagRow* _tmp7_;
+	DataImportsFSpotDbFSpotTagRow* _tmp8_;
 	GError * _inner_error_ = NULL;
 #line 304 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_TAGS_CACHE (self), NULL);
@@ -3012,7 +3006,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 		result = NULL;
 #line 307 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 3002 "FSpotImporter.c"
+#line 2996 "FSpotImporter.c"
 	}
 #line 308 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp1_ = self->priv->tags_map;
@@ -3030,7 +3024,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 		result = tag;
 #line 310 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 3020 "FSpotImporter.c"
+#line 3014 "FSpotImporter.c"
 	}
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp5_ = self->priv->tags_table;
@@ -3050,7 +3044,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 			_g_object_unref0 (tag);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return NULL;
-#line 3040 "FSpotImporter.c"
+#line 3034 "FSpotImporter.c"
 		} else {
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_g_object_unref0 (tag);
@@ -3060,25 +3054,25 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 			g_clear_error (&_inner_error_);
 #line 311 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return NULL;
-#line 3050 "FSpotImporter.c"
+#line 3044 "FSpotImporter.c"
 		}
 	}
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp8_ = tag_row;
 #line 312 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (_tmp8_ != NULL) {
-#line 3057 "FSpotImporter.c"
+#line 3051 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp9_ = NULL;
-		gint64 _tmp10_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp11_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp9_;
+		gint64 _tmp10_;
+		DataImportsFSpotFSpotImportableTag* _tmp11_;
 		DataImportsFSpotFSpotImportableTag* new_tag = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp12_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp13_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp14_ = NULL;
-		GeeHashMap* _tmp15_ = NULL;
-		gint64 _tmp16_ = 0LL;
-		DataImportsFSpotFSpotImportableTag* _tmp17_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp12_;
+		DataImportsFSpotFSpotImportableTag* _tmp13_;
+		DataImportsFSpotFSpotImportableTag* _tmp14_;
+		GeeHashMap* _tmp15_;
+		gint64 _tmp16_;
+		DataImportsFSpotFSpotImportableTag* _tmp17_;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp9_ = tag_row;
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3099,7 +3093,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 				_g_object_unref0 (tag);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 3089 "FSpotImporter.c"
+#line 3083 "FSpotImporter.c"
 			} else {
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (tag_row);
@@ -3111,7 +3105,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 				g_clear_error (&_inner_error_);
 #line 313 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return NULL;
-#line 3101 "FSpotImporter.c"
+#line 3095 "FSpotImporter.c"
 			}
 		}
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3140,7 +3134,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 		_g_object_unref0 (tag);
 #line 316 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return result;
-#line 3130 "FSpotImporter.c"
+#line 3124 "FSpotImporter.c"
 	}
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = NULL;
@@ -3150,7 +3144,7 @@ static DataImportsFSpotFSpotImportableTag* data_imports_fspot_fspot_tags_cache_g
 	_g_object_unref0 (tag);
 #line 318 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 3140 "FSpotImporter.c"
+#line 3134 "FSpotImporter.c"
 }
 
 
@@ -3161,18 +3155,18 @@ static void data_imports_fspot_fspot_tags_cache_class_init (DataImportsFSpotFSpo
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotTagsCachePrivate));
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_tags_cache_finalize;
-#line 3151 "FSpotImporter.c"
+#line 3145 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_tags_cache_instance_init (DataImportsFSpotFSpotTagsCache * self) {
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv = DATA_IMPORTS_FSPOT_FSPOT_TAGS_CACHE_GET_PRIVATE (self);
-#line 3158 "FSpotImporter.c"
+#line 3152 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_tags_cache_finalize (GObject * obj) {
 	DataImportsFSpotFSpotTagsCache * self;
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_TAGS_CACHE, DataImportsFSpotFSpotTagsCache);
@@ -3182,7 +3176,7 @@ static void data_imports_fspot_fspot_tags_cache_finalize (GObject* obj) {
 	_g_object_unref0 (self->priv->tags_map);
 #line 283 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_tags_cache_parent_class)->finalize (obj);
-#line 3172 "FSpotImporter.c"
+#line 3166 "FSpotImporter.c"
 }
 
 
@@ -3200,8 +3194,8 @@ GType data_imports_fspot_fspot_tags_cache_get_type (void) {
 
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_construct (GType object_type, SpitDataImportsService* service, SpitDataImportsPluginHost* host) {
 	DataImportsFSpotFSpotDataImporter * self = NULL;
-	SpitDataImportsService* _tmp0_ = NULL;
-	SpitDataImportsPluginHost* _tmp1_ = NULL;
+	SpitDataImportsService* _tmp0_;
+	SpitDataImportsPluginHost* _tmp1_;
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (SPIT_DATA_IMPORTS_IS_SERVICE (service), NULL);
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3220,21 +3214,21 @@ DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_constr
 	self->priv->host = _tmp1_;
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return self;
-#line 3210 "FSpotImporter.c"
+#line 3204 "FSpotImporter.c"
 }
 
 
 DataImportsFSpotFSpotDataImporter* data_imports_fspot_fspot_data_importer_new (SpitDataImportsService* service, SpitDataImportsPluginHost* host) {
 #line 328 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return data_imports_fspot_fspot_data_importer_construct (DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, service, host);
-#line 3217 "FSpotImporter.c"
+#line 3211 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitDataImportsDataImporter* base) {
 	DataImportsFSpotFSpotDataImporter * self;
 	gboolean result = FALSE;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3243,15 +3237,15 @@ static gboolean data_imports_fspot_fspot_data_importer_real_is_running (SpitData
 	result = _tmp0_;
 #line 336 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 3233 "FSpotImporter.c"
+#line 3227 "FSpotImporter.c"
 }
 
 
 static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_service (SpitDataImportsDataImporter* base) {
 	DataImportsFSpotFSpotDataImporter * self;
 	SpitDataImportsService* result = NULL;
-	SpitDataImportsService* _tmp0_ = NULL;
-	SpitDataImportsService* _tmp1_ = NULL;
+	SpitDataImportsService* _tmp0_;
+	SpitDataImportsService* _tmp1_;
 #line 339 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3262,13 +3256,13 @@ static SpitDataImportsService* data_imports_fspot_fspot_data_importer_real_get_s
 	result = _tmp1_;
 #line 340 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 3252 "FSpotImporter.c"
+#line 3246 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDataImporter* base) {
 	DataImportsFSpotFSpotDataImporter * self;
-	gboolean _tmp0_ = FALSE;
+	gboolean _tmp0_;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 344 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3277,7 +3271,7 @@ static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDa
 	if (_tmp0_) {
 #line 345 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3267 "FSpotImporter.c"
+#line 3261 "FSpotImporter.c"
 	}
 #line 347 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_debug ("FSpotImporter.vala:347: FSpotDataImporter: starting interaction.");
@@ -3285,7 +3279,7 @@ static void data_imports_fspot_fspot_data_importer_real_start (SpitDataImportsDa
 	self->priv->running = TRUE;
 #line 351 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (self);
-#line 3275 "FSpotImporter.c"
+#line 3269 "FSpotImporter.c"
 }
 
 
@@ -3297,69 +3291,69 @@ static void data_imports_fspot_fspot_data_importer_real_stop (SpitDataImportsDat
 	g_debug ("FSpotImporter.vala:355: FSpotDataImporter: stopping interaction.");
 #line 357 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv->running = FALSE;
-#line 3287 "FSpotImporter.c"
+#line 3281 "FSpotImporter.c"
 }
 
 
 /**
      * Action that discovers importable libraries based on standard locations.
      */
-static void _vala_array_add2 (SpitDataImportsImportableLibrary*** array, int* length, int* size, SpitDataImportsImportableLibrary* value) {
+static void _vala_array_add2 (SpitDataImportsImportableLibrary** * array, int* length, int* size, SpitDataImportsImportableLibrary* value) {
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableLibrary*, *array, (*size) + 1);
-#line 3301 "FSpotImporter.c"
+#line 3295 "FSpotImporter.c"
 	}
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3307 "FSpotImporter.c"
+#line 3301 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_data_importer_do_discover_importable_libraries (DataImportsFSpotFSpotDataImporter* self) {
 	SpitDataImportsImportableLibrary** discovered_libraries = NULL;
-	SpitDataImportsImportableLibrary** _tmp0_ = NULL;
-	gint discovered_libraries_length1 = 0;
-	gint _discovered_libraries_size_ = 0;
+	SpitDataImportsImportableLibrary** _tmp0_;
+	gint discovered_libraries_length1;
+	gint _discovered_libraries_size_;
 	GFile** db_files = NULL;
-	const gchar* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
-	GFile* _tmp3_ = NULL;
-	GFile* _tmp4_ = NULL;
-	GFile* _tmp5_ = NULL;
-	GFile* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	GFile* _tmp8_ = NULL;
-	GFile* _tmp9_ = NULL;
-	GFile* _tmp10_ = NULL;
-	GFile* _tmp11_ = NULL;
-	GFile* _tmp12_ = NULL;
-	GFile* _tmp13_ = NULL;
-	GFile* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GFile* _tmp16_ = NULL;
-	GFile* _tmp17_ = NULL;
-	GFile* _tmp18_ = NULL;
-	GFile* _tmp19_ = NULL;
-	GFile* _tmp20_ = NULL;
-	GFile** _tmp21_ = NULL;
-	GFile** _tmp22_ = NULL;
-	gint _tmp22__length1 = 0;
-	gint db_files_length1 = 0;
-	gint _db_files_size_ = 0;
-	GFile** _tmp23_ = NULL;
-	gint _tmp23__length1 = 0;
+	const gchar* _tmp1_;
+	GFile* _tmp2_;
+	GFile* _tmp3_;
+	GFile* _tmp4_;
+	GFile* _tmp5_;
+	GFile* _tmp6_;
+	const gchar* _tmp7_;
+	GFile* _tmp8_;
+	GFile* _tmp9_;
+	GFile* _tmp10_;
+	GFile* _tmp11_;
+	GFile* _tmp12_;
+	GFile* _tmp13_;
+	GFile* _tmp14_;
+	const gchar* _tmp15_;
+	GFile* _tmp16_;
+	GFile* _tmp17_;
+	GFile* _tmp18_;
+	GFile* _tmp19_;
+	GFile* _tmp20_;
+	GFile** _tmp21_;
+	GFile** _tmp22_;
+	gint _tmp22__length1;
+	gint db_files_length1;
+	gint _db_files_size_;
+	GFile** _tmp23_;
+	gint _tmp23__length1;
 	const gchar* _tmp33_ = NULL;
-	SpitDataImportsImportableLibrary** _tmp34_ = NULL;
-	gint _tmp34__length1 = 0;
-	SpitDataImportsPluginHost* _tmp35_ = NULL;
-	SpitDataImportsImportableLibrary** _tmp36_ = NULL;
-	gint _tmp36__length1 = 0;
+	SpitDataImportsImportableLibrary** _tmp34_;
+	gint _tmp34__length1;
+	SpitDataImportsPluginHost* _tmp35_;
+	SpitDataImportsImportableLibrary** _tmp36_;
+	gint _tmp36__length1;
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self));
 #line 366 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3446,7 +3440,7 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 	_tmp23_ = db_files;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp23__length1 = db_files_length1;
-#line 3436 "FSpotImporter.c"
+#line 3430 "FSpotImporter.c"
 	{
 		GFile** db_file_collection = NULL;
 		gint db_file_collection_length1 = 0;
@@ -3458,31 +3452,31 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 		db_file_collection_length1 = _tmp23__length1;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		for (db_file_it = 0; db_file_it < _tmp23__length1; db_file_it = db_file_it + 1) {
-#line 3448 "FSpotImporter.c"
-			GFile* _tmp24_ = NULL;
+#line 3442 "FSpotImporter.c"
+			GFile* _tmp24_;
 			GFile* db_file = NULL;
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp24_ = _g_object_ref0 (db_file_collection[db_file_it]);
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			db_file = _tmp24_;
-#line 3455 "FSpotImporter.c"
+#line 3449 "FSpotImporter.c"
 			{
-				GFile* _tmp25_ = NULL;
-				gboolean _tmp26_ = FALSE;
+				GFile* _tmp25_;
+				gboolean _tmp26_;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp25_ = db_file;
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_tmp26_ = g_file_query_exists (_tmp25_, NULL);
 #line 382 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (_tmp26_) {
-#line 3465 "FSpotImporter.c"
-					SpitDataImportsImportableLibrary** _tmp27_ = NULL;
-					gint _tmp27__length1 = 0;
-					GFile* _tmp28_ = NULL;
-					DataImportsFSpotFSpotImportableLibrary* _tmp29_ = NULL;
-					GFile* _tmp30_ = NULL;
-					gchar* _tmp31_ = NULL;
-					gchar* _tmp32_ = NULL;
+#line 3459 "FSpotImporter.c"
+					SpitDataImportsImportableLibrary** _tmp27_;
+					gint _tmp27__length1;
+					GFile* _tmp28_;
+					DataImportsFSpotFSpotImportableLibrary* _tmp29_;
+					GFile* _tmp30_;
+					gchar* _tmp31_;
+					gchar* _tmp32_;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tmp27_ = discovered_libraries;
 #line 383 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3503,11 +3497,11 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 					g_message ("FSpotImporter.vala:384: Discovered importable library: %s", _tmp32_);
 #line 384 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_free0 (_tmp32_);
-#line 3493 "FSpotImporter.c"
+#line 3487 "FSpotImporter.c"
 				}
 #line 381 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (db_file);
-#line 3497 "FSpotImporter.c"
+#line 3491 "FSpotImporter.c"
 			}
 		}
 	}
@@ -3519,11 +3513,11 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 	if (_tmp34__length1 > 0) {
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE;
-#line 3509 "FSpotImporter.c"
+#line 3503 "FSpotImporter.c"
 	} else {
 #line 389 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp33_ = DATA_IMPORTS_FSPOT_SERVICE_WELCOME_MESSAGE_FILE_ONLY;
-#line 3513 "FSpotImporter.c"
+#line 3507 "FSpotImporter.c"
 	}
 #line 388 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp35_ = self->priv->host;
@@ -3537,15 +3531,15 @@ static void data_imports_fspot_fspot_data_importer_do_discover_importable_librar
 	db_files = (_vala_array_free (db_files, db_files_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 365 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	discovered_libraries = (_vala_array_free (discovered_libraries, discovered_libraries_length1, (GDestroyNotify) g_object_unref), NULL);
-#line 3527 "FSpotImporter.c"
+#line 3521 "FSpotImporter.c"
 }
 
 
 static void data_imports_fspot_fspot_data_importer_real_on_library_selected (SpitDataImportsDataImporter* base, SpitDataImportsImportableLibrary* library) {
 	DataImportsFSpotFSpotDataImporter * self;
-	SpitDataImportsImportableLibrary* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	GFile* _tmp2_ = NULL;
+	SpitDataImportsImportableLibrary* _tmp0_;
+	GFile* _tmp1_;
+	GFile* _tmp2_;
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 395 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3560,82 +3554,82 @@ static void data_imports_fspot_fspot_data_importer_real_on_library_selected (Spi
 	spit_data_imports_data_importer_on_file_selected (G_TYPE_CHECK_INSTANCE_CAST (self, SPIT_DATA_IMPORTS_TYPE_DATA_IMPORTER, SpitDataImportsDataImporter), _tmp2_);
 #line 396 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (_tmp2_);
-#line 3550 "FSpotImporter.c"
+#line 3544 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag*** array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value) {
+static void _vala_array_add3 (DataImportsFSpotFSpotImportableTag** * array, int* length, int* size, DataImportsFSpotFSpotImportableTag* value) {
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (DataImportsFSpotFSpotImportableTag*, *array, (*size) + 1);
-#line 3561 "FSpotImporter.c"
+#line 3555 "FSpotImporter.c"
 	}
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3567 "FSpotImporter.c"
+#line 3561 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add4 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
+static void _vala_array_add4 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3578 "FSpotImporter.c"
+#line 3572 "FSpotImporter.c"
 	}
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3584 "FSpotImporter.c"
+#line 3578 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add5 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
+static void _vala_array_add5 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3595 "FSpotImporter.c"
+#line 3589 "FSpotImporter.c"
 	}
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3601 "FSpotImporter.c"
+#line 3595 "FSpotImporter.c"
 }
 
 
-static void _vala_array_add6 (SpitDataImportsImportableMediaItem*** array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
+static void _vala_array_add6 (SpitDataImportsImportableMediaItem** * array, int* length, int* size, SpitDataImportsImportableMediaItem* value) {
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if ((*length) == (*size)) {
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		*array = g_renew (SpitDataImportsImportableMediaItem*, *array, (*size) + 1);
-#line 3612 "FSpotImporter.c"
+#line 3606 "FSpotImporter.c"
 	}
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[(*length)++] = value;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	(*array)[*length] = NULL;
-#line 3618 "FSpotImporter.c"
+#line 3612 "FSpotImporter.c"
 }
 
 
 static void _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback (gint imported_items_count, gpointer self) {
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_data_importer_on_imported_items_count ((DataImportsFSpotFSpotDataImporter*) self, imported_items_count);
-#line 3625 "FSpotImporter.c"
+#line 3619 "FSpotImporter.c"
 }
 
 
@@ -3647,12 +3641,11 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 	gdouble progress_delta_per_photo = 0.0;
 	gdouble progress_plugin_to_host_ratio = 0.0;
 	gdouble current_progress = 0.0;
-	SpitDataImportsPluginHost* _tmp24_ = NULL;
-	const gchar* _tmp25_ = NULL;
-	GeeArrayList* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	SpitDataImportsPluginHost* _tmp173_ = NULL;
+	SpitDataImportsPluginHost* _tmp24_;
+	GeeArrayList* _tmp35_;
+	gint _tmp36_;
+	gint _tmp37_;
+	SpitDataImportsPluginHost* _tmp172_;
 	GError * _inner_error_ = NULL;
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
@@ -3664,12 +3657,12 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 	progress_plugin_to_host_ratio = 0.5;
 #line 405 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	current_progress = 0.0;
-#line 3654 "FSpotImporter.c"
+#line 3647 "FSpotImporter.c"
 	{
 		DataImportsFSpotDbFSpotDatabase* _tmp0_ = NULL;
-		GFile* _tmp1_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp2_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp3_ = NULL;
+		GFile* _tmp1_;
+		DataImportsFSpotDbFSpotDatabase* _tmp2_;
+		DataImportsFSpotDbFSpotDatabase* _tmp3_;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp1_ = file;
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3680,12 +3673,12 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3670 "FSpotImporter.c"
+#line 3663 "FSpotImporter.c"
 				goto __catch0_database_error;
 			}
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == SPIT_DATA_IMPORTS_DATA_IMPORT_ERROR) {
-#line 3675 "FSpotImporter.c"
+#line 3668 "FSpotImporter.c"
 				goto __catch0_spit_data_imports_data_import_error;
 			}
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3700,7 +3693,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			g_clear_error (&_inner_error_);
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return;
-#line 3690 "FSpotImporter.c"
+#line 3683 "FSpotImporter.c"
 		}
 #line 407 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp3_ = _tmp0_;
@@ -3712,17 +3705,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		database = _tmp3_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3702 "FSpotImporter.c"
+#line 3695 "FSpotImporter.c"
 	}
 	goto __finally0;
 	__catch0_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gchar* _tmp6_ = NULL;
-		gchar* _tmp7_ = NULL;
-		SpitDataImportsPluginHost* _tmp8_ = NULL;
+		GError* _tmp4_;
+		const gchar* _tmp5_;
+		gchar* _tmp6_;
+		gchar* _tmp7_;
+		SpitDataImportsPluginHost* _tmp8_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3753,17 +3746,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 411 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3743 "FSpotImporter.c"
+#line 3736 "FSpotImporter.c"
 	}
 	goto __finally0;
 	__catch0_spit_data_imports_data_import_error:
 	{
 		GError* e = NULL;
-		GError* _tmp9_ = NULL;
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		SpitDataImportsPluginHost* _tmp13_ = NULL;
+		GError* _tmp9_;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		SpitDataImportsPluginHost* _tmp13_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3794,7 +3787,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 415 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3784 "FSpotImporter.c"
+#line 3777 "FSpotImporter.c"
 	}
 	__finally0:
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3811,14 +3804,14 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		g_clear_error (&_inner_error_);
 #line 406 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3801 "FSpotImporter.c"
+#line 3794 "FSpotImporter.c"
 	}
 	{
 		DataImportsFSpotFSpotTagsCache* _tmp14_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotTagsTable* _tmp16_ = NULL;
-		DataImportsFSpotFSpotTagsCache* _tmp17_ = NULL;
-		DataImportsFSpotFSpotTagsCache* _tmp18_ = NULL;
+		DataImportsFSpotDbFSpotDatabase* _tmp15_;
+		DataImportsFSpotDbFSpotTagsTable* _tmp16_;
+		DataImportsFSpotFSpotTagsCache* _tmp17_;
+		DataImportsFSpotFSpotTagsCache* _tmp18_;
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp15_ = database;
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3831,7 +3824,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3821 "FSpotImporter.c"
+#line 3814 "FSpotImporter.c"
 				goto __catch1_database_error;
 			}
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3846,7 +3839,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			g_clear_error (&_inner_error_);
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return;
-#line 3836 "FSpotImporter.c"
+#line 3829 "FSpotImporter.c"
 		}
 #line 418 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp18_ = _tmp14_;
@@ -3858,17 +3851,17 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		tags_cache = _tmp18_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (_tmp14_);
-#line 3848 "FSpotImporter.c"
+#line 3841 "FSpotImporter.c"
 	}
 	goto __finally1;
 	__catch1_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
-		gchar* _tmp22_ = NULL;
-		SpitDataImportsPluginHost* _tmp23_ = NULL;
+		GError* _tmp19_;
+		const gchar* _tmp20_;
+		gchar* _tmp21_;
+		gchar* _tmp22_;
+		SpitDataImportsPluginHost* _tmp23_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3899,7 +3892,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 422 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3889 "FSpotImporter.c"
+#line 3882 "FSpotImporter.c"
 	}
 	__finally1:
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3916,34 +3909,32 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		g_clear_error (&_inner_error_);
 #line 417 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 3906 "FSpotImporter.c"
+#line 3899 "FSpotImporter.c"
 	}
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_tmp24_ = self->priv->host;
 #line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp25_ = _ ("Preparing to import");
-#line 424 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_install_import_progress_pane (_tmp24_, _tmp25_);
-#line 3914 "FSpotImporter.c"
+	spit_data_imports_plugin_host_install_import_progress_pane (_tmp24_, _ ("Preparing to import"));
+#line 3905 "FSpotImporter.c"
 	{
-		GeeArrayList* _tmp26_ = NULL;
-		DataImportsFSpotDbFSpotDatabase* _tmp27_ = NULL;
-		DataImportsFSpotDbFSpotPhotosTable* _tmp28_ = NULL;
-		GeeArrayList* _tmp29_ = NULL;
-		GeeArrayList* _tmp30_ = NULL;
+		GeeArrayList* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotDatabase* _tmp26_;
+		DataImportsFSpotDbFSpotPhotosTable* _tmp27_;
+		GeeArrayList* _tmp28_;
+		GeeArrayList* _tmp29_;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp27_ = database;
+		_tmp26_ = database;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp28_ = _tmp27_->photos_table;
+		_tmp27_ = _tmp26_->photos_table;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp29_ = data_imports_fspot_db_fspot_photos_table_get_all (_tmp28_, &_inner_error_);
+		_tmp28_ = data_imports_fspot_db_fspot_photos_table_get_all (_tmp27_, &_inner_error_);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp26_ = _tmp29_;
+		_tmp25_ = _tmp28_;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			if (_inner_error_->domain == DATABASE_ERROR) {
-#line 3933 "FSpotImporter.c"
+#line 3924 "FSpotImporter.c"
 				goto __catch2_database_error;
 			}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -3958,49 +3949,49 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			g_clear_error (&_inner_error_);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			return;
-#line 3948 "FSpotImporter.c"
+#line 3939 "FSpotImporter.c"
 		}
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp30_ = _tmp26_;
+		_tmp29_ = _tmp25_;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp26_ = NULL;
+		_tmp25_ = NULL;
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (all_photos);
 #line 426 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		all_photos = _tmp30_;
+		all_photos = _tmp29_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_object_unref0 (_tmp26_);
-#line 3960 "FSpotImporter.c"
+		_g_object_unref0 (_tmp25_);
+#line 3951 "FSpotImporter.c"
 	}
 	goto __finally2;
 	__catch2_database_error:
 	{
 		GError* e = NULL;
-		GError* _tmp31_ = NULL;
-		const gchar* _tmp32_ = NULL;
-		gchar* _tmp33_ = NULL;
-		gchar* _tmp34_ = NULL;
-		SpitDataImportsPluginHost* _tmp35_ = NULL;
+		GError* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
+		gchar* _tmp33_;
+		SpitDataImportsPluginHost* _tmp34_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		e = _inner_error_;
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_inner_error_ = NULL;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp31_ = e;
+		_tmp30_ = e;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp32_ = _tmp31_->message;
+		_tmp31_ = _tmp30_->message;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp33_ = g_strdup_printf ("FSpotDataImporter: Can't read photos table: %s", _tmp32_);
+		_tmp32_ = g_strdup_printf ("FSpotDataImporter: Can't read photos table: %s", _tmp31_);
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp34_ = _tmp33_;
+		_tmp33_ = _tmp32_;
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		g_debug ("FSpotImporter.vala:428: %s", _tmp34_);
+		g_debug ("FSpotImporter.vala:428: %s", _tmp33_);
 #line 428 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_g_free0 (_tmp34_);
+		_g_free0 (_tmp33_);
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp35_ = self->priv->host;
+		_tmp34_ = self->priv->host;
 #line 429 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		spit_data_imports_plugin_host_post_error_message (_tmp35_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE);
+		spit_data_imports_plugin_host_post_error_message (_tmp34_, DATA_IMPORTS_FSPOT_ERROR_CANT_READ_PHOTOS_TABLE);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_error_free0 (e);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4011,7 +4002,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		_g_object_unref0 (database);
 #line 430 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 4001 "FSpotImporter.c"
+#line 3992 "FSpotImporter.c"
 	}
 	__finally2:
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4028,108 +4019,108 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 		g_clear_error (&_inner_error_);
 #line 425 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		return;
-#line 4018 "FSpotImporter.c"
+#line 4009 "FSpotImporter.c"
 	}
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp36_ = all_photos;
+	_tmp35_ = all_photos;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp37_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+	_tmp36_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp38_ = _tmp37_;
+	_tmp37_ = _tmp36_;
 #line 432 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	if (_tmp38_ > 0) {
-#line 4028 "FSpotImporter.c"
-		GeeArrayList* _tmp39_ = NULL;
-		gint _tmp40_ = 0;
-		gint _tmp41_ = 0;
+	if (_tmp37_ > 0) {
+#line 4019 "FSpotImporter.c"
+		GeeArrayList* _tmp38_;
+		gint _tmp39_;
+		gint _tmp40_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp39_ = all_photos;
+		_tmp38_ = all_photos;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp40_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp39_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp41_ = _tmp40_;
+		_tmp40_ = _tmp39_;
 #line 433 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		progress_delta_per_photo = 1.0 / _tmp41_;
-#line 4040 "FSpotImporter.c"
+		progress_delta_per_photo = 1.0 / _tmp40_;
+#line 4031 "FSpotImporter.c"
 	}
 	{
 		GeeArrayList* _photo_row_list = NULL;
-		GeeArrayList* _tmp42_ = NULL;
-		GeeArrayList* _tmp43_ = NULL;
+		GeeArrayList* _tmp41_;
+		GeeArrayList* _tmp42_;
 		gint _photo_row_size = 0;
-		GeeArrayList* _tmp44_ = NULL;
-		gint _tmp45_ = 0;
-		gint _tmp46_ = 0;
+		GeeArrayList* _tmp43_;
+		gint _tmp44_;
+		gint _tmp45_;
 		gint _photo_row_index = 0;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp42_ = all_photos;
+		_tmp41_ = all_photos;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp43_ = _g_object_ref0 (_tmp42_);
+		_tmp42_ = _g_object_ref0 (_tmp41_);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_photo_row_list = _tmp43_;
+		_photo_row_list = _tmp42_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp44_ = _photo_row_list;
+		_tmp43_ = _photo_row_list;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp45_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+		_tmp44_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_tmp46_ = _tmp45_;
+		_tmp45_ = _tmp44_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-		_photo_row_size = _tmp46_;
+		_photo_row_size = _tmp45_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_photo_row_index = -1;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		while (TRUE) {
-#line 4069 "FSpotImporter.c"
-			gint _tmp47_ = 0;
-			gint _tmp48_ = 0;
-			gint _tmp49_ = 0;
+#line 4060 "FSpotImporter.c"
+			gint _tmp46_;
+			gint _tmp47_;
+			gint _tmp48_;
 			DataImportsFSpotDbFSpotPhotoRow* photo_row = NULL;
-			GeeArrayList* _tmp50_ = NULL;
-			gint _tmp51_ = 0;
-			gpointer _tmp52_ = NULL;
+			GeeArrayList* _tmp49_;
+			gint _tmp50_;
+			gpointer _tmp51_;
 			gboolean hidden = FALSE;
 			gboolean favorite = FALSE;
 			DataImportsFSpotFSpotImportableTag** tags = NULL;
-			DataImportsFSpotFSpotImportableTag** _tmp53_ = NULL;
-			gint tags_length1 = 0;
-			gint _tags_size_ = 0;
+			DataImportsFSpotFSpotImportableTag** _tmp52_;
+			gint tags_length1;
+			gint _tags_size_;
 			DataImportsFSpotFSpotImportableEvent* event = NULL;
 			DataImportsFSpotDbFSpotRollRow* roll_row = NULL;
 			SpitDataImportsImportableMediaItem** importable_items = NULL;
-			SpitDataImportsImportableMediaItem** _tmp97_ = NULL;
-			gint importable_items_length1 = 0;
-			gint _importable_items_size_ = 0;
-			gboolean _tmp161_ = FALSE;
+			SpitDataImportsImportableMediaItem** _tmp96_;
+			gint importable_items_length1;
+			gint _importable_items_size_;
+			gboolean _tmp160_;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp47_ = _photo_row_index;
+			_tmp46_ = _photo_row_index;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_photo_row_index = _tmp47_ + 1;
+			_photo_row_index = _tmp46_ + 1;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp48_ = _photo_row_index;
+			_tmp47_ = _photo_row_index;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp49_ = _photo_row_size;
+			_tmp48_ = _photo_row_size;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (!(_tmp48_ < _tmp49_)) {
+			if (!(_tmp47_ < _tmp48_)) {
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				break;
-#line 4102 "FSpotImporter.c"
+#line 4093 "FSpotImporter.c"
 			}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp50_ = _photo_row_list;
+			_tmp49_ = _photo_row_list;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp51_ = _photo_row_index;
+			_tmp50_ = _photo_row_index;
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp52_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp51_);
+			_tmp51_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp50_);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			photo_row = (DataImportsFSpotDbFSpotPhotoRow*) _tmp52_;
+			photo_row = (DataImportsFSpotDbFSpotPhotoRow*) _tmp51_;
 #line 435 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			hidden = FALSE;
 #line 436 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			favorite = FALSE;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp53_ = g_new0 (DataImportsFSpotFSpotImportableTag*, 0 + 1);
+			_tmp52_ = g_new0 (DataImportsFSpotFSpotImportableTag*, 0 + 1);
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			tags = _tmp53_;
+			tags = _tmp52_;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			tags_length1 = 0;
 #line 437 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4138,31 +4129,31 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			event = NULL;
 #line 439 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			roll_row = NULL;
-#line 4128 "FSpotImporter.c"
+#line 4119 "FSpotImporter.c"
 			{
-				GeeArrayList* _tmp54_ = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp55_ = NULL;
-				DataImportsFSpotDbFSpotTagsTable* _tmp56_ = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp57_ = NULL;
-				gint64 _tmp58_ = 0LL;
-				GeeArrayList* _tmp59_ = NULL;
+				GeeArrayList* _tmp53_ = NULL;
+				DataImportsFSpotDbFSpotDatabase* _tmp54_;
+				DataImportsFSpotDbFSpotTagsTable* _tmp55_;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp56_;
+				gint64 _tmp57_;
+				GeeArrayList* _tmp58_;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp55_ = database;
+				_tmp54_ = database;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp56_ = _tmp55_->tags_table;
+				_tmp55_ = _tmp54_->tags_table;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp57_ = photo_row;
+				_tmp56_ = photo_row;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp58_ = _tmp57_->photo_id;
+				_tmp57_ = _tmp56_->photo_id;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp59_ = data_imports_fspot_db_fspot_tags_table_get_by_photo_id (_tmp56_, _tmp58_, &_inner_error_);
+				_tmp58_ = data_imports_fspot_db_fspot_tags_table_get_by_photo_id (_tmp55_, _tmp57_, &_inner_error_);
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp54_ = _tmp59_;
+				_tmp53_ = _tmp58_;
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4152 "FSpotImporter.c"
+#line 4143 "FSpotImporter.c"
 						goto __catch3_database_error;
 					}
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4187,80 +4178,78 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 					g_clear_error (&_inner_error_);
 #line 449 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					return;
-#line 4177 "FSpotImporter.c"
+#line 4168 "FSpotImporter.c"
 				}
 				{
 					GeeArrayList* _tag_row_list = NULL;
-					GeeArrayList* _tmp60_ = NULL;
+					GeeArrayList* _tmp59_;
 					gint _tag_row_size = 0;
-					GeeArrayList* _tmp61_ = NULL;
-					gint _tmp62_ = 0;
-					gint _tmp63_ = 0;
+					GeeArrayList* _tmp60_;
+					gint _tmp61_;
+					gint _tmp62_;
 					gint _tag_row_index = 0;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp60_ = _tmp54_;
-#line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp54_ = NULL;
+					_tmp59_ = _g_object_ref0 (_tmp53_);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tag_row_list = _tmp60_;
+					_tag_row_list = _tmp59_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp61_ = _tag_row_list;
+					_tmp60_ = _tag_row_list;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp62_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+					_tmp61_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp63_ = _tmp62_;
+					_tmp62_ = _tmp61_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tag_row_size = _tmp63_;
+					_tag_row_size = _tmp62_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_tag_row_index = -1;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					while (TRUE) {
-#line 4205 "FSpotImporter.c"
-						gint _tmp64_ = 0;
-						gint _tmp65_ = 0;
-						gint _tmp66_ = 0;
+#line 4194 "FSpotImporter.c"
+						gint _tmp63_;
+						gint _tmp64_;
+						gint _tmp65_;
 						DataImportsFSpotDbFSpotTagRow* tag_row = NULL;
-						GeeArrayList* _tmp67_ = NULL;
-						gint _tmp68_ = 0;
-						gpointer _tmp69_ = NULL;
+						GeeArrayList* _tmp66_;
+						gint _tmp67_;
+						gpointer _tmp68_;
 						DataImportsFSpotFSpotImportableTag* tag = NULL;
-						DataImportsFSpotFSpotTagsCache* _tmp70_ = NULL;
-						DataImportsFSpotDbFSpotTagRow* _tmp71_ = NULL;
-						DataImportsFSpotFSpotImportableTag* _tmp72_ = NULL;
-						DataImportsFSpotFSpotImportableTag* _tmp73_ = NULL;
-						DataImportsFSpotDbFSpotDatabase* _tmp74_ = NULL;
-						gint64 _tmp75_ = 0LL;
-						gboolean _tmp76_ = FALSE;
+						DataImportsFSpotFSpotTagsCache* _tmp69_;
+						DataImportsFSpotDbFSpotTagRow* _tmp70_;
+						DataImportsFSpotFSpotImportableTag* _tmp71_;
+						DataImportsFSpotFSpotImportableTag* _tmp72_;
+						DataImportsFSpotDbFSpotDatabase* _tmp73_;
+						gint64 _tmp74_;
+						gboolean _tmp75_;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp64_ = _tag_row_index;
+						_tmp63_ = _tag_row_index;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tag_row_index = _tmp64_ + 1;
+						_tag_row_index = _tmp63_ + 1;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp65_ = _tag_row_index;
+						_tmp64_ = _tag_row_index;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp66_ = _tag_row_size;
+						_tmp65_ = _tag_row_size;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (!(_tmp65_ < _tmp66_)) {
+						if (!(_tmp64_ < _tmp65_)) {
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							break;
-#line 4233 "FSpotImporter.c"
+#line 4222 "FSpotImporter.c"
 						}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp67_ = _tag_row_list;
+						_tmp66_ = _tag_row_list;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp68_ = _tag_row_index;
+						_tmp67_ = _tag_row_index;
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp69_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp68_);
+						_tmp68_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp67_);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						tag_row = (DataImportsFSpotDbFSpotTagRow*) _tmp69_;
+						tag_row = (DataImportsFSpotDbFSpotTagRow*) _tmp68_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp70_ = tags_cache;
+						_tmp69_ = tags_cache;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp71_ = tag_row;
+						_tmp70_ = tag_row;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp72_ = data_imports_fspot_fspot_tags_cache_get_tag (_tmp70_, _tmp71_, &_inner_error_);
+						_tmp71_ = data_imports_fspot_fspot_tags_cache_get_tag (_tmp69_, _tmp70_, &_inner_error_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						tag = _tmp72_;
+						tag = _tmp71_;
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4268,10 +4257,10 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_g_object_unref0 (_tag_row_list);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tmp54_);
+							_g_object_unref0 (_tmp53_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4261 "FSpotImporter.c"
+#line 4250 "FSpotImporter.c"
 								goto __catch3_database_error;
 							}
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4279,7 +4268,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_g_object_unref0 (_tag_row_list);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_g_object_unref0 (_tmp54_);
+							_g_object_unref0 (_tmp53_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							_g_object_unref0 (roll_row);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4302,90 +4291,90 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 							g_clear_error (&_inner_error_);
 #line 451 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							return;
-#line 4292 "FSpotImporter.c"
+#line 4281 "FSpotImporter.c"
 						}
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp73_ = tag;
+						_tmp72_ = tag;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp74_ = database;
+						_tmp73_ = database;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp75_ = _tmp74_->hidden_tag_id;
+						_tmp74_ = _tmp73_->hidden_tag_id;
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp76_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp73_, _tmp75_);
+						_tmp75_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp72_, _tmp74_);
 #line 452 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp76_) {
+						if (_tmp75_) {
 #line 453 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							hidden = TRUE;
-#line 4306 "FSpotImporter.c"
+#line 4295 "FSpotImporter.c"
 						} else {
-							DataImportsFSpotFSpotImportableTag* _tmp77_ = NULL;
-							gboolean _tmp78_ = FALSE;
+							DataImportsFSpotFSpotImportableTag* _tmp76_;
+							gboolean _tmp77_;
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp77_ = tag;
+							_tmp76_ = tag;
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp78_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp77_);
+							_tmp77_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp76_);
 #line 454 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							if (_tmp78_) {
+							if (_tmp77_) {
 #line 455 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 								favorite = TRUE;
-#line 4318 "FSpotImporter.c"
+#line 4307 "FSpotImporter.c"
 							} else {
-								DataImportsFSpotFSpotImportableTag** _tmp79_ = NULL;
-								gint _tmp79__length1 = 0;
-								DataImportsFSpotFSpotImportableTag* _tmp80_ = NULL;
-								DataImportsFSpotFSpotImportableTag* _tmp81_ = NULL;
+								DataImportsFSpotFSpotImportableTag** _tmp78_;
+								gint _tmp78__length1;
+								DataImportsFSpotFSpotImportableTag* _tmp79_;
+								DataImportsFSpotFSpotImportableTag* _tmp80_;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp79_ = tags;
+								_tmp78_ = tags;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp79__length1 = tags_length1;
+								_tmp78__length1 = tags_length1;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp80_ = tag;
+								_tmp79_ = tag;
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_tmp81_ = _g_object_ref0 (_tmp80_);
+								_tmp80_ = _g_object_ref0 (_tmp79_);
 #line 457 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-								_vala_array_add3 (&tags, &tags_length1, &_tags_size_, _tmp81_);
-#line 4334 "FSpotImporter.c"
+								_vala_array_add3 (&tags, &tags_length1, &_tags_size_, _tmp80_);
+#line 4323 "FSpotImporter.c"
 							}
 						}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_g_object_unref0 (tag);
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_g_object_unref0 (tag_row);
-#line 4341 "FSpotImporter.c"
+#line 4330 "FSpotImporter.c"
 					}
 #line 447 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_object_unref0 (_tag_row_list);
-#line 4345 "FSpotImporter.c"
+#line 4334 "FSpotImporter.c"
 				}
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_tmp54_);
-#line 4349 "FSpotImporter.c"
+				_g_object_unref0 (_tmp53_);
+#line 4338 "FSpotImporter.c"
 			}
 			goto __finally3;
 			__catch3_database_error:
 			{
 				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp82_ = NULL;
-				gint64 _tmp83_ = 0LL;
-				GError* _tmp84_ = NULL;
-				const gchar* _tmp85_ = NULL;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp81_;
+				gint64 _tmp82_;
+				GError* _tmp83_;
+				const gchar* _tmp84_;
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				e = _inner_error_;
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_inner_error_ = NULL;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp82_ = photo_row;
+				_tmp81_ = photo_row;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp83_ = _tmp82_->photo_id;
+				_tmp82_ = _tmp81_->photo_id;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp84_ = e;
+				_tmp83_ = e;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp85_ = _tmp84_->message;
+				_tmp84_ = _tmp83_->message;
 #line 461 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_message ("FSpotImporter.vala:461: Failed to retrieve tags for photo ID %ld: %s", (glong) _tmp83_, _tmp85_);
+				g_message ("FSpotImporter.vala:461: Failed to retrieve tags for photo ID %ld: %s", (glong) _tmp82_, _tmp84_);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_error_free0 (e);
-#line 4375 "FSpotImporter.c"
+#line 4364 "FSpotImporter.c"
 			}
 			__finally3:
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4412,33 +4401,33 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				g_clear_error (&_inner_error_);
 #line 446 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return;
-#line 4402 "FSpotImporter.c"
+#line 4391 "FSpotImporter.c"
 			}
 			{
-				DataImportsFSpotDbFSpotRollRow* _tmp86_ = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp87_ = NULL;
-				DataImportsFSpotDbFSpotRollsTable* _tmp88_ = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp89_ = NULL;
-				gint64 _tmp90_ = 0LL;
-				DataImportsFSpotDbFSpotRollRow* _tmp91_ = NULL;
-				DataImportsFSpotDbFSpotRollRow* _tmp92_ = NULL;
+				DataImportsFSpotDbFSpotRollRow* _tmp85_ = NULL;
+				DataImportsFSpotDbFSpotDatabase* _tmp86_;
+				DataImportsFSpotDbFSpotRollsTable* _tmp87_;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp88_;
+				gint64 _tmp89_;
+				DataImportsFSpotDbFSpotRollRow* _tmp90_;
+				DataImportsFSpotDbFSpotRollRow* _tmp91_;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp87_ = database;
+				_tmp86_ = database;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp88_ = _tmp87_->rolls_table;
+				_tmp87_ = _tmp86_->rolls_table;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp89_ = photo_row;
+				_tmp88_ = photo_row;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp90_ = _tmp89_->roll_id;
+				_tmp89_ = _tmp88_->roll_id;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp91_ = data_imports_fspot_db_fspot_rolls_table_get_by_id (_tmp88_, _tmp90_, &_inner_error_);
+				_tmp90_ = data_imports_fspot_db_fspot_rolls_table_get_by_id (_tmp87_, _tmp89_, &_inner_error_);
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp86_ = _tmp91_;
+				_tmp85_ = _tmp90_;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4428 "FSpotImporter.c"
+#line 4417 "FSpotImporter.c"
 						goto __catch4_database_error;
 					}
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4463,45 +4452,45 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 					g_clear_error (&_inner_error_);
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					return;
-#line 4453 "FSpotImporter.c"
+#line 4442 "FSpotImporter.c"
 				}
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp92_ = _tmp86_;
+				_tmp91_ = _tmp85_;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp86_ = NULL;
+				_tmp85_ = NULL;
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (roll_row);
 #line 466 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				roll_row = _tmp92_;
+				roll_row = _tmp91_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_g_object_unref0 (_tmp86_);
-#line 4465 "FSpotImporter.c"
+				_g_object_unref0 (_tmp85_);
+#line 4454 "FSpotImporter.c"
 			}
 			goto __finally4;
 			__catch4_database_error:
 			{
 				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp93_ = NULL;
-				gint64 _tmp94_ = 0LL;
-				GError* _tmp95_ = NULL;
-				const gchar* _tmp96_ = NULL;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp92_;
+				gint64 _tmp93_;
+				GError* _tmp94_;
+				const gchar* _tmp95_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				e = _inner_error_;
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_inner_error_ = NULL;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp93_ = photo_row;
+				_tmp92_ = photo_row;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp94_ = _tmp93_->photo_id;
+				_tmp93_ = _tmp92_->photo_id;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp95_ = e;
+				_tmp94_ = e;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp96_ = _tmp95_->message;
+				_tmp95_ = _tmp94_->message;
 #line 469 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				g_message ("FSpotImporter.vala:469: Failed to retrieve roll for photo ID %ld: %s", (glong) _tmp94_, _tmp96_);
+				g_message ("FSpotImporter.vala:469: Failed to retrieve roll for photo ID %ld: %s", (glong) _tmp93_, _tmp95_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_error_free0 (e);
-#line 4491 "FSpotImporter.c"
+#line 4480 "FSpotImporter.c"
 			}
 			__finally4:
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4528,45 +4517,45 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				g_clear_error (&_inner_error_);
 #line 465 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return;
-#line 4518 "FSpotImporter.c"
+#line 4507 "FSpotImporter.c"
 			}
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp97_ = g_new0 (SpitDataImportsImportableMediaItem*, 0 + 1);
+			_tmp96_ = g_new0 (SpitDataImportsImportableMediaItem*, 0 + 1);
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			importable_items = _tmp97_;
+			importable_items = _tmp96_;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			importable_items_length1 = 0;
 #line 473 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_importable_items_size_ = importable_items_length1;
-#line 4528 "FSpotImporter.c"
+#line 4517 "FSpotImporter.c"
 			{
 				GeeArrayList* photo_versions = NULL;
-				DataImportsFSpotDbFSpotDatabase* _tmp98_ = NULL;
-				DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp99_ = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp100_ = NULL;
-				gint64 _tmp101_ = 0LL;
-				GeeArrayList* _tmp102_ = NULL;
+				DataImportsFSpotDbFSpotDatabase* _tmp97_;
+				DataImportsFSpotDbFSpotPhotoVersionsTable* _tmp98_;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp99_;
+				gint64 _tmp100_;
+				GeeArrayList* _tmp101_;
 				gboolean photo_versions_added = FALSE;
 				gboolean photo_versions_skipped = FALSE;
-				gboolean _tmp128_ = FALSE;
-				gboolean _tmp129_ = FALSE;
+				gboolean _tmp127_ = FALSE;
+				gboolean _tmp128_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp98_ = database;
+				_tmp97_ = database;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp99_ = _tmp98_->photo_versions_table;
+				_tmp98_ = _tmp97_->photo_versions_table;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp100_ = photo_row;
+				_tmp99_ = photo_row;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp101_ = _tmp100_->photo_id;
+				_tmp100_ = _tmp99_->photo_id;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp102_ = data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (_tmp99_, _tmp101_, &_inner_error_);
+				_tmp101_ = data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (_tmp98_, _tmp100_, &_inner_error_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				photo_versions = _tmp102_;
+				photo_versions = _tmp101_;
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					if (_inner_error_->domain == DATABASE_ERROR) {
-#line 4556 "FSpotImporter.c"
+#line 4545 "FSpotImporter.c"
 						goto __catch5_database_error;
 					}
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4593,319 +4582,319 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 					g_clear_error (&_inner_error_);
 #line 475 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					return;
-#line 4583 "FSpotImporter.c"
+#line 4572 "FSpotImporter.c"
 				}
 #line 477 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				photo_versions_added = FALSE;
 #line 478 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				photo_versions_skipped = FALSE;
-#line 4589 "FSpotImporter.c"
+#line 4578 "FSpotImporter.c"
 				{
 					GeeArrayList* _photo_version_row_list = NULL;
-					GeeArrayList* _tmp103_ = NULL;
-					GeeArrayList* _tmp104_ = NULL;
+					GeeArrayList* _tmp102_;
+					GeeArrayList* _tmp103_;
 					gint _photo_version_row_size = 0;
-					GeeArrayList* _tmp105_ = NULL;
-					gint _tmp106_ = 0;
-					gint _tmp107_ = 0;
+					GeeArrayList* _tmp104_;
+					gint _tmp105_;
+					gint _tmp106_;
 					gint _photo_version_row_index = 0;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp103_ = photo_versions;
+					_tmp102_ = photo_versions;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp104_ = _g_object_ref0 (_tmp103_);
+					_tmp103_ = _g_object_ref0 (_tmp102_);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_photo_version_row_list = _tmp104_;
+					_photo_version_row_list = _tmp103_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp105_ = _photo_version_row_list;
+					_tmp104_ = _photo_version_row_list;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp106_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
+					_tmp105_ = gee_abstract_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection));
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp107_ = _tmp106_;
+					_tmp106_ = _tmp105_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_photo_version_row_size = _tmp107_;
+					_photo_version_row_size = _tmp106_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_photo_version_row_index = -1;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					while (TRUE) {
-#line 4617 "FSpotImporter.c"
-						gint _tmp108_ = 0;
-						gint _tmp109_ = 0;
-						gint _tmp110_ = 0;
+#line 4606 "FSpotImporter.c"
+						gint _tmp107_;
+						gint _tmp108_;
+						gint _tmp109_;
 						DataImportsFSpotDbFSpotPhotoVersionRow* photo_version_row = NULL;
-						GeeArrayList* _tmp111_ = NULL;
-						gint _tmp112_ = 0;
-						gpointer _tmp113_ = NULL;
-						gboolean _tmp114_ = FALSE;
-						DataImportsFSpotDbFSpotPhotoVersionRow* _tmp115_ = NULL;
-						GFile* _tmp116_ = NULL;
+						GeeArrayList* _tmp110_;
+						gint _tmp111_;
+						gpointer _tmp112_;
+						gboolean _tmp113_ = FALSE;
+						DataImportsFSpotDbFSpotPhotoVersionRow* _tmp114_;
+						GFile* _tmp115_;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp108_ = _photo_version_row_index;
+						_tmp107_ = _photo_version_row_index;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_photo_version_row_index = _tmp108_ + 1;
+						_photo_version_row_index = _tmp107_ + 1;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp109_ = _photo_version_row_index;
+						_tmp108_ = _photo_version_row_index;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp110_ = _photo_version_row_size;
+						_tmp109_ = _photo_version_row_size;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (!(_tmp109_ < _tmp110_)) {
+						if (!(_tmp108_ < _tmp109_)) {
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							break;
-#line 4640 "FSpotImporter.c"
+#line 4629 "FSpotImporter.c"
 						}
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp111_ = _photo_version_row_list;
+						_tmp110_ = _photo_version_row_list;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp112_ = _photo_version_row_index;
+						_tmp111_ = _photo_version_row_index;
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp113_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp111_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp112_);
+						_tmp112_ = gee_abstract_list_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp110_, GEE_TYPE_ABSTRACT_LIST, GeeAbstractList), _tmp111_);
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						photo_version_row = (DataImportsFSpotDbFSpotPhotoVersionRow*) _tmp113_;
+						photo_version_row = (DataImportsFSpotDbFSpotPhotoVersionRow*) _tmp112_;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp115_ = photo_version_row;
+						_tmp114_ = photo_version_row;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp116_ = _tmp115_->base_path;
+						_tmp115_ = _tmp114_->base_path;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp116_ != NULL) {
-#line 4656 "FSpotImporter.c"
-							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp117_ = NULL;
-							const gchar* _tmp118_ = NULL;
+						if (_tmp115_ != NULL) {
+#line 4645 "FSpotImporter.c"
+							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp116_;
+							const gchar* _tmp117_;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp117_ = photo_version_row;
+							_tmp116_ = photo_version_row;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp118_ = _tmp117_->filename;
+							_tmp117_ = _tmp116_->filename;
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp114_ = _tmp118_ != NULL;
-#line 4665 "FSpotImporter.c"
+							_tmp113_ = _tmp117_ != NULL;
+#line 4654 "FSpotImporter.c"
 						} else {
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp114_ = FALSE;
-#line 4669 "FSpotImporter.c"
+							_tmp113_ = FALSE;
+#line 4658 "FSpotImporter.c"
 						}
 #line 480 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						if (_tmp114_) {
-#line 4673 "FSpotImporter.c"
-							SpitDataImportsImportableMediaItem** _tmp119_ = NULL;
-							gint _tmp119__length1 = 0;
-							DataImportsFSpotDbFSpotPhotoRow* _tmp120_ = NULL;
-							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp121_ = NULL;
-							DataImportsFSpotDbFSpotRollRow* _tmp122_ = NULL;
-							DataImportsFSpotFSpotImportableTag** _tmp123_ = NULL;
-							gint _tmp123__length1 = 0;
-							DataImportsFSpotFSpotImportableEvent* _tmp124_ = NULL;
-							gboolean _tmp125_ = FALSE;
-							gboolean _tmp126_ = FALSE;
-							DataImportsFSpotFSpotImportableItem* _tmp127_ = NULL;
+						if (_tmp113_) {
+#line 4662 "FSpotImporter.c"
+							SpitDataImportsImportableMediaItem** _tmp118_;
+							gint _tmp118__length1;
+							DataImportsFSpotDbFSpotPhotoRow* _tmp119_;
+							DataImportsFSpotDbFSpotPhotoVersionRow* _tmp120_;
+							DataImportsFSpotDbFSpotRollRow* _tmp121_;
+							DataImportsFSpotFSpotImportableTag** _tmp122_;
+							gint _tmp122__length1;
+							DataImportsFSpotFSpotImportableEvent* _tmp123_;
+							gboolean _tmp124_;
+							gboolean _tmp125_;
+							DataImportsFSpotFSpotImportableItem* _tmp126_;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp119_ = importable_items;
+							_tmp118_ = importable_items;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp119__length1 = importable_items_length1;
+							_tmp118__length1 = importable_items_length1;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp120_ = photo_row;
+							_tmp119_ = photo_row;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp121_ = photo_version_row;
+							_tmp120_ = photo_version_row;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp122_ = roll_row;
+							_tmp121_ = roll_row;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp123_ = tags;
+							_tmp122_ = tags;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp123__length1 = tags_length1;
+							_tmp122__length1 = tags_length1;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp124_ = event;
+							_tmp123_ = event;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp125_ = hidden;
+							_tmp124_ = hidden;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp126_ = favorite;
+							_tmp125_ = favorite;
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_tmp127_ = data_imports_fspot_fspot_importable_item_new (_tmp120_, _tmp121_, _tmp122_, _tmp123_, _tmp123__length1, _tmp124_, _tmp125_, _tmp126_);
+							_tmp126_ = data_imports_fspot_fspot_importable_item_new (_tmp119_, _tmp120_, _tmp121_, _tmp122_, _tmp122__length1, _tmp123_, _tmp124_, _tmp125_);
 #line 481 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-							_vala_array_add4 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp127_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
+							_vala_array_add4 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp126_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
 #line 484 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							photo_versions_added = TRUE;
-#line 4711 "FSpotImporter.c"
+#line 4700 "FSpotImporter.c"
 						} else {
 #line 486 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 							photo_versions_skipped = TRUE;
-#line 4715 "FSpotImporter.c"
+#line 4704 "FSpotImporter.c"
 						}
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 						_g_object_unref0 (photo_version_row);
-#line 4719 "FSpotImporter.c"
+#line 4708 "FSpotImporter.c"
 					}
 #line 479 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 					_g_object_unref0 (_photo_version_row_list);
-#line 4723 "FSpotImporter.c"
+#line 4712 "FSpotImporter.c"
 				}
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp129_ = photo_versions_skipped;
+				_tmp128_ = photo_versions_skipped;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp129_) {
+				if (_tmp128_) {
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp128_ = TRUE;
-#line 4731 "FSpotImporter.c"
+					_tmp127_ = TRUE;
+#line 4720 "FSpotImporter.c"
 				} else {
-					gboolean _tmp130_ = FALSE;
+					gboolean _tmp129_;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp130_ = photo_versions_added;
+					_tmp129_ = photo_versions_added;
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp128_ = !_tmp130_;
-#line 4738 "FSpotImporter.c"
+					_tmp127_ = !_tmp129_;
+#line 4727 "FSpotImporter.c"
 				}
 #line 494 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp128_) {
-#line 4742 "FSpotImporter.c"
-					gboolean _tmp131_ = FALSE;
-					DataImportsFSpotDbFSpotPhotoRow* _tmp132_ = NULL;
-					GFile* _tmp133_ = NULL;
+				if (_tmp127_) {
+#line 4731 "FSpotImporter.c"
+					gboolean _tmp130_ = FALSE;
+					DataImportsFSpotDbFSpotPhotoRow* _tmp131_;
+					GFile* _tmp132_;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp132_ = photo_row;
+					_tmp131_ = photo_row;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp133_ = _tmp132_->base_path;
+					_tmp132_ = _tmp131_->base_path;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_tmp133_ != NULL) {
-#line 4752 "FSpotImporter.c"
-						DataImportsFSpotDbFSpotPhotoRow* _tmp134_ = NULL;
-						const gchar* _tmp135_ = NULL;
+					if (_tmp132_ != NULL) {
+#line 4741 "FSpotImporter.c"
+						DataImportsFSpotDbFSpotPhotoRow* _tmp133_;
+						const gchar* _tmp134_;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp134_ = photo_row;
+						_tmp133_ = photo_row;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp135_ = _tmp134_->filename;
+						_tmp134_ = _tmp133_->filename;
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp131_ = _tmp135_ != NULL;
-#line 4761 "FSpotImporter.c"
+						_tmp130_ = _tmp134_ != NULL;
+#line 4750 "FSpotImporter.c"
 					} else {
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp131_ = FALSE;
-#line 4765 "FSpotImporter.c"
+						_tmp130_ = FALSE;
+#line 4754 "FSpotImporter.c"
 					}
 #line 495 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					if (_tmp131_) {
-#line 4769 "FSpotImporter.c"
-						SpitDataImportsImportableMediaItem** _tmp136_ = NULL;
-						gint _tmp136__length1 = 0;
-						DataImportsFSpotDbFSpotPhotoRow* _tmp137_ = NULL;
-						DataImportsFSpotDbFSpotRollRow* _tmp138_ = NULL;
-						DataImportsFSpotFSpotImportableTag** _tmp139_ = NULL;
-						gint _tmp139__length1 = 0;
-						DataImportsFSpotFSpotImportableEvent* _tmp140_ = NULL;
-						gboolean _tmp141_ = FALSE;
-						gboolean _tmp142_ = FALSE;
-						DataImportsFSpotFSpotImportableItem* _tmp143_ = NULL;
+					if (_tmp130_) {
+#line 4758 "FSpotImporter.c"
+						SpitDataImportsImportableMediaItem** _tmp135_;
+						gint _tmp135__length1;
+						DataImportsFSpotDbFSpotPhotoRow* _tmp136_;
+						DataImportsFSpotDbFSpotRollRow* _tmp137_;
+						DataImportsFSpotFSpotImportableTag** _tmp138_;
+						gint _tmp138__length1;
+						DataImportsFSpotFSpotImportableEvent* _tmp139_;
+						gboolean _tmp140_;
+						gboolean _tmp141_;
+						DataImportsFSpotFSpotImportableItem* _tmp142_;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp136_ = importable_items;
+						_tmp135_ = importable_items;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp136__length1 = importable_items_length1;
+						_tmp135__length1 = importable_items_length1;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp137_ = photo_row;
+						_tmp136_ = photo_row;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp138_ = roll_row;
+						_tmp137_ = roll_row;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp139_ = tags;
+						_tmp138_ = tags;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp139__length1 = tags_length1;
+						_tmp138__length1 = tags_length1;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp140_ = event;
+						_tmp139_ = event;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp141_ = hidden;
+						_tmp140_ = hidden;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp142_ = favorite;
+						_tmp141_ = favorite;
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_tmp143_ = data_imports_fspot_fspot_importable_item_new (_tmp137_, NULL, _tmp138_, _tmp139_, _tmp139__length1, _tmp140_, _tmp141_, _tmp142_);
+						_tmp142_ = data_imports_fspot_fspot_importable_item_new (_tmp136_, NULL, _tmp137_, _tmp138_, _tmp138__length1, _tmp139_, _tmp140_, _tmp141_);
 #line 496 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-						_vala_array_add5 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp143_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
-#line 4802 "FSpotImporter.c"
+						_vala_array_add5 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp142_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
+#line 4791 "FSpotImporter.c"
 					}
 				}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_object_unref0 (photo_versions);
-#line 4807 "FSpotImporter.c"
+#line 4796 "FSpotImporter.c"
 			}
 			goto __finally5;
 			__catch5_database_error:
 			{
 				GError* e = NULL;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp144_ = NULL;
-				gint64 _tmp145_ = 0LL;
-				GError* _tmp146_ = NULL;
-				const gchar* _tmp147_ = NULL;
-				gboolean _tmp148_ = FALSE;
-				DataImportsFSpotDbFSpotPhotoRow* _tmp149_ = NULL;
-				GFile* _tmp150_ = NULL;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp143_;
+				gint64 _tmp144_;
+				GError* _tmp145_;
+				const gchar* _tmp146_;
+				gboolean _tmp147_ = FALSE;
+				DataImportsFSpotDbFSpotPhotoRow* _tmp148_;
+				GFile* _tmp149_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				e = _inner_error_;
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_inner_error_ = NULL;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp144_ = photo_row;
+				_tmp143_ = photo_row;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp145_ = _tmp144_->photo_id;
+				_tmp144_ = _tmp143_->photo_id;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp146_ = e;
+				_tmp145_ = e;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp147_ = _tmp146_->message;
+				_tmp146_ = _tmp145_->message;
 #line 504 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				g_message ("FSpotImporter.vala:504: Failed to retrieve versions for photo ID %ld: " \
-"%s", (glong) _tmp145_, _tmp147_);
+"%s", (glong) _tmp144_, _tmp146_);
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp149_ = photo_row;
+				_tmp148_ = photo_row;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp150_ = _tmp149_->base_path;
+				_tmp149_ = _tmp148_->base_path;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp150_ != NULL) {
-#line 4840 "FSpotImporter.c"
-					DataImportsFSpotDbFSpotPhotoRow* _tmp151_ = NULL;
-					const gchar* _tmp152_ = NULL;
+				if (_tmp149_ != NULL) {
+#line 4829 "FSpotImporter.c"
+					DataImportsFSpotDbFSpotPhotoRow* _tmp150_;
+					const gchar* _tmp151_;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp151_ = photo_row;
+					_tmp150_ = photo_row;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp152_ = _tmp151_->filename;
+					_tmp151_ = _tmp150_->filename;
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp148_ = _tmp152_ != NULL;
-#line 4849 "FSpotImporter.c"
+					_tmp147_ = _tmp151_ != NULL;
+#line 4838 "FSpotImporter.c"
 				} else {
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp148_ = FALSE;
-#line 4853 "FSpotImporter.c"
+					_tmp147_ = FALSE;
+#line 4842 "FSpotImporter.c"
 				}
 #line 506 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				if (_tmp148_) {
-#line 4857 "FSpotImporter.c"
-					SpitDataImportsImportableMediaItem** _tmp153_ = NULL;
-					gint _tmp153__length1 = 0;
-					DataImportsFSpotDbFSpotPhotoRow* _tmp154_ = NULL;
-					DataImportsFSpotDbFSpotRollRow* _tmp155_ = NULL;
-					DataImportsFSpotFSpotImportableTag** _tmp156_ = NULL;
-					gint _tmp156__length1 = 0;
-					DataImportsFSpotFSpotImportableEvent* _tmp157_ = NULL;
-					gboolean _tmp158_ = FALSE;
-					gboolean _tmp159_ = FALSE;
-					DataImportsFSpotFSpotImportableItem* _tmp160_ = NULL;
+				if (_tmp147_) {
+#line 4846 "FSpotImporter.c"
+					SpitDataImportsImportableMediaItem** _tmp152_;
+					gint _tmp152__length1;
+					DataImportsFSpotDbFSpotPhotoRow* _tmp153_;
+					DataImportsFSpotDbFSpotRollRow* _tmp154_;
+					DataImportsFSpotFSpotImportableTag** _tmp155_;
+					gint _tmp155__length1;
+					DataImportsFSpotFSpotImportableEvent* _tmp156_;
+					gboolean _tmp157_;
+					gboolean _tmp158_;
+					DataImportsFSpotFSpotImportableItem* _tmp159_;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp153_ = importable_items;
+					_tmp152_ = importable_items;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp153__length1 = importable_items_length1;
+					_tmp152__length1 = importable_items_length1;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp154_ = photo_row;
+					_tmp153_ = photo_row;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp155_ = roll_row;
+					_tmp154_ = roll_row;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp156_ = tags;
+					_tmp155_ = tags;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp156__length1 = tags_length1;
+					_tmp155__length1 = tags_length1;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp157_ = event;
+					_tmp156_ = event;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp158_ = hidden;
+					_tmp157_ = hidden;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp159_ = favorite;
+					_tmp158_ = favorite;
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_tmp160_ = data_imports_fspot_fspot_importable_item_new (_tmp154_, NULL, _tmp155_, _tmp156_, _tmp156__length1, _tmp157_, _tmp158_, _tmp159_);
+					_tmp159_ = data_imports_fspot_fspot_importable_item_new (_tmp153_, NULL, _tmp154_, _tmp155_, _tmp155__length1, _tmp156_, _tmp157_, _tmp158_);
 #line 507 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-					_vala_array_add6 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp160_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
-#line 4890 "FSpotImporter.c"
+					_vala_array_add6 (&importable_items, &importable_items_length1, &_importable_items_size_, G_TYPE_CHECK_INSTANCE_CAST (_tmp159_, SPIT_DATA_IMPORTS_TYPE_IMPORTABLE_MEDIA_ITEM, SpitDataImportsImportableMediaItem));
+#line 4879 "FSpotImporter.c"
 				}
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				_g_error_free0 (e);
-#line 4894 "FSpotImporter.c"
+#line 4883 "FSpotImporter.c"
 			}
 			__finally5:
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -4934,56 +4923,56 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				g_clear_error (&_inner_error_);
 #line 474 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				return;
-#line 4923 "FSpotImporter.c"
+#line 4912 "FSpotImporter.c"
 			}
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			_tmp161_ = self->priv->running;
+			_tmp160_ = self->priv->running;
 #line 514 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-			if (_tmp161_) {
-#line 4929 "FSpotImporter.c"
-				SpitDataImportsPluginHost* _tmp162_ = NULL;
-				SpitDataImportsImportableMediaItem** _tmp163_ = NULL;
-				gint _tmp163__length1 = 0;
-				gdouble _tmp164_ = 0.0;
-				gdouble _tmp165_ = 0.0;
-				gdouble _tmp166_ = 0.0;
-				gdouble _tmp167_ = 0.0;
-				gdouble _tmp168_ = 0.0;
-				gdouble _tmp169_ = 0.0;
-				gdouble _tmp170_ = 0.0;
-				SpitDataImportsPluginHost* _tmp171_ = NULL;
-				gdouble _tmp172_ = 0.0;
+			if (_tmp160_) {
+#line 4918 "FSpotImporter.c"
+				SpitDataImportsPluginHost* _tmp161_;
+				SpitDataImportsImportableMediaItem** _tmp162_;
+				gint _tmp162__length1;
+				gdouble _tmp163_;
+				gdouble _tmp164_;
+				gdouble _tmp165_;
+				gdouble _tmp166_;
+				gdouble _tmp167_;
+				gdouble _tmp168_;
+				gdouble _tmp169_;
+				SpitDataImportsPluginHost* _tmp170_;
+				gdouble _tmp171_;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp162_ = self->priv->host;
+				_tmp161_ = self->priv->host;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp163_ = importable_items;
+				_tmp162_ = importable_items;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp163__length1 = importable_items_length1;
+				_tmp162__length1 = importable_items_length1;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp164_ = current_progress;
+				_tmp163_ = current_progress;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp165_ = progress_delta_per_photo;
+				_tmp164_ = progress_delta_per_photo;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp166_ = progress_plugin_to_host_ratio;
+				_tmp165_ = progress_plugin_to_host_ratio;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp167_ = progress_delta_per_photo;
+				_tmp166_ = progress_delta_per_photo;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp168_ = progress_plugin_to_host_ratio;
+				_tmp167_ = progress_plugin_to_host_ratio;
 #line 515 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				spit_data_imports_plugin_host_prepare_media_items_for_import (_tmp162_, _tmp163_, _tmp163__length1, _tmp164_ + (_tmp165_ * _tmp166_), _tmp167_ * (1 - _tmp168_), NULL);
+				spit_data_imports_plugin_host_prepare_media_items_for_import (_tmp161_, _tmp162_, _tmp162__length1, _tmp163_ + (_tmp164_ * _tmp165_), _tmp166_ * (1 - _tmp167_), NULL);
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp169_ = current_progress;
+				_tmp168_ = current_progress;
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp170_ = progress_delta_per_photo;
+				_tmp169_ = progress_delta_per_photo;
 #line 521 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				current_progress = _tmp169_ + _tmp170_;
+				current_progress = _tmp168_ + _tmp169_;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp171_ = self->priv->host;
+				_tmp170_ = self->priv->host;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				_tmp172_ = current_progress;
+				_tmp171_ = current_progress;
 #line 522 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-				spit_data_imports_plugin_host_update_import_progress_pane (_tmp171_, _tmp172_, NULL);
-#line 4972 "FSpotImporter.c"
+				spit_data_imports_plugin_host_update_import_progress_pane (_tmp170_, _tmp171_, NULL);
+#line 4961 "FSpotImporter.c"
 			} else {
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -4997,7 +4986,7 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 				_g_object_unref0 (photo_row);
 #line 524 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 				break;
-#line 4986 "FSpotImporter.c"
+#line 4975 "FSpotImporter.c"
 			}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			importable_items = (_vala_array_free (importable_items, importable_items_length1, (GDestroyNotify) g_object_unref), NULL);
@@ -5009,31 +4998,31 @@ static void data_imports_fspot_fspot_data_importer_real_on_file_selected (SpitDa
 			tags = (_vala_array_free (tags, tags_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_g_object_unref0 (photo_row);
-#line 4998 "FSpotImporter.c"
+#line 4987 "FSpotImporter.c"
 		}
 #line 434 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (_photo_row_list);
-#line 5002 "FSpotImporter.c"
+#line 4991 "FSpotImporter.c"
 	}
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	_tmp173_ = self->priv->host;
+	_tmp172_ = self->priv->host;
 #line 527 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	spit_data_imports_plugin_host_finalize_import (_tmp173_, _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback, self, NULL);
+	spit_data_imports_plugin_host_finalize_import (_tmp172_, _data_imports_fspot_fspot_data_importer_on_imported_items_count_spit_data_imports_imported_items_count_callback, self, NULL);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (all_photos);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (tags_cache);
 #line 399 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_object_unref0 (database);
-#line 5014 "FSpotImporter.c"
+#line 5003 "FSpotImporter.c"
 }
 
 
 void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImportsFSpotFSpotDataImporter* self, gint imported_items_count) {
-	SpitDataImportsPluginHost* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	SpitDataImportsPluginHost* _tmp0_;
+	gint _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
 #line 530 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self));
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5048,18 +5037,18 @@ void data_imports_fspot_fspot_data_importer_on_imported_items_count (DataImports
 	spit_data_imports_plugin_host_install_static_message_pane (_tmp0_, _tmp3_, SPIT_DATA_IMPORTS_PLUGIN_HOST_BUTTON_MODE_CLOSE);
 #line 531 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	_g_free0 (_tmp3_);
-#line 5037 "FSpotImporter.c"
+#line 5026 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) {
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
 #line 537 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5080,11 +5069,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImports
 	_tmp4_ = _result_;
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (!_tmp4_) {
-#line 5069 "FSpotImporter.c"
+#line 5058 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
+		DataImportsFSpotFSpotImportableTag* _tmp5_;
+		DataImportsFSpotFSpotImportableTag* _tmp6_;
+		DataImportsFSpotFSpotImportableTag* _tmp7_;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = tag;
 #line 540 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5097,37 +5086,37 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_event (DataImports
 		if (_tmp7_ == NULL) {
 #line 542 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = FALSE;
-#line 5086 "FSpotImporter.c"
+#line 5075 "FSpotImporter.c"
 		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			DataImportsFSpotFSpotImportableTag* _tmp8_;
+			gboolean _tmp9_;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp8_ = parent;
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_event (self, _tmp8_);
 #line 544 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = _tmp9_;
-#line 5096 "FSpotImporter.c"
+#line 5085 "FSpotImporter.c"
 		}
 #line 539 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (parent);
-#line 5100 "FSpotImporter.c"
+#line 5089 "FSpotImporter.c"
 	}
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _result_;
 #line 546 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 5106 "FSpotImporter.c"
+#line 5095 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag, gint64 hidden_tag_id) {
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	gint64 _tmp0_ = 0LL;
-	DataImportsFSpotFSpotImportableTag* _tmp1_ = NULL;
-	gint64 _tmp2_ = 0LL;
-	gboolean _tmp3_ = FALSE;
+	gint64 _tmp0_;
+	DataImportsFSpotFSpotImportableTag* _tmp1_;
+	gint64 _tmp2_;
+	gboolean _tmp3_;
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
 #line 549 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5144,11 +5133,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport
 	_tmp3_ = _result_;
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (!_tmp3_) {
-#line 5133 "FSpotImporter.c"
+#line 5122 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp4_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL;
+		DataImportsFSpotFSpotImportableTag* _tmp4_;
+		DataImportsFSpotFSpotImportableTag* _tmp5_;
+		DataImportsFSpotFSpotImportableTag* _tmp6_;
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp4_ = tag;
 #line 552 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5161,11 +5150,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport
 		if (_tmp6_ == NULL) {
 #line 554 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = FALSE;
-#line 5150 "FSpotImporter.c"
+#line 5139 "FSpotImporter.c"
 		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
-			gint64 _tmp8_ = 0LL;
-			gboolean _tmp9_ = FALSE;
+			DataImportsFSpotFSpotImportableTag* _tmp7_;
+			gint64 _tmp8_;
+			gboolean _tmp9_;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp7_ = parent;
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5174,28 +5163,28 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_hidden (DataImport
 			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_hidden (self, _tmp7_, _tmp8_);
 #line 556 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = _tmp9_;
-#line 5163 "FSpotImporter.c"
+#line 5152 "FSpotImporter.c"
 		}
 #line 551 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (parent);
-#line 5167 "FSpotImporter.c"
+#line 5156 "FSpotImporter.c"
 	}
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _result_;
 #line 558 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 5173 "FSpotImporter.c"
+#line 5162 "FSpotImporter.c"
 }
 
 
 static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImportsFSpotFSpotDataImporter* self, DataImportsFSpotFSpotImportableTag* tag) {
 	gboolean result = FALSE;
 	gboolean _result_ = FALSE;
-	DataImportsFSpotFSpotImportableTag* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_ = FALSE;
+	DataImportsFSpotFSpotImportableTag* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gboolean _tmp3_;
+	gboolean _tmp4_;
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_IS_FSPOT_DATA_IMPORTER (self), FALSE);
 #line 561 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5216,11 +5205,11 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImpo
 	_tmp4_ = _result_;
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	if (!_tmp4_) {
-#line 5205 "FSpotImporter.c"
+#line 5194 "FSpotImporter.c"
 		DataImportsFSpotFSpotImportableTag* parent = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp5_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp6_ = NULL;
-		DataImportsFSpotFSpotImportableTag* _tmp7_ = NULL;
+		DataImportsFSpotFSpotImportableTag* _tmp5_;
+		DataImportsFSpotFSpotImportableTag* _tmp6_;
+		DataImportsFSpotFSpotImportableTag* _tmp7_;
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_tmp5_ = tag;
 #line 564 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
@@ -5233,27 +5222,27 @@ static gboolean data_imports_fspot_fspot_data_importer_is_tag_favorite (DataImpo
 		if (_tmp7_ == NULL) {
 #line 566 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = FALSE;
-#line 5222 "FSpotImporter.c"
+#line 5211 "FSpotImporter.c"
 		} else {
-			DataImportsFSpotFSpotImportableTag* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			DataImportsFSpotFSpotImportableTag* _tmp8_;
+			gboolean _tmp9_;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp8_ = parent;
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_tmp9_ = data_imports_fspot_fspot_data_importer_is_tag_favorite (self, _tmp8_);
 #line 568 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 			_result_ = _tmp9_;
-#line 5232 "FSpotImporter.c"
+#line 5221 "FSpotImporter.c"
 		}
 #line 563 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 		_g_object_unref0 (parent);
-#line 5236 "FSpotImporter.c"
+#line 5225 "FSpotImporter.c"
 	}
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	result = _result_;
 #line 570 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	return result;
-#line 5242 "FSpotImporter.c"
+#line 5231 "FSpotImporter.c"
 }
 
 
@@ -5264,7 +5253,7 @@ static void data_imports_fspot_fspot_data_importer_class_init (DataImportsFSpotF
 	g_type_class_add_private (klass, sizeof (DataImportsFSpotFSpotDataImporterPrivate));
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (klass)->finalize = data_imports_fspot_fspot_data_importer_finalize;
-#line 5253 "FSpotImporter.c"
+#line 5242 "FSpotImporter.c"
 }
 
 
@@ -5272,18 +5261,18 @@ static void data_imports_fspot_fspot_data_importer_spit_data_imports_data_import
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	data_imports_fspot_fspot_data_importer_spit_data_imports_data_importer_parent_iface = g_type_interface_peek_parent (iface);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->is_running = (gboolean (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_is_running;
+	iface->is_running = (gboolean (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_is_running;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->get_service = (SpitDataImportsService* (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_get_service;
+	iface->get_service = (SpitDataImportsService* (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_get_service;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->start = (void (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_start;
+	iface->start = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_start;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->stop = (void (*)(SpitDataImportsDataImporter*)) data_imports_fspot_fspot_data_importer_real_stop;
+	iface->stop = (void (*) (SpitDataImportsDataImporter *)) data_imports_fspot_fspot_data_importer_real_stop;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->on_library_selected = (void (*)(SpitDataImportsDataImporter*, SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_data_importer_real_on_library_selected;
+	iface->on_library_selected = (void (*) (SpitDataImportsDataImporter *, SpitDataImportsImportableLibrary*)) data_imports_fspot_fspot_data_importer_real_on_library_selected;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
-	iface->on_file_selected = (void (*)(SpitDataImportsDataImporter*, GFile*)) data_imports_fspot_fspot_data_importer_real_on_file_selected;
-#line 5272 "FSpotImporter.c"
+	iface->on_file_selected = (void (*) (SpitDataImportsDataImporter *, GFile*)) data_imports_fspot_fspot_data_importer_real_on_file_selected;
+#line 5261 "FSpotImporter.c"
 }
 
 
@@ -5296,17 +5285,17 @@ static void data_imports_fspot_fspot_data_importer_instance_init (DataImportsFSp
 	self->priv->service = NULL;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self->priv->running = FALSE;
-#line 5285 "FSpotImporter.c"
+#line 5274 "FSpotImporter.c"
 }
 
 
-static void data_imports_fspot_fspot_data_importer_finalize (GObject* obj) {
+static void data_imports_fspot_fspot_data_importer_finalize (GObject * obj) {
 	DataImportsFSpotFSpotDataImporter * self;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_TYPE_FSPOT_DATA_IMPORTER, DataImportsFSpotFSpotDataImporter);
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotImporter.vala"
 	G_OBJECT_CLASS (data_imports_fspot_fspot_data_importer_parent_class)->finalize (obj);
-#line 5295 "FSpotImporter.c"
+#line 5284 "FSpotImporter.c"
 }
 
 
diff --git a/plugins/shotwell-data-imports/FSpotMetaTable.c b/plugins/shotwell-data-imports/FSpotMetaTable.c
index 55e20af..0b87d55 100644
--- a/plugins/shotwell-data-imports/FSpotMetaTable.c
+++ b/plugins/shotwell-data-imports/FSpotMetaTable.c
@@ -1,4 +1,4 @@
-/* FSpotMetaTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotMetaTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotMetaTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -154,7 +154,7 @@ static gpointer data_imports_fspot_db_fspot_meta_table_parent_class = NULL;
 static gpointer data_imports_fspot_db_fspot_meta_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance;
 static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_meta_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -162,7 +162,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_new (void);
 DataImportsFSpotDbFSpotMetaRow* data_imports_fspot_db_fspot_meta_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_meta_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj);
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
 GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -198,8 +198,8 @@ static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_beh
 static DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_construct (GType object_type);
 static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow** row, gint offset);
-static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
@@ -234,7 +234,7 @@ static void data_imports_fspot_db_fspot_meta_row_instance_init (DataImportsFSpot
 }
 
 
-static void data_imports_fspot_db_fspot_meta_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_meta_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotMetaRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_ROW, DataImportsFSpotDbFSpotMetaRow);
@@ -265,9 +265,9 @@ GType data_imports_fspot_db_fspot_meta_row_get_type (void) {
 
 DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_construct (GType object_type, sqlite3* db) {
 	DataImportsFSpotDbFSpotMetaTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -297,408 +297,408 @@ DataImportsFSpotDbFSpotMetaTable* data_imports_fspot_db_fspot_meta_table_new (sq
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
 #line 312 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 322 "FSpotMetaTable.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 332 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 338 "FSpotMetaTable.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 349 "FSpotMetaTable.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 361 "FSpotMetaTable.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 365 "FSpotMetaTable.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 369 "FSpotMetaTable.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 373 "FSpotMetaTable.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 396 "FSpotMetaTable.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 405 "FSpotMetaTable.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 418 "FSpotMetaTable.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 424 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 434 "FSpotMetaTable.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 446 "FSpotMetaTable.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 450 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 456 "FSpotMetaTable.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 467 "FSpotMetaTable.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 482 "FSpotMetaTable.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 486 "FSpotMetaTable.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 490 "FSpotMetaTable.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 496 "FSpotMetaTable.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 508 "FSpotMetaTable.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 529 "FSpotMetaTable.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 533 "FSpotMetaTable.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 539 "FSpotMetaTable.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 546 "FSpotMetaTable.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
 #line 554 "FSpotMetaTable.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 592 "FSpotMetaTable.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 601 "FSpotMetaTable.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 617 "FSpotMetaTable.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 623 "FSpotMetaTable.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 637 "FSpotMetaTable.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 657 "FSpotMetaTable.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 672 "FSpotMetaTable.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 676 "FSpotMetaTable.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 684 "FSpotMetaTable.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 695 "FSpotMetaTable.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 704 "FSpotMetaTable.c"
 	}
@@ -708,42 +708,42 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotMetaTable* self, const gchar* name, GError** error) {
 	gchar* result = NULL;
 	gchar** columns = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gchar** _tmp2_ = NULL;
-	gint columns_length1 = 0;
-	gint _columns_size_ = 0;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp0_;
+	gint _tmp1_;
+	gchar** _tmp2_;
+	gint columns_length1;
+	gint _columns_size_;
 	gchar* column_list = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-	gchar* _tmp4_ = NULL;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+	gchar* _tmp4_;
 	gchar* sql = NULL;
-	const gchar* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
+	const gchar* _tmp5_;
+	const gchar* _tmp6_;
+	gchar* _tmp7_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
-	sqlite3* _tmp8_ = NULL;
-	const gchar* _tmp9_ = NULL;
+	sqlite3* _tmp8_;
+	const gchar* _tmp9_;
 	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	gint _tmp12_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	gchar* _tmp19_ = NULL;
-	GDestroyNotify _tmp20_ = NULL;
-	gint _tmp21_ = 0;
-	gint _tmp22_ = 0;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	gint _tmp29_ = 0;
+	gint _tmp11_;
+	gint _tmp12_;
+	sqlite3_stmt* _tmp17_;
+	const gchar* _tmp18_;
+	gchar* _tmp19_;
+	GDestroyNotify _tmp20_;
+	gint _tmp21_;
+	gint _tmp22_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	gint _tmp29_;
 	DataImportsFSpotDbFSpotMetaRow* row = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp32_;
+	sqlite3_stmt* _tmp33_;
 	gpointer _tmp34_ = NULL;
-	DataImportsFSpotDbFSpotMetaRow* _tmp35_ = NULL;
-	const gchar* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	DataImportsFSpotDbFSpotMetaRow* _tmp35_;
+	const gchar* _tmp36_;
+	gchar* _tmp37_;
 	GError * _inner_error_ = NULL;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
@@ -792,10 +792,10 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp12_ != SQLITE_OK) {
 #line 795 "FSpotMetaTable.c"
-		const gchar* _tmp13_ = NULL;
-		gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gint _tmp16_ = 0;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
+		gint _tmp16_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp13_ = sql;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -861,10 +861,10 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp22_ != SQLITE_OK) {
 #line 864 "FSpotMetaTable.c"
-		const gchar* _tmp23_ = NULL;
-		gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
-		gint _tmp26_ = 0;
+		const gchar* _tmp23_;
+		gchar* _tmp24_;
+		gchar* _tmp25_;
+		gint _tmp26_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp23_ = name;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -924,13 +924,13 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp29_ != SQLITE_ROW) {
 #line 927 "FSpotMetaTable.c"
-		gint _tmp30_ = 0;
+		gint _tmp30_;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp30_ = res;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		if (_tmp30_ != SQLITE_DONE) {
 #line 933 "FSpotMetaTable.c"
-			gint _tmp31_ = 0;
+			gint _tmp31_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 			_tmp31_ = res;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1022,8 +1022,8 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_data (DataImportsFSpotDbFSpotM
 gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
@@ -1067,8 +1067,8 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_app_version (DataImportsFSpotD
 gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
 	gchar* result = NULL;
 	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), NULL);
@@ -1111,17 +1111,17 @@ gchar* data_imports_fspot_db_fspot_meta_table_get_db_version (DataImportsFSpotDb
 
 static gint64 int64_parse (const gchar* str) {
 	gint64 result = 0LL;
-	const gchar* _tmp0_ = NULL;
-	gint64 _tmp1_ = 0LL;
-#line 679 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	const gchar* _tmp0_;
+	gint64 _tmp1_;
+#line 687 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (str != NULL, 0LL);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = str;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = g_ascii_strtoll (_tmp0_, NULL, (guint) 0);
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _tmp1_;
-#line 680 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 688 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 1127 "FSpotMetaTable.c"
 }
@@ -1130,7 +1130,7 @@ static gint64 int64_parse (const gchar* str) {
 gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpotDbFSpotMetaTable* self, GError** error) {
 	gint64 result = 0LL;
 	gchar* id_str = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	GError * _inner_error_ = NULL;
 #line 73 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_META_TABLE (self), 0LL);
@@ -1163,7 +1163,7 @@ gint64 data_imports_fspot_db_fspot_meta_table_get_hidden_tag_id (DataImportsFSpo
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (id_str != NULL) {
 #line 1166 "FSpotMetaTable.c"
-		gint64 _tmp3_ = 0LL;
+		gint64 _tmp3_;
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp3_ = int64_parse (id_str);
 #line 76 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1251,15 +1251,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotMetaBehavior* result = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotMetaBehavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp0_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotMetaBehavior* _tmp3_;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_meta_behavior_instance;
 #line 92 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1262 "FSpotMetaTable.c"
-		DataImportsFSpotDbFSpotMetaBehavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotMetaBehavior* _tmp1_;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_meta_behavior_new ();
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1283,7 +1283,7 @@ DataImportsFSpotDbFSpotMetaBehavior* data_imports_fspot_db_fspot_meta_behavior_g
 static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
 #line 98 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1299,11 +1299,11 @@ static gchar* data_imports_fspot_db_fspot_meta_behavior_real_get_table_name (Dat
 static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
 #line 102 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1334,18 +1334,18 @@ static gchar** data_imports_fspot_db_fspot_meta_behavior_real_list_columns (Data
 }
 
 
-static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_meta_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotMetaRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 	DataImportsFSpotDbFSpotMetaRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotMetaRow* _tmp0_ = NULL;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	sqlite3_stmt* _tmp5_ = NULL;
-	gint _tmp6_ = 0;
-	const gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	DataImportsFSpotDbFSpotMetaRow* _tmp0_;
+	sqlite3_stmt* _tmp1_;
+	gint _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	sqlite3_stmt* _tmp5_;
+	gint _tmp6_;
+	const gchar* _tmp7_;
+	gchar* _tmp8_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
@@ -1406,11 +1406,11 @@ static void data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspo
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	data_imports_fspot_db_fspot_meta_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_meta_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_meta_behavior_real_get_table_name;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_meta_behavior_real_list_columns;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_meta_behavior_real_build_row;
 #line 1415 "FSpotMetaTable.c"
 }
 
@@ -1419,7 +1419,7 @@ static void data_imports_fspot_db_fspot_meta_behavior_instance_init (DataImports
 }
 
 
-static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_meta_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotMetaBehavior * self;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotMetaTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_META_BEHAVIOR, DataImportsFSpotDbFSpotMetaBehavior);
diff --git a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
index b1e6274..8865ca1 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotoTagsTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotoTagsTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotPhotoTagsTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotPhotoTagsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -153,7 +153,7 @@ static gpointer data_imports_fspot_db_fspot_photo_tags_table_parent_class = NULL
 static gpointer data_imports_fspot_db_fspot_photo_tags_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -161,7 +161,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_new (void);
 DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject * obj);
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
 GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -191,8 +191,8 @@ static DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_p
 DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotPhotoTagRow* data_imports_fspot_db_fspot_photo_tag_row_construct (GType object_type) {
@@ -225,7 +225,7 @@ static void data_imports_fspot_db_fspot_photo_tag_row_instance_init (DataImports
 }
 
 
-static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_tag_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoTagRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAG_ROW, DataImportsFSpotDbFSpotPhotoTagRow);
@@ -252,10 +252,10 @@ GType data_imports_fspot_db_fspot_photo_tag_row_get_type (void) {
 
 DataImportsFSpotDbFSpotPhotoTagsTable* data_imports_fspot_db_fspot_photo_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotPhotoTagsTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
@@ -339,15 +339,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_tags_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp3_;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 350 "FSpotPhotoTagsTable.c"
-		DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoTagsV0Behavior* _tmp1_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_tags_v0_behavior_new ();
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
@@ -371,7 +371,7 @@ DataImportsFSpotDbFSpotPhotoTagsV0Behavior* data_imports_fspot_db_fspot_photo_ta
 static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
 #line 42 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
@@ -387,11 +387,11 @@ static gchar* data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_
 static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
@@ -422,16 +422,16 @@ static gchar** data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_colu
 }
 
 
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoTagRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
 	DataImportsFSpotDbFSpotPhotoTagRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoTagRow* _tmp0_ = NULL;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint64 _tmp3_ = 0LL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint64 _tmp6_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoTagRow* _tmp0_;
+	sqlite3_stmt* _tmp1_;
+	gint _tmp2_;
+	gint64 _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint64 _tmp6_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
@@ -484,11 +484,11 @@ static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspo
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	data_imports_fspot_db_fspot_photo_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_get_table_name;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_list_columns;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_tags_v0_behavior_real_build_row;
 #line 493 "FSpotPhotoTagsTable.c"
 }
 
@@ -497,7 +497,7 @@ static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_instance_init (Da
 }
 
 
-static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_tags_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoTagsV0Behavior * self;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoTagsV0Behavior);
diff --git a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
index 267d1f1..d7b9079 100644
--- a/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotoVersionsTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotPhotoVersionsTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotPhotoVersionsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -251,23 +251,23 @@ static gpointer data_imports_fspot_db_fspot_photo_versions_table_parent_class =
 static gpointer data_imports_fspot_db_fspot_photo_versions_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v9_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v16_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v17_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photo_versions_v18_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance;
 static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -275,7 +275,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_new (void);
 DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject * obj);
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
 GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -310,8 +310,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fsp
 DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR_DUMMY_PROPERTY
@@ -321,8 +321,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fsp
 DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR_DUMMY_PROPERTY
@@ -332,8 +332,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fs
 DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR_DUMMY_PROPERTY
@@ -343,8 +343,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fs
 DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR_DUMMY_PROPERTY
@@ -354,8 +354,8 @@ static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fs
 DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotPhotoVersionRow* data_imports_fspot_db_fspot_photo_version_row_construct (GType object_type) {
@@ -388,7 +388,7 @@ static void data_imports_fspot_db_fspot_photo_version_row_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_version_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSION_ROW, DataImportsFSpotDbFSpotPhotoVersionRow);
@@ -423,10 +423,10 @@ GType data_imports_fspot_db_fspot_photo_version_row_get_type (void) {
 
 DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_versions_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotPhotoVersionsTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -461,26 +461,26 @@ DataImportsFSpotDbFSpotPhotoVersionsTable* data_imports_fspot_db_fspot_photo_ver
 GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (DataImportsFSpotDbFSpotPhotoVersionsTable* self, gint64 photo_id, GError** error) {
 	GeeArrayList* result = NULL;
 	GeeArrayList* rows = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gchar* column_list = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp1_;
 	gchar* sql = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
 	gint res = 0;
-	sqlite3* _tmp5_ = NULL;
-	const gchar* _tmp6_ = NULL;
+	sqlite3* _tmp5_;
+	const gchar* _tmp6_;
 	sqlite3_stmt* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint64 _tmp15_ = 0LL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	sqlite3_stmt* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
+	gint _tmp8_;
+	gint _tmp9_;
+	sqlite3_stmt* _tmp14_;
+	gint64 _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	sqlite3_stmt* _tmp19_;
+	gint _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTO_VERSIONS_TABLE (self), NULL);
@@ -517,10 +517,10 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp9_ != SQLITE_OK) {
 #line 520 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gchar* _tmp12_ = NULL;
-		gint _tmp13_ = 0;
+		const gchar* _tmp10_;
+		gchar* _tmp11_;
+		gchar* _tmp12_;
+		gint _tmp13_;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp10_ = sql;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -582,7 +582,7 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp17_ != SQLITE_OK) {
 #line 585 "FSpotPhotoVersionsTable.c"
-		gint _tmp18_ = 0;
+		gint _tmp18_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp18_ = res;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -632,15 +632,15 @@ GeeArrayList* data_imports_fspot_db_fspot_photo_versions_table_get_by_photo_id (
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	while (TRUE) {
 #line 635 "FSpotPhotoVersionsTable.c"
-		gint _tmp21_ = 0;
+		gint _tmp21_;
 		DataImportsFSpotDbFSpotPhotoVersionRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp22_ = NULL;
-		sqlite3_stmt* _tmp23_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp22_;
+		sqlite3_stmt* _tmp23_;
 		gpointer _tmp24_ = NULL;
-		GeeArrayList* _tmp25_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp26_ = NULL;
-		sqlite3_stmt* _tmp27_ = NULL;
-		gint _tmp28_ = 0;
+		GeeArrayList* _tmp25_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp26_;
+		sqlite3_stmt* _tmp27_;
+		gint _tmp28_;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp21_ = res;
 #line 52 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -741,15 +741,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_photo_versions_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp3_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 752 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* _tmp1_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v0_behavior_new ();
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -773,7 +773,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV0Behavior* data_imports_fspot_db_fspot_phot
 static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
 #line 80 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -789,13 +789,13 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_ta
 static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint _tmp5__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gint _tmp5__length1;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
 #line 84 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -834,32 +834,32 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_ = NULL;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
+	gchar* _tmp28_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_;
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
 #line 87 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -920,14 +920,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_ro
 	if (_tmp18_ != NULL) {
 #line 922 "FSpotPhotoVersionsTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		const gchar* _tmp19_;
+		GFile* _tmp20_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
+		GFile* _tmp22_;
+		GFile* _tmp23_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+		GFile* _tmp25_;
+		gchar* _tmp26_;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp19_ = full_path;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -998,11 +998,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_get_table_name;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_list_columns;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v0_behavior_real_build_row;
 #line 1007 "FSpotPhotoVersionsTable.c"
 }
 
@@ -1011,7 +1011,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_instance_init
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV0Behavior * self;
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV0Behavior);
@@ -1054,15 +1054,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fsp
 
 DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_photo_versions_v9_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp3_;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance;
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1065 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* _tmp1_;
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v9_behavior_new ();
 #line 115 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1086,7 +1086,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV9Behavior* data_imports_fspot_db_fspot_phot
 static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 119 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
 #line 120 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1102,14 +1102,14 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_ta
 static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar** _tmp5_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
 #line 123 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1152,35 +1152,35 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL;
-	gchar* _tmp28_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_ = NULL;
-	sqlite3_stmt* _tmp30_ = NULL;
-	gint _tmp31_ = 0;
-	gint _tmp32_ = 0;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
+	gchar* _tmp28_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp29_;
+	sqlite3_stmt* _tmp30_;
+	gint _tmp31_;
+	gint _tmp32_;
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
 #line 128 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1241,14 +1241,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_ro
 	if (_tmp18_ != NULL) {
 #line 1243 "FSpotPhotoVersionsTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		const gchar* _tmp19_;
+		GFile* _tmp20_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
+		GFile* _tmp22_;
+		GFile* _tmp23_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+		GFile* _tmp25_;
+		gchar* _tmp26_;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp19_ = full_path;
 #line 136 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1325,11 +1325,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v9_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_get_table_name;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_list_columns;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v9_behavior_real_build_row;
 #line 1334 "FSpotPhotoVersionsTable.c"
 }
 
@@ -1338,7 +1338,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_instance_init
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v9_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV9Behavior * self;
 #line 107 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V9_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV9Behavior);
@@ -1381,15 +1381,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fs
 
 DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_photo_versions_v16_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp3_;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance;
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1392 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* _tmp1_;
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v16_behavior_new ();
 #line 156 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1413,7 +1413,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV16Behavior* data_imports_fspot_db_fspot_pho
 static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 160 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
 #line 161 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1429,15 +1429,15 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_t
 static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 164 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
 #line 165 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1484,38 +1484,38 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	const gchar* _tmp30_ = NULL;
-	gchar* _tmp31_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint _tmp35_ = 0;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	const gchar* _tmp30_;
+	gchar* _tmp31_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	gint _tmp35_;
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
 #line 169 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1576,14 +1576,14 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_r
 	if (_tmp18_ != NULL) {
 #line 1578 "FSpotPhotoVersionsTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		GFile* _tmp23_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_ = NULL;
-		GFile* _tmp25_ = NULL;
-		gchar* _tmp26_ = NULL;
+		const gchar* _tmp19_;
+		GFile* _tmp20_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp21_;
+		GFile* _tmp22_;
+		GFile* _tmp23_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp24_;
+		GFile* _tmp25_;
+		gchar* _tmp26_;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp19_ = full_path;
 #line 177 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1666,11 +1666,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_get_table_name;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_list_columns;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v16_behavior_real_build_row;
 #line 1675 "FSpotPhotoVersionsTable.c"
 }
 
@@ -1679,7 +1679,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_instance_ini
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v16_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV16Behavior * self;
 #line 148 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV16Behavior);
@@ -1722,15 +1722,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fs
 
 DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_photo_versions_v17_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp3_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1733 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* _tmp1_;
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v17_behavior_new ();
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1754,7 +1754,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV17Behavior* data_imports_fspot_db_fspot_pho
 static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
 #line 203 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1770,16 +1770,16 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_t
 static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
 #line 207 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1830,44 +1830,44 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
 	gboolean _tmp22_ = FALSE;
-	const gchar* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	const gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
+	const gchar* _tmp23_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
 #line 211 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1937,7 +1937,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_r
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp23_ != NULL) {
 #line 1940 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp24_ = NULL;
+		const gchar* _tmp24_;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp24_ = filename;
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -1951,12 +1951,12 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_r
 #line 219 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp22_) {
 #line 1954 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
+		const gchar* _tmp26_;
+		GFile* _tmp27_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp25_ = _vala_row;
 #line 220 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2033,11 +2033,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_get_table_name;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_list_columns;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v17_behavior_real_build_row;
 #line 2042 "FSpotPhotoVersionsTable.c"
 }
 
@@ -2046,7 +2046,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_instance_ini
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v17_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV17Behavior * self;
 #line 190 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV17Behavior);
@@ -2089,15 +2089,15 @@ static DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fs
 
 DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_photo_versions_v18_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp3_;
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance;
 #line 238 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2100 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* _tmp1_;
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photo_versions_v18_behavior_new ();
 #line 239 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2121,7 +2121,7 @@ DataImportsFSpotDbFSpotPhotoVersionsV18Behavior* data_imports_fspot_db_fspot_pho
 static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 243 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2137,16 +2137,16 @@ static gchar* data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_t
 static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
 #line 247 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
 #line 248 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2197,44 +2197,44 @@ static gchar** data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoVersionRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 	DataImportsFSpotDbFSpotPhotoVersionRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_ = NULL;
-	sqlite3_stmt* _tmp10_ = NULL;
-	gint _tmp11_ = 0;
-	const gchar* _tmp12_ = NULL;
-	gchar* _tmp13_ = NULL;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp9_;
+	sqlite3_stmt* _tmp10_;
+	gint _tmp11_;
+	const gchar* _tmp12_;
+	gchar* _tmp13_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp14_ = NULL;
-	gint _tmp15_ = 0;
-	const gchar* _tmp16_ = NULL;
-	gchar* _tmp17_ = NULL;
+	sqlite3_stmt* _tmp14_;
+	gint _tmp15_;
+	const gchar* _tmp16_;
+	gchar* _tmp17_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	const gchar* _tmp20_ = NULL;
-	gchar* _tmp21_ = NULL;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	const gchar* _tmp20_;
+	gchar* _tmp21_;
 	gboolean _tmp22_ = FALSE;
-	const gchar* _tmp23_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	const gchar* _tmp34_ = NULL;
-	gchar* _tmp35_ = NULL;
-	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_ = NULL;
-	sqlite3_stmt* _tmp37_ = NULL;
-	gint _tmp38_ = 0;
-	gint _tmp39_ = 0;
+	const gchar* _tmp23_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	const gchar* _tmp34_;
+	gchar* _tmp35_;
+	DataImportsFSpotDbFSpotPhotoVersionRow* _tmp36_;
+	sqlite3_stmt* _tmp37_;
+	gint _tmp38_;
+	gint _tmp39_;
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
 #line 252 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2304,7 +2304,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_r
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp23_ != NULL) {
 #line 2307 "FSpotPhotoVersionsTable.c"
-		const gchar* _tmp24_ = NULL;
+		const gchar* _tmp24_;
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp24_ = filename;
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2318,12 +2318,12 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_r
 #line 260 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	if (_tmp22_) {
 #line 2321 "FSpotPhotoVersionsTable.c"
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_ = NULL;
-		const gchar* _tmp26_ = NULL;
-		GFile* _tmp27_ = NULL;
-		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
-		gchar* _tmp30_ = NULL;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp25_;
+		const gchar* _tmp26_;
+		GFile* _tmp27_;
+		DataImportsFSpotDbFSpotPhotoVersionRow* _tmp28_;
+		const gchar* _tmp29_;
+		gchar* _tmp30_;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 		_tmp25_ = _vala_row;
 #line 261 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
@@ -2400,11 +2400,11 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	data_imports_fspot_db_fspot_photo_versions_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_get_table_name;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_list_columns;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photo_versions_v18_behavior_real_build_row;
 #line 2409 "FSpotPhotoVersionsTable.c"
 }
 
@@ -2413,7 +2413,7 @@ static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_instance_ini
 }
 
 
-static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_versions_v18_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoVersionsV18Behavior * self;
 #line 231 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotoVersionsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_VERSIONS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotoVersionsV18Behavior);
diff --git a/plugins/shotwell-data-imports/FSpotPhotosTable.c b/plugins/shotwell-data-imports/FSpotPhotosTable.c
index af8cc0a..4eb3d76 100644
--- a/plugins/shotwell-data-imports/FSpotPhotosTable.c
+++ b/plugins/shotwell-data-imports/FSpotPhotosTable.c
@@ -1,4 +1,4 @@
-/* FSpotPhotosTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotPhotosTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotPhotosTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -294,31 +294,31 @@ static gpointer data_imports_fspot_db_fspot_photos_table_parent_class = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v5_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v7_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v11_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v16_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v17_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_photos_v18_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance;
 static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_photo_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -326,7 +326,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_new (void);
 DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_photo_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photo_row_finalize (GObject * obj);
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
 GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -349,7 +349,7 @@ void data_imports_fspot_db_fspot_database_table_set_behavior (DataImportsFSpotDb
 DataImportsFSpotDbFSpotTableBehavior* data_imports_fspot_db_fspot_database_behavior_get_photos_behavior (DataImportsFSpotDbFSpotDatabaseBehavior* self);
 GQuark database_error_quark (void);
 GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error);
-gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt** stmt, GError** error);
+gint data_imports_fspot_db_fspot_database_table_select_all (DataImportsFSpotDbFSpotDatabaseTable* self, sqlite3_stmt* * stmt, GError** error);
 void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
 GType data_imports_fspot_db_fspot_photos_v0_behavior_get_type (void) G_GNUC_CONST;
 enum  {
@@ -360,9 +360,9 @@ static DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_phot
 DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
 #define DATA_IMPORTS_FSPOT_DB_INVALID_ID ((gint64) -1)
-static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v5_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V5_BEHAVIOR_DUMMY_PROPERTY
@@ -372,8 +372,8 @@ static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_phot
 DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v7_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V7_BEHAVIOR_DUMMY_PROPERTY
@@ -383,8 +383,8 @@ static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_phot
 DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v11_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V11_BEHAVIOR_DUMMY_PROPERTY
@@ -394,8 +394,8 @@ static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v16_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V16_BEHAVIOR_DUMMY_PROPERTY
@@ -405,8 +405,8 @@ static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v17_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V17_BEHAVIOR_DUMMY_PROPERTY
@@ -416,8 +416,8 @@ static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_photos_v18_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_PHOTOS_V18_BEHAVIOR_DUMMY_PROPERTY
@@ -427,8 +427,8 @@ static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_pho
 DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset);
-static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotPhotoRow* data_imports_fspot_db_fspot_photo_row_construct (GType object_type) {
@@ -461,7 +461,7 @@ static void data_imports_fspot_db_fspot_photo_row_instance_init (DataImportsFSpo
 }
 
 
-static void data_imports_fspot_db_fspot_photo_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photo_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotoRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTO_ROW, DataImportsFSpotDbFSpotPhotoRow);
@@ -496,10 +496,10 @@ GType data_imports_fspot_db_fspot_photo_row_get_type (void) {
 
 DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotPhotosTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -534,11 +534,11 @@ DataImportsFSpotDbFSpotPhotosTable* data_imports_fspot_db_fspot_photos_table_new
 GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpotDbFSpotPhotosTable* self, GError** error) {
 	GeeArrayList* result = NULL;
 	GeeArrayList* all = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gint res = 0;
 	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	gint _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_PHOTOS_TABLE (self), NULL);
@@ -584,12 +584,12 @@ GeeArrayList* data_imports_fspot_db_fspot_photos_table_get_all (DataImportsFSpot
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	while (TRUE) {
 #line 587 "FSpotPhotosTable.c"
-		gint _tmp3_ = 0;
+		gint _tmp3_;
 		DataImportsFSpotDbFSpotPhotoRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp4_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp4_;
 		gpointer _tmp5_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp6_ = NULL;
-		gint _tmp7_ = 0;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp6_;
+		gint _tmp7_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp3_ = res;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -680,15 +680,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp3_;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v0_behavior_instance;
 #line 60 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 691 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV0Behavior* _tmp1_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v0_behavior_new ();
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -712,7 +712,7 @@ DataImportsFSpotDbFSpotPhotosV0Behavior* data_imports_fspot_db_fspot_photos_v0_b
 static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 65 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -728,15 +728,15 @@ static gchar* data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 69 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -783,43 +783,43 @@ static gchar** data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp32_ = NULL;
-	sqlite3_stmt* _tmp33_ = NULL;
-	gint _tmp34_ = 0;
-	gint64 _tmp35_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp37_ = NULL;
-	gchar* _tmp38_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp32_;
+	sqlite3_stmt* _tmp33_;
+	gint _tmp34_;
+	gint64 _tmp35_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp37_;
+	gchar* _tmp38_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -875,7 +875,7 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataI
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 878 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -889,12 +889,12 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row (DataI
 #line 81 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 892 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -987,11 +987,11 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v0_behavior_real_get_table_name;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v0_behavior_real_list_columns;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v0_behavior_real_build_row;
 #line 996 "FSpotPhotosTable.c"
 }
 
@@ -1000,7 +1000,7 @@ static void data_imports_fspot_db_fspot_photos_v0_behavior_instance_init (DataIm
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV0Behavior * self;
 #line 53 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V0_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV0Behavior);
@@ -1043,15 +1043,15 @@ static DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_phot
 
 DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp3_;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v5_behavior_instance;
 #line 104 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1054 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV5Behavior* _tmp1_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v5_behavior_new ();
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1075,7 +1075,7 @@ DataImportsFSpotDbFSpotPhotosV5Behavior* data_imports_fspot_db_fspot_photos_v5_b
 static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1091,16 +1091,16 @@ static gchar* data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
 #line 114 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1151,46 +1151,46 @@ static gchar** data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint64 _tmp38_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp40_ = NULL;
-	gchar* _tmp41_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint64 _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp40_;
+	gchar* _tmp41_;
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
 #line 118 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1246,7 +1246,7 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataI
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 1249 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1260,12 +1260,12 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row (DataI
 #line 125 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 1263 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 126 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1364,11 +1364,11 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v5_behavior_real_get_table_name;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v5_behavior_real_list_columns;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v5_behavior_real_build_row;
 #line 1373 "FSpotPhotosTable.c"
 }
 
@@ -1377,7 +1377,7 @@ static void data_imports_fspot_db_fspot_photos_v5_behavior_instance_init (DataIm
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v5_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV5Behavior * self;
 #line 97 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V5_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV5Behavior);
@@ -1420,15 +1420,15 @@ static DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_phot
 
 DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp3_;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v7_behavior_instance;
 #line 149 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1431 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV7Behavior* _tmp1_;
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v7_behavior_new ();
 #line 150 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1452,7 +1452,7 @@ DataImportsFSpotDbFSpotPhotosV7Behavior* data_imports_fspot_db_fspot_photos_v7_b
 static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 154 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
 #line 155 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1468,15 +1468,15 @@ static gchar* data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 158 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
 #line 159 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1523,40 +1523,40 @@ static gchar** data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint64 _tmp30_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp36_ = NULL;
-	gchar* _tmp37_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint64 _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp36_;
+	gchar* _tmp37_;
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
 #line 163 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1603,14 +1603,14 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row (DataI
 	if (_tmp13_ != NULL) {
 #line 1605 "FSpotPhotosTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		const gchar* _tmp14_;
+		GFile* _tmp15_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp14_ = full_path;
 #line 170 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1715,11 +1715,11 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v7_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v7_behavior_real_get_table_name;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v7_behavior_real_list_columns;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v7_behavior_real_build_row;
 #line 1724 "FSpotPhotosTable.c"
 }
 
@@ -1728,7 +1728,7 @@ static void data_imports_fspot_db_fspot_photos_v7_behavior_instance_init (DataIm
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v7_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV7Behavior * self;
 #line 142 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V7_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV7Behavior);
@@ -1771,15 +1771,15 @@ static DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp3_;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v11_behavior_instance;
 #line 192 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 1782 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV11Behavior* _tmp1_;
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v11_behavior_new ();
 #line 193 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1803,7 +1803,7 @@ DataImportsFSpotDbFSpotPhotosV11Behavior* data_imports_fspot_db_fspot_photos_v11
 static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 197 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
 #line 198 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1819,16 +1819,16 @@ static gchar* data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gint _tmp8__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar** _tmp7_;
+	gchar** _tmp8_;
+	gint _tmp8__length1;
 #line 201 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
 #line 202 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1879,43 +1879,43 @@ static gchar** data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint64 _tmp30_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	gchar* _tmp40_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint64 _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	gchar* _tmp40_;
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
 #line 206 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -1962,14 +1962,14 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row (Data
 	if (_tmp13_ != NULL) {
 #line 1964 "FSpotPhotosTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		const gchar* _tmp14_;
+		GFile* _tmp15_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
 #line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp14_ = full_path;
 #line 213 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2080,11 +2080,11 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_d
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v11_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v11_behavior_real_get_table_name;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v11_behavior_real_list_columns;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v11_behavior_real_build_row;
 #line 2089 "FSpotPhotosTable.c"
 }
 
@@ -2093,7 +2093,7 @@ static void data_imports_fspot_db_fspot_photos_v11_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v11_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV11Behavior * self;
 #line 185 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V11_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV11Behavior);
@@ -2136,15 +2136,15 @@ static DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp3_;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v16_behavior_instance;
 #line 235 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2147 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV16Behavior* _tmp1_;
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v16_behavior_new ();
 #line 236 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2168,7 +2168,7 @@ DataImportsFSpotDbFSpotPhotosV16Behavior* data_imports_fspot_db_fspot_photos_v16
 static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 240 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
 #line 241 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2184,17 +2184,17 @@ static gchar* data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar** _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 #line 244 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
 #line 245 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2249,46 +2249,46 @@ static gchar** data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* full_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
-	const gchar* _tmp13_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp22_ = NULL;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
-	const gchar* _tmp25_ = NULL;
-	gchar* _tmp26_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp27_ = NULL;
-	sqlite3_stmt* _tmp28_ = NULL;
-	gint _tmp29_ = 0;
-	gint64 _tmp30_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint _tmp38_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	const gchar* _tmp42_ = NULL;
-	gchar* _tmp43_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
+	const gchar* _tmp13_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp22_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
+	const gchar* _tmp25_;
+	gchar* _tmp26_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp27_;
+	sqlite3_stmt* _tmp28_;
+	gint _tmp29_;
+	gint64 _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint _tmp41_;
+	const gchar* _tmp42_;
+	gchar* _tmp43_;
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
 #line 249 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2335,14 +2335,14 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row (Data
 	if (_tmp13_ != NULL) {
 #line 2337 "FSpotPhotosTable.c"
 		GFile* uri = NULL;
-		const gchar* _tmp14_ = NULL;
-		GFile* _tmp15_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp16_ = NULL;
-		GFile* _tmp17_ = NULL;
-		GFile* _tmp18_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp19_ = NULL;
-		GFile* _tmp20_ = NULL;
-		gchar* _tmp21_ = NULL;
+		const gchar* _tmp14_;
+		GFile* _tmp15_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp16_;
+		GFile* _tmp17_;
+		GFile* _tmp18_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp19_;
+		GFile* _tmp20_;
+		gchar* _tmp21_;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp14_ = full_path;
 #line 256 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2459,11 +2459,11 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_d
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v16_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v16_behavior_real_get_table_name;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v16_behavior_real_list_columns;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v16_behavior_real_build_row;
 #line 2468 "FSpotPhotosTable.c"
 }
 
@@ -2472,7 +2472,7 @@ static void data_imports_fspot_db_fspot_photos_v16_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v16_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV16Behavior * self;
 #line 228 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V16_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV16Behavior);
@@ -2515,15 +2515,15 @@ static DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp3_;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v17_behavior_instance;
 #line 279 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2526 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV17Behavior* _tmp1_;
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v17_behavior_new ();
 #line 280 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2547,7 +2547,7 @@ DataImportsFSpotDbFSpotPhotosV17Behavior* data_imports_fspot_db_fspot_photos_v17
 static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 284 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
 #line 285 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2563,18 +2563,18 @@ static gchar* data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gchar** _tmp10_ = NULL;
-	gint _tmp10__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
+	gchar** _tmp9_;
+	gchar** _tmp10_;
+	gint _tmp10__length1;
 #line 288 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
 #line 289 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2633,52 +2633,52 @@ static gchar** data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint64 _tmp38_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp43_ = NULL;
-	sqlite3_stmt* _tmp44_ = NULL;
-	gint _tmp45_ = 0;
-	const gchar* _tmp46_ = NULL;
-	gchar* _tmp47_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint64 _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp43_;
+	sqlite3_stmt* _tmp44_;
+	gint _tmp45_;
+	const gchar* _tmp46_;
+	gchar* _tmp47_;
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
 #line 293 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2734,7 +2734,7 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (Data
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 2737 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2748,12 +2748,12 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row (Data
 #line 300 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 2751 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 301 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2864,11 +2864,11 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_d
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v17_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v17_behavior_real_get_table_name;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v17_behavior_real_list_columns;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v17_behavior_real_build_row;
 #line 2873 "FSpotPhotosTable.c"
 }
 
@@ -2877,7 +2877,7 @@ static void data_imports_fspot_db_fspot_photos_v17_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v17_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV17Behavior * self;
 #line 272 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V17_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV17Behavior);
@@ -2920,15 +2920,15 @@ static DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_pho
 
 DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior* result = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp3_;
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_photos_v18_behavior_instance;
 #line 321 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp0_ == NULL) {
 #line 2931 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotPhotosV18Behavior* _tmp1_;
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_photos_v18_behavior_new ();
 #line 322 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2952,7 +2952,7 @@ DataImportsFSpotDbFSpotPhotosV18Behavior* data_imports_fspot_db_fspot_photos_v18
 static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 326 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
 #line 327 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -2968,17 +2968,17 @@ static gchar* data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_nam
 static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar** _tmp8_ = NULL;
-	gchar** _tmp9_ = NULL;
-	gint _tmp9__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar** _tmp8_;
+	gchar** _tmp9_;
+	gint _tmp9__length1;
 #line 330 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
 #line 331 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3033,49 +3033,49 @@ static gchar** data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotPhotoRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
 	DataImportsFSpotDbFSpotPhotoRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint64 _tmp8_ = 0LL;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp0_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	gint64 _tmp8_;
 	gchar* base_path = NULL;
-	sqlite3_stmt* _tmp9_ = NULL;
-	gint _tmp10_ = 0;
-	const gchar* _tmp11_ = NULL;
-	gchar* _tmp12_ = NULL;
+	sqlite3_stmt* _tmp9_;
+	gint _tmp10_;
+	const gchar* _tmp11_;
+	gchar* _tmp12_;
 	gchar* filename = NULL;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint _tmp14_ = 0;
-	const gchar* _tmp15_ = NULL;
-	gchar* _tmp16_ = NULL;
+	sqlite3_stmt* _tmp13_;
+	gint _tmp14_;
+	const gchar* _tmp15_;
+	gchar* _tmp16_;
 	gboolean _tmp17_ = FALSE;
-	const gchar* _tmp18_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp26_ = NULL;
-	sqlite3_stmt* _tmp27_ = NULL;
-	gint _tmp28_ = 0;
-	const gchar* _tmp29_ = NULL;
-	gchar* _tmp30_ = NULL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp31_ = NULL;
-	sqlite3_stmt* _tmp32_ = NULL;
-	gint _tmp33_ = 0;
-	gint64 _tmp34_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp35_ = NULL;
-	sqlite3_stmt* _tmp36_ = NULL;
-	gint _tmp37_ = 0;
-	gint64 _tmp38_ = 0LL;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp39_ = NULL;
-	sqlite3_stmt* _tmp40_ = NULL;
-	gint _tmp41_ = 0;
-	gint _tmp42_ = 0;
-	DataImportsFSpotDbFSpotPhotoRow* _tmp43_ = NULL;
-	gchar* _tmp44_ = NULL;
+	const gchar* _tmp18_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp26_;
+	sqlite3_stmt* _tmp27_;
+	gint _tmp28_;
+	const gchar* _tmp29_;
+	gchar* _tmp30_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp31_;
+	sqlite3_stmt* _tmp32_;
+	gint _tmp33_;
+	gint64 _tmp34_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp35_;
+	sqlite3_stmt* _tmp36_;
+	gint _tmp37_;
+	gint64 _tmp38_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp39_;
+	sqlite3_stmt* _tmp40_;
+	gint _tmp41_;
+	gint _tmp42_;
+	DataImportsFSpotDbFSpotPhotoRow* _tmp43_;
+	gchar* _tmp44_;
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
 #line 335 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3131,7 +3131,7 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (Data
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp18_ != NULL) {
 #line 3134 "FSpotPhotosTable.c"
-		const gchar* _tmp19_ = NULL;
+		const gchar* _tmp19_;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp19_ = filename;
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3145,12 +3145,12 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row (Data
 #line 342 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	if (_tmp17_) {
 #line 3148 "FSpotPhotosTable.c"
-		DataImportsFSpotDbFSpotPhotoRow* _tmp20_ = NULL;
-		const gchar* _tmp21_ = NULL;
-		GFile* _tmp22_ = NULL;
-		DataImportsFSpotDbFSpotPhotoRow* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
-		gchar* _tmp25_ = NULL;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp20_;
+		const gchar* _tmp21_;
+		GFile* _tmp22_;
+		DataImportsFSpotDbFSpotPhotoRow* _tmp23_;
+		const gchar* _tmp24_;
+		gchar* _tmp25_;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 		_tmp20_ = _vala_row;
 #line 343 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
@@ -3255,11 +3255,11 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_d
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	data_imports_fspot_db_fspot_photos_v18_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_photos_v18_behavior_real_get_table_name;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_photos_v18_behavior_real_list_columns;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_photos_v18_behavior_real_build_row;
 #line 3264 "FSpotPhotosTable.c"
 }
 
@@ -3268,7 +3268,7 @@ static void data_imports_fspot_db_fspot_photos_v18_behavior_instance_init (DataI
 }
 
 
-static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_photos_v18_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotPhotosV18Behavior * self;
 #line 314 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotPhotosTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_PHOTOS_V18_BEHAVIOR, DataImportsFSpotDbFSpotPhotosV18Behavior);
diff --git a/plugins/shotwell-data-imports/FSpotRollsTable.c b/plugins/shotwell-data-imports/FSpotRollsTable.c
index f232dd9..3b3e3e4 100644
--- a/plugins/shotwell-data-imports/FSpotRollsTable.c
+++ b/plugins/shotwell-data-imports/FSpotRollsTable.c
@@ -1,4 +1,4 @@
-/* FSpotRollsTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotRollsTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotRollsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -185,11 +185,11 @@ static gpointer data_imports_fspot_db_fspot_rolls_table_parent_class = NULL;
 static gpointer data_imports_fspot_db_fspot_rolls_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance;
 static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 static gpointer data_imports_fspot_db_fspot_rolls_v5_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance;
 static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_roll_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -197,7 +197,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_new (void);
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_roll_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_roll_row_finalize (GObject * obj);
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
 GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -233,8 +233,8 @@ static DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls
 DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset);
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj);
 GType data_imports_fspot_db_fspot_rolls_v5_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_ROLLS_V5_BEHAVIOR_DUMMY_PROPERTY
@@ -244,8 +244,8 @@ static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls
 DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset);
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_roll_row_construct (GType object_type) {
@@ -278,7 +278,7 @@ static void data_imports_fspot_db_fspot_roll_row_instance_init (DataImportsFSpot
 }
 
 
-static void data_imports_fspot_db_fspot_roll_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_roll_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotRollRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLL_ROW, DataImportsFSpotDbFSpotRollRow);
@@ -305,10 +305,10 @@ GType data_imports_fspot_db_fspot_roll_row_get_type (void) {
 
 DataImportsFSpotDbFSpotRollsTable* data_imports_fspot_db_fspot_rolls_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotRollsTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -345,24 +345,24 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 	sqlite3_stmt* stmt = NULL;
 	DataImportsFSpotDbFSpotRollRow* row = NULL;
 	gchar* column_list = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* sql = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 	gint res = 0;
-	sqlite3* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	sqlite3* _tmp4_;
+	const gchar* _tmp5_;
 	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint64 _tmp14_ = 0LL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint _tmp19_ = 0;
-	gint _tmp20_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp13_;
+	gint64 _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp18_;
+	gint _tmp19_;
+	gint _tmp20_;
 	GError * _inner_error_ = NULL;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_ROLLS_TABLE (self), NULL);
@@ -397,10 +397,10 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp8_ != SQLITE_OK) {
 #line 400 "FSpotRollsTable.c"
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gint _tmp12_;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp9_ = sql;
 #line 37 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -462,7 +462,7 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp16_ != SQLITE_OK) {
 #line 465 "FSpotRollsTable.c"
-		gint _tmp17_ = 0;
+		gint _tmp17_;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp17_ = res;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -514,8 +514,8 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp20_ == SQLITE_ROW) {
 #line 517 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp21_ = NULL;
-		sqlite3_stmt* _tmp22_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp21_;
+		sqlite3_stmt* _tmp22_;
 		gpointer _tmp23_ = NULL;
 #line 45 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp21_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
@@ -529,13 +529,13 @@ DataImportsFSpotDbFSpotRollRow* data_imports_fspot_db_fspot_rolls_table_get_by_i
 		row = _tmp23_;
 #line 531 "FSpotRollsTable.c"
 	} else {
-		gint _tmp24_ = 0;
+		gint _tmp24_;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp24_ = res;
 #line 46 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		if (_tmp24_ == SQLITE_DONE) {
 #line 538 "FSpotRollsTable.c"
-			gint64 _tmp25_ = 0LL;
+			gint64 _tmp25_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 			_tmp25_ = roll_id;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -609,15 +609,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotRollsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotRollsV0Behavior* _tmp3_;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_rolls_v0_behavior_instance;
 #line 61 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 620 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotRollsV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotRollsV0Behavior* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_rolls_v0_behavior_new ();
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -641,7 +641,7 @@ DataImportsFSpotDbFSpotRollsV0Behavior* data_imports_fspot_db_fspot_rolls_v0_beh
 static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
 #line 67 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -657,11 +657,11 @@ static gchar* data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 70 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
 #line 71 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -692,16 +692,16 @@ static gchar** data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns (
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 	DataImportsFSpotDbFSpotRollRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp0_ = NULL;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint64 _tmp3_ = 0LL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint64 _tmp6_ = 0LL;
+	DataImportsFSpotDbFSpotRollRow* _tmp0_;
+	sqlite3_stmt* _tmp1_;
+	gint _tmp2_;
+	gint64 _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint64 _tmp6_;
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -754,11 +754,11 @@ static void data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	data_imports_fspot_db_fspot_rolls_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_get_table_name;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_list_columns;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v0_behavior_real_build_row;
 #line 763 "FSpotRollsTable.c"
 }
 
@@ -767,7 +767,7 @@ static void data_imports_fspot_db_fspot_rolls_v0_behavior_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_rolls_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotRollsV0Behavior * self;
 #line 54 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V0_BEHAVIOR, DataImportsFSpotDbFSpotRollsV0Behavior);
@@ -810,15 +810,15 @@ static DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls
 
 DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotRollsV5Behavior* result = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotRollsV5Behavior* _tmp3_;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_rolls_v5_behavior_instance;
 #line 90 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 821 "FSpotRollsTable.c"
-		DataImportsFSpotDbFSpotRollsV5Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotRollsV5Behavior* _tmp1_;
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_rolls_v5_behavior_new ();
 #line 91 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -842,7 +842,7 @@ DataImportsFSpotDbFSpotRollsV5Behavior* data_imports_fspot_db_fspot_rolls_v5_beh
 static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 95 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
 #line 96 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -858,11 +858,11 @@ static gchar* data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name
 static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint _tmp3__length1;
 #line 99 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -893,16 +893,16 @@ static gchar** data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns (
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotRollRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 	DataImportsFSpotDbFSpotRollRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotRollRow* _tmp0_ = NULL;
-	sqlite3_stmt* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
-	gint64 _tmp3_ = 0LL;
-	sqlite3_stmt* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
-	gint64 _tmp6_ = 0LL;
+	DataImportsFSpotDbFSpotRollRow* _tmp0_;
+	sqlite3_stmt* _tmp1_;
+	gint _tmp2_;
+	gint64 _tmp3_;
+	sqlite3_stmt* _tmp4_;
+	gint _tmp5_;
+	gint64 _tmp6_;
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
 #line 103 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
@@ -955,11 +955,11 @@ static void data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	data_imports_fspot_db_fspot_rolls_v5_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_get_table_name;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_list_columns;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_rolls_v5_behavior_real_build_row;
 #line 964 "FSpotRollsTable.c"
 }
 
@@ -968,7 +968,7 @@ static void data_imports_fspot_db_fspot_rolls_v5_behavior_instance_init (DataImp
 }
 
 
-static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_rolls_v5_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotRollsV5Behavior * self;
 #line 83 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotRollsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_ROLLS_V5_BEHAVIOR, DataImportsFSpotDbFSpotRollsV5Behavior);
diff --git a/plugins/shotwell-data-imports/FSpotTableBehavior.c b/plugins/shotwell-data-imports/FSpotTableBehavior.c
index e3d5c7d..016fee8 100644
--- a/plugins/shotwell-data-imports/FSpotTableBehavior.c
+++ b/plugins/shotwell-data-imports/FSpotTableBehavior.c
@@ -1,4 +1,4 @@
-/* FSpotTableBehavior.c generated by valac 0.34.7, the Vala compiler
+/* FSpotTableBehavior.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotTableBehavior.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
diff --git a/plugins/shotwell-data-imports/FSpotTagsTable.c b/plugins/shotwell-data-imports/FSpotTagsTable.c
index 95f6432..54fe7c6 100644
--- a/plugins/shotwell-data-imports/FSpotTagsTable.c
+++ b/plugins/shotwell-data-imports/FSpotTagsTable.c
@@ -1,4 +1,4 @@
-/* FSpotTagsTable.c generated by valac 0.34.7, the Vala compiler
+/* FSpotTagsTable.c generated by valac 0.36.6, the Vala compiler
  * generated from FSpotTagsTable.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -187,7 +187,7 @@ static gpointer data_imports_fspot_db_fspot_tags_table_parent_class = NULL;
 static gpointer data_imports_fspot_db_fspot_tags_v0_behavior_parent_class = NULL;
 static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_instance;
 static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_instance = NULL;
-static DataImportsFSpotDbFSpotTableBehaviorIface* data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
+static DataImportsFSpotDbFSpotTableBehaviorIface * data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = NULL;
 
 GType data_imports_fspot_db_fspot_tag_row_get_type (void) G_GNUC_CONST;
 enum  {
@@ -195,7 +195,7 @@ enum  {
 };
 DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_new (void);
 DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_construct (GType object_type);
-static void data_imports_fspot_db_fspot_tag_row_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_tag_row_finalize (GObject * obj);
 gpointer importable_database_table_ref (gpointer instance);
 void importable_database_table_unref (gpointer instance);
 GParamSpec* param_spec_importable_database_table (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
@@ -231,7 +231,7 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 void data_imports_fspot_db_fspot_table_behavior_build_row (DataImportsFSpotDbFSpotTableBehavior* self, sqlite3_stmt* stmt, gpointer* row, gint offset);
 GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error);
 gchar* data_imports_fspot_db_fspot_table_behavior_get_table_name (DataImportsFSpotDbFSpotTableBehavior* self);
-static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable* obj);
+static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable * obj);
 GType data_imports_fspot_db_fspot_tags_v0_behavior_get_type (void) G_GNUC_CONST;
 enum  {
 	DATA_IMPORTS_FSPOT_DB_FSPOT_TAGS_V0_BEHAVIOR_DUMMY_PROPERTY
@@ -241,8 +241,8 @@ static DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v
 DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_get_instance (void);
 static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base);
 static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1);
-static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow** row, gint offset);
-static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject* obj);
+static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow* * row, gint offset);
+static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject * obj);
 
 
 DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tag_row_construct (GType object_type) {
@@ -275,7 +275,7 @@ static void data_imports_fspot_db_fspot_tag_row_instance_init (DataImportsFSpotD
 }
 
 
-static void data_imports_fspot_db_fspot_tag_row_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_tag_row_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotTagRow * self;
 #line 12 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAG_ROW, DataImportsFSpotDbFSpotTagRow);
@@ -306,12 +306,12 @@ GType data_imports_fspot_db_fspot_tag_row_get_type (void) {
 
 DataImportsFSpotDbFSpotTagsTable* data_imports_fspot_db_fspot_tags_table_construct (GType object_type, sqlite3* db, DataImportsFSpotDbFSpotDatabaseBehavior* db_behavior) {
 	DataImportsFSpotDbFSpotTagsTable* self = NULL;
-	sqlite3* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp3_ = NULL;
-	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp4_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp5_ = NULL;
+	sqlite3* _tmp0_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp1_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp2_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp3_;
+	DataImportsFSpotDbFSpotDatabaseBehavior* _tmp4_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp5_;
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	g_return_val_if_fail (db != NULL, NULL);
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -356,24 +356,24 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id
 	sqlite3_stmt* stmt = NULL;
 	DataImportsFSpotDbFSpotTagRow* row = NULL;
 	gchar* column_list = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 	gchar* sql = NULL;
-	const gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
+	const gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gchar* _tmp3_;
 	gint res = 0;
-	sqlite3* _tmp4_ = NULL;
-	const gchar* _tmp5_ = NULL;
+	sqlite3* _tmp4_;
+	const gchar* _tmp5_;
 	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	gint _tmp8_ = 0;
-	sqlite3_stmt* _tmp13_ = NULL;
-	gint64 _tmp14_ = 0LL;
-	gint _tmp15_ = 0;
-	gint _tmp16_ = 0;
-	sqlite3_stmt* _tmp17_ = NULL;
-	gint _tmp18_ = 0;
-	gint _tmp19_ = 0;
+	gint _tmp7_;
+	gint _tmp8_;
+	sqlite3_stmt* _tmp13_;
+	gint64 _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
+	sqlite3_stmt* _tmp17_;
+	gint _tmp18_;
+	gint _tmp19_;
 	GError * _inner_error_ = NULL;
 #line 41 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL);
@@ -408,10 +408,10 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id
 #line 48 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	if (_tmp8_ != SQLITE_OK) {
 #line 411 "FSpotTagsTable.c"
-		const gchar* _tmp9_ = NULL;
-		gchar* _tmp10_ = NULL;
-		gchar* _tmp11_ = NULL;
-		gint _tmp12_ = 0;
+		const gchar* _tmp9_;
+		gchar* _tmp10_;
+		gchar* _tmp11_;
+		gint _tmp12_;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp9_ = sql;
 #line 49 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -483,8 +483,8 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	if (_tmp19_ == SQLITE_ROW) {
 #line 486 "FSpotTagsTable.c"
-		DataImportsFSpotDbFSpotTableBehavior* _tmp20_ = NULL;
-		sqlite3_stmt* _tmp21_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp20_;
+		sqlite3_stmt* _tmp21_;
 		gpointer _tmp22_ = NULL;
 #line 56 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_DATABASE_TABLE, DataImportsFSpotDbFSpotDatabaseTable)->behavior;
@@ -498,13 +498,13 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id
 		row = _tmp22_;
 #line 500 "FSpotTagsTable.c"
 	} else {
-		gint _tmp23_ = 0;
+		gint _tmp23_;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp23_ = res;
 #line 57 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		if (_tmp23_ == SQLITE_DONE) {
 #line 507 "FSpotTagsTable.c"
-			gint64 _tmp24_ = 0LL;
+			gint64 _tmp24_;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 			_tmp24_ = tag_id;
 #line 58 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -529,30 +529,30 @@ DataImportsFSpotDbFSpotTagRow* data_imports_fspot_db_fspot_tags_table_get_by_id
 GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImportsFSpotDbFSpotTagsTable* self, gint64 photo_id, GError** error) {
 	GeeArrayList* result = NULL;
 	GeeArrayList* rows = NULL;
-	GeeArrayList* _tmp0_ = NULL;
+	GeeArrayList* _tmp0_;
 	sqlite3_stmt* stmt = NULL;
 	gchar* column_list = NULL;
-	gchar* _tmp1_ = NULL;
+	gchar* _tmp1_;
 	gchar* sql = NULL;
-	const gchar* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	DataImportsFSpotDbFSpotTableBehavior* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	gchar* _tmp7_ = NULL;
-	gchar* _tmp8_ = NULL;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	DataImportsFSpotDbFSpotTableBehavior* _tmp4_;
+	gchar* _tmp5_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	gchar* _tmp8_;
 	gint res = 0;
-	sqlite3* _tmp9_ = NULL;
-	const gchar* _tmp10_ = NULL;
+	sqlite3* _tmp9_;
+	const gchar* _tmp10_;
 	sqlite3_stmt* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint _tmp13_ = 0;
-	sqlite3_stmt* _tmp18_ = NULL;
-	gint64 _tmp19_ = 0LL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
-	sqlite3_stmt* _tmp23_ = NULL;
-	gint _tmp24_ = 0;
+	gint _tmp12_;
+	gint _tmp13_;
+	sqlite3_stmt* _tmp18_;
+	gint64 _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
+	sqlite3_stmt* _tmp23_;
+	gint _tmp24_;
 	GError * _inner_error_ = NULL;
 #line 63 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	g_return_val_if_fail (DATA_IMPORTS_FSPOT_DB_IS_FSPOT_TAGS_TABLE (self), NULL);
@@ -600,10 +600,10 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport
 #line 74 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	if (_tmp13_ != SQLITE_OK) {
 #line 602 "FSpotTagsTable.c"
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		gchar* _tmp16_ = NULL;
-		gint _tmp17_ = 0;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		gchar* _tmp16_;
+		gint _tmp17_;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp14_ = sql;
 #line 75 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -665,7 +665,7 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport
 #line 78 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	if (_tmp21_ != SQLITE_OK) {
 #line 667 "FSpotTagsTable.c"
-		gint _tmp22_ = 0;
+		gint _tmp22_;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp22_ = res;
 #line 79 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -715,15 +715,15 @@ GeeArrayList* data_imports_fspot_db_fspot_tags_table_get_by_photo_id (DataImport
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	while (TRUE) {
 #line 717 "FSpotTagsTable.c"
-		gint _tmp25_ = 0;
+		gint _tmp25_;
 		DataImportsFSpotDbFSpotTagRow* row = NULL;
-		DataImportsFSpotDbFSpotTableBehavior* _tmp26_ = NULL;
-		sqlite3_stmt* _tmp27_ = NULL;
+		DataImportsFSpotDbFSpotTableBehavior* _tmp26_;
+		sqlite3_stmt* _tmp27_;
 		gpointer _tmp28_ = NULL;
-		GeeArrayList* _tmp29_ = NULL;
-		DataImportsFSpotDbFSpotTagRow* _tmp30_ = NULL;
-		sqlite3_stmt* _tmp31_ = NULL;
-		gint _tmp32_ = 0;
+		GeeArrayList* _tmp29_;
+		DataImportsFSpotDbFSpotTagRow* _tmp30_;
+		sqlite3_stmt* _tmp31_;
+		gint _tmp32_;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp25_ = res;
 #line 82 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -790,7 +790,7 @@ static void data_imports_fspot_db_fspot_tags_table_instance_init (DataImportsFSp
 }
 
 
-static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable* obj) {
+static void data_imports_fspot_db_fspot_tags_table_finalize (ImportableDatabaseTable * obj) {
 	DataImportsFSpotDbFSpotTagsTable * self;
 #line 24 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_TABLE, DataImportsFSpotDbFSpotTagsTable);
@@ -843,15 +843,15 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behavior_get_instance (void) {
 	DataImportsFSpotDbFSpotTagsV0Behavior* result = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp2_ = NULL;
-	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp3_ = NULL;
+	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp0_;
+	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp2_;
+	DataImportsFSpotDbFSpotTagsV0Behavior* _tmp3_;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	_tmp0_ = data_imports_fspot_db_fspot_tags_v0_behavior_instance;
 #line 100 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	if (_tmp0_ == NULL) {
 #line 853 "FSpotTagsTable.c"
-		DataImportsFSpotDbFSpotTagsV0Behavior* _tmp1_ = NULL;
+		DataImportsFSpotDbFSpotTagsV0Behavior* _tmp1_;
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp1_ = data_imports_fspot_db_fspot_tags_v0_behavior_new ();
 #line 101 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -875,7 +875,7 @@ DataImportsFSpotDbFSpotTagsV0Behavior* data_imports_fspot_db_fspot_tags_v0_behav
 static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name (DataImportsFSpotDbFSpotTableBehavior* base) {
 	DataImportsFSpotDbFSpotTagsV0Behavior * self;
 	gchar* result = NULL;
-	gchar* _tmp0_ = NULL;
+	gchar* _tmp0_;
 #line 105 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
 #line 106 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -891,15 +891,15 @@ static gchar* data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name (
 static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (DataImportsFSpotDbFSpotTableBehavior* base, int* result_length1) {
 	DataImportsFSpotDbFSpotTagsV0Behavior * self;
 	gchar** result = NULL;
-	gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	gchar* _tmp2_ = NULL;
-	gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gchar* _tmp5_ = NULL;
-	gchar** _tmp6_ = NULL;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	gchar* _tmp0_;
+	gchar* _tmp1_;
+	gchar* _tmp2_;
+	gchar* _tmp3_;
+	gchar* _tmp4_;
+	gchar* _tmp5_;
+	gchar** _tmp6_;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 109 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
 #line 110 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -946,38 +946,38 @@ static gchar** data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns (D
 }
 
 
-static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow** row, gint offset) {
+static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImportsFSpotDbFSpotTableBehavior* base, sqlite3_stmt* stmt, DataImportsFSpotDbFSpotTagRow* * row, gint offset) {
 	DataImportsFSpotDbFSpotTagsV0Behavior * self;
 	DataImportsFSpotDbFSpotTagRow* _vala_row = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp0_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp1_ = NULL;
-	sqlite3_stmt* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint64 _tmp4_ = 0LL;
-	DataImportsFSpotDbFSpotTagRow* _tmp5_ = NULL;
-	sqlite3_stmt* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
-	const gchar* _tmp8_ = NULL;
-	gchar* _tmp9_ = NULL;
-	DataImportsFSpotDbFSpotTagRow* _tmp10_ = NULL;
-	sqlite3_stmt* _tmp11_ = NULL;
-	gint _tmp12_ = 0;
-	gint64 _tmp13_ = 0LL;
-	DataImportsFSpotDbFSpotTagRow* _tmp14_ = NULL;
-	sqlite3_stmt* _tmp15_ = NULL;
-	gint _tmp16_ = 0;
-	gint _tmp17_ = 0;
-	DataImportsFSpotDbFSpotTagRow* _tmp18_ = NULL;
-	sqlite3_stmt* _tmp19_ = NULL;
-	gint _tmp20_ = 0;
-	gint _tmp21_ = 0;
+	DataImportsFSpotDbFSpotTagRow* _tmp0_;
+	DataImportsFSpotDbFSpotTagRow* _tmp1_;
+	sqlite3_stmt* _tmp2_;
+	gint _tmp3_;
+	gint64 _tmp4_;
+	DataImportsFSpotDbFSpotTagRow* _tmp5_;
+	sqlite3_stmt* _tmp6_;
+	gint _tmp7_;
+	const gchar* _tmp8_;
+	gchar* _tmp9_;
+	DataImportsFSpotDbFSpotTagRow* _tmp10_;
+	sqlite3_stmt* _tmp11_;
+	gint _tmp12_;
+	gint64 _tmp13_;
+	DataImportsFSpotDbFSpotTagRow* _tmp14_;
+	sqlite3_stmt* _tmp15_;
+	gint _tmp16_;
+	gint _tmp17_;
+	DataImportsFSpotDbFSpotTagRow* _tmp18_;
+	sqlite3_stmt* _tmp19_;
+	gint _tmp20_;
+	gint _tmp21_;
 	gchar* icon_str = NULL;
-	sqlite3_stmt* _tmp22_ = NULL;
-	gint _tmp23_ = 0;
-	const gchar* _tmp24_ = NULL;
-	gchar* _tmp25_ = NULL;
+	sqlite3_stmt* _tmp22_;
+	gint _tmp23_;
+	const gchar* _tmp24_;
+	gchar* _tmp25_;
 	gboolean _tmp26_ = FALSE;
-	const gchar* _tmp27_ = NULL;
+	const gchar* _tmp27_;
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
 #line 113 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -1057,8 +1057,8 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImp
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	if (_tmp27_ != NULL) {
 #line 1059 "FSpotTagsTable.c"
-		const gchar* _tmp28_ = NULL;
-		gboolean _tmp29_ = FALSE;
+		const gchar* _tmp28_;
+		gboolean _tmp29_;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp28_ = icon_str;
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -1074,9 +1074,9 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImp
 #line 121 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	if (_tmp26_) {
 #line 1076 "FSpotTagsTable.c"
-		DataImportsFSpotDbFSpotTagRow* _tmp30_ = NULL;
-		const gchar* _tmp31_ = NULL;
-		gchar* _tmp32_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp30_;
+		const gchar* _tmp31_;
+		gchar* _tmp32_;
 #line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp30_ = _vala_row;
 #line 122 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -1089,8 +1089,8 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row (DataImp
 		_tmp30_->stock_icon = _tmp32_;
 #line 1090 "FSpotTagsTable.c"
 	} else {
-		DataImportsFSpotDbFSpotTagRow* _tmp33_ = NULL;
-		gchar* _tmp34_ = NULL;
+		DataImportsFSpotDbFSpotTagRow* _tmp33_;
+		gchar* _tmp34_;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 		_tmp33_ = _vala_row;
 #line 124 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
@@ -1129,11 +1129,11 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_f
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	data_imports_fspot_db_fspot_tags_v0_behavior_data_imports_fspot_db_fspot_table_behavior_parent_iface = g_type_interface_peek_parent (iface);
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	iface->get_table_name = (gchar* (*)(DataImportsFSpotDbFSpotTableBehavior*)) data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name;
+	iface->get_table_name = (gchar* (*) (DataImportsFSpotDbFSpotTableBehavior *)) data_imports_fspot_db_fspot_tags_v0_behavior_real_get_table_name;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	iface->list_columns = (gchar** (*)(DataImportsFSpotDbFSpotTableBehavior*, int*)) data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns;
+	iface->list_columns = (gchar** (*) (DataImportsFSpotDbFSpotTableBehavior *, int*)) data_imports_fspot_db_fspot_tags_v0_behavior_real_list_columns;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
-	iface->build_row = (void (*)(DataImportsFSpotDbFSpotTableBehavior*, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row;
+	iface->build_row = (void (*) (DataImportsFSpotDbFSpotTableBehavior *, sqlite3_stmt*, gpointer*, gint)) data_imports_fspot_db_fspot_tags_v0_behavior_real_build_row;
 #line 1137 "FSpotTagsTable.c"
 }
 
@@ -1142,7 +1142,7 @@ static void data_imports_fspot_db_fspot_tags_v0_behavior_instance_init (DataImpo
 }
 
 
-static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject* obj) {
+static void data_imports_fspot_db_fspot_tags_v0_behavior_finalize (GObject * obj) {
 	DataImportsFSpotDbFSpotTagsV0Behavior * self;
 #line 93 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/FSpotTagsTable.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, DATA_IMPORTS_FSPOT_DB_TYPE_FSPOT_TAGS_V0_BEHAVIOR, DataImportsFSpotDbFSpotTagsV0Behavior);
diff --git a/plugins/shotwell-data-imports/SqliteSupport.c b/plugins/shotwell-data-imports/SqliteSupport.c
index c02a5e6..eb9eec2 100644
--- a/plugins/shotwell-data-imports/SqliteSupport.c
+++ b/plugins/shotwell-data-imports/SqliteSupport.c
@@ -1,4 +1,4 @@
-/* SqliteSupport.c generated by valac 0.34.7, the Vala compiler
+/* SqliteSupport.c generated by valac 0.36.6, the Vala compiler
  * generated from SqliteSupport.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -72,7 +72,7 @@ enum  {
 void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name);
 void importable_database_table_throw_error (const gchar* method, gint res, GError** error);
 ImportableDatabaseTable* importable_database_table_construct (GType object_type);
-static void importable_database_table_finalize (ImportableDatabaseTable* obj);
+static void importable_database_table_finalize (ImportableDatabaseTable * obj);
 
 
 GQuark database_error_quark (void) {
@@ -81,8 +81,8 @@ GQuark database_error_quark (void) {
 
 
 void importable_database_table_set_table_name (ImportableDatabaseTable* self, const gchar* table_name) {
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (IS_IMPORTABLE_DATABASE_TABLE (self));
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -101,12 +101,12 @@ void importable_database_table_set_table_name (ImportableDatabaseTable* self, co
 
 void importable_database_table_throw_error (const gchar* method, gint res, GError** error) {
 	gchar* msg = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	sqlite3* _tmp2_ = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar* _tmp4_ = NULL;
-	gint _tmp5_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	sqlite3* _tmp2_;
+	const gchar* _tmp3_;
+	gchar* _tmp4_;
+	gint _tmp5_;
 	GError * _inner_error_ = NULL;
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (method != NULL);
@@ -162,8 +162,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_NOTADB:
 #line 164 "SqliteSupport.c"
 		{
-			const gchar* _tmp6_ = NULL;
-			GError* _tmp7_ = NULL;
+			const gchar* _tmp6_;
+			GError* _tmp7_;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp6_ = msg;
 #line 47 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -195,8 +195,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_NOMEM:
 #line 197 "SqliteSupport.c"
 		{
-			const gchar* _tmp8_ = NULL;
-			GError* _tmp9_ = NULL;
+			const gchar* _tmp8_;
+			GError* _tmp9_;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp8_ = msg;
 #line 50 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -232,8 +232,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_INTERRUPT:
 #line 234 "SqliteSupport.c"
 		{
-			const gchar* _tmp10_ = NULL;
-			GError* _tmp11_ = NULL;
+			const gchar* _tmp10_;
+			GError* _tmp11_;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp10_ = msg;
 #line 55 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -273,8 +273,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_RANGE:
 #line 275 "SqliteSupport.c"
 		{
-			const gchar* _tmp12_ = NULL;
-			GError* _tmp13_ = NULL;
+			const gchar* _tmp12_;
+			GError* _tmp13_;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp12_ = msg;
 #line 62 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -308,8 +308,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_MISMATCH:
 #line 310 "SqliteSupport.c"
 		{
-			const gchar* _tmp14_ = NULL;
-			GError* _tmp15_ = NULL;
+			const gchar* _tmp14_;
+			GError* _tmp15_;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp14_ = msg;
 #line 66 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -346,8 +346,8 @@ void importable_database_table_throw_error (const gchar* method, gint res, GErro
 		case SQLITE_MISUSE:
 #line 348 "SqliteSupport.c"
 		{
-			const gchar* _tmp16_ = NULL;
-			GError* _tmp17_ = NULL;
+			const gchar* _tmp16_;
+			GError* _tmp17_;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 			_tmp16_ = msg;
 #line 72 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -434,7 +434,7 @@ static gchar* value_importable_database_table_collect_value (GValue* value, guin
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	if (collect_values[0].v_pointer) {
 #line 437 "SqliteSupport.c"
-		ImportableDatabaseTable* object;
+		ImportableDatabaseTable * object;
 		object = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -461,7 +461,7 @@ static gchar* value_importable_database_table_collect_value (GValue* value, guin
 
 
 static gchar* value_importable_database_table_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	ImportableDatabaseTable** object_p;
+	ImportableDatabaseTable ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	if (!object_p) {
@@ -513,7 +513,7 @@ gpointer value_get_importable_database_table (const GValue* value) {
 
 
 void value_set_importable_database_table (GValue* value, gpointer v_object) {
-	ImportableDatabaseTable* old;
+	ImportableDatabaseTable * old;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE));
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -544,7 +544,7 @@ void value_set_importable_database_table (GValue* value, gpointer v_object) {
 
 
 void value_take_importable_database_table (GValue* value, gpointer v_object) {
-	ImportableDatabaseTable* old;
+	ImportableDatabaseTable * old;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_IMPORTABLE_DATABASE_TABLE));
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
@@ -590,7 +590,7 @@ static void importable_database_table_instance_init (ImportableDatabaseTable * s
 }
 
 
-static void importable_database_table_finalize (ImportableDatabaseTable* obj) {
+static void importable_database_table_finalize (ImportableDatabaseTable * obj) {
 	ImportableDatabaseTable * self;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_IMPORTABLE_DATABASE_TABLE, ImportableDatabaseTable);
@@ -617,7 +617,7 @@ GType importable_database_table_get_type (void) {
 
 
 gpointer importable_database_table_ref (gpointer instance) {
-	ImportableDatabaseTable* self;
+	ImportableDatabaseTable * self;
 	self = instance;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -628,7 +628,7 @@ gpointer importable_database_table_ref (gpointer instance) {
 
 
 void importable_database_table_unref (gpointer instance) {
-	ImportableDatabaseTable* self;
+	ImportableDatabaseTable * self;
 	self = instance;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/SqliteSupport.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {
diff --git a/plugins/shotwell-data-imports/VersionNumber.c b/plugins/shotwell-data-imports/VersionNumber.c
index 7d21a8d..dd5f414 100644
--- a/plugins/shotwell-data-imports/VersionNumber.c
+++ b/plugins/shotwell-data-imports/VersionNumber.c
@@ -1,4 +1,4 @@
-/* VersionNumber.c generated by valac 0.34.7, the Vala compiler
+/* VersionNumber.c generated by valac 0.36.6, the Vala compiler
  * generated from VersionNumber.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -43,7 +43,7 @@ struct _UtilsVersionNumberPrivate {
 
 
 static gpointer utils_version_number_parent_class = NULL;
-static GeeComparableIface* utils_version_number_gee_comparable_parent_iface = NULL;
+static GeeComparableIface * utils_version_number_gee_comparable_parent_iface = NULL;
 
 GType utils_version_number_get_type (void) G_GNUC_CONST;
 #define UTILS_VERSION_NUMBER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumberPrivate))
@@ -57,7 +57,7 @@ UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_versi
 UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator);
 gchar* utils_version_number_to_string (UtilsVersionNumber* self);
 static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVersionNumber* other);
-static void utils_version_number_finalize (GObject* obj);
+static void utils_version_number_finalize (GObject * obj);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static gint _vala_array_length (gpointer array);
@@ -72,10 +72,10 @@ static gint* _vala_array_dup3 (gint* self, int length) {
 
 UtilsVersionNumber* utils_version_number_construct (GType object_type, gint* version, int version_length1) {
 	UtilsVersionNumber * self = NULL;
-	gint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gint* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gint* _tmp0_;
+	gint _tmp0__length1;
+	gint* _tmp1_;
+	gint _tmp1__length1;
 #line 16 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	self = (UtilsVersionNumber*) g_object_new (object_type, NULL);
 #line 17 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -110,15 +110,15 @@ UtilsVersionNumber* utils_version_number_new (gint* version, int version_length1
 UtilsVersionNumber* utils_version_number_construct_from_string (GType object_type, const gchar* str_version, const gchar* separator) {
 	UtilsVersionNumber * self = NULL;
 	gchar** version_items = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gchar** _tmp2_ = NULL;
-	gchar** _tmp3_ = NULL;
-	gint version_items_length1 = 0;
-	gint _version_items_size_ = 0;
-	gchar** _tmp4_ = NULL;
-	gint _tmp4__length1 = 0;
-	gint* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gchar** _tmp2_;
+	gchar** _tmp3_;
+	gint version_items_length1;
+	gint _version_items_size_;
+	gchar** _tmp4_;
+	gint _tmp4__length1;
+	gint* _tmp5_;
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	g_return_val_if_fail (str_version != NULL, NULL);
 #line 20 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -164,22 +164,22 @@ UtilsVersionNumber* utils_version_number_construct_from_string (GType object_typ
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 			while (TRUE) {
 #line 167 "VersionNumber.c"
-				gint _tmp8_ = 0;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				gint* _tmp10_ = NULL;
-				gint _tmp10__length1 = 0;
-				gint _tmp11_ = 0;
-				gchar** _tmp12_ = NULL;
-				gint _tmp12__length1 = 0;
-				gint _tmp13_ = 0;
-				const gchar* _tmp14_ = NULL;
-				gint _tmp15_ = 0;
-				gint _tmp16_ = 0;
+				gint _tmp8_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				gint* _tmp10_;
+				gint _tmp10__length1;
+				gint _tmp11_;
+				gchar** _tmp12_;
+				gint _tmp12__length1;
+				gint _tmp13_;
+				const gchar* _tmp14_;
+				gint _tmp15_;
+				gint _tmp16_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (!_tmp6_) {
 #line 182 "VersionNumber.c"
-					gint _tmp7_ = 0;
+					gint _tmp7_;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp7_ = i;
 #line 23 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -241,408 +241,408 @@ UtilsVersionNumber* utils_version_number_new_from_string (const gchar* str_versi
 
 static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int str_array_length1) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
+	const gchar* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gchar** _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar** _tmp3_;
+	gint _tmp3__length1;
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = separator;
-#line 1054 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1078 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp0_ == NULL) {
-#line 1055 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1079 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		separator = "";
 #line 256 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp3__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp3_ != NULL) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = TRUE;
 #line 266 "VersionNumber.c"
 	} else {
-		gchar** _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp4_;
+		gint _tmp4__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp4__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp2_ = _tmp4__length1 > 0;
 #line 276 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp2_) {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = TRUE;
 #line 282 "VersionNumber.c"
 	} else {
 		gboolean _tmp5_ = FALSE;
-		gchar** _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar** _tmp6_;
+		gint _tmp6__length1;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp6__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp6__length1 == -1) {
 #line 293 "VersionNumber.c"
-			gchar** _tmp7_ = NULL;
-			gint _tmp7__length1 = 0;
-			const gchar* _tmp8_ = NULL;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar** _tmp7_;
+			gint _tmp7__length1;
+			const gchar* _tmp8_;
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7_ = str_array;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp7__length1 = str_array_length1;
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp8_ = _tmp7_[0];
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = _tmp8_ != NULL;
 #line 305 "VersionNumber.c"
 		} else {
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp5_ = FALSE;
 #line 309 "VersionNumber.c"
 		}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp1_ = _tmp5_;
 #line 313 "VersionNumber.c"
 	}
-#line 1057 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1081 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	if (_tmp1_) {
 #line 317 "VersionNumber.c"
 		gint i = 0;
 		gsize len = 0UL;
-		gint _tmp31_ = 0;
-		gint _tmp33_ = 0;
-		gint _tmp34_ = 0;
-		gsize _tmp35_ = 0UL;
-		const gchar* _tmp36_ = NULL;
-		gint _tmp37_ = 0;
-		gint _tmp38_ = 0;
-		gint _tmp39_ = 0;
+		gint _tmp31_;
+		gint _tmp33_;
+		gint _tmp34_;
+		gsize _tmp35_;
+		const gchar* _tmp36_;
+		gint _tmp37_;
+		gint _tmp38_;
+		gint _tmp39_;
 		const gchar* res = NULL;
-		gsize _tmp40_ = 0UL;
-		void* _tmp41_ = NULL;
+		gsize _tmp40_;
+		void* _tmp41_;
 		void* ptr = NULL;
-		const gchar* _tmp42_ = NULL;
-		gchar** _tmp43_ = NULL;
-		gint _tmp43__length1 = 0;
-		const gchar* _tmp44_ = NULL;
-		void* _tmp45_ = NULL;
-		const gchar* _tmp62_ = NULL;
-#line 1059 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		const gchar* _tmp42_;
+		gchar** _tmp43_;
+		gint _tmp43__length1;
+		const gchar* _tmp44_;
+		void* _tmp45_;
+		const gchar* _tmp62_;
+#line 1083 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = (gsize) 1;
 #line 340 "VersionNumber.c"
 		{
 			gboolean _tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp9_ = TRUE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 349 "VersionNumber.c"
 				gboolean _tmp11_ = FALSE;
 				gboolean _tmp12_ = FALSE;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
 				gint _tmp21_ = 0;
-				gchar** _tmp22_ = NULL;
-				gint _tmp22__length1 = 0;
-				gint _tmp23_ = 0;
-				const gchar* _tmp24_ = NULL;
-				gsize _tmp30_ = 0UL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp22_;
+				gint _tmp22__length1;
+				gint _tmp23_;
+				const gchar* _tmp24_;
+				gsize _tmp30_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp9_) {
 #line 362 "VersionNumber.c"
-					gint _tmp10_ = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp10_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp10_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp10_ + 1;
 #line 368 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp9_ = FALSE;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp13__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp13__length1 != -1) {
 #line 378 "VersionNumber.c"
-					gint _tmp14_ = 0;
-					gchar** _tmp15_ = NULL;
-					gint _tmp15__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp14_;
+					gchar** _tmp15_;
+					gint _tmp15__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp14_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp15__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = _tmp14_ < _tmp15__length1;
 #line 390 "VersionNumber.c"
 				} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp12_ = FALSE;
 #line 394 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp12_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = TRUE;
 #line 400 "VersionNumber.c"
 				} else {
 					gboolean _tmp16_ = FALSE;
-					gchar** _tmp17_ = NULL;
-					gint _tmp17__length1 = 0;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp17_;
+					gint _tmp17__length1;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp17__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					if (_tmp17__length1 == -1) {
 #line 411 "VersionNumber.c"
-						gchar** _tmp18_ = NULL;
-						gint _tmp18__length1 = 0;
-						gint _tmp19_ = 0;
-						const gchar* _tmp20_ = NULL;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+						gchar** _tmp18_;
+						gint _tmp18__length1;
+						gint _tmp19_;
+						const gchar* _tmp20_;
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18_ = str_array;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp18__length1 = str_array_length1;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp19_ = i;
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp20_ = _tmp18_[_tmp19_];
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = _tmp20_ != NULL;
 #line 426 "VersionNumber.c"
 					} else {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 						_tmp16_ = FALSE;
 #line 430 "VersionNumber.c"
 					}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp11_ = _tmp16_;
 #line 434 "VersionNumber.c"
 				}
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp11_) {
-#line 1060 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1084 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 440 "VersionNumber.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp22__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp23_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp24_ = _tmp22_[_tmp23_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp24_ != NULL) {
 #line 452 "VersionNumber.c"
-					gchar** _tmp25_ = NULL;
-					gint _tmp25__length1 = 0;
-					gint _tmp26_ = 0;
-					const gchar* _tmp27_ = NULL;
-					gint _tmp28_ = 0;
-					gint _tmp29_ = 0;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp25_;
+					gint _tmp25__length1;
+					gint _tmp26_;
+					const gchar* _tmp27_;
+					gint _tmp28_;
+					gint _tmp29_;
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25_ = str_array;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp25__length1 = str_array_length1;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp26_ = i;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp27_ = _tmp25_[_tmp26_];
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp28_ = strlen ((const gchar*) _tmp27_);
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp29_ = _tmp28_;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = _tmp29_;
 #line 473 "VersionNumber.c"
 				} else {
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp21_ = 0;
 #line 477 "VersionNumber.c"
 				}
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp30_ = len;
-#line 1061 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1085 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				len = _tmp30_ + _tmp21_;
 #line 483 "VersionNumber.c"
 			}
 		}
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp31_ = i;
-#line 1063 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1087 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		if (_tmp31_ == 0) {
 #line 490 "VersionNumber.c"
-			gchar* _tmp32_ = NULL;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+			gchar* _tmp32_;
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp32_ = g_strdup ("");
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			result = _tmp32_;
-#line 1064 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1088 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			return result;
 #line 498 "VersionNumber.c"
 		}
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp33_ = i;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		str_array_length1 = _tmp33_;
-#line 1066 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1090 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp34_ = str_array_length1;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp35_ = len;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp36_ = separator;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp37_ = strlen ((const gchar*) _tmp36_);
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp38_ = _tmp37_;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp39_ = i;
-#line 1067 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1091 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		len = _tmp35_ + (_tmp38_ * (_tmp39_ - 1));
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp40_ = len;
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp41_ = g_malloc (_tmp40_);
-#line 1069 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1093 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = _tmp41_;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp42_ = res;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43_ = str_array;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp43__length1 = str_array_length1;
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp44_ = _tmp43_[0];
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp45_ = g_stpcpy ((void*) _tmp42_, (const gchar*) _tmp44_);
-#line 1070 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1094 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		ptr = _tmp45_;
 #line 536 "VersionNumber.c"
 		{
 			gboolean _tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			i = 1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			_tmp46_ = TRUE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 			while (TRUE) {
 #line 545 "VersionNumber.c"
-				gint _tmp48_ = 0;
-				gchar** _tmp49_ = NULL;
-				gint _tmp49__length1 = 0;
-				void* _tmp50_ = NULL;
-				const gchar* _tmp51_ = NULL;
-				void* _tmp52_ = NULL;
+				gint _tmp48_;
+				gchar** _tmp49_;
+				gint _tmp49__length1;
+				void* _tmp50_;
+				const gchar* _tmp51_;
+				void* _tmp52_;
 				const gchar* _tmp53_ = NULL;
-				gchar** _tmp54_ = NULL;
-				gint _tmp54__length1 = 0;
-				gint _tmp55_ = 0;
-				const gchar* _tmp56_ = NULL;
-				void* _tmp60_ = NULL;
-				void* _tmp61_ = NULL;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+				gchar** _tmp54_;
+				gint _tmp54__length1;
+				gint _tmp55_;
+				const gchar* _tmp56_;
+				void* _tmp60_;
+				void* _tmp61_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!_tmp46_) {
 #line 561 "VersionNumber.c"
-					gint _tmp47_ = 0;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gint _tmp47_;
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp47_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					i = _tmp47_ + 1;
 #line 567 "VersionNumber.c"
 				}
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp46_ = FALSE;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp48_ = i;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49_ = str_array;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp49__length1 = str_array_length1;
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (!(_tmp48_ < _tmp49__length1)) {
-#line 1071 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1095 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					break;
 #line 581 "VersionNumber.c"
 				}
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp50_ = ptr;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp51_ = separator;
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp52_ = g_stpcpy (_tmp50_, (const gchar*) _tmp51_);
-#line 1072 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1096 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp52_;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp54__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp55_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp56_ = _tmp54_[_tmp55_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				if (_tmp56_ != NULL) {
 #line 601 "VersionNumber.c"
-					gchar** _tmp57_ = NULL;
-					gint _tmp57__length1 = 0;
-					gint _tmp58_ = 0;
-					const gchar* _tmp59_ = NULL;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+					gchar** _tmp57_;
+					gint _tmp57__length1;
+					gint _tmp58_;
+					const gchar* _tmp59_;
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57_ = str_array;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp57__length1 = str_array_length1;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp58_ = i;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp59_ = _tmp57_[_tmp58_];
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = (const gchar*) _tmp59_;
 #line 616 "VersionNumber.c"
 				} else {
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 					_tmp53_ = "";
 #line 620 "VersionNumber.c"
 				}
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp60_ = ptr;
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				_tmp61_ = g_stpcpy (_tmp60_, _tmp53_);
-#line 1073 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1097 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 				ptr = _tmp61_;
 #line 628 "VersionNumber.c"
 			}
 		}
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp62_ = res;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		res = NULL;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = (gchar*) _tmp62_;
-#line 1076 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1100 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 639 "VersionNumber.c"
 	} else {
-		gchar* _tmp63_ = NULL;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+		gchar* _tmp63_;
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		_tmp63_ = g_strdup ("");
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		result = _tmp63_;
-#line 1078 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1102 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 		return result;
 #line 648 "VersionNumber.c"
 	}
@@ -652,14 +652,14 @@ static gchar* _vala_g_strjoinv (const gchar* separator, gchar** str_array, int s
 gchar* utils_version_number_to_string (UtilsVersionNumber* self) {
 	gchar* result = NULL;
 	gchar** version_items = NULL;
-	gint* _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint version_items_length1 = 0;
-	gint _version_items_size_ = 0;
-	gchar** _tmp13_ = NULL;
-	gint _tmp13__length1 = 0;
-	gchar* _tmp14_ = NULL;
+	gint* _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint version_items_length1;
+	gint _version_items_size_;
+	gchar** _tmp13_;
+	gint _tmp13__length1;
+	gchar* _tmp14_;
 #line 27 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	g_return_val_if_fail (UTILS_IS_VERSION_NUMBER (self), NULL);
 #line 28 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -687,22 +687,22 @@ gchar* utils_version_number_to_string (UtilsVersionNumber* self) {
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 			while (TRUE) {
 #line 690 "VersionNumber.c"
-				gint _tmp4_ = 0;
-				gint* _tmp5_ = NULL;
-				gint _tmp5__length1 = 0;
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gint _tmp7_ = 0;
-				gint* _tmp8_ = NULL;
-				gint _tmp8__length1 = 0;
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
-				gchar* _tmp11_ = NULL;
-				gchar* _tmp12_ = NULL;
+				gint _tmp4_;
+				gint* _tmp5_;
+				gint _tmp5__length1;
+				gchar** _tmp6_;
+				gint _tmp6__length1;
+				gint _tmp7_;
+				gint* _tmp8_;
+				gint _tmp8__length1;
+				gint _tmp9_;
+				gint _tmp10_;
+				gchar* _tmp11_;
+				gchar* _tmp12_;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (!_tmp2_) {
 #line 705 "VersionNumber.c"
-					gint _tmp3_ = 0;
+					gint _tmp3_;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp3_ = i;
 #line 29 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -769,11 +769,11 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 	UtilsVersionNumber * self;
 	gint result = 0;
 	gint _tmp0_ = 0;
-	gint* _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
-	UtilsVersionNumber* _tmp2_ = NULL;
-	gint* _tmp3_ = NULL;
-	gint _tmp3__length1 = 0;
+	gint* _tmp1_;
+	gint _tmp1__length1;
+	UtilsVersionNumber* _tmp2_;
+	gint* _tmp3_;
+	gint _tmp3__length1;
 	gint max_len = 0;
 	gint res = 0;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -793,8 +793,8 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 35 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	if (_tmp1__length1 > _tmp3__length1) {
 #line 796 "VersionNumber.c"
-		gint* _tmp4_ = NULL;
-		gint _tmp4__length1 = 0;
+		gint* _tmp4_;
+		gint _tmp4__length1;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 		_tmp4_ = self->priv->version;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -803,9 +803,9 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 		_tmp0_ = _tmp4__length1;
 #line 805 "VersionNumber.c"
 	} else {
-		UtilsVersionNumber* _tmp5_ = NULL;
-		gint* _tmp6_ = NULL;
-		gint _tmp6__length1 = 0;
+		UtilsVersionNumber* _tmp5_;
+		gint* _tmp6_;
+		gint _tmp6__length1;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 		_tmp5_ = other;
 #line 36 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -833,26 +833,26 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 			while (TRUE) {
 #line 836 "VersionNumber.c"
-				gint _tmp9_ = 0;
-				gint _tmp10_ = 0;
+				gint _tmp9_;
+				gint _tmp10_;
 				gint _tmp11_ = 0;
-				gint _tmp12_ = 0;
-				gint* _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
+				gint _tmp12_;
+				gint* _tmp13_;
+				gint _tmp13__length1;
 				gint this_v = 0;
 				gint _tmp17_ = 0;
-				gint _tmp18_ = 0;
-				UtilsVersionNumber* _tmp19_ = NULL;
-				gint* _tmp20_ = NULL;
-				gint _tmp20__length1 = 0;
+				gint _tmp18_;
+				UtilsVersionNumber* _tmp19_;
+				gint* _tmp20_;
+				gint _tmp20__length1;
 				gint other_v = 0;
-				gint _tmp25_ = 0;
-				gint _tmp26_ = 0;
-				gint _tmp27_ = 0;
+				gint _tmp25_;
+				gint _tmp26_;
+				gint _tmp27_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (!_tmp7_) {
 #line 855 "VersionNumber.c"
-					gint _tmp8_ = 0;
+					gint _tmp8_;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp8_ = i;
 #line 38 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -880,10 +880,10 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (_tmp12_ < _tmp13__length1) {
 #line 883 "VersionNumber.c"
-					gint* _tmp14_ = NULL;
-					gint _tmp14__length1 = 0;
-					gint _tmp15_ = 0;
-					gint _tmp16_ = 0;
+					gint* _tmp14_;
+					gint _tmp14__length1;
+					gint _tmp15_;
+					gint _tmp16_;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp14_ = self->priv->version;
 #line 39 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -913,11 +913,11 @@ static gint utils_version_number_real_compare_to (GeeComparable* base, UtilsVers
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 				if (_tmp18_ < _tmp20__length1) {
 #line 916 "VersionNumber.c"
-					UtilsVersionNumber* _tmp21_ = NULL;
-					gint* _tmp22_ = NULL;
-					gint _tmp22__length1 = 0;
-					gint _tmp23_ = 0;
-					gint _tmp24_ = 0;
+					UtilsVersionNumber* _tmp21_;
+					gint* _tmp22_;
+					gint _tmp22__length1;
+					gint _tmp23_;
+					gint _tmp24_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 					_tmp21_ = other;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
@@ -978,7 +978,7 @@ static void utils_version_number_gee_comparable_interface_init (GeeComparableIfa
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	utils_version_number_gee_comparable_parent_iface = g_type_interface_peek_parent (iface);
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
-	iface->compare_to = (gint (*)(GeeComparable*, gconstpointer)) utils_version_number_real_compare_to;
+	iface->compare_to = (gint (*) (GeeComparable *, gconstpointer)) utils_version_number_real_compare_to;
 #line 983 "VersionNumber.c"
 }
 
@@ -990,7 +990,7 @@ static void utils_version_number_instance_init (UtilsVersionNumber * self) {
 }
 
 
-static void utils_version_number_finalize (GObject* obj) {
+static void utils_version_number_finalize (GObject * obj) {
 	UtilsVersionNumber * self;
 #line 13 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/VersionNumber.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, UTILS_TYPE_VERSION_NUMBER, UtilsVersionNumber);
diff --git a/plugins/shotwell-data-imports/shotwell-data-imports.c b/plugins/shotwell-data-imports/shotwell-data-imports.c
index 31600b3..467066b 100644
--- a/plugins/shotwell-data-imports/shotwell-data-imports.c
+++ b/plugins/shotwell-data-imports/shotwell-data-imports.c
@@ -1,4 +1,4 @@
-/* shotwell-data-imports.c generated by valac 0.34.7, the Vala compiler
+/* shotwell-data-imports.c generated by valac 0.36.6, the Vala compiler
  * generated from shotwell-data-imports.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -55,7 +55,7 @@ struct _ShotwellDataImportsCoreServicesPrivate {
 
 
 static gpointer shotwell_data_imports_core_services_parent_class = NULL;
-static SpitModuleIface* shotwell_data_imports_core_services_spit_module_parent_iface = NULL;
+static SpitModuleIface * shotwell_data_imports_core_services_spit_module_parent_iface = NULL;
 
 GType shotwell_data_imports_core_services_get_type (void) G_GNUC_CONST;
 #define SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServicesPrivate))
@@ -67,18 +67,18 @@ ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct (
 FSpotService* fspot_service_new (GFile* resource_directory);
 FSpotService* fspot_service_construct (GType object_type, GFile* resource_directory);
 GType fspot_service_get_type (void) G_GNUC_CONST;
-static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value);
+static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value);
 static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base);
 static const gchar* shotwell_data_imports_core_services_real_get_version (SpitModule* base);
 static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule* base);
 static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1);
-static void shotwell_data_imports_core_services_finalize (GObject* obj);
+static void shotwell_data_imports_core_services_finalize (GObject * obj);
 SpitModule* spit_entry_point (SpitEntryPointParams* params);
 static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
 static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
 
 
-static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, SpitPluggable* value) {
+static void _vala_array_add7 (SpitPluggable** * array, int* length, int* size, SpitPluggable* value) {
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	if ((*length) == (*size)) {
 #line 18 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
@@ -98,11 +98,11 @@ static void _vala_array_add7 (SpitPluggable*** array, int* length, int* size, Sp
 ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_construct (GType object_type, GFile* module_file) {
 	ShotwellDataImportsCoreServices * self = NULL;
 	GFile* resource_directory = NULL;
-	GFile* _tmp0_ = NULL;
-	GFile* _tmp1_ = NULL;
-	SpitPluggable** _tmp2_ = NULL;
-	gint _tmp2__length1 = 0;
-	FSpotService* _tmp3_ = NULL;
+	GFile* _tmp0_;
+	GFile* _tmp1_;
+	SpitPluggable** _tmp2_;
+	gint _tmp2__length1;
+	FSpotService* _tmp3_;
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	g_return_val_if_fail (G_IS_FILE (module_file), NULL);
 #line 15 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
@@ -139,16 +139,13 @@ ShotwellDataImportsCoreServices* shotwell_data_imports_core_services_new (GFile*
 static const gchar* shotwell_data_imports_core_services_real_get_module_name (SpitModule* base) {
 	ShotwellDataImportsCoreServices * self;
 	const gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
 #line 21 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	_tmp0_ = _ ("Core Data Import Services");
-#line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	result = _tmp0_;
+	result = _ ("Core Data Import Services");
 #line 22 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	return result;
-#line 152 "shotwell-data-imports.c"
+#line 149 "shotwell-data-imports.c"
 }
 
 
@@ -161,7 +158,7 @@ static const gchar* shotwell_data_imports_core_services_real_get_version (SpitMo
 	result = _VERSION;
 #line 26 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	return result;
-#line 165 "shotwell-data-imports.c"
+#line 162 "shotwell-data-imports.c"
 }
 
 
@@ -174,17 +171,17 @@ static const gchar* shotwell_data_imports_core_services_real_get_id (SpitModule*
 	result = "org.yorba.shotwell.data_imports.core_services";
 #line 30 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	return result;
-#line 178 "shotwell-data-imports.c"
+#line 175 "shotwell-data-imports.c"
 }
 
 
 static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (SpitModule* base, int* result_length1) {
 	ShotwellDataImportsCoreServices * self;
 	SpitPluggable** result = NULL;
-	SpitPluggable** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	SpitPluggable** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	SpitPluggable** _tmp0_;
+	gint _tmp0__length1;
+	SpitPluggable** _tmp1_;
+	gint _tmp1__length1;
 #line 33 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
@@ -199,13 +196,13 @@ static SpitPluggable** shotwell_data_imports_core_services_real_get_pluggables (
 	if (result_length1) {
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 		*result_length1 = _tmp1__length1;
-#line 203 "shotwell-data-imports.c"
+#line 200 "shotwell-data-imports.c"
 	}
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	result = _tmp1_;
 #line 34 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	return result;
-#line 209 "shotwell-data-imports.c"
+#line 206 "shotwell-data-imports.c"
 }
 
 
@@ -216,7 +213,7 @@ static void shotwell_data_imports_core_services_class_init (ShotwellDataImportsC
 	g_type_class_add_private (klass, sizeof (ShotwellDataImportsCoreServicesPrivate));
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	G_OBJECT_CLASS (klass)->finalize = shotwell_data_imports_core_services_finalize;
-#line 220 "shotwell-data-imports.c"
+#line 217 "shotwell-data-imports.c"
 }
 
 
@@ -224,19 +221,19 @@ static void shotwell_data_imports_core_services_spit_module_interface_init (Spit
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	shotwell_data_imports_core_services_spit_module_parent_iface = g_type_interface_peek_parent (iface);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_module_name = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_module_name;
+	iface->get_module_name = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_module_name;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_version = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_version;
+	iface->get_version = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_version;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_id = (const gchar* (*)(SpitModule*)) shotwell_data_imports_core_services_real_get_id;
+	iface->get_id = (const gchar* (*) (SpitModule *)) shotwell_data_imports_core_services_real_get_id;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
-	iface->get_pluggables = (SpitPluggable** (*)(SpitModule*, int*)) shotwell_data_imports_core_services_real_get_pluggables;
-#line 235 "shotwell-data-imports.c"
+	iface->get_pluggables = (SpitPluggable** (*) (SpitModule *, int*)) shotwell_data_imports_core_services_real_get_pluggables;
+#line 232 "shotwell-data-imports.c"
 }
 
 
 static void shotwell_data_imports_core_services_instance_init (ShotwellDataImportsCoreServices * self) {
-	SpitPluggable** _tmp0_ = NULL;
+	SpitPluggable** _tmp0_;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	self->priv = SHOTWELL_DATA_IMPORTS_CORE_SERVICES_GET_PRIVATE (self);
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
@@ -247,11 +244,11 @@ static void shotwell_data_imports_core_services_instance_init (ShotwellDataImpor
 	self->priv->pluggables_length1 = 0;
 #line 11 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	self->priv->_pluggables_size_ = self->priv->pluggables_length1;
-#line 251 "shotwell-data-imports.c"
+#line 248 "shotwell-data-imports.c"
 }
 
 
-static void shotwell_data_imports_core_services_finalize (GObject* obj) {
+static void shotwell_data_imports_core_services_finalize (GObject * obj) {
 	ShotwellDataImportsCoreServices * self;
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_SHOTWELL_DATA_IMPORTS_CORE_SERVICES, ShotwellDataImportsCoreServices);
@@ -259,7 +256,7 @@ static void shotwell_data_imports_core_services_finalize (GObject* obj) {
 	self->priv->pluggables = (_vala_array_free (self->priv->pluggables, self->priv->pluggables_length1, (GDestroyNotify) g_object_unref), NULL);
 #line 10 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	G_OBJECT_CLASS (shotwell_data_imports_core_services_parent_class)->finalize (obj);
-#line 263 "shotwell-data-imports.c"
+#line 260 "shotwell-data-imports.c"
 }
 
 
@@ -279,14 +276,14 @@ GType shotwell_data_imports_core_services_get_type (void) {
 
 SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	SpitModule* result = NULL;
-	SpitEntryPointParams* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	SpitEntryPointParams* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	SpitEntryPointParams* _tmp0_;
+	gint _tmp1_;
+	SpitEntryPointParams* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	ShotwellDataImportsCoreServices* _tmp5_ = NULL;
-	SpitEntryPointParams* _tmp6_ = NULL;
-	gint _tmp7_ = 0;
+	SpitEntryPointParams* _tmp6_;
+	gint _tmp7_;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	_tmp0_ = params;
 #line 40 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
@@ -305,10 +302,10 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 	_tmp7_ = (*_tmp6_).module_spit_interface;
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	if (_tmp7_ != SPIT_UNSUPPORTED_INTERFACE) {
-#line 309 "shotwell-data-imports.c"
-		SpitEntryPointParams* _tmp8_ = NULL;
-		GFile* _tmp9_ = NULL;
-		ShotwellDataImportsCoreServices* _tmp10_ = NULL;
+#line 306 "shotwell-data-imports.c"
+		SpitEntryPointParams* _tmp8_;
+		GFile* _tmp9_;
+		ShotwellDataImportsCoreServices* _tmp10_;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 		_tmp8_ = params;
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
@@ -319,19 +316,19 @@ SpitModule* spit_entry_point (SpitEntryPointParams* params) {
 		_g_object_unref0 (_tmp5_);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 		_tmp5_ = _tmp10_;
-#line 323 "shotwell-data-imports.c"
+#line 320 "shotwell-data-imports.c"
 	} else {
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 		_g_object_unref0 (_tmp5_);
 #line 44 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 		_tmp5_ = NULL;
-#line 329 "shotwell-data-imports.c"
+#line 326 "shotwell-data-imports.c"
 	}
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, SPIT_TYPE_MODULE, SpitModule);
 #line 43 "/home/jens/Source/shotwell/plugins/shotwell-data-imports/shotwell-data-imports.vala"
 	return result;
-#line 335 "shotwell-data-imports.c"
+#line 332 "shotwell-data-imports.c"
 }