Merge branch 'feature/upstream' into develop

1 files changed, 385 insertions, 385 deletions

diff --git a/src/core/Alteration.c b/src/core/Alteration.c
index b1e62b6..173f45f 100644
--- a/src/core/Alteration.c
+++ b/src/core/Alteration.c
@@ -1,4 +1,4 @@
-/* Alteration.c generated by valac 0.34.7, the Vala compiler
+/* Alteration.c generated by valac 0.36.6, the Vala compiler
  * generated from Alteration.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -111,7 +111,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other);
 gboolean alteration_equals (Alteration* self, Alteration* other);
 static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src);
 Alteration* alteration_compress (Alteration* self, Alteration* other);
-static void alteration_finalize (Alteration* obj);
+static void alteration_finalize (Alteration * 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);
@@ -119,8 +119,8 @@ static gint _vala_array_length (gpointer array);
 
 Alteration* alteration_construct (GType object_type, const gchar* subject, const gchar* detail) {
 	Alteration* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
 #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (subject != NULL, NULL);
 #line 32 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -148,19 +148,19 @@ Alteration* alteration_new (const gchar* subject, const gchar* detail) {
 
 Alteration* alteration_construct_from_list (GType object_type, const gchar* list) {
 	Alteration* self = NULL;
-	const gchar* _tmp0_ = NULL;
-	gint _tmp1_ = 0;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
 	gchar** pairs = NULL;
-	const gchar* _tmp3_ = NULL;
-	gchar** _tmp4_ = NULL;
-	gchar** _tmp5_ = NULL;
-	gint pairs_length1 = 0;
-	gint _pairs_size_ = 0;
-	gchar** _tmp6_ = NULL;
-	gint _tmp6__length1 = 0;
-	gchar** _tmp7_ = NULL;
-	gint _tmp7__length1 = 0;
+	const gchar* _tmp3_;
+	gchar** _tmp4_;
+	gchar** _tmp5_;
+	gint pairs_length1;
+	gint _pairs_size_;
+	gchar** _tmp6_;
+	gint _tmp6__length1;
+	gchar** _tmp7_;
+	gint _tmp7__length1;
 #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (list != NULL, NULL);
 #line 38 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -206,7 +206,7 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list
 #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		for (pair_it = 0; pair_it < _tmp7__length1; pair_it = pair_it + 1) {
 #line 209 "Alteration.c"
-			gchar* _tmp8_ = NULL;
+			gchar* _tmp8_;
 			gchar* pair = NULL;
 #line 42 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp8_ = g_strdup (pair_collection[pair_it]);
@@ -215,19 +215,19 @@ Alteration* alteration_construct_from_list (GType object_type, const gchar* list
 #line 216 "Alteration.c"
 			{
 				gchar** subject_detail = NULL;
-				const gchar* _tmp9_ = NULL;
-				gchar** _tmp10_ = NULL;
-				gchar** _tmp11_ = NULL;
-				gint subject_detail_length1 = 0;
-				gint _subject_detail_size_ = 0;
-				gchar** _tmp12_ = NULL;
-				gint _tmp12__length1 = 0;
-				gchar** _tmp13_ = NULL;
-				gint _tmp13__length1 = 0;
-				const gchar* _tmp14_ = NULL;
-				gchar** _tmp15_ = NULL;
-				gint _tmp15__length1 = 0;
-				const gchar* _tmp16_ = NULL;
+				const gchar* _tmp9_;
+				gchar** _tmp10_;
+				gchar** _tmp11_;
+				gint subject_detail_length1;
+				gint _subject_detail_size_;
+				gchar** _tmp12_;
+				gint _tmp12__length1;
+				gchar** _tmp13_;
+				gint _tmp13__length1;
+				const gchar* _tmp14_;
+				gchar** _tmp15_;
+				gint _tmp15__length1;
+				const gchar* _tmp16_;
 #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp9_ = pair;
 #line 43 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -283,10 +283,10 @@ Alteration* alteration_new_from_list (const gchar* list) {
 
 Alteration* alteration_construct_from_array (GType object_type, gchar** array, int array_length1) {
 	Alteration* self = NULL;
-	gchar** _tmp0_ = NULL;
-	gint _tmp0__length1 = 0;
-	gchar** _tmp1_ = NULL;
-	gint _tmp1__length1 = 0;
+	gchar** _tmp0_;
+	gint _tmp0__length1;
+	gchar** _tmp1_;
+	gint _tmp1__length1;
 #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	self = (Alteration*) g_type_create_instance (object_type);
 #line 52 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -312,7 +312,7 @@ Alteration* alteration_construct_from_array (GType object_type, gchar** array, i
 #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		for (pair_it = 0; pair_it < _tmp1__length1; pair_it = pair_it + 1) {
 #line 315 "Alteration.c"
-			gchar* _tmp2_ = NULL;
+			gchar* _tmp2_;
 			gchar* pair = NULL;
 #line 53 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp2_ = g_strdup (pair_collection[pair_it]);
@@ -321,19 +321,19 @@ Alteration* alteration_construct_from_array (GType object_type, gchar** array, i
 #line 322 "Alteration.c"
 			{
 				gchar** subject_detail = NULL;
-				const gchar* _tmp3_ = NULL;
-				gchar** _tmp4_ = NULL;
-				gchar** _tmp5_ = NULL;
-				gint subject_detail_length1 = 0;
-				gint _subject_detail_size_ = 0;
-				gchar** _tmp6_ = NULL;
-				gint _tmp6__length1 = 0;
-				gchar** _tmp7_ = NULL;
-				gint _tmp7__length1 = 0;
-				const gchar* _tmp8_ = NULL;
-				gchar** _tmp9_ = NULL;
-				gint _tmp9__length1 = 0;
-				const gchar* _tmp10_ = NULL;
+				const gchar* _tmp3_;
+				gchar** _tmp4_;
+				gchar** _tmp5_;
+				gint subject_detail_length1;
+				gint _subject_detail_size_;
+				gchar** _tmp6_;
+				gint _tmp6__length1;
+				gchar** _tmp7_;
+				gint _tmp7__length1;
+				const gchar* _tmp8_;
+				gchar** _tmp9_;
+				gint _tmp9__length1;
+				const gchar* _tmp10_;
 #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp3_ = pair;
 #line 54 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -394,8 +394,8 @@ static gpointer _g_object_ref0 (gpointer self) {
 
 static Alteration* alteration_construct_from_map (GType object_type, GeeMultiMap* map) {
 	Alteration* self = NULL;
-	GeeMultiMap* _tmp0_ = NULL;
-	GeeMultiMap* _tmp1_ = NULL;
+	GeeMultiMap* _tmp0_;
+	GeeMultiMap* _tmp1_;
 #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (GEE_IS_MULTI_MAP (map), NULL);
 #line 62 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -424,21 +424,21 @@ static Alteration* alteration_new_from_map (GeeMultiMap* map) {
 static gchar* string_strip (const gchar* self) {
 	gchar* result = NULL;
 	gchar* _result_ = NULL;
-	gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-#line 1207 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+	gchar* _tmp0_;
+	const gchar* _tmp1_;
+#line 1234 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, NULL);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp0_ = g_strdup (self);
-#line 1208 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1235 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_result_ = _tmp0_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	_tmp1_ = _result_;
-#line 1209 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1236 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	g_strstrip (_tmp1_);
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	result = _result_;
-#line 1210 "/usr/share/vala-0.34/vapi/glib-2.0.vapi"
+#line 1237 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
 	return result;
 #line 444 "Alteration.c"
 }
@@ -446,24 +446,24 @@ static gchar* string_strip (const gchar* self) {
 
 static void alteration_add_detail (Alteration* self, const gchar* sub, const gchar* det) {
 	gchar* subject = NULL;
-	const gchar* _tmp0_ = NULL;
-	gchar* _tmp1_ = NULL;
-	const gchar* _tmp2_ = NULL;
-	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
+	const gchar* _tmp0_;
+	gchar* _tmp1_;
+	const gchar* _tmp2_;
+	gint _tmp3_;
+	gint _tmp4_;
 	gchar* detail = NULL;
-	const gchar* _tmp5_ = NULL;
-	gchar* _tmp6_ = NULL;
-	const gchar* _tmp7_ = NULL;
-	gint _tmp8_ = 0;
-	gint _tmp9_ = 0;
+	const gchar* _tmp5_;
+	gchar* _tmp6_;
+	const gchar* _tmp7_;
+	gint _tmp8_;
+	gint _tmp9_;
 	gboolean _tmp10_ = FALSE;
-	const gchar* _tmp11_ = NULL;
-	GeeMultiMap* _tmp18_ = NULL;
-	const gchar* _tmp20_ = NULL;
-	GeeMultiMap* _tmp25_ = NULL;
-	const gchar* _tmp26_ = NULL;
-	const gchar* _tmp27_ = NULL;
+	const gchar* _tmp11_;
+	GeeMultiMap* _tmp18_;
+	const gchar* _tmp20_;
+	GeeMultiMap* _tmp25_;
+	const gchar* _tmp26_;
+	const gchar* _tmp27_;
 #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (IS_ALTERATION (self));
 #line 66 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -503,7 +503,7 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp11_ == NULL) {
 #line 506 "Alteration.c"
-		GeeMultiMap* _tmp12_ = NULL;
+		GeeMultiMap* _tmp12_;
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp12_ = self->priv->map;
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -517,11 +517,11 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 75 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp10_) {
 #line 520 "Alteration.c"
-		const gchar* _tmp13_ = NULL;
-		const gchar* _tmp14_ = NULL;
-		gchar* _tmp15_ = NULL;
-		const gchar* _tmp16_ = NULL;
-		gchar* _tmp17_ = NULL;
+		const gchar* _tmp13_;
+		const gchar* _tmp14_;
+		gchar* _tmp15_;
+		const gchar* _tmp16_;
+		gchar* _tmp17_;
 #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp13_ = self->priv->detail;
 #line 76 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -555,7 +555,7 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 85 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp18_ == NULL) {
 #line 558 "Alteration.c"
-		GeeMultiMap* _tmp19_ = NULL;
+		GeeMultiMap* _tmp19_;
 #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp19_ = alteration_create_map (self);
 #line 86 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -569,10 +569,10 @@ static void alteration_add_detail (Alteration* self, const gchar* sub, const gch
 #line 89 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp20_ != NULL) {
 #line 572 "Alteration.c"
-		const gchar* _tmp21_ = NULL;
-		GeeMultiMap* _tmp22_ = NULL;
-		const gchar* _tmp23_ = NULL;
-		const gchar* _tmp24_ = NULL;
+		const gchar* _tmp21_;
+		GeeMultiMap* _tmp22_;
+		const gchar* _tmp23_;
+		const gchar* _tmp24_;
 #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp21_ = self->priv->detail;
 #line 90 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -631,7 +631,7 @@ static gboolean _alteration_case_equal_gee_equal_data_func (gconstpointer a, gco
 
 static GeeMultiMap* alteration_create_map (Alteration* self) {
 	GeeMultiMap* result = NULL;
-	GeeHashMultiMap* _tmp0_ = NULL;
+	GeeHashMultiMap* _tmp0_;
 #line 101 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 102 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -646,9 +646,9 @@ static GeeMultiMap* alteration_create_map (Alteration* self) {
 
 static gboolean alteration_case_equal (const gchar* a, const gchar* b) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gboolean _tmp2_ = FALSE;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gboolean _tmp2_;
 #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	_tmp0_ = a;
 #line 106 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -665,8 +665,8 @@ static gboolean alteration_case_equal (const gchar* a, const gchar* b) {
 
 static guint alteration_case_hash (const gchar* a) {
 	guint result = 0U;
-	const gchar* _tmp0_ = NULL;
-	guint _tmp1_ = 0U;
+	const gchar* _tmp0_;
+	guint _tmp1_;
 #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	_tmp0_ = a;
 #line 110 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -681,9 +681,9 @@ static guint alteration_case_hash (const gchar* a) {
 
 static inline gboolean alteration_equal_values (const gchar* str1, const gchar* str2) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	gint _tmp2_ = 0;
+	const gchar* _tmp0_;
+	const gchar* _tmp1_;
+	gint _tmp2_;
 #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (str1 != NULL, FALSE);
 #line 113 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -704,9 +704,9 @@ static inline gboolean alteration_equal_values (const gchar* str1, const gchar*
 
 static inline guint alteration_hash_value (const gchar* str) {
 	guint result = 0U;
-	GHashFunc _tmp0_ = NULL;
-	const gchar* _tmp1_ = NULL;
-	guint _tmp2_ = 0U;
+	GHashFunc _tmp0_;
+	const gchar* _tmp1_;
+	guint _tmp2_;
 #line 117 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (str != NULL, 0U);
 #line 118 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -725,12 +725,12 @@ static inline guint alteration_hash_value (const gchar* str) {
 
 gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 	gboolean result = FALSE;
-	const gchar* _tmp0_ = NULL;
-	GeeMultiMap* _tmp4_ = NULL;
+	const gchar* _tmp0_;
+	GeeMultiMap* _tmp4_;
 	GeeSet* keys = NULL;
-	GeeMultiMap* _tmp5_ = NULL;
-	GeeSet* _tmp6_ = NULL;
-	GeeSet* _tmp7_ = NULL;
+	GeeMultiMap* _tmp5_;
+	GeeSet* _tmp6_;
+	GeeSet* _tmp7_;
 #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 121 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -740,9 +740,9 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 #line 122 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp0_ != NULL) {
 #line 743 "Alteration.c"
-		const gchar* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		gboolean _tmp3_ = FALSE;
+		const gchar* _tmp1_;
+		const gchar* _tmp2_;
+		gboolean _tmp3_;
 #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp1_ = self->priv->subject;
 #line 123 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -772,8 +772,8 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 #line 773 "Alteration.c"
 		{
 			GeeIterator* _key_it = NULL;
-			GeeSet* _tmp8_ = NULL;
-			GeeIterator* _tmp9_ = NULL;
+			GeeSet* _tmp8_;
+			GeeIterator* _tmp9_;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp8_ = keys;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -783,14 +783,14 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 786 "Alteration.c"
-				GeeIterator* _tmp10_ = NULL;
-				gboolean _tmp11_ = FALSE;
+				GeeIterator* _tmp10_;
+				gboolean _tmp11_;
 				gchar* key = NULL;
-				GeeIterator* _tmp12_ = NULL;
-				gpointer _tmp13_ = NULL;
-				const gchar* _tmp14_ = NULL;
-				const gchar* _tmp15_ = NULL;
-				gboolean _tmp16_ = FALSE;
+				GeeIterator* _tmp12_;
+				gpointer _tmp13_;
+				const gchar* _tmp14_;
+				const gchar* _tmp15_;
+				gboolean _tmp16_;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp10_ = _key_it;
 #line 128 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -849,13 +849,13 @@ gboolean alteration_has_subject (Alteration* self, const gchar* subject) {
 gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gchar* detail) {
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	const gchar* _tmp1_ = NULL;
-	GeeMultiMap* _tmp10_ = NULL;
+	const gchar* _tmp1_;
+	GeeMultiMap* _tmp10_;
 	GeeCollection* values = NULL;
-	GeeMultiMap* _tmp11_ = NULL;
-	const gchar* _tmp12_ = NULL;
-	GeeCollection* _tmp13_ = NULL;
-	GeeCollection* _tmp14_ = NULL;
+	GeeMultiMap* _tmp11_;
+	const gchar* _tmp12_;
+	GeeCollection* _tmp13_;
+	GeeCollection* _tmp14_;
 #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 137 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -867,7 +867,7 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp1_ != NULL) {
 #line 870 "Alteration.c"
-		const gchar* _tmp2_ = NULL;
+		const gchar* _tmp2_;
 #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp2_ = self->priv->detail;
 #line 138 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -882,9 +882,9 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 	if (_tmp0_) {
 #line 884 "Alteration.c"
 		gboolean _tmp3_ = FALSE;
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp4_ = self->priv->subject;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -894,9 +894,9 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp6_) {
 #line 897 "Alteration.c"
-			const gchar* _tmp7_ = NULL;
-			const gchar* _tmp8_ = NULL;
-			gboolean _tmp9_ = FALSE;
+			const gchar* _tmp7_;
+			const gchar* _tmp8_;
+			gboolean _tmp9_;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp7_ = self->priv->detail;
 #line 139 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -936,8 +936,8 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 937 "Alteration.c"
 		{
 			GeeIterator* _value_it = NULL;
-			GeeCollection* _tmp15_ = NULL;
-			GeeIterator* _tmp16_ = NULL;
+			GeeCollection* _tmp15_;
+			GeeIterator* _tmp16_;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp15_ = values;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -947,14 +947,14 @@ gboolean alteration_has_detail (Alteration* self, const gchar* subject, const gc
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 950 "Alteration.c"
-				GeeIterator* _tmp17_ = NULL;
-				gboolean _tmp18_ = FALSE;
+				GeeIterator* _tmp17_;
+				gboolean _tmp18_;
 				gchar* value = NULL;
-				GeeIterator* _tmp19_ = NULL;
-				gpointer _tmp20_ = NULL;
-				const gchar* _tmp21_ = NULL;
-				const gchar* _tmp22_ = NULL;
-				gboolean _tmp23_ = FALSE;
+				GeeIterator* _tmp19_;
+				gpointer _tmp20_;
+				const gchar* _tmp21_;
+				const gchar* _tmp22_;
+				gboolean _tmp23_;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp17_ = _value_it;
 #line 144 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1014,9 +1014,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 	GeeCollection* result = NULL;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	const gchar* _tmp2_ = NULL;
+	const gchar* _tmp2_;
 	GeeCollection* _tmp10_ = NULL;
-	GeeMultiMap* _tmp11_ = NULL;
+	GeeMultiMap* _tmp11_;
 #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 153 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1026,7 +1026,7 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp2_ != NULL) {
 #line 1029 "Alteration.c"
-		const gchar* _tmp3_ = NULL;
+		const gchar* _tmp3_;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp3_ = self->priv->detail;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1040,9 +1040,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp1_) {
 #line 1043 "Alteration.c"
-		const gchar* _tmp4_ = NULL;
-		const gchar* _tmp5_ = NULL;
-		gboolean _tmp6_ = FALSE;
+		const gchar* _tmp4_;
+		const gchar* _tmp5_;
+		gboolean _tmp6_;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp4_ = self->priv->subject;
 #line 154 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1061,9 +1061,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 	if (_tmp0_) {
 #line 1063 "Alteration.c"
 		GeeArrayList* details = NULL;
-		GeeArrayList* _tmp7_ = NULL;
-		GeeArrayList* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		GeeArrayList* _tmp7_;
+		GeeArrayList* _tmp8_;
+		const gchar* _tmp9_;
 #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = gee_array_list_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, NULL, NULL, NULL);
 #line 155 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1085,9 +1085,9 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp11_ != NULL) {
 #line 1088 "Alteration.c"
-		GeeMultiMap* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		GeeCollection* _tmp14_ = NULL;
+		GeeMultiMap* _tmp12_;
+		const gchar* _tmp13_;
+		GeeCollection* _tmp14_;
 #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp12_ = self->priv->map;
 #line 161 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1116,10 +1116,10 @@ GeeCollection* alteration_get_details (Alteration* self, const gchar* subject) {
 
 gchar* alteration_to_string (Alteration* self) {
 	gchar* result = NULL;
-	const gchar* _tmp0_ = NULL;
-	GeeMultiMap* _tmp5_ = NULL;
+	const gchar* _tmp0_;
+	GeeMultiMap* _tmp5_;
 	gchar* str = NULL;
-	gchar* _tmp6_ = NULL;
+	gchar* _tmp6_;
 #line 164 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1127,10 +1127,10 @@ gchar* alteration_to_string (Alteration* self) {
 #line 165 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp0_ != NULL) {
 #line 1130 "Alteration.c"
-		const gchar* _tmp1_ = NULL;
-		const gchar* _tmp2_ = NULL;
-		const gchar* _tmp3_ = NULL;
-		gchar* _tmp4_ = NULL;
+		const gchar* _tmp1_;
+		const gchar* _tmp2_;
+		const gchar* _tmp3_;
+		gchar* _tmp4_;
 #line 166 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp1_ = self->priv->detail;
 #line 166 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1158,11 +1158,11 @@ gchar* alteration_to_string (Alteration* self) {
 #line 1159 "Alteration.c"
 	{
 		GeeIterator* _key_it = NULL;
-		GeeMultiMap* _tmp7_ = NULL;
-		GeeSet* _tmp8_ = NULL;
-		GeeSet* _tmp9_ = NULL;
-		GeeIterator* _tmp10_ = NULL;
-		GeeIterator* _tmp11_ = NULL;
+		GeeMultiMap* _tmp7_;
+		GeeSet* _tmp8_;
+		GeeSet* _tmp9_;
+		GeeIterator* _tmp10_;
+		GeeIterator* _tmp11_;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = self->priv->map;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1180,11 +1180,11 @@ gchar* alteration_to_string (Alteration* self) {
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		while (TRUE) {
 #line 1183 "Alteration.c"
-			GeeIterator* _tmp12_ = NULL;
-			gboolean _tmp13_ = FALSE;
+			GeeIterator* _tmp12_;
+			gboolean _tmp13_;
 			gchar* key = NULL;
-			GeeIterator* _tmp14_ = NULL;
-			gpointer _tmp15_ = NULL;
+			GeeIterator* _tmp14_;
+			gpointer _tmp15_;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp12_ = _key_it;
 #line 174 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1204,12 +1204,12 @@ gchar* alteration_to_string (Alteration* self) {
 #line 1205 "Alteration.c"
 			{
 				GeeIterator* _value_it = NULL;
-				GeeMultiMap* _tmp16_ = NULL;
-				const gchar* _tmp17_ = NULL;
-				GeeCollection* _tmp18_ = NULL;
-				GeeCollection* _tmp19_ = NULL;
-				GeeIterator* _tmp20_ = NULL;
-				GeeIterator* _tmp21_ = NULL;
+				GeeMultiMap* _tmp16_;
+				const gchar* _tmp17_;
+				GeeCollection* _tmp18_;
+				GeeCollection* _tmp19_;
+				GeeIterator* _tmp20_;
+				GeeIterator* _tmp21_;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp16_ = self->priv->map;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1229,20 +1229,20 @@ gchar* alteration_to_string (Alteration* self) {
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				while (TRUE) {
 #line 1232 "Alteration.c"
-					GeeIterator* _tmp22_ = NULL;
-					gboolean _tmp23_ = FALSE;
+					GeeIterator* _tmp22_;
+					gboolean _tmp23_;
 					gchar* value = NULL;
-					GeeIterator* _tmp24_ = NULL;
-					gpointer _tmp25_ = NULL;
-					const gchar* _tmp26_ = NULL;
-					gint _tmp27_ = 0;
-					gint _tmp28_ = 0;
-					const gchar* _tmp31_ = NULL;
-					const gchar* _tmp32_ = NULL;
-					const gchar* _tmp33_ = NULL;
-					gchar* _tmp34_ = NULL;
-					gchar* _tmp35_ = NULL;
-					gchar* _tmp36_ = NULL;
+					GeeIterator* _tmp24_;
+					gpointer _tmp25_;
+					const gchar* _tmp26_;
+					gint _tmp27_;
+					gint _tmp28_;
+					const gchar* _tmp31_;
+					const gchar* _tmp32_;
+					const gchar* _tmp33_;
+					gchar* _tmp34_;
+					gchar* _tmp35_;
+					gchar* _tmp36_;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					_tmp22_ = _value_it;
 #line 175 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1268,8 +1268,8 @@ gchar* alteration_to_string (Alteration* self) {
 #line 176 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					if (_tmp28_ != 0) {
 #line 1271 "Alteration.c"
-						const gchar* _tmp29_ = NULL;
-						gchar* _tmp30_ = NULL;
+						const gchar* _tmp29_;
+						gchar* _tmp30_;
 #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 						_tmp29_ = str;
 #line 177 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1324,16 +1324,16 @@ gchar* alteration_to_string (Alteration* self) {
 
 gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 	gboolean _tmp19_ = FALSE;
 	gboolean _tmp20_ = FALSE;
-	GeeMultiMap* _tmp21_ = NULL;
+	GeeMultiMap* _tmp21_;
 	gboolean _tmp56_ = FALSE;
-	GeeMultiMap* _tmp57_ = NULL;
+	GeeMultiMap* _tmp57_;
 #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 187 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1353,8 +1353,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp4_ != NULL) {
 #line 1356 "Alteration.c"
-		Alteration* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		Alteration* _tmp5_;
+		const gchar* _tmp6_;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp5_ = other;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1370,7 +1370,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp3_) {
 #line 1373 "Alteration.c"
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp7_;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = self->priv->detail;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1384,8 +1384,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp2_) {
 #line 1387 "Alteration.c"
-		Alteration* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		Alteration* _tmp8_;
+		const gchar* _tmp9_;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp8_ = other;
 #line 193 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1402,10 +1402,10 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	if (_tmp1_) {
 #line 1404 "Alteration.c"
 		gboolean _tmp10_ = FALSE;
-		const gchar* _tmp11_ = NULL;
-		Alteration* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
+		const gchar* _tmp11_;
+		Alteration* _tmp12_;
+		const gchar* _tmp13_;
+		gboolean _tmp14_;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp11_ = self->priv->subject;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1417,10 +1417,10 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp14_) {
 #line 1420 "Alteration.c"
-			const gchar* _tmp15_ = NULL;
-			Alteration* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			const gchar* _tmp15_;
+			Alteration* _tmp16_;
+			const gchar* _tmp17_;
+			gboolean _tmp18_;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp15_ = self->priv->detail;
 #line 194 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1448,8 +1448,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp21_ != NULL) {
 #line 1451 "Alteration.c"
-		Alteration* _tmp22_ = NULL;
-		GeeMultiMap* _tmp23_ = NULL;
+		Alteration* _tmp22_;
+		GeeMultiMap* _tmp23_;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp22_ = other;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1469,14 +1469,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 1470 "Alteration.c"
 	} else {
 		gboolean _tmp24_ = FALSE;
-		GeeMultiMap* _tmp25_ = NULL;
+		GeeMultiMap* _tmp25_;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp25_ = self->priv->map;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp25_ == NULL) {
 #line 1478 "Alteration.c"
-			Alteration* _tmp26_ = NULL;
-			GeeMultiMap* _tmp27_ = NULL;
+			Alteration* _tmp26_;
+			GeeMultiMap* _tmp27_;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp26_ = other;
 #line 197 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1497,35 +1497,35 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	if (_tmp19_) {
 #line 1499 "Alteration.c"
 		const gchar* _tmp28_ = NULL;
-		const gchar* _tmp29_ = NULL;
+		const gchar* _tmp29_;
 		gchar* single_subject = NULL;
-		gchar* _tmp33_ = NULL;
+		gchar* _tmp33_;
 		const gchar* _tmp34_ = NULL;
-		const gchar* _tmp35_ = NULL;
+		const gchar* _tmp35_;
 		gchar* single_detail = NULL;
-		gchar* _tmp39_ = NULL;
+		gchar* _tmp39_;
 		GeeMultiMap* _tmp40_ = NULL;
-		GeeMultiMap* _tmp41_ = NULL;
+		GeeMultiMap* _tmp41_;
 		GeeMultiMap* multimap = NULL;
-		GeeMultiMap* _tmp45_ = NULL;
+		GeeMultiMap* _tmp45_;
 		gboolean _tmp46_ = FALSE;
-		GeeMultiMap* _tmp47_ = NULL;
-		const gchar* _tmp48_ = NULL;
-		gboolean _tmp49_ = FALSE;
+		GeeMultiMap* _tmp47_;
+		const gchar* _tmp48_;
+		gboolean _tmp49_;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp29_ = self->priv->subject;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp29_ != NULL) {
 #line 1520 "Alteration.c"
-			const gchar* _tmp30_ = NULL;
+			const gchar* _tmp30_;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp30_ = self->priv->subject;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp28_ = _tmp30_;
 #line 1526 "Alteration.c"
 		} else {
-			Alteration* _tmp31_ = NULL;
-			const gchar* _tmp32_ = NULL;
+			Alteration* _tmp31_;
+			const gchar* _tmp32_;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp31_ = other;
 #line 198 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1543,15 +1543,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp35_ != NULL) {
 #line 1546 "Alteration.c"
-			const gchar* _tmp36_ = NULL;
+			const gchar* _tmp36_;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp36_ = self->priv->detail;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp34_ = _tmp36_;
 #line 1552 "Alteration.c"
 		} else {
-			Alteration* _tmp37_ = NULL;
-			const gchar* _tmp38_ = NULL;
+			Alteration* _tmp37_;
+			const gchar* _tmp38_;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp37_ = other;
 #line 199 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1569,15 +1569,15 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp41_ != NULL) {
 #line 1572 "Alteration.c"
-			GeeMultiMap* _tmp42_ = NULL;
+			GeeMultiMap* _tmp42_;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp42_ = self->priv->map;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp40_ = _tmp42_;
 #line 1578 "Alteration.c"
 		} else {
-			Alteration* _tmp43_ = NULL;
-			GeeMultiMap* _tmp44_ = NULL;
+			Alteration* _tmp43_;
+			GeeMultiMap* _tmp44_;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp43_ = other;
 #line 200 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1599,12 +1599,12 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp49_) {
 #line 1602 "Alteration.c"
-			GeeMultiMap* _tmp50_ = NULL;
-			const gchar* _tmp51_ = NULL;
-			GeeCollection* _tmp52_ = NULL;
-			GeeCollection* _tmp53_ = NULL;
-			const gchar* _tmp54_ = NULL;
-			gboolean _tmp55_ = FALSE;
+			GeeMultiMap* _tmp50_;
+			const gchar* _tmp51_;
+			GeeCollection* _tmp52_;
+			GeeCollection* _tmp53_;
+			const gchar* _tmp54_;
+			gboolean _tmp55_;
 #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp50_ = self->priv->map;
 #line 202 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1644,8 +1644,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp57_ != NULL) {
 #line 1647 "Alteration.c"
-		Alteration* _tmp58_ = NULL;
-		GeeMultiMap* _tmp59_ = NULL;
+		Alteration* _tmp58_;
+		GeeMultiMap* _tmp59_;
 #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp58_ = other;
 #line 206 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1662,14 +1662,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 	if (_tmp56_) {
 #line 1664 "Alteration.c"
 		GeeSet* keys = NULL;
-		GeeMultiMap* _tmp60_ = NULL;
-		GeeSet* _tmp61_ = NULL;
-		GeeSet* _tmp62_ = NULL;
+		GeeMultiMap* _tmp60_;
+		GeeSet* _tmp61_;
+		GeeSet* _tmp62_;
 		GeeSet* other_keys = NULL;
-		Alteration* _tmp63_ = NULL;
-		GeeMultiMap* _tmp64_ = NULL;
-		GeeSet* _tmp65_ = NULL;
-		GeeSet* _tmp66_ = NULL;
+		Alteration* _tmp63_;
+		GeeMultiMap* _tmp64_;
+		GeeSet* _tmp65_;
+		GeeSet* _tmp66_;
 #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp60_ = self->priv->map;
 #line 207 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1695,8 +1695,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 1696 "Alteration.c"
 		{
 			GeeIterator* _subject_it = NULL;
-			GeeSet* _tmp67_ = NULL;
-			GeeIterator* _tmp68_ = NULL;
+			GeeSet* _tmp67_;
+			GeeIterator* _tmp68_;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp67_ = other_keys;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1706,25 +1706,25 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 1709 "Alteration.c"
-				GeeIterator* _tmp69_ = NULL;
-				gboolean _tmp70_ = FALSE;
+				GeeIterator* _tmp69_;
+				gboolean _tmp70_;
 				gchar* subject = NULL;
-				GeeIterator* _tmp71_ = NULL;
-				gpointer _tmp72_ = NULL;
-				GeeSet* _tmp73_ = NULL;
-				const gchar* _tmp74_ = NULL;
-				gboolean _tmp75_ = FALSE;
+				GeeIterator* _tmp71_;
+				gpointer _tmp72_;
+				GeeSet* _tmp73_;
+				const gchar* _tmp74_;
+				gboolean _tmp75_;
 				GeeCollection* details = NULL;
-				GeeMultiMap* _tmp76_ = NULL;
-				const gchar* _tmp77_ = NULL;
-				GeeCollection* _tmp78_ = NULL;
+				GeeMultiMap* _tmp76_;
+				const gchar* _tmp77_;
+				GeeCollection* _tmp78_;
 				GeeCollection* other_details = NULL;
-				Alteration* _tmp79_ = NULL;
-				GeeMultiMap* _tmp80_ = NULL;
-				const gchar* _tmp81_ = NULL;
-				GeeCollection* _tmp82_ = NULL;
+				Alteration* _tmp79_;
+				GeeMultiMap* _tmp80_;
+				const gchar* _tmp81_;
+				GeeCollection* _tmp82_;
 				gboolean _tmp83_ = FALSE;
-				GeeCollection* _tmp84_ = NULL;
+				GeeCollection* _tmp84_;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp69_ = _subject_it;
 #line 212 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1778,7 +1778,7 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				if (_tmp84_ != NULL) {
 #line 1781 "Alteration.c"
-					GeeCollection* _tmp85_ = NULL;
+					GeeCollection* _tmp85_;
 #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					_tmp85_ = other_details;
 #line 219 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1794,8 +1794,8 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 1795 "Alteration.c"
 					{
 						GeeIterator* _detail_it = NULL;
-						GeeCollection* _tmp86_ = NULL;
-						GeeIterator* _tmp87_ = NULL;
+						GeeCollection* _tmp86_;
+						GeeIterator* _tmp87_;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 						_tmp86_ = other_details;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1805,14 +1805,14 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 						while (TRUE) {
 #line 1808 "Alteration.c"
-							GeeIterator* _tmp88_ = NULL;
-							gboolean _tmp89_ = FALSE;
+							GeeIterator* _tmp88_;
+							gboolean _tmp89_;
 							gchar* detail = NULL;
-							GeeIterator* _tmp90_ = NULL;
-							gpointer _tmp91_ = NULL;
-							GeeCollection* _tmp92_ = NULL;
-							const gchar* _tmp93_ = NULL;
-							gboolean _tmp94_ = FALSE;
+							GeeIterator* _tmp90_;
+							gpointer _tmp91_;
+							GeeCollection* _tmp92_;
+							const gchar* _tmp93_;
+							gboolean _tmp94_;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 							_tmp88_ = _detail_it;
 #line 220 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1896,13 +1896,13 @@ gboolean alteration_contains_any (Alteration* self, Alteration* other) {
 
 gboolean alteration_equals (Alteration* self, Alteration* other) {
 	gboolean result = FALSE;
-	Alteration* _tmp0_ = NULL;
+	Alteration* _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	gboolean _tmp3_ = FALSE;
-	const gchar* _tmp4_ = NULL;
+	const gchar* _tmp4_;
 	gboolean _tmp19_ = FALSE;
-	GeeMultiMap* _tmp20_ = NULL;
+	GeeMultiMap* _tmp20_;
 #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), FALSE);
 #line 231 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1922,8 +1922,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp4_ != NULL) {
 #line 1925 "Alteration.c"
-		Alteration* _tmp5_ = NULL;
-		const gchar* _tmp6_ = NULL;
+		Alteration* _tmp5_;
+		const gchar* _tmp6_;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp5_ = other;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1939,7 +1939,7 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp3_) {
 #line 1942 "Alteration.c"
-		const gchar* _tmp7_ = NULL;
+		const gchar* _tmp7_;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = self->priv->detail;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1953,8 +1953,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp2_) {
 #line 1956 "Alteration.c"
-		Alteration* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		Alteration* _tmp8_;
+		const gchar* _tmp9_;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp8_ = other;
 #line 237 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1971,10 +1971,10 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 	if (_tmp1_) {
 #line 1973 "Alteration.c"
 		gboolean _tmp10_ = FALSE;
-		const gchar* _tmp11_ = NULL;
-		Alteration* _tmp12_ = NULL;
-		const gchar* _tmp13_ = NULL;
-		gboolean _tmp14_ = FALSE;
+		const gchar* _tmp11_;
+		Alteration* _tmp12_;
+		const gchar* _tmp13_;
+		gboolean _tmp14_;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp11_ = self->priv->subject;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -1986,10 +1986,10 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (_tmp14_) {
 #line 1989 "Alteration.c"
-			const gchar* _tmp15_ = NULL;
-			Alteration* _tmp16_ = NULL;
-			const gchar* _tmp17_ = NULL;
-			gboolean _tmp18_ = FALSE;
+			const gchar* _tmp15_;
+			Alteration* _tmp16_;
+			const gchar* _tmp17_;
+			gboolean _tmp18_;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp15_ = self->priv->detail;
 #line 238 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2017,8 +2017,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp20_ != NULL) {
 #line 2020 "Alteration.c"
-		Alteration* _tmp21_ = NULL;
-		GeeMultiMap* _tmp22_ = NULL;
+		Alteration* _tmp21_;
+		GeeMultiMap* _tmp22_;
 #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp21_ = other;
 #line 241 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2035,26 +2035,26 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 	if (_tmp19_) {
 #line 2037 "Alteration.c"
 		GeeSet* keys = NULL;
-		GeeMultiMap* _tmp23_ = NULL;
-		GeeSet* _tmp24_ = NULL;
-		GeeSet* _tmp25_ = NULL;
+		GeeMultiMap* _tmp23_;
+		GeeSet* _tmp24_;
+		GeeSet* _tmp25_;
 		GeeSet* other_keys = NULL;
-		Alteration* _tmp26_ = NULL;
-		GeeMultiMap* _tmp27_ = NULL;
-		GeeSet* _tmp28_ = NULL;
-		GeeSet* _tmp29_ = NULL;
-		GeeSet* _tmp30_ = NULL;
-		gint _tmp31_ = 0;
-		gint _tmp32_ = 0;
-		GeeSet* _tmp33_ = NULL;
-		gint _tmp34_ = 0;
-		gint _tmp35_ = 0;
-		GeeSet* _tmp36_ = NULL;
-		GeeSet* _tmp37_ = NULL;
-		gboolean _tmp38_ = FALSE;
-		GeeSet* _tmp39_ = NULL;
-		GeeSet* _tmp40_ = NULL;
-		gboolean _tmp41_ = FALSE;
+		Alteration* _tmp26_;
+		GeeMultiMap* _tmp27_;
+		GeeSet* _tmp28_;
+		GeeSet* _tmp29_;
+		GeeSet* _tmp30_;
+		gint _tmp31_;
+		gint _tmp32_;
+		GeeSet* _tmp33_;
+		gint _tmp34_;
+		gint _tmp35_;
+		GeeSet* _tmp36_;
+		GeeSet* _tmp37_;
+		gboolean _tmp38_;
+		GeeSet* _tmp39_;
+		GeeSet* _tmp40_;
+		gboolean _tmp41_;
 #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp23_ = self->priv->map;
 #line 243 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2139,8 +2139,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 		}
 		{
 			GeeIterator* _key_it = NULL;
-			GeeSet* _tmp42_ = NULL;
-			GeeIterator* _tmp43_ = NULL;
+			GeeSet* _tmp42_;
+			GeeIterator* _tmp43_;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp42_ = keys;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2150,32 +2150,32 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			while (TRUE) {
 #line 2153 "Alteration.c"
-				GeeIterator* _tmp44_ = NULL;
-				gboolean _tmp45_ = FALSE;
+				GeeIterator* _tmp44_;
+				gboolean _tmp45_;
 				gchar* key = NULL;
-				GeeIterator* _tmp46_ = NULL;
-				gpointer _tmp47_ = NULL;
+				GeeIterator* _tmp46_;
+				gpointer _tmp47_;
 				GeeCollection* values = NULL;
-				GeeMultiMap* _tmp48_ = NULL;
-				const gchar* _tmp49_ = NULL;
-				GeeCollection* _tmp50_ = NULL;
+				GeeMultiMap* _tmp48_;
+				const gchar* _tmp49_;
+				GeeCollection* _tmp50_;
 				GeeCollection* other_values = NULL;
-				Alteration* _tmp51_ = NULL;
-				GeeMultiMap* _tmp52_ = NULL;
-				const gchar* _tmp53_ = NULL;
-				GeeCollection* _tmp54_ = NULL;
-				GeeCollection* _tmp55_ = NULL;
-				gint _tmp56_ = 0;
-				gint _tmp57_ = 0;
-				GeeCollection* _tmp58_ = NULL;
-				gint _tmp59_ = 0;
-				gint _tmp60_ = 0;
-				GeeCollection* _tmp61_ = NULL;
-				GeeCollection* _tmp62_ = NULL;
-				gboolean _tmp63_ = FALSE;
-				GeeCollection* _tmp64_ = NULL;
-				GeeCollection* _tmp65_ = NULL;
-				gboolean _tmp66_ = FALSE;
+				Alteration* _tmp51_;
+				GeeMultiMap* _tmp52_;
+				const gchar* _tmp53_;
+				GeeCollection* _tmp54_;
+				GeeCollection* _tmp55_;
+				gint _tmp56_;
+				gint _tmp57_;
+				GeeCollection* _tmp58_;
+				gint _tmp59_;
+				gint _tmp60_;
+				GeeCollection* _tmp61_;
+				GeeCollection* _tmp62_;
+				gboolean _tmp63_;
+				GeeCollection* _tmp64_;
+				GeeCollection* _tmp65_;
+				gboolean _tmp66_;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp44_ = _key_it;
 #line 257 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2326,8 +2326,8 @@ gboolean alteration_equals (Alteration* self, Alteration* other) {
 
 static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 	GeeSet* keys = NULL;
-	GeeMultiMap* _tmp0_ = NULL;
-	GeeSet* _tmp1_ = NULL;
+	GeeMultiMap* _tmp0_;
+	GeeSet* _tmp1_;
 #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (GEE_IS_MULTI_MAP (dest));
 #line 279 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2341,8 +2341,8 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 2342 "Alteration.c"
 	{
 		GeeIterator* _key_it = NULL;
-		GeeSet* _tmp2_ = NULL;
-		GeeIterator* _tmp3_ = NULL;
+		GeeSet* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp2_ = keys;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2352,15 +2352,15 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		while (TRUE) {
 #line 2355 "Alteration.c"
-			GeeIterator* _tmp4_ = NULL;
-			gboolean _tmp5_ = FALSE;
+			GeeIterator* _tmp4_;
+			gboolean _tmp5_;
 			gchar* key = NULL;
-			GeeIterator* _tmp6_ = NULL;
-			gpointer _tmp7_ = NULL;
+			GeeIterator* _tmp6_;
+			gpointer _tmp7_;
 			GeeCollection* values = NULL;
-			GeeMultiMap* _tmp8_ = NULL;
-			const gchar* _tmp9_ = NULL;
-			GeeCollection* _tmp10_ = NULL;
+			GeeMultiMap* _tmp8_;
+			const gchar* _tmp9_;
+			GeeCollection* _tmp10_;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 			_tmp4_ = _key_it;
 #line 282 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2388,8 +2388,8 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 2389 "Alteration.c"
 			{
 				GeeIterator* _value_it = NULL;
-				GeeCollection* _tmp11_ = NULL;
-				GeeIterator* _tmp12_ = NULL;
+				GeeCollection* _tmp11_;
+				GeeIterator* _tmp12_;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				_tmp11_ = values;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2399,14 +2399,14 @@ static void alteration_multimap_add_all (GeeMultiMap* dest, GeeMultiMap* src) {
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 				while (TRUE) {
 #line 2402 "Alteration.c"
-					GeeIterator* _tmp13_ = NULL;
-					gboolean _tmp14_ = FALSE;
+					GeeIterator* _tmp13_;
+					gboolean _tmp14_;
 					gchar* value = NULL;
-					GeeIterator* _tmp15_ = NULL;
-					gpointer _tmp16_ = NULL;
-					GeeMultiMap* _tmp17_ = NULL;
-					const gchar* _tmp18_ = NULL;
-					const gchar* _tmp19_ = NULL;
+					GeeIterator* _tmp15_;
+					gpointer _tmp16_;
+					GeeMultiMap* _tmp17_;
+					const gchar* _tmp18_;
+					const gchar* _tmp19_;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 					_tmp13_ = _value_it;
 #line 284 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2464,17 +2464,17 @@ static gpointer _alteration_ref0 (gpointer self) {
 
 Alteration* alteration_compress (Alteration* self, Alteration* other) {
 	Alteration* result = NULL;
-	Alteration* _tmp0_ = NULL;
-	gboolean _tmp1_ = FALSE;
+	Alteration* _tmp0_;
+	gboolean _tmp1_;
 	GeeMultiMap* compressed = NULL;
-	GeeMultiMap* _tmp3_ = NULL;
+	GeeMultiMap* _tmp3_;
 	gboolean _tmp4_ = FALSE;
-	const gchar* _tmp5_ = NULL;
+	const gchar* _tmp5_;
 	gboolean _tmp13_ = FALSE;
-	Alteration* _tmp14_ = NULL;
-	const gchar* _tmp15_ = NULL;
-	GeeMultiMap* _tmp28_ = NULL;
-	Alteration* _tmp29_ = NULL;
+	Alteration* _tmp14_;
+	const gchar* _tmp15_;
+	GeeMultiMap* _tmp28_;
+	Alteration* _tmp29_;
 #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_val_if_fail (IS_ALTERATION (self), NULL);
 #line 291 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2486,7 +2486,7 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 292 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp1_) {
 #line 2489 "Alteration.c"
-		Alteration* _tmp2_ = NULL;
+		Alteration* _tmp2_;
 #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp2_ = _alteration_ref0 (self);
 #line 293 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2504,7 +2504,7 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp5_ != NULL) {
 #line 2507 "Alteration.c"
-		const gchar* _tmp6_ = NULL;
+		const gchar* _tmp6_;
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp6_ = self->priv->detail;
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2518,9 +2518,9 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 299 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp4_) {
 #line 2521 "Alteration.c"
-		GeeMultiMap* _tmp7_ = NULL;
-		const gchar* _tmp8_ = NULL;
-		const gchar* _tmp9_ = NULL;
+		GeeMultiMap* _tmp7_;
+		const gchar* _tmp8_;
+		const gchar* _tmp9_;
 #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp7_ = compressed;
 #line 300 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2531,9 +2531,9 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 		gee_multi_map_set (_tmp7_, _tmp8_, _tmp9_);
 #line 2533 "Alteration.c"
 	} else {
-		GeeMultiMap* _tmp10_ = NULL;
-		GeeMultiMap* _tmp11_ = NULL;
-		GeeMultiMap* _tmp12_ = NULL;
+		GeeMultiMap* _tmp10_;
+		GeeMultiMap* _tmp11_;
+		GeeMultiMap* _tmp12_;
 #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp10_ = self->priv->map;
 #line 302 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2553,8 +2553,8 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp15_ != NULL) {
 #line 2556 "Alteration.c"
-		Alteration* _tmp16_ = NULL;
-		const gchar* _tmp17_ = NULL;
+		Alteration* _tmp16_;
+		const gchar* _tmp17_;
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp16_ = other;
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2570,11 +2570,11 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 #line 306 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (_tmp13_) {
 #line 2573 "Alteration.c"
-		GeeMultiMap* _tmp18_ = NULL;
-		Alteration* _tmp19_ = NULL;
-		const gchar* _tmp20_ = NULL;
-		Alteration* _tmp21_ = NULL;
-		const gchar* _tmp22_ = NULL;
+		GeeMultiMap* _tmp18_;
+		Alteration* _tmp19_;
+		const gchar* _tmp20_;
+		Alteration* _tmp21_;
+		const gchar* _tmp22_;
 #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp18_ = compressed;
 #line 307 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2589,11 +2589,11 @@ Alteration* alteration_compress (Alteration* self, Alteration* other) {
 		gee_multi_map_set (_tmp18_, _tmp20_, _tmp22_);
 #line 2591 "Alteration.c"
 	} else {
-		Alteration* _tmp23_ = NULL;
-		GeeMultiMap* _tmp24_ = NULL;
-		GeeMultiMap* _tmp25_ = NULL;
-		Alteration* _tmp26_ = NULL;
-		GeeMultiMap* _tmp27_ = NULL;
+		Alteration* _tmp23_;
+		GeeMultiMap* _tmp24_;
+		GeeMultiMap* _tmp25_;
+		Alteration* _tmp26_;
+		GeeMultiMap* _tmp27_;
 #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		_tmp23_ = other;
 #line 309 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2666,7 +2666,7 @@ static gchar* value_alteration_collect_value (GValue* value, guint n_collect_val
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (collect_values[0].v_pointer) {
 #line 2669 "Alteration.c"
-		Alteration* object;
+		Alteration * object;
 		object = collect_values[0].v_pointer;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 		if (object->parent_instance.g_class == NULL) {
@@ -2693,7 +2693,7 @@ static gchar* value_alteration_collect_value (GValue* value, guint n_collect_val
 
 
 static gchar* value_alteration_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
-	Alteration** object_p;
+	Alteration ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (!object_p) {
@@ -2745,7 +2745,7 @@ gpointer value_get_alteration (const GValue* value) {
 
 
 void value_set_alteration (GValue* value, gpointer v_object) {
-	Alteration* old;
+	Alteration * old;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION));
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2776,7 +2776,7 @@ void value_set_alteration (GValue* value, gpointer v_object) {
 
 
 void value_take_alteration (GValue* value, gpointer v_object) {
-	Alteration* old;
+	Alteration * old;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, TYPE_ALTERATION));
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
@@ -2830,7 +2830,7 @@ static void alteration_instance_init (Alteration * self) {
 }
 
 
-static void alteration_finalize (Alteration* obj) {
+static void alteration_finalize (Alteration * obj) {
 	Alteration * self;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ALTERATION, Alteration);
@@ -2861,7 +2861,7 @@ GType alteration_get_type (void) {
 
 
 gpointer alteration_ref (gpointer instance) {
-	Alteration* self;
+	Alteration * self;
 	self = instance;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	g_atomic_int_inc (&self->ref_count);
@@ -2872,7 +2872,7 @@ gpointer alteration_ref (gpointer instance) {
 
 
 void alteration_unref (gpointer instance) {
-	Alteration* self;
+	Alteration * self;
 	self = instance;
 #line 27 "/home/jens/Source/shotwell/src/core/Alteration.vala"
 	if (g_atomic_int_dec_and_test (&self->ref_count)) {