Merge branch 'feature/upstream' into develop

1 files changed, 1069 insertions, 1152 deletions

diff --git a/src/sidebar/Branch.c b/src/sidebar/Branch.c
index a49cdac..e855a99 100644
--- a/src/sidebar/Branch.c
+++ b/src/sidebar/Branch.c
@@ -1,4 +1,4 @@
-/* Branch.c generated by valac 0.36.6, the Vala compiler
+/* Branch.c generated by valac 0.40.4, the Vala compiler
  * generated from Branch.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <stdlib.h>
@@ -56,6 +57,11 @@ typedef struct _SidebarEntryIface SidebarEntryIface;
 
 typedef struct _SidebarTree SidebarTree;
 typedef struct _SidebarTreeClass SidebarTreeClass;
+enum  {
+	SIDEBAR_BRANCH_0_PROPERTY,
+	SIDEBAR_BRANCH_NUM_PROPERTIES
+};
+static GParamSpec* sidebar_branch_properties[SIDEBAR_BRANCH_NUM_PROPERTIES];
 #define _sidebar_branch_node_unref0(var) ((var == NULL) ? NULL : (var = (sidebar_branch_node_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 typedef struct _SidebarBranchNodePrivate SidebarBranchNodePrivate;
@@ -67,9 +73,9 @@ enum  {
 	SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL,
 	SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL,
 	SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL,
-	SIDEBAR_BRANCH_LAST_SIGNAL
+	SIDEBAR_BRANCH_NUM_SIGNALS
 };
-static guint sidebar_branch_signals[SIDEBAR_BRANCH_LAST_SIGNAL] = {0};
+static guint sidebar_branch_signals[SIDEBAR_BRANCH_NUM_SIGNALS] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -139,110 +145,180 @@ static gpointer sidebar_branch_node_parent_class = NULL;
 GType sidebar_branch_get_type (void) G_GNUC_CONST;
 static gpointer sidebar_branch_node_ref (gpointer instance);
 static void sidebar_branch_node_unref (gpointer instance);
-static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* sidebar_branch_param_spec_node (const gchar* name,
+                                            const gchar* nick,
+                                            const gchar* blurb,
+                                            GType object_type,
+                                            GParamFlags flags) G_GNUC_UNUSED;
+static void sidebar_branch_value_set_node (GValue* value,
+                                    gpointer v_object) G_GNUC_UNUSED;
+static void sidebar_branch_value_take_node (GValue* value,
+                                     gpointer v_object) G_GNUC_UNUSED;
 static gpointer sidebar_branch_value_get_node (const GValue* value) G_GNUC_UNUSED;
 static GType sidebar_branch_node_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType sidebar_branch_options_get_type (void) G_GNUC_CONST;
 GType sidebar_tree_get_type (void) G_GNUC_CONST;
 GType sidebar_entry_get_type (void) G_GNUC_CONST;
 #define SIDEBAR_BRANCH_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), SIDEBAR_TYPE_BRANCH, SidebarBranchPrivate))
-enum  {
-	SIDEBAR_BRANCH_DUMMY_PROPERTY
-};
 gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self);
 gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self);
 gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self);
 gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self);
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator);
-static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator);
-static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator);
-void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown);
+SidebarBranch* sidebar_branch_new (SidebarEntry* root,
+                                   SidebarBranchOptions options,
+                                   GCompareFunc default_comparator,
+                                   GCompareFunc root_comparator);
+SidebarBranch* sidebar_branch_construct (GType object_type,
+                                         SidebarEntry* root,
+                                         SidebarBranchOptions options,
+                                         GCompareFunc default_comparator,
+                                         GCompareFunc root_comparator);
+static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry,
+                                            SidebarBranchNode* parent,
+                                            GCompareFunc comparator);
+static SidebarBranchNode* sidebar_branch_node_construct (GType object_type,
+                                                  SidebarEntry* entry,
+                                                  SidebarBranchNode* parent,
+                                                  GCompareFunc comparator);
+void sidebar_branch_set_show_branch (SidebarBranch* self,
+                                     gboolean shown);
 SidebarEntry* sidebar_branch_get_root (SidebarBranch* self);
 gboolean sidebar_branch_get_show_branch (SidebarBranch* self);
 gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self);
 gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self);
 gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self);
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator);
-static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child);
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry);
-static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target);
-static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node);
-static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self);
-static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child);
+void sidebar_branch_graft (SidebarBranch* self,
+                           SidebarEntry* parent,
+                           SidebarEntry* entry,
+                           GCompareFunc comparator);
+static void sidebar_branch_node_add_child (SidebarBranchNode* self,
+                                    SidebarBranchNode* child);
+void sidebar_branch_prune (SidebarBranch* self,
+                           SidebarEntry* entry);
+static void sidebar_branch_node_prune_children (SidebarBranchNode* self,
+                                         SidebarBranchNodePruneCallback cb,
+                                         void* cb_target);
+static void sidebar_branch_prune_callback (SidebarBranch* self,
+                                    SidebarBranchNode* node);
+static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node,
+                                                                        gpointer self);
+static void sidebar_branch_node_remove_child (SidebarBranchNode* self,
+                                       SidebarBranchNode* child);
 static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self);
-void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry);
-gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry);
-void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry);
-static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child);
+void sidebar_branch_reparent (SidebarBranch* self,
+                              SidebarEntry* new_parent,
+                              SidebarEntry* entry);
+gboolean sidebar_branch_has_entry (SidebarBranch* self,
+                                   SidebarEntry* entry);
+void sidebar_branch_reorder (SidebarBranch* self,
+                             SidebarEntry* entry);
+static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self,
+                                            SidebarBranchNode* child);
 void sidebar_branch_reorder_all (SidebarBranch* self);
-static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target);
-static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node);
-static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self);
-void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive);
-void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator);
-static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target);
-void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator);
-gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent);
-GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent);
-SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target);
-SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry);
-SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry);
-SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry);
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-enum  {
-	SIDEBAR_BRANCH_NODE_DUMMY_PROPERTY
-};
-static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode);
-static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self);
-static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child);
+static void sidebar_branch_node_reorder_children (SidebarBranchNode* self,
+                                           gboolean recursive,
+                                           SidebarBranchNodeChildrenReorderedCallback cb,
+                                           void* cb_target);
+static void sidebar_branch_children_reordered_callback (SidebarBranch* self,
+                                                 SidebarBranchNode* node);
+static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node,
+                                                                                                  gpointer self);
+void sidebar_branch_reorder_children (SidebarBranch* self,
+                                      SidebarEntry* entry,
+                                      gboolean recursive);
+void sidebar_branch_change_all_comparators (SidebarBranch* self,
+                                            GCompareFunc comparator);
+static void sidebar_branch_node_change_comparator (SidebarBranchNode* self,
+                                            GCompareFunc comparator,
+                                            gboolean recursive,
+                                            SidebarBranchNodeChildrenReorderedCallback cb,
+                                            void* cb_target);
+void sidebar_branch_change_comparator (SidebarBranch* self,
+                                       SidebarEntry* entry,
+                                       gboolean recursive,
+                                       GCompareFunc comparator);
+gint sidebar_branch_get_child_count (SidebarBranch* self,
+                                     SidebarEntry* parent);
+GeeList* sidebar_branch_get_children (SidebarBranch* self,
+                                      SidebarEntry* parent);
+SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self,
+                                               SidebarEntry* parent,
+                                               Locator locator,
+                                               void* locator_target);
+SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self,
+                                         SidebarEntry* entry);
+SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self,
+                                                   SidebarEntry* entry);
+SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self,
+                                               SidebarEntry* entry);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
+                                                  GValue * return_value,
+                                                  guint n_param_values,
+                                                  const GValue * param_values,
+                                                  gpointer invocation_hint,
+                                                  gpointer marshal_data);
+static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode,
+                                             SidebarBranchNode* bnode);
+static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a,
+                                                                 gconstpointer b,
+                                                                 gpointer self);
+static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
+                                                SidebarBranchNode* child);
 static void sidebar_branch_node_finalize (SidebarBranchNode * obj);
 static void sidebar_branch_finalize (GObject * obj);
 
 
-gboolean sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_hide_if_empty (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY) != 0;
 #line 19 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 212 "Branch.c"
+#line 280 "Branch.c"
 }
 
 
-gboolean sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_auto_open_on_new_child (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD) != 0;
 #line 23 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 222 "Branch.c"
+#line 292 "Branch.c"
 }
 
 
-gboolean sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_startup_expand_to_first_child (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD) != 0;
 #line 27 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 232 "Branch.c"
+#line 304 "Branch.c"
 }
 
 
-gboolean sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self) {
+gboolean
+sidebar_branch_options_is_startup_open_grouping (SidebarBranchOptions self)
+{
 	gboolean result = FALSE;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = (self & SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING) != 0;
 #line 31 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 242 "Branch.c"
+#line 316 "Branch.c"
 }
 
 
-GType sidebar_branch_options_get_type (void) {
+GType
+sidebar_branch_options_get_type (void)
+{
 	static volatile gsize sidebar_branch_options_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_branch_options_type_id__volatile)) {
 		static const GFlagsValue values[] = {{SIDEBAR_BRANCH_OPTIONS_NONE, "SIDEBAR_BRANCH_OPTIONS_NONE", "none"}, {SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY, "SIDEBAR_BRANCH_OPTIONS_HIDE_IF_EMPTY", "hide-if-empty"}, {SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD, "SIDEBAR_BRANCH_OPTIONS_AUTO_OPEN_ON_NEW_CHILD", "auto-open-on-new-child"}, {SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD, "SIDEBAR_BRANCH_OPTIONS_STARTUP_EXPAND_TO_FIRST_CHILD", "startup-expand-to-first-child"}, {SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING, "SIDEBAR_BRANCH_OPTIONS_STARTUP_OPEN_GROUPING", "startup-open-grouping"}, {0, NULL, NULL}};
@@ -254,97 +330,84 @@ GType sidebar_branch_options_get_type (void) {
 }
 
 
-SidebarBranch* sidebar_branch_construct (GType object_type, SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) {
+SidebarBranch*
+sidebar_branch_construct (GType object_type,
+                          SidebarEntry* root,
+                          SidebarBranchOptions options,
+                          GCompareFunc default_comparator,
+                          GCompareFunc root_comparator)
+{
 	SidebarBranch * self = NULL;
-	GCompareFunc _tmp0_;
-	GCompareFunc _tmp1_ = NULL;
-	GCompareFunc _tmp2_;
-	SidebarEntry* _tmp5_;
-	SidebarBranchNode* _tmp6_;
-	SidebarBranchOptions _tmp7_;
-	GeeHashMap* _tmp8_;
-	SidebarEntry* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	SidebarBranchOptions _tmp11_;
-	gboolean _tmp12_;
+	GCompareFunc _tmp0_ = NULL;
+	SidebarBranchNode* _tmp1_;
+	GeeHashMap* _tmp2_;
+	SidebarBranchNode* _tmp3_;
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (root), NULL);
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = (SidebarBranch*) g_object_new (object_type, NULL);
 #line 208 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = default_comparator;
-#line 208 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->default_comparator = _tmp0_;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = root_comparator;
+	self->priv->default_comparator = default_comparator;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp2_ != NULL) {
-#line 283 "Branch.c"
-		GCompareFunc _tmp3_;
+	if (root_comparator != NULL) {
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp3_ = root_comparator;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp1_ = _tmp3_;
-#line 289 "Branch.c"
+		_tmp0_ = root_comparator;
+#line 356 "Branch.c"
 	} else {
-		GCompareFunc _tmp4_;
-#line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = default_comparator;
 #line 210 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp1_ = _tmp4_;
-#line 296 "Branch.c"
+		_tmp0_ = default_comparator;
+#line 360 "Branch.c"
 	}
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = root;
-#line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = sidebar_branch_node_new (_tmp5_, NULL, _tmp1_);
+	_tmp1_ = sidebar_branch_node_new (root, NULL, _tmp0_);
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (self->priv->root);
 #line 209 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->root = _tmp6_;
-#line 211 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = options;
+	self->priv->root = _tmp1_;
 #line 211 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->options = _tmp7_;
+	self->priv->options = options;
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = self->priv->map;
+	_tmp2_ = self->priv->map;
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = root;
+	_tmp3_ = self->priv->root;
 #line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = self->priv->root;
-#line 213 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_, _tmp10_);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = options;
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), root, _tmp3_);
 #line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = sidebar_branch_options_is_hide_if_empty (_tmp11_);
-#line 215 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp12_) {
+	if (sidebar_branch_options_is_hide_if_empty (options)) {
 #line 216 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, FALSE);
-#line 326 "Branch.c"
+#line 380 "Branch.c"
 	}
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self;
-#line 330 "Branch.c"
+#line 384 "Branch.c"
 }
 
 
-SidebarBranch* sidebar_branch_new (SidebarEntry* root, SidebarBranchOptions options, GCompareFunc default_comparator, GCompareFunc root_comparator) {
+SidebarBranch*
+sidebar_branch_new (SidebarEntry* root,
+                    SidebarBranchOptions options,
+                    GCompareFunc default_comparator,
+                    GCompareFunc root_comparator)
+{
 #line 206 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return sidebar_branch_construct (SIDEBAR_TYPE_BRANCH, root, options, default_comparator, root_comparator);
-#line 337 "Branch.c"
+#line 396 "Branch.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 344 "Branch.c"
+#line 405 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) {
+SidebarEntry*
+sidebar_branch_get_root (SidebarBranch* self)
+{
 	SidebarEntry* result = NULL;
 	SidebarBranchNode* _tmp0_;
 	SidebarEntry* _tmp1_;
@@ -361,40 +424,36 @@ SidebarEntry* sidebar_branch_get_root (SidebarBranch* self) {
 	result = _tmp2_;
 #line 220 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 365 "Branch.c"
+#line 428 "Branch.c"
 }
 
 
-void sidebar_branch_set_show_branch (SidebarBranch* self, gboolean shown) {
+void
+sidebar_branch_set_show_branch (SidebarBranch* self,
+                                gboolean shown)
+{
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
-	gboolean _tmp3_;
 #line 223 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->shown;
 #line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = shown;
-#line 224 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (_tmp0_ == shown) {
 #line 225 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 384 "Branch.c"
+#line 445 "Branch.c"
 	}
 #line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = shown;
-#line 227 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->priv->shown = _tmp2_;
+	self->priv->shown = shown;
 #line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = shown;
-#line 228 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, _tmp3_);
-#line 394 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL], 0, shown);
+#line 451 "Branch.c"
 }
 
 
-gboolean sidebar_branch_get_show_branch (SidebarBranch* self) {
+gboolean
+sidebar_branch_get_show_branch (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 231 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -405,87 +464,79 @@ gboolean sidebar_branch_get_show_branch (SidebarBranch* self) {
 	result = _tmp0_;
 #line 232 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 409 "Branch.c"
+#line 468 "Branch.c"
 }
 
 
-gboolean sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self) {
+gboolean
+sidebar_branch_is_auto_open_on_new_child (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	SidebarBranchOptions _tmp0_;
-	gboolean _tmp1_;
 #line 235 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->options;
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = sidebar_branch_options_is_auto_open_on_new_child (_tmp0_);
-#line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp1_;
+	result = sidebar_branch_options_is_auto_open_on_new_child (_tmp0_);
 #line 236 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 427 "Branch.c"
+#line 485 "Branch.c"
 }
 
 
-gboolean sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self) {
+gboolean
+sidebar_branch_is_startup_expand_to_first_child (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	SidebarBranchOptions _tmp0_;
-	gboolean _tmp1_;
 #line 239 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->options;
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = sidebar_branch_options_is_startup_expand_to_first_child (_tmp0_);
-#line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp1_;
+	result = sidebar_branch_options_is_startup_expand_to_first_child (_tmp0_);
 #line 240 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 445 "Branch.c"
+#line 502 "Branch.c"
 }
 
 
-gboolean sidebar_branch_is_startup_open_grouping (SidebarBranch* self) {
+gboolean
+sidebar_branch_is_startup_open_grouping (SidebarBranch* self)
+{
 	gboolean result = FALSE;
 	SidebarBranchOptions _tmp0_;
-	gboolean _tmp1_;
 #line 243 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->options;
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = sidebar_branch_options_is_startup_open_grouping (_tmp0_);
-#line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp1_;
+	result = sidebar_branch_options_is_startup_open_grouping (_tmp0_);
 #line 244 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 463 "Branch.c"
+#line 519 "Branch.c"
 }
 
 
-void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEntry* entry, GCompareFunc comparator) {
+void
+sidebar_branch_graft (SidebarBranch* self,
+                      SidebarEntry* parent,
+                      SidebarEntry* entry,
+                      GCompareFunc comparator)
+{
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gboolean _tmp2_;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gboolean _tmp5_;
-	SidebarBranchOptions _tmp6_;
-	gboolean _tmp7_;
+	GeeHashMap* _tmp1_;
+	SidebarBranchOptions _tmp2_;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp8_;
-	SidebarEntry* _tmp9_;
-	gpointer _tmp10_;
-	GCompareFunc _tmp11_ = NULL;
-	GCompareFunc _tmp12_;
+	GeeHashMap* _tmp3_;
+	gpointer _tmp4_;
+	GCompareFunc _tmp5_ = NULL;
 	SidebarBranchNode* entry_node = NULL;
-	SidebarEntry* _tmp15_;
-	SidebarBranchNode* _tmp16_;
-	SidebarBranchNode* _tmp17_;
-	SidebarBranchNode* _tmp18_;
-	GeeHashMap* _tmp19_;
-	SidebarEntry* _tmp20_;
-	SidebarEntry* _tmp21_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
+	SidebarBranchNode* _tmp9_;
+	GeeHashMap* _tmp10_;
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -495,239 +546,193 @@ void sidebar_branch_graft (SidebarBranch* self, SidebarEntry* parent, SidebarEnt
 #line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
-#line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 249 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp2_, "map.has_key(parent)");
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent), "map.has_key(parent)");
 #line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp1_ = self->priv->map;
 #line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
-#line 250 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (!_tmp5_, "!map.has_key(entry)");
-#line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = self->priv->options;
+	_vala_assert (!gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "!map.has_key(entry)");
 #line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = sidebar_branch_options_is_hide_if_empty (_tmp6_);
+	_tmp2_ = self->priv->options;
 #line 252 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp7_) {
+	if (sidebar_branch_options_is_hide_if_empty (_tmp2_)) {
 #line 253 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, TRUE);
-#line 520 "Branch.c"
+#line 561 "Branch.c"
 	}
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = self->priv->map;
-#line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = parent;
+	_tmp3_ = self->priv->map;
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp9_);
+	_tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 255 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp10_;
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = comparator;
-#line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp12_ != NULL) {
-#line 534 "Branch.c"
-		GCompareFunc _tmp13_;
+	parent_node = (SidebarBranchNode*) _tmp4_;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp13_ = comparator;
+	if (comparator != NULL) {
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = _tmp13_;
-#line 540 "Branch.c"
+		_tmp5_ = comparator;
+#line 573 "Branch.c"
 	} else {
-		GCompareFunc _tmp14_;
+		GCompareFunc _tmp6_;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp14_ = self->priv->default_comparator;
+		_tmp6_ = self->priv->default_comparator;
 #line 257 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = _tmp14_;
-#line 547 "Branch.c"
+		_tmp5_ = _tmp6_;
+#line 580 "Branch.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry;
+	_tmp7_ = parent_node;
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = parent_node;
+	_tmp8_ = sidebar_branch_node_new (entry, _tmp7_, _tmp5_);
 #line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp17_ = sidebar_branch_node_new (_tmp15_, _tmp16_, _tmp11_);
-#line 256 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = _tmp17_;
+	entry_node = _tmp8_;
 #line 259 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = parent_node;
+	_tmp9_ = parent_node;
 #line 259 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_add_child (_tmp18_, entry_node);
-#line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp19_ = self->priv->map;
+	sidebar_branch_node_add_child (_tmp9_, entry_node);
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp20_ = entry;
+	_tmp10_ = self->priv->map;
 #line 260 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp20_, entry_node);
+	gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, entry_node);
 #line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = entry;
-#line 262 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, _tmp21_);
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_ADDED_SIGNAL], 0, entry);
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 247 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (parent_node);
-#line 575 "Branch.c"
+#line 602 "Branch.c"
 }
 
 
-static void _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node, gpointer self) {
+static void
+_sidebar_branch_prune_callback_sidebar_branch_node_prune_callback (SidebarBranchNode* node,
+                                                                   gpointer self)
+{
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_prune_callback ((SidebarBranch*) self, node);
-#line 582 "Branch.c"
+#line 612 "Branch.c"
 }
 
 
-void sidebar_branch_prune (SidebarBranch* self, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gboolean _tmp5_;
+void
+sidebar_branch_prune (SidebarBranch* self,
+                      SidebarEntry* entry)
+{
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp6_;
-	SidebarEntry* _tmp7_;
-	gpointer _tmp8_;
+	GeeHashMap* _tmp3_;
+	gpointer _tmp4_;
+	SidebarBranchNode* _tmp5_;
+	SidebarBranchNode* _tmp6_;
+	SidebarBranchNode* _tmp7_;
+	SidebarBranchNode* _tmp8_;
 	SidebarBranchNode* _tmp9_;
 	SidebarBranchNode* _tmp10_;
-	SidebarBranchNode* _tmp11_;
-	SidebarBranchNode* _tmp12_;
-	SidebarBranchNode* _tmp13_;
-	SidebarBranchNode* _tmp14_;
 	gboolean removed = FALSE;
-	GeeHashMap* _tmp15_;
-	SidebarEntry* _tmp16_;
-	gboolean _tmp17_;
-	gboolean _tmp18_;
-	SidebarEntry* _tmp19_;
-	gboolean _tmp20_ = FALSE;
-	SidebarBranchOptions _tmp21_;
-	gboolean _tmp22_;
+	GeeHashMap* _tmp11_;
+	gboolean _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_ = FALSE;
+	SidebarBranchOptions _tmp15_;
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 267 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp0_ != _tmp2_, "entry != root.entry");
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_vala_assert (entry != _tmp1_, "entry != root.entry");
 #line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = self->priv->map;
 #line 268 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp5_, "map.has_key(entry)");
-#line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = self->priv->map;
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "map.has_key(entry)");
 #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry;
+	_tmp3_ = self->priv->map;
 #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
+	_tmp4_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 270 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp8_;
+	entry_node = (SidebarBranchNode*) _tmp4_;
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp5_ = entry_node;
 #line 272 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_prune_children (_tmp9_, _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback, self);
+	sidebar_branch_node_prune_children (_tmp5_, _sidebar_branch_prune_callback_sidebar_branch_node_prune_callback, self);
 #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = entry_node;
+	_tmp6_ = entry_node;
 #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->parent;
+	_tmp7_ = _tmp6_->parent;
 #line 274 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp11_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp7_ != NULL, "entry_node.parent != null");
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = entry_node;
+	_tmp8_ = entry_node;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp12_->parent;
+	_tmp9_ = _tmp8_->parent;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = entry_node;
+	_tmp10_ = entry_node;
 #line 275 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_remove_child (_tmp13_, _tmp14_);
-#line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = self->priv->map;
+	sidebar_branch_node_remove_child (_tmp9_, _tmp10_);
 #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = entry;
+	_tmp11_ = self->priv->map;
 #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp17_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, NULL);
+	_tmp12_ = gee_abstract_map_unset (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry, NULL);
 #line 277 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	removed = _tmp17_;
+	removed = _tmp12_;
 #line 278 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = removed;
+	_tmp13_ = removed;
 #line 278 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp18_, "removed");
+	_vala_assert (_tmp13_, "removed");
 #line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp19_ = entry;
-#line 280 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp19_);
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = self->priv->options;
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, entry);
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp22_ = sidebar_branch_options_is_hide_if_empty (_tmp21_);
+	_tmp15_ = self->priv->options;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp22_) {
-#line 680 "Branch.c"
-		SidebarBranchNode* _tmp23_;
-		gboolean _tmp24_;
+	if (sidebar_branch_options_is_hide_if_empty (_tmp15_)) {
+#line 692 "Branch.c"
+		SidebarBranchNode* _tmp16_;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp23_ = self->priv->root;
+		_tmp16_ = self->priv->root;
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp24_ = sidebar_branch_node_has_children (_tmp23_);
-#line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = !_tmp24_;
-#line 689 "Branch.c"
+		_tmp14_ = !sidebar_branch_node_has_children (_tmp16_);
+#line 698 "Branch.c"
 	} else {
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = FALSE;
-#line 693 "Branch.c"
+		_tmp14_ = FALSE;
+#line 702 "Branch.c"
 	}
 #line 282 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp20_) {
+	if (_tmp14_) {
 #line 283 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_set_show_branch (self, FALSE);
-#line 699 "Branch.c"
+#line 708 "Branch.c"
 	}
 #line 266 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 703 "Branch.c"
+#line 712 "Branch.c"
 }
 
 
-void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+void
+sidebar_branch_reparent (SidebarBranch* self,
+                         SidebarEntry* new_parent,
+                         SidebarEntry* entry)
+{
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
+	GeeHashMap* _tmp2_;
 	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gboolean _tmp5_;
-	GeeHashMap* _tmp6_;
-	SidebarEntry* _tmp7_;
-	gboolean _tmp8_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp9_;
-	SidebarEntry* _tmp10_;
-	gpointer _tmp11_;
+	GeeHashMap* _tmp4_;
+	gpointer _tmp5_;
 	SidebarBranchNode* new_parent_node = NULL;
-	GeeHashMap* _tmp12_;
-	SidebarEntry* _tmp13_;
-	gpointer _tmp14_;
-	SidebarBranchNode* _tmp15_;
+	GeeHashMap* _tmp6_;
+	gpointer _tmp7_;
+	SidebarBranchNode* _tmp8_;
 	SidebarEntry* old_parent = NULL;
-	SidebarBranchNode* _tmp16_;
-	SidebarEntry* _tmp17_;
-	SidebarEntry* _tmp18_;
-	SidebarBranchNode* _tmp19_;
-	SidebarEntry* _tmp20_;
+	SidebarBranchNode* _tmp9_;
+	SidebarEntry* _tmp10_;
+	SidebarEntry* _tmp11_;
+	SidebarBranchNode* _tmp12_;
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -735,83 +740,69 @@ void sidebar_branch_reparent (SidebarBranch* self, SidebarEntry* new_parent, Sid
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 288 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp0_ != _tmp2_, "entry != root.entry");
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_vala_assert (entry != _tmp1_, "entry != root.entry");
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = self->priv->map;
 #line 289 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp5_, "map.has_key(entry)");
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry), "map.has_key(entry)");
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = self->priv->map;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = new_parent;
-#line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp7_);
+	_tmp3_ = self->priv->map;
 #line 290 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_, "map.has_key(new_parent)");
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_parent), "map.has_key(new_parent)");
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = self->priv->map;
+	_tmp4_ = self->priv->map;
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = entry;
+	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp10_);
-#line 292 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp11_;
-#line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = self->priv->map;
+	entry_node = (SidebarBranchNode*) _tmp5_;
 #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = new_parent;
+	_tmp6_ = self->priv->map;
 #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp13_);
+	_tmp7_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), new_parent);
 #line 293 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	new_parent_node = (SidebarBranchNode*) _tmp14_;
+	new_parent_node = (SidebarBranchNode*) _tmp7_;
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry_node->parent;
+	_tmp8_ = entry_node->parent;
 #line 295 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp15_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = entry_node->parent;
+	_tmp9_ = entry_node->parent;
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp17_ = _tmp16_->entry;
+	_tmp10_ = _tmp9_->entry;
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = _g_object_ref0 (_tmp17_);
+	_tmp11_ = _g_object_ref0 (_tmp10_);
 #line 296 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	old_parent = _tmp18_;
+	old_parent = _tmp11_;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp19_ = entry_node->parent;
+	_tmp12_ = entry_node->parent;
 #line 298 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_remove_child (_tmp19_, entry_node);
+	sidebar_branch_node_remove_child (_tmp12_, entry_node);
 #line 299 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_add_child (new_parent_node, entry_node);
 #line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp20_ = entry;
-#line 301 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, _tmp20_, old_parent);
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REPARENTED_SIGNAL], 0, entry, old_parent);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (old_parent);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (new_parent_node);
 #line 287 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 806 "Branch.c"
+#line 795 "Branch.c"
 }
 
 
-gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) {
+gboolean
+sidebar_branch_has_entry (SidebarBranch* self,
+                          SidebarEntry* entry)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	SidebarBranchNode* _tmp1_;
 	SidebarEntry* _tmp2_;
-	SidebarEntry* _tmp3_;
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), FALSE);
 #line 304 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -821,111 +812,98 @@ gboolean sidebar_branch_has_entry (SidebarBranch* self, SidebarEntry* entry) {
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp2_ = _tmp1_->entry;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = entry;
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp2_ == _tmp3_) {
+	if (_tmp2_ == entry) {
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = TRUE;
-#line 830 "Branch.c"
+#line 819 "Branch.c"
 	} else {
-		GeeHashMap* _tmp4_;
-		SidebarEntry* _tmp5_;
-		gboolean _tmp6_;
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = self->priv->map;
+		GeeHashMap* _tmp3_;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp5_ = entry;
+		_tmp3_ = self->priv->map;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp6_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp5_);
-#line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp0_ = _tmp6_;
-#line 843 "Branch.c"
+		_tmp0_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
+#line 826 "Branch.c"
 	}
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = _tmp0_;
 #line 305 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 849 "Branch.c"
+#line 832 "Branch.c"
 }
 
 
-void sidebar_branch_reorder (SidebarBranch* self, SidebarEntry* entry) {
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+void
+sidebar_branch_reorder (SidebarBranch* self,
+                        SidebarEntry* entry)
+{
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
 	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	SidebarBranchNode* _tmp11_;
-	gboolean _tmp12_;
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_ENTRY (entry));
 #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 311 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp0_ != _tmp2_, "entry != root.entry");
-#line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
+	_vala_assert (entry != _tmp1_, "entry != root.entry");
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 313 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 314 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 314 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 316 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
-#line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp7_ = entry_node;
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = entry_node;
+	_tmp8_ = _tmp7_->parent;
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = sidebar_branch_node_reorder_child (_tmp10_, _tmp11_);
+	_tmp9_ = entry_node;
 #line 317 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp12_) {
-#line 908 "Branch.c"
-		SidebarEntry* _tmp13_;
-#line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp13_ = entry;
+	if (sidebar_branch_node_reorder_child (_tmp8_, _tmp9_)) {
 #line 318 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, _tmp13_);
-#line 914 "Branch.c"
+		g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_MOVED_SIGNAL], 0, entry);
+#line 887 "Branch.c"
 	}
 #line 310 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 918 "Branch.c"
+#line 891 "Branch.c"
 }
 
 
-static void _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node, gpointer self) {
+static void
+_sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback (SidebarBranchNode* node,
+                                                                                             gpointer self)
+{
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_children_reordered_callback ((SidebarBranch*) self, node);
-#line 925 "Branch.c"
+#line 901 "Branch.c"
 }
 
 
-void sidebar_branch_reorder_all (SidebarBranch* self) {
+void
+sidebar_branch_reorder_all (SidebarBranch* self)
+{
 	SidebarBranchNode* _tmp0_;
 #line 322 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
@@ -933,16 +911,18 @@ void sidebar_branch_reorder_all (SidebarBranch* self) {
 	_tmp0_ = self->priv->root;
 #line 323 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_reorder_children (_tmp0_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
-#line 937 "Branch.c"
+#line 915 "Branch.c"
 }
 
 
-void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry, gboolean recursive) {
+void
+sidebar_branch_reorder_children (SidebarBranch* self,
+                                 SidebarEntry* entry,
+                                 gboolean recursive)
+{
 	SidebarBranchNode* entry_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
-	gboolean _tmp3_;
+	gpointer _tmp1_;
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -950,45 +930,43 @@ void sidebar_branch_reorder_children (SidebarBranch* self, SidebarEntry* entry,
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = entry;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 328 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp2_;
+	entry_node = (SidebarBranchNode*) _tmp1_;
 #line 329 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (entry_node != NULL, "entry_node != null");
 #line 331 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = recursive;
-#line 331 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_reorder_children (entry_node, _tmp3_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
+	sidebar_branch_node_reorder_children (entry_node, recursive, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
 #line 327 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 967 "Branch.c"
+#line 943 "Branch.c"
 }
 
 
-void sidebar_branch_change_all_comparators (SidebarBranch* self, GCompareFunc comparator) {
+void
+sidebar_branch_change_all_comparators (SidebarBranch* self,
+                                       GCompareFunc comparator)
+{
 	SidebarBranchNode* _tmp0_;
-	GCompareFunc _tmp1_;
 #line 334 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->root;
 #line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = comparator;
-#line 335 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_change_comparator (_tmp0_, _tmp1_, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
-#line 982 "Branch.c"
+	sidebar_branch_node_change_comparator (_tmp0_, comparator, TRUE, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
+#line 958 "Branch.c"
 }
 
 
-void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry, gboolean recursive, GCompareFunc comparator) {
+void
+sidebar_branch_change_comparator (SidebarBranch* self,
+                                  SidebarEntry* entry,
+                                  gboolean recursive,
+                                  GCompareFunc comparator)
+{
 	SidebarBranchNode* entry_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
-	GCompareFunc _tmp3_;
-	gboolean _tmp4_;
+	gpointer _tmp1_;
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -996,35 +974,31 @@ void sidebar_branch_change_comparator (SidebarBranch* self, SidebarEntry* entry,
 #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = entry;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 340 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp2_;
+	entry_node = (SidebarBranchNode*) _tmp1_;
 #line 341 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (entry_node != NULL, "entry_node != null");
 #line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = comparator;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = recursive;
-#line 343 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_change_comparator (entry_node, _tmp3_, _tmp4_, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
+	sidebar_branch_node_change_comparator (entry_node, comparator, recursive, _sidebar_branch_children_reordered_callback_sidebar_branch_node_children_reordered_callback, self);
 #line 338 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
-#line 1015 "Branch.c"
+#line 987 "Branch.c"
 }
 
 
-gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent) {
+gint
+sidebar_branch_get_child_count (SidebarBranch* self,
+                                SidebarEntry* parent)
+{
 	gint result = 0;
 	SidebarBranchNode* parent_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
-	SidebarBranchNode* _tmp3_;
-	gint _tmp4_ = 0;
-	SidebarBranchNode* _tmp5_;
-	GeeSortedSet* _tmp6_;
+	gpointer _tmp1_;
+	SidebarBranchNode* _tmp2_;
+	gint _tmp3_ = 0;
+	SidebarBranchNode* _tmp4_;
+	GeeSortedSet* _tmp5_;
 #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), 0);
 #line 346 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1032,65 +1006,63 @@ gint sidebar_branch_get_child_count (SidebarBranch* self, SidebarEntry* parent)
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 347 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp2_;
+	parent_node = (SidebarBranchNode*) _tmp1_;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = parent_node;
+	_tmp2_ = parent_node;
 #line 348 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp3_ != NULL, "parent_node != null");
+	_vala_assert (_tmp2_ != NULL, "parent_node != null");
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = parent_node;
+	_tmp4_ = parent_node;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = _tmp5_->children;
+	_tmp5_ = _tmp4_->children;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp6_ != NULL) {
-#line 1051 "Branch.c"
-		SidebarBranchNode* _tmp7_;
-		GeeSortedSet* _tmp8_;
+	if (_tmp5_ != NULL) {
+#line 1023 "Branch.c"
+		SidebarBranchNode* _tmp6_;
+		GeeSortedSet* _tmp7_;
+		gint _tmp8_;
 		gint _tmp9_;
-		gint _tmp10_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp7_ = parent_node;
+		_tmp6_ = parent_node;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp8_ = _tmp7_->children;
+		_tmp7_ = _tmp6_->children;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp9_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection));
+		_tmp8_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = _tmp10_;
-#line 1066 "Branch.c"
+		_tmp3_ = _tmp9_;
+#line 1038 "Branch.c"
 	} else {
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp4_ = 0;
-#line 1070 "Branch.c"
+		_tmp3_ = 0;
+#line 1042 "Branch.c"
 	}
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp4_;
+	result = _tmp3_;
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (parent_node);
 #line 350 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1078 "Branch.c"
+#line 1050 "Branch.c"
 }
 
 
-GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent) {
+GeeList*
+sidebar_branch_get_children (SidebarBranch* self,
+                             SidebarEntry* parent)
+{
 	GeeList* result = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gboolean _tmp2_;
 	SidebarBranchNode* parent_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
-	SidebarBranchNode* _tmp6_;
-	GeeSortedSet* _tmp7_;
+	GeeHashMap* _tmp1_;
+	gpointer _tmp2_;
+	SidebarBranchNode* _tmp3_;
+	GeeSortedSet* _tmp4_;
 	GeeList* child_entries = NULL;
-	GeeArrayList* _tmp8_;
+	GeeArrayList* _tmp5_;
 #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 355 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1098,93 +1070,84 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 #line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
-#line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 356 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp2_, "map.has_key(parent)");
-#line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
+	_vala_assert (gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent), "map.has_key(parent)");
 #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = parent;
+	_tmp1_ = self->priv->map;
 #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 358 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp5_;
+	parent_node = (SidebarBranchNode*) _tmp2_;
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = parent_node;
+	_tmp3_ = parent_node;
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = _tmp6_->children;
+	_tmp4_ = _tmp3_->children;
 #line 359 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp7_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_sidebar_branch_node_unref0 (parent_node);
 #line 360 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1127 "Branch.c"
+#line 1093 "Branch.c"
 	}
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp5_ = gee_array_list_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 362 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_LIST, GeeList);
-#line 1133 "Branch.c"
+	child_entries = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_LIST, GeeList);
+#line 1099 "Branch.c"
 	{
 		GeeIterator* _child_it = NULL;
-		SidebarBranchNode* _tmp9_;
-		GeeSortedSet* _tmp10_;
-		GeeIterator* _tmp11_;
+		SidebarBranchNode* _tmp6_;
+		GeeSortedSet* _tmp7_;
+		GeeIterator* _tmp8_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp9_ = parent_node;
+		_tmp6_ = parent_node;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp10_ = _tmp9_->children;
+		_tmp7_ = _tmp6_->children;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_child_it = _tmp11_;
+		_child_it = _tmp8_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1149 "Branch.c"
-			GeeIterator* _tmp12_;
-			gboolean _tmp13_;
+#line 1115 "Branch.c"
+			GeeIterator* _tmp9_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp14_;
-			gpointer _tmp15_;
-			GeeList* _tmp16_;
-			SidebarBranchNode* _tmp17_;
-			SidebarEntry* _tmp18_;
-#line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp12_ = _child_it;
+			GeeIterator* _tmp10_;
+			gpointer _tmp11_;
+			GeeList* _tmp12_;
+			SidebarBranchNode* _tmp13_;
+			SidebarEntry* _tmp14_;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13_ = gee_iterator_next (_tmp12_);
+			_tmp9_ = _child_it;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp13_) {
+			if (!gee_iterator_next (_tmp9_)) {
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1166 "Branch.c"
+#line 1129 "Branch.c"
 			}
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp14_ = _child_it;
+			_tmp10_ = _child_it;
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp15_ = gee_iterator_get (_tmp14_);
+			_tmp11_ = gee_iterator_get (_tmp10_);
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp15_;
+			child = (SidebarBranchNode*) _tmp11_;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp16_ = child_entries;
+			_tmp12_ = child_entries;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17_ = child;
+			_tmp13_ = child;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp18_ = _tmp17_->entry;
+			_tmp14_ = _tmp13_->entry;
 #line 364 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), _tmp18_);
+			gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 1184 "Branch.c"
+#line 1147 "Branch.c"
 		}
 #line 363 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 1188 "Branch.c"
+#line 1151 "Branch.c"
 	}
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = child_entries;
@@ -1192,19 +1155,23 @@ GeeList* sidebar_branch_get_children (SidebarBranch* self, SidebarEntry* parent)
 	_sidebar_branch_node_unref0 (parent_node);
 #line 366 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1196 "Branch.c"
+#line 1159 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry* parent, Locator locator, void* locator_target) {
+SidebarEntry*
+sidebar_branch_find_first_child (SidebarBranch* self,
+                                 SidebarEntry* parent,
+                                 Locator locator,
+                                 void* locator_target)
+{
 	SidebarEntry* result = NULL;
 	SidebarBranchNode* parent_node = NULL;
 	GeeHashMap* _tmp0_;
-	SidebarEntry* _tmp1_;
-	gpointer _tmp2_;
+	gpointer _tmp1_;
+	SidebarBranchNode* _tmp2_;
 	SidebarBranchNode* _tmp3_;
-	SidebarBranchNode* _tmp4_;
-	GeeSortedSet* _tmp5_;
+	GeeSortedSet* _tmp4_;
 #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 369 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1212,95 +1179,81 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp0_ = self->priv->map;
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = parent;
+	_tmp1_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), parent);
 #line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp1_);
-#line 370 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	parent_node = (SidebarBranchNode*) _tmp2_;
+	parent_node = (SidebarBranchNode*) _tmp1_;
 #line 371 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = parent_node;
+	_tmp2_ = parent_node;
 #line 371 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp3_ != NULL, "parent_node != null");
+	_vala_assert (_tmp2_ != NULL, "parent_node != null");
 #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = parent_node;
+	_tmp3_ = parent_node;
 #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = _tmp4_->children;
+	_tmp4_ = _tmp3_->children;
 #line 373 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp5_ == NULL) {
+	if (_tmp4_ == NULL) {
 #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_sidebar_branch_node_unref0 (parent_node);
 #line 374 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1237 "Branch.c"
+#line 1202 "Branch.c"
 	}
 	{
 		GeeIterator* _child_it = NULL;
-		SidebarBranchNode* _tmp6_;
-		GeeSortedSet* _tmp7_;
-		GeeIterator* _tmp8_;
+		SidebarBranchNode* _tmp5_;
+		GeeSortedSet* _tmp6_;
+		GeeIterator* _tmp7_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp6_ = parent_node;
+		_tmp5_ = parent_node;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp7_ = _tmp6_->children;
+		_tmp6_ = _tmp5_->children;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_child_it = _tmp8_;
+		_child_it = _tmp7_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1254 "Branch.c"
-			GeeIterator* _tmp9_;
-			gboolean _tmp10_;
+#line 1219 "Branch.c"
+			GeeIterator* _tmp8_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp11_;
-			gpointer _tmp12_;
-			Locator _tmp13_;
-			void* _tmp13__target;
-			SidebarBranchNode* _tmp14_;
-			SidebarEntry* _tmp15_;
-			gboolean _tmp16_;
-#line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp9_ = _child_it;
+			GeeIterator* _tmp9_;
+			gpointer _tmp10_;
+			SidebarBranchNode* _tmp11_;
+			SidebarEntry* _tmp12_;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp10_ = gee_iterator_next (_tmp9_);
+			_tmp8_ = _child_it;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp10_) {
+			if (!gee_iterator_next (_tmp8_)) {
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1273 "Branch.c"
+#line 1232 "Branch.c"
 			}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp11_ = _child_it;
+			_tmp9_ = _child_it;
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp12_ = gee_iterator_get (_tmp11_);
+			_tmp10_ = gee_iterator_get (_tmp9_);
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp12_;
+			child = (SidebarBranchNode*) _tmp10_;
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13_ = locator;
+			_tmp11_ = child;
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13__target = locator_target;
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp14_ = child;
+			_tmp12_ = _tmp11_->entry;
 #line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp15_ = _tmp14_->entry;
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp16_ = _tmp13_ (_tmp15_, _tmp13__target);
-#line 377 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (_tmp16_) {
-#line 1293 "Branch.c"
-				SidebarBranchNode* _tmp17_;
-				SidebarEntry* _tmp18_;
-				SidebarEntry* _tmp19_;
+			if (locator (_tmp12_, locator_target)) {
+#line 1246 "Branch.c"
+				SidebarBranchNode* _tmp13_;
+				SidebarEntry* _tmp14_;
+				SidebarEntry* _tmp15_;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp17_ = child;
+				_tmp13_ = child;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp18_ = _tmp17_->entry;
+				_tmp14_ = _tmp13_->entry;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp19_ = _g_object_ref0 (_tmp18_);
+				_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				result = _tmp19_;
+				result = _tmp15_;
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1309,15 +1262,15 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 				_sidebar_branch_node_unref0 (parent_node);
 #line 378 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				return result;
-#line 1313 "Branch.c"
+#line 1266 "Branch.c"
 			}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 1317 "Branch.c"
+#line 1270 "Branch.c"
 		}
 #line 376 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 1321 "Branch.c"
+#line 1274 "Branch.c"
 	}
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = NULL;
@@ -1325,341 +1278,339 @@ SidebarEntry* sidebar_branch_find_first_child (SidebarBranch* self, SidebarEntry
 	_sidebar_branch_node_unref0 (parent_node);
 #line 381 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1329 "Branch.c"
+#line 1282 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_parent (SidebarBranch* self, SidebarEntry* entry) {
+SidebarEntry*
+sidebar_branch_get_parent (SidebarBranch* self,
+                           SidebarEntry* entry)
+{
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	SidebarEntry* _tmp11_;
-	SidebarEntry* _tmp12_;
+	SidebarEntry* _tmp9_;
+	SidebarEntry* _tmp10_;
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 385 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 386 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp2_) {
+	if (entry == _tmp1_) {
 #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 387 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1365 "Branch.c"
+#line 1317 "Branch.c"
 	}
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 389 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 390 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 390 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 391 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp7_ = entry_node;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp8_ = _tmp7_->parent;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->entry;
+	_tmp9_ = _tmp8_->entry;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = _g_object_ref0 (_tmp11_);
+	_tmp10_ = _g_object_ref0 (_tmp9_);
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp12_;
+	result = _tmp10_;
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 393 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1399 "Branch.c"
+#line 1349 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_previous_sibling (SidebarBranch* self, SidebarEntry* entry) {
+SidebarEntry*
+sidebar_branch_get_previous_sibling (SidebarBranch* self,
+                                     SidebarEntry* entry)
+{
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	GeeSortedSet* _tmp11_;
+	GeeSortedSet* _tmp9_;
 	SidebarBranchNode* sibling = NULL;
-	SidebarBranchNode* _tmp12_;
+	SidebarBranchNode* _tmp10_;
+	SidebarBranchNode* _tmp11_;
+	GeeSortedSet* _tmp12_;
 	SidebarBranchNode* _tmp13_;
-	GeeSortedSet* _tmp14_;
-	SidebarBranchNode* _tmp15_;
-	gpointer _tmp16_;
-	SidebarEntry* _tmp17_ = NULL;
-	SidebarBranchNode* _tmp18_;
-	SidebarEntry* _tmp21_;
+	gpointer _tmp14_;
+	SidebarEntry* _tmp15_ = NULL;
+	SidebarBranchNode* _tmp16_;
+	SidebarEntry* _tmp19_;
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 397 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 398 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp2_) {
+	if (entry == _tmp1_) {
 #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 399 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1443 "Branch.c"
+#line 1392 "Branch.c"
 	}
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 401 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 402 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 402 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 403 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp7_ = entry_node;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp8_ = _tmp7_->parent;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->children;
+	_tmp9_ = _tmp8_->children;
 #line 404 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp11_ != NULL, "entry_node.parent.children != null");
+	_vala_assert (_tmp9_ != NULL, "entry_node.parent.children != null");
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = entry_node;
+	_tmp10_ = entry_node;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp12_->parent;
+	_tmp11_ = _tmp10_->parent;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = _tmp13_->children;
+	_tmp12_ = _tmp11_->children;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry_node;
+	_tmp13_ = entry_node;
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = gee_sorted_set_lower (_tmp14_, _tmp15_);
+	_tmp14_ = gee_sorted_set_lower (_tmp12_, _tmp13_);
 #line 406 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sibling = (SidebarBranchNode*) _tmp16_;
+	sibling = (SidebarBranchNode*) _tmp14_;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = sibling;
+	_tmp16_ = sibling;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp18_ != NULL) {
-#line 1487 "Branch.c"
-		SidebarBranchNode* _tmp19_;
-		SidebarEntry* _tmp20_;
+	if (_tmp16_ != NULL) {
+#line 1434 "Branch.c"
+		SidebarBranchNode* _tmp17_;
+		SidebarEntry* _tmp18_;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp19_ = sibling;
+		_tmp17_ = sibling;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = _tmp19_->entry;
+		_tmp18_ = _tmp17_->entry;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = _tmp20_;
-#line 1496 "Branch.c"
+		_tmp15_ = _tmp18_;
+#line 1443 "Branch.c"
 	} else {
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = NULL;
-#line 1500 "Branch.c"
+		_tmp15_ = NULL;
+#line 1447 "Branch.c"
 	}
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = _g_object_ref0 (_tmp17_);
+	_tmp19_ = _g_object_ref0 (_tmp15_);
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp21_;
+	result = _tmp19_;
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (sibling);
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 408 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1512 "Branch.c"
+#line 1459 "Branch.c"
 }
 
 
-SidebarEntry* sidebar_branch_get_next_sibling (SidebarBranch* self, SidebarEntry* entry) {
+SidebarEntry*
+sidebar_branch_get_next_sibling (SidebarBranch* self,
+                                 SidebarEntry* entry)
+{
 	SidebarEntry* result = NULL;
-	SidebarEntry* _tmp0_;
-	SidebarBranchNode* _tmp1_;
-	SidebarEntry* _tmp2_;
+	SidebarBranchNode* _tmp0_;
+	SidebarEntry* _tmp1_;
 	SidebarBranchNode* entry_node = NULL;
-	GeeHashMap* _tmp3_;
-	SidebarEntry* _tmp4_;
-	gpointer _tmp5_;
+	GeeHashMap* _tmp2_;
+	gpointer _tmp3_;
+	SidebarBranchNode* _tmp4_;
+	SidebarBranchNode* _tmp5_;
 	SidebarBranchNode* _tmp6_;
 	SidebarBranchNode* _tmp7_;
 	SidebarBranchNode* _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarBranchNode* _tmp10_;
-	GeeSortedSet* _tmp11_;
+	GeeSortedSet* _tmp9_;
 	SidebarBranchNode* sibling = NULL;
-	SidebarBranchNode* _tmp12_;
+	SidebarBranchNode* _tmp10_;
+	SidebarBranchNode* _tmp11_;
+	GeeSortedSet* _tmp12_;
 	SidebarBranchNode* _tmp13_;
-	GeeSortedSet* _tmp14_;
-	SidebarBranchNode* _tmp15_;
-	gpointer _tmp16_;
-	SidebarEntry* _tmp17_ = NULL;
-	SidebarBranchNode* _tmp18_;
-	SidebarEntry* _tmp21_;
+	gpointer _tmp14_;
+	SidebarEntry* _tmp15_ = NULL;
+	SidebarBranchNode* _tmp16_;
+	SidebarEntry* _tmp19_;
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_BRANCH (self), NULL);
 #line 412 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->priv->root;
+	_tmp0_ = self->priv->root;
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = _tmp1_->entry;
+	_tmp1_ = _tmp0_->entry;
 #line 413 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp2_) {
+	if (entry == _tmp1_) {
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = NULL;
 #line 414 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1556 "Branch.c"
+#line 1502 "Branch.c"
 	}
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->priv->map;
-#line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = entry;
+	_tmp2_ = self->priv->map;
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp4_);
+	_tmp3_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), entry);
 #line 416 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	entry_node = (SidebarBranchNode*) _tmp5_;
+	entry_node = (SidebarBranchNode*) _tmp3_;
 #line 417 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = entry_node;
+	_tmp4_ = entry_node;
 #line 417 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp6_ != NULL, "entry_node != null");
+	_vala_assert (_tmp4_ != NULL, "entry_node != null");
 #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = entry_node;
+	_tmp5_ = entry_node;
 #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->parent;
+	_tmp6_ = _tmp5_->parent;
 #line 418 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp8_ != NULL, "entry_node.parent != null");
+	_vala_assert (_tmp6_ != NULL, "entry_node.parent != null");
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = entry_node;
+	_tmp7_ = entry_node;
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->parent;
+	_tmp8_ = _tmp7_->parent;
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = _tmp10_->children;
+	_tmp9_ = _tmp8_->children;
 #line 419 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp11_ != NULL, "entry_node.parent.children != null");
+	_vala_assert (_tmp9_ != NULL, "entry_node.parent.children != null");
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = entry_node;
+	_tmp10_ = entry_node;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp12_->parent;
+	_tmp11_ = _tmp10_->parent;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = _tmp13_->children;
+	_tmp12_ = _tmp11_->children;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = entry_node;
+	_tmp13_ = entry_node;
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp16_ = gee_sorted_set_higher (_tmp14_, _tmp15_);
+	_tmp14_ = gee_sorted_set_higher (_tmp12_, _tmp13_);
 #line 421 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sibling = (SidebarBranchNode*) _tmp16_;
+	sibling = (SidebarBranchNode*) _tmp14_;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = sibling;
+	_tmp16_ = sibling;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp18_ != NULL) {
-#line 1600 "Branch.c"
-		SidebarBranchNode* _tmp19_;
-		SidebarEntry* _tmp20_;
+	if (_tmp16_ != NULL) {
+#line 1544 "Branch.c"
+		SidebarBranchNode* _tmp17_;
+		SidebarEntry* _tmp18_;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp19_ = sibling;
+		_tmp17_ = sibling;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp20_ = _tmp19_->entry;
+		_tmp18_ = _tmp17_->entry;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = _tmp20_;
-#line 1609 "Branch.c"
+		_tmp15_ = _tmp18_;
+#line 1553 "Branch.c"
 	} else {
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = NULL;
-#line 1613 "Branch.c"
+		_tmp15_ = NULL;
+#line 1557 "Branch.c"
 	}
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp21_ = _g_object_ref0 (_tmp17_);
+	_tmp19_ = _g_object_ref0 (_tmp15_);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp21_;
+	result = _tmp19_;
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (sibling);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_sidebar_branch_node_unref0 (entry_node);
 #line 423 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1625 "Branch.c"
+#line 1569 "Branch.c"
 }
 
 
-static void sidebar_branch_prune_callback (SidebarBranch* self, SidebarBranchNode* node) {
-	SidebarBranchNode* _tmp0_;
-	SidebarEntry* _tmp1_;
+static void
+sidebar_branch_prune_callback (SidebarBranch* self,
+                               SidebarBranchNode* node)
+{
+	SidebarEntry* _tmp0_;
 #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 426 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (node));
 #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = node;
-#line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = _tmp0_->entry;
+	_tmp0_ = node->entry;
 #line 427 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp1_);
-#line 1642 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_ENTRY_REMOVED_SIGNAL], 0, _tmp0_);
+#line 1586 "Branch.c"
 }
 
 
-static void sidebar_branch_children_reordered_callback (SidebarBranch* self, SidebarBranchNode* node) {
-	SidebarBranchNode* _tmp0_;
-	SidebarEntry* _tmp1_;
+static void
+sidebar_branch_children_reordered_callback (SidebarBranch* self,
+                                            SidebarBranchNode* node)
+{
+	SidebarEntry* _tmp0_;
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_IS_BRANCH (self));
 #line 430 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (node));
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = node;
+	_tmp0_ = node->entry;
 #line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = _tmp0_->entry;
-#line 431 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp1_);
-#line 1659 "Branch.c"
+	g_signal_emit (self, sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL], 0, _tmp0_);
+#line 1603 "Branch.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure,
+                                             GValue * return_value,
+                                             guint n_param_values,
+                                             const GValue * param_values,
+                                             gpointer invocation_hint,
+                                             gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_OBJECT callback;
 	register GCClosure * cc;
@@ -1674,28 +1625,30 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT (GClosure * closure, GVa
 		data1 = closure->data;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 1678 "Branch.c"
+#line 1629 "Branch.c"
 	} else {
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		data2 = closure->data;
-#line 1684 "Branch.c"
+#line 1635 "Branch.c"
 	}
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT) (marshal_data ? marshal_data : cc->callback);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), data2);
-#line 1690 "Branch.c"
+#line 1641 "Branch.c"
 }
 
 
-static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) {
+static SidebarBranchNode*
+sidebar_branch_node_construct (GType object_type,
+                               SidebarEntry* entry,
+                               SidebarBranchNode* parent,
+                               GCompareFunc comparator)
+{
 	SidebarBranchNode* self = NULL;
 	SidebarEntry* _tmp0_;
-	SidebarEntry* _tmp1_;
-	SidebarBranchNode* _tmp2_;
-	GCompareFunc _tmp3_;
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_IS_ENTRY (entry), NULL);
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1703,101 +1656,80 @@ static SidebarBranchNode* sidebar_branch_node_construct (GType object_type, Side
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = (SidebarBranchNode*) g_type_create_instance (object_type);
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = entry;
-#line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (entry);
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->entry);
 #line 46 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->entry = _tmp1_;
-#line 47 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = parent;
+	self->entry = _tmp0_;
 #line 47 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->parent = _tmp2_;
+	self->parent = parent;
 #line 48 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = comparator;
-#line 48 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->comparator = _tmp3_;
+	self->comparator = comparator;
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return self;
-#line 1724 "Branch.c"
+#line 1671 "Branch.c"
 }
 
 
-static SidebarBranchNode* sidebar_branch_node_new (SidebarEntry* entry, SidebarBranchNode* parent, GCompareFunc comparator) {
+static SidebarBranchNode*
+sidebar_branch_node_new (SidebarEntry* entry,
+                         SidebarBranchNode* parent,
+                         GCompareFunc comparator)
+{
 #line 45 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return sidebar_branch_node_construct (SIDEBAR_BRANCH_TYPE_NODE, entry, parent, comparator);
-#line 1731 "Branch.c"
+#line 1682 "Branch.c"
 }
 
 
-static gint sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode, SidebarBranchNode* bnode) {
+static gint
+sidebar_branch_node_comparator_wrapper (SidebarBranchNode* anode,
+                                        SidebarBranchNode* bnode)
+{
 	gint result = 0;
 	SidebarBranchNode* _tmp0_;
 	SidebarBranchNode* _tmp1_;
 	SidebarBranchNode* _tmp2_;
-	SidebarBranchNode* _tmp3_;
-	SidebarBranchNode* _tmp4_;
-	SidebarBranchNode* _tmp5_;
-	SidebarBranchNode* _tmp6_;
-	SidebarBranchNode* _tmp7_;
-	GCompareFunc _tmp8_;
-	SidebarBranchNode* _tmp9_;
-	SidebarEntry* _tmp10_;
-	SidebarBranchNode* _tmp11_;
-	SidebarEntry* _tmp12_;
-	gint _tmp13_;
+	GCompareFunc _tmp3_;
+	SidebarEntry* _tmp4_;
+	SidebarEntry* _tmp5_;
 #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (anode), 0);
 #line 51 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (bnode), 0);
 #line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = anode;
-#line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = bnode;
-#line 52 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (anode == bnode) {
 #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		result = 0;
 #line 53 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 1765 "Branch.c"
+#line 1707 "Branch.c"
 	}
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = anode;
+	_tmp0_ = anode->parent;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = _tmp2_->parent;
+	_tmp1_ = bnode->parent;
 #line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = bnode;
-#line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = _tmp4_->parent;
-#line 55 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp3_ == _tmp5_, "anode.parent == bnode.parent");
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = anode;
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = _tmp6_->parent;
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = _tmp7_->comparator;
+	_vala_assert (_tmp0_ == _tmp1_, "anode.parent == bnode.parent");
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = anode;
-#line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _tmp9_->entry;
+	_tmp2_ = anode->parent;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp11_ = bnode;
+	_tmp3_ = _tmp2_->comparator;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = _tmp11_->entry;
+	_tmp4_ = anode->entry;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = _tmp8_ (_tmp10_, _tmp12_);
+	_tmp5_ = bnode->entry;
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	result = _tmp13_;
+	result = _tmp3_ (_tmp4_, _tmp5_);
 #line 57 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1797 "Branch.c"
+#line 1727 "Branch.c"
 }
 
 
-static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
+static gboolean
+sidebar_branch_node_has_children (SidebarBranchNode* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	GeeSortedSet* _tmp1_;
@@ -1807,7 +1739,7 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
 	_tmp1_ = self->children;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (_tmp1_ != NULL) {
-#line 1811 "Branch.c"
+#line 1743 "Branch.c"
 		GeeSortedSet* _tmp2_;
 		gint _tmp3_;
 		gint _tmp4_;
@@ -1819,82 +1751,82 @@ static gboolean sidebar_branch_node_has_children (SidebarBranchNode* self) {
 		_tmp4_ = _tmp3_;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = _tmp4_ > 0;
-#line 1823 "Branch.c"
+#line 1755 "Branch.c"
 	} else {
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_tmp0_ = FALSE;
-#line 1827 "Branch.c"
+#line 1759 "Branch.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = _tmp0_;
 #line 61 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1833 "Branch.c"
+#line 1765 "Branch.c"
 }
 
 
-static gint _sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a, gconstpointer b, gpointer self) {
+static gint
+_sidebar_branch_node_comparator_wrapper_gcompare_data_func (gconstpointer a,
+                                                            gconstpointer b,
+                                                            gpointer self)
+{
 	gint result;
 	result = sidebar_branch_node_comparator_wrapper ((SidebarBranchNode*) a, (SidebarBranchNode*) b);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 1842 "Branch.c"
+#line 1778 "Branch.c"
 }
 
 
-static void sidebar_branch_node_add_child (SidebarBranchNode* self, SidebarBranchNode* child) {
-	SidebarBranchNode* _tmp0_;
-	GeeSortedSet* _tmp1_;
+static void
+sidebar_branch_node_add_child (SidebarBranchNode* self,
+                               SidebarBranchNode* child)
+{
+	GeeSortedSet* _tmp0_;
 	gboolean added = FALSE;
-	GeeSortedSet* _tmp3_;
-	SidebarBranchNode* _tmp4_;
-	gboolean _tmp5_;
+	GeeSortedSet* _tmp2_;
 #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 64 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (child));
 #line 65 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = child;
-#line 65 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_->parent = self;
+	child->parent = self;
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = self->children;
+	_tmp0_ = self->children;
 #line 67 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp1_ == NULL) {
-#line 1865 "Branch.c"
-		GeeTreeSet* _tmp2_;
+	if (_tmp0_ == NULL) {
+#line 1799 "Branch.c"
+		GeeTreeSet* _tmp1_;
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp2_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+		_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 68 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 1873 "Branch.c"
+		self->children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
+#line 1807 "Branch.c"
 	}
 #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = self->children;
-#line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = child;
-#line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection), _tmp4_);
+	_tmp2_ = self->children;
 #line 70 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	added = _tmp5_;
+	added = gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), child);
 #line 71 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (added, "added");
-#line 1885 "Branch.c"
+#line 1815 "Branch.c"
 }
 
 
-static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBranchNode* child) {
+static void
+sidebar_branch_node_remove_child (SidebarBranchNode* self,
+                                  SidebarBranchNode* child)
+{
 	GeeSortedSet* _tmp0_;
 	GeeSortedSet* new_children = NULL;
 	GeeTreeSet* _tmp1_;
 	gboolean found = FALSE;
-	gboolean _tmp12_;
-	GeeSortedSet* _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	SidebarBranchNode* _tmp18_;
+	gboolean _tmp10_;
+	GeeSortedSet* _tmp11_;
+	gint _tmp12_;
+	gint _tmp13_;
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -1909,7 +1841,7 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 81 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	found = FALSE;
-#line 1913 "Branch.c"
+#line 1845 "Branch.c"
 	{
 		GeeIterator* _c_it = NULL;
 		GeeSortedSet* _tmp2_;
@@ -1922,105 +1854,101 @@ static void sidebar_branch_node_remove_child (SidebarBranchNode* self, SidebarBr
 		_c_it = _tmp3_;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 1926 "Branch.c"
+#line 1858 "Branch.c"
 			GeeIterator* _tmp4_;
-			gboolean _tmp5_;
 			SidebarBranchNode* c = NULL;
-			GeeIterator* _tmp6_;
-			gpointer _tmp7_;
-			SidebarBranchNode* _tmp8_;
-			SidebarBranchNode* _tmp9_;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			SidebarBranchNode* _tmp7_;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp4_ = _c_it;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp5_ = gee_iterator_next (_tmp4_);
-#line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp5_) {
+			if (!gee_iterator_next (_tmp4_)) {
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 1942 "Branch.c"
+#line 1870 "Branch.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp6_ = _c_it;
+			_tmp5_ = _c_it;
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = gee_iterator_get (_tmp6_);
+			_tmp6_ = gee_iterator_get (_tmp5_);
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			c = (SidebarBranchNode*) _tmp7_;
-#line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = c;
+			c = (SidebarBranchNode*) _tmp6_;
 #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp9_ = child;
+			_tmp7_ = c;
 #line 83 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (_tmp8_ != _tmp9_) {
-#line 1956 "Branch.c"
-				GeeSortedSet* _tmp10_;
-				SidebarBranchNode* _tmp11_;
+			if (_tmp7_ != child) {
+#line 1882 "Branch.c"
+				GeeSortedSet* _tmp8_;
+				SidebarBranchNode* _tmp9_;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp10_ = new_children;
+				_tmp8_ = new_children;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11_ = c;
+				_tmp9_ = c;
 #line 84 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, GEE_TYPE_COLLECTION, GeeCollection), _tmp11_);
-#line 1965 "Branch.c"
+				gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_);
+#line 1891 "Branch.c"
 			} else {
 #line 86 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				found = TRUE;
-#line 1969 "Branch.c"
+#line 1895 "Branch.c"
 			}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (c);
-#line 1973 "Branch.c"
+#line 1899 "Branch.c"
 		}
 #line 82 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_c_it);
-#line 1977 "Branch.c"
+#line 1903 "Branch.c"
 	}
 #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp12_ = found;
+	_tmp10_ = found;
 #line 89 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_vala_assert (_tmp12_, "found");
+	_vala_assert (_tmp10_, "found");
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp13_ = new_children;
+	_tmp11_ = new_children;
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp14_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp12_ = gee_collection_get_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = _tmp14_;
+	_tmp13_ = _tmp12_;
 #line 91 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp15_ != 0) {
-#line 1991 "Branch.c"
-		GeeSortedSet* _tmp16_;
-		GeeSortedSet* _tmp17_;
+	if (_tmp13_ != 0) {
+#line 1917 "Branch.c"
+		GeeSortedSet* _tmp14_;
+		GeeSortedSet* _tmp15_;
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp16_ = new_children;
+		_tmp14_ = new_children;
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp17_ = _g_object_ref0 (_tmp16_);
+		_tmp15_ = _g_object_ref0 (_tmp14_);
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 92 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		self->children = _tmp17_;
-#line 2002 "Branch.c"
+		self->children = _tmp15_;
+#line 1928 "Branch.c"
 	} else {
 #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (self->children);
 #line 94 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		self->children = NULL;
-#line 2008 "Branch.c"
+#line 1934 "Branch.c"
 	}
 #line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_ = child;
-#line 96 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp18_->parent = NULL;
+	child->parent = NULL;
 #line 74 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (new_children);
-#line 2016 "Branch.c"
+#line 1940 "Branch.c"
 }
 
 
-static void sidebar_branch_node_prune_children (SidebarBranchNode* self, SidebarBranchNodePruneCallback cb, void* cb_target) {
+static void
+sidebar_branch_node_prune_children (SidebarBranchNode* self,
+                                    SidebarBranchNodePruneCallback cb,
+                                    void* cb_target)
+{
 	GeeSortedSet* _tmp0_;
 	GeeSortedSet* old_children = NULL;
-	GeeSortedSet* _tmp9_;
-	GeeSortedSet* _tmp10_;
+	GeeSortedSet* _tmp7_;
+	GeeSortedSet* _tmp8_;
 #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 100 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2029,7 +1957,7 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 	if (_tmp0_ == NULL) {
 #line 101 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 2033 "Branch.c"
+#line 1961 "Branch.c"
 	}
 	{
 		GeeIterator* _child_it = NULL;
@@ -2043,118 +1971,103 @@ static void sidebar_branch_node_prune_children (SidebarBranchNode* self, Sidebar
 		_child_it = _tmp2_;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2047 "Branch.c"
+#line 1975 "Branch.c"
 			GeeIterator* _tmp3_;
-			gboolean _tmp4_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp5_;
-			gpointer _tmp6_;
-			SidebarBranchNode* _tmp7_;
-			SidebarBranchNodePruneCallback _tmp8_;
-			void* _tmp8__target;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SidebarBranchNode* _tmp6_;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp3_ = _child_it;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp4_) {
+			if (!gee_iterator_next (_tmp3_)) {
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2064 "Branch.c"
+#line 1987 "Branch.c"
 			}
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp5_ = _child_it;
+			_tmp4_ = _child_it;
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp6_ = gee_iterator_get (_tmp5_);
+			_tmp5_ = gee_iterator_get (_tmp4_);
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp6_;
-#line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = child;
-#line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = cb;
+			child = (SidebarBranchNode*) _tmp5_;
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8__target = cb_target;
+			_tmp6_ = child;
 #line 104 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			sidebar_branch_node_prune_children (_tmp7_, _tmp8_, _tmp8__target);
+			sidebar_branch_node_prune_children (_tmp6_, cb, cb_target);
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 2082 "Branch.c"
+#line 2001 "Branch.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 2086 "Branch.c"
+#line 2005 "Branch.c"
 	}
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp9_ = self->children;
+	_tmp7_ = self->children;
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp10_ = _g_object_ref0 (_tmp9_);
+	_tmp8_ = _g_object_ref0 (_tmp7_);
 #line 106 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	old_children = _tmp10_;
+	old_children = _tmp8_;
 #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->children);
 #line 107 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->children = NULL;
-#line 2098 "Branch.c"
+#line 2017 "Branch.c"
 	{
 		GeeIterator* _child_it = NULL;
-		GeeSortedSet* _tmp11_;
-		GeeIterator* _tmp12_;
+		GeeSortedSet* _tmp9_;
+		GeeIterator* _tmp10_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp11_ = old_children;
+		_tmp9_ = old_children;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_tmp12_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp10_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-		_child_it = _tmp12_;
+		_child_it = _tmp10_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2111 "Branch.c"
-			GeeIterator* _tmp13_;
-			gboolean _tmp14_;
+#line 2030 "Branch.c"
+			GeeIterator* _tmp11_;
 			SidebarBranchNode* child = NULL;
-			GeeIterator* _tmp15_;
-			gpointer _tmp16_;
-			SidebarBranchNodePruneCallback _tmp17_;
-			void* _tmp17__target;
-			SidebarBranchNode* _tmp18_;
-#line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp13_ = _child_it;
+			GeeIterator* _tmp12_;
+			gpointer _tmp13_;
+			SidebarBranchNode* _tmp14_;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp14_ = gee_iterator_next (_tmp13_);
+			_tmp11_ = _child_it;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp14_) {
+			if (!gee_iterator_next (_tmp11_)) {
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2128 "Branch.c"
+#line 2042 "Branch.c"
 			}
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp15_ = _child_it;
+			_tmp12_ = _child_it;
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp16_ = gee_iterator_get (_tmp15_);
+			_tmp13_ = gee_iterator_get (_tmp12_);
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			child = (SidebarBranchNode*) _tmp16_;
-#line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17_ = cb;
+			child = (SidebarBranchNode*) _tmp13_;
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17__target = cb_target;
-#line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp18_ = child;
+			_tmp14_ = child;
 #line 113 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp17_ (_tmp18_, _tmp17__target);
+			cb (_tmp14_, cb_target);
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (child);
-#line 2146 "Branch.c"
+#line 2056 "Branch.c"
 		}
 #line 112 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_child_it);
-#line 2150 "Branch.c"
+#line 2060 "Branch.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (old_children);
-#line 2154 "Branch.c"
+#line 2064 "Branch.c"
 }
 
 
-static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self, SidebarBranchNode* child) {
+static gint
+sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
+                                           SidebarBranchNode* child)
+{
 	gint result = 0;
 	GeeSortedSet* _tmp0_;
 	gint index = 0;
@@ -2170,11 +2083,11 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 		result = -1;
 #line 120 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return result;
-#line 2174 "Branch.c"
+#line 2087 "Branch.c"
 	}
 #line 122 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	index = 0;
-#line 2178 "Branch.c"
+#line 2091 "Branch.c"
 	{
 		GeeIterator* _c_it = NULL;
 		GeeSortedSet* _tmp1_;
@@ -2187,37 +2100,31 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 		_c_it = _tmp2_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		while (TRUE) {
-#line 2191 "Branch.c"
+#line 2104 "Branch.c"
 			GeeIterator* _tmp3_;
-			gboolean _tmp4_;
 			SidebarBranchNode* c = NULL;
-			GeeIterator* _tmp5_;
-			gpointer _tmp6_;
-			SidebarBranchNode* _tmp7_;
-			SidebarBranchNode* _tmp8_;
-			gint _tmp9_;
+			GeeIterator* _tmp4_;
+			gpointer _tmp5_;
+			SidebarBranchNode* _tmp6_;
+			gint _tmp7_;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_tmp3_ = _c_it;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp4_ = gee_iterator_next (_tmp3_);
-#line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (!_tmp4_) {
+			if (!gee_iterator_next (_tmp3_)) {
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				break;
-#line 2208 "Branch.c"
+#line 2117 "Branch.c"
 			}
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp5_ = _c_it;
+			_tmp4_ = _c_it;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp6_ = gee_iterator_get (_tmp5_);
+			_tmp5_ = gee_iterator_get (_tmp4_);
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			c = (SidebarBranchNode*) _tmp6_;
+			c = (SidebarBranchNode*) _tmp5_;
 #line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = child;
+			_tmp6_ = c;
 #line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = c;
-#line 124 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			if (_tmp7_ == _tmp8_) {
+			if (child == _tmp6_) {
 #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				result = index;
 #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2226,43 +2133,41 @@ static gint sidebar_branch_node_index_of_by_reference (SidebarBranchNode* self,
 				_g_object_unref0 (_c_it);
 #line 125 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				return result;
-#line 2230 "Branch.c"
+#line 2137 "Branch.c"
 			}
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp9_ = index;
+			_tmp7_ = index;
 #line 127 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			index = _tmp9_ + 1;
+			index = _tmp7_ + 1;
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_sidebar_branch_node_unref0 (c);
-#line 2238 "Branch.c"
+#line 2145 "Branch.c"
 		}
 #line 123 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		_g_object_unref0 (_c_it);
-#line 2242 "Branch.c"
+#line 2149 "Branch.c"
 	}
 #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	result = -1;
 #line 130 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 2248 "Branch.c"
+#line 2155 "Branch.c"
 }
 
 
-static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, SidebarBranchNode* child) {
+static gboolean
+sidebar_branch_node_reorder_child (SidebarBranchNode* self,
+                                   SidebarBranchNode* child)
+{
 	gboolean result = FALSE;
 	GeeSortedSet* _tmp0_;
 	gint old_index = 0;
-	SidebarBranchNode* _tmp1_;
-	gint _tmp2_;
 	GeeSortedSet* new_children = NULL;
-	GeeTreeSet* _tmp3_;
+	GeeTreeSet* _tmp1_;
 	gboolean added = FALSE;
-	GeeSortedSet* _tmp4_;
-	gboolean _tmp5_;
-	GeeSortedSet* _tmp6_;
+	GeeSortedSet* _tmp2_;
+	GeeSortedSet* _tmp3_;
 	gint new_index = 0;
-	SidebarBranchNode* _tmp7_;
-	gint _tmp8_;
 #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (SIDEBAR_BRANCH_IS_NODE (self), FALSE);
 #line 134 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2272,37 +2177,27 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side
 #line 135 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (_tmp0_ != NULL, "children != null");
 #line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = child;
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = sidebar_branch_node_index_of_by_reference (self, _tmp1_);
-#line 137 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	old_index = _tmp2_;
+	old_index = sidebar_branch_node_index_of_by_reference (self, child);
 #line 138 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (old_index >= 0, "old_index >= 0");
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp3_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
+	_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
 #line 146 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_SORTED_SET, GeeSortedSet);
-#line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp4_ = self->children;
+	new_children = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SORTED_SET, GeeSortedSet);
 #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp5_ = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (new_children, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection));
+	_tmp2_ = self->children;
 #line 147 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	added = _tmp5_;
+	added = gee_collection_add_all (G_TYPE_CHECK_INSTANCE_CAST (new_children, GEE_TYPE_COLLECTION, GeeCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection));
 #line 148 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (added, "added");
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = _g_object_ref0 (new_children);
+	_tmp3_ = _g_object_ref0 (new_children);
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->children);
 #line 150 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->children = _tmp6_;
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp7_ = child;
+	self->children = _tmp3_;
 #line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp8_ = sidebar_branch_node_index_of_by_reference (self, _tmp7_);
-#line 152 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	new_index = _tmp8_;
+	new_index = sidebar_branch_node_index_of_by_reference (self, child);
 #line 153 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_vala_assert (new_index >= 0, "new_index >= 0");
 #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2311,11 +2206,16 @@ static gboolean sidebar_branch_node_reorder_child (SidebarBranchNode* self, Side
 	_g_object_unref0 (new_children);
 #line 155 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return result;
-#line 2315 "Branch.c"
+#line 2210 "Branch.c"
 }
 
 
-static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) {
+static void
+sidebar_branch_node_reorder_children (SidebarBranchNode* self,
+                                      gboolean recursive,
+                                      SidebarBranchNodeChildrenReorderedCallback cb,
+                                      void* cb_target)
+{
 	GeeSortedSet* _tmp0_;
 	GeeSortedSet* reordered = NULL;
 	GeeTreeSet* _tmp1_;
@@ -2323,9 +2223,6 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 	GeeSortedSet* _tmp3_;
 	GeeSortedSet* _tmp4_;
 	GeeSortedSet* _tmp5_;
-	gboolean _tmp6_;
-	SidebarBranchNodeChildrenReorderedCallback _tmp15_;
-	void* _tmp15__target;
 #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 159 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2334,7 +2231,7 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 	if (_tmp0_ == NULL) {
 #line 160 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return;
-#line 2338 "Branch.c"
+#line 2235 "Branch.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_tmp1_ = gee_tree_set_new (SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, _sidebar_branch_node_comparator_wrapper_gcompare_data_func, NULL, NULL);
@@ -2355,256 +2252,248 @@ static void sidebar_branch_node_reorder_children (SidebarBranchNode* self, gbool
 #line 164 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->children = _tmp5_;
 #line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp6_ = recursive;
-#line 166 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp6_) {
-#line 2362 "Branch.c"
+	if (recursive) {
+#line 2257 "Branch.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeSortedSet* _tmp7_;
-			GeeIterator* _tmp8_;
+			GeeSortedSet* _tmp6_;
+			GeeIterator* _tmp7_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp7_ = self->children;
+			_tmp6_ = self->children;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp8_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_child_it = _tmp8_;
+			_child_it = _tmp7_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			while (TRUE) {
-#line 2375 "Branch.c"
-				GeeIterator* _tmp9_;
-				gboolean _tmp10_;
+#line 2270 "Branch.c"
+				GeeIterator* _tmp8_;
 				SidebarBranchNode* child = NULL;
-				GeeIterator* _tmp11_;
-				gpointer _tmp12_;
-				SidebarBranchNode* _tmp13_;
-				SidebarBranchNodeChildrenReorderedCallback _tmp14_;
-				void* _tmp14__target;
-#line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp9_ = _child_it;
+				GeeIterator* _tmp9_;
+				gpointer _tmp10_;
+				SidebarBranchNode* _tmp11_;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp10_ = gee_iterator_next (_tmp9_);
+				_tmp8_ = _child_it;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				if (!_tmp10_) {
+				if (!gee_iterator_next (_tmp8_)) {
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 					break;
-#line 2392 "Branch.c"
+#line 2282 "Branch.c"
 				}
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11_ = _child_it;
+				_tmp9_ = _child_it;
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp12_ = gee_iterator_get (_tmp11_);
+				_tmp10_ = gee_iterator_get (_tmp9_);
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				child = (SidebarBranchNode*) _tmp12_;
+				child = (SidebarBranchNode*) _tmp10_;
 #line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp13_ = child;
-#line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp14_ = cb;
+				_tmp11_ = child;
 #line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp14__target = cb_target;
-#line 168 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				sidebar_branch_node_reorder_children (_tmp13_, TRUE, _tmp14_, _tmp14__target);
+				sidebar_branch_node_reorder_children (_tmp11_, TRUE, cb, cb_target);
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
-#line 2410 "Branch.c"
+#line 2296 "Branch.c"
 			}
 #line 167 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_g_object_unref0 (_child_it);
-#line 2414 "Branch.c"
+#line 2300 "Branch.c"
 		}
 	}
 #line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ = cb;
-#line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15__target = cb_target;
-#line 171 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp15_ (self, _tmp15__target);
+	cb (self, cb_target);
 #line 158 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (reordered);
-#line 2425 "Branch.c"
+#line 2307 "Branch.c"
 }
 
 
-static void sidebar_branch_node_change_comparator (SidebarBranchNode* self, GCompareFunc comparator, gboolean recursive, SidebarBranchNodeChildrenReorderedCallback cb, void* cb_target) {
-	GCompareFunc _tmp0_;
-	SidebarBranchNodeChildrenReorderedCallback _tmp1_;
-	void* _tmp1__target;
-	gboolean _tmp2_;
+static void
+sidebar_branch_node_change_comparator (SidebarBranchNode* self,
+                                       GCompareFunc comparator,
+                                       gboolean recursive,
+                                       SidebarBranchNodeChildrenReorderedCallback cb,
+                                       void* cb_target)
+{
 #line 174 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (SIDEBAR_BRANCH_IS_NODE (self));
 #line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp0_ = comparator;
-#line 176 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	self->comparator = _tmp0_;
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1_ = cb;
-#line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp1__target = cb_target;
+	self->comparator = comparator;
 #line 179 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	sidebar_branch_node_reorder_children (self, FALSE, _tmp1_, _tmp1__target);
+	sidebar_branch_node_reorder_children (self, FALSE, cb, cb_target);
 #line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	_tmp2_ = recursive;
-#line 181 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-	if (_tmp2_) {
-#line 2450 "Branch.c"
+	if (recursive) {
+#line 2326 "Branch.c"
 		{
 			GeeIterator* _child_it = NULL;
-			GeeSortedSet* _tmp3_;
-			GeeIterator* _tmp4_;
+			GeeSortedSet* _tmp0_;
+			GeeIterator* _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp3_ = self->children;
+			_tmp0_ = self->children;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_tmp4_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_ITERABLE, GeeIterable));
+			_tmp1_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-			_child_it = _tmp4_;
+			_child_it = _tmp1_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			while (TRUE) {
-#line 2463 "Branch.c"
-				GeeIterator* _tmp5_;
-				gboolean _tmp6_;
+#line 2339 "Branch.c"
+				GeeIterator* _tmp2_;
 				SidebarBranchNode* child = NULL;
-				GeeIterator* _tmp7_;
-				gpointer _tmp8_;
-				SidebarBranchNode* _tmp9_;
-				GCompareFunc _tmp10_;
-				SidebarBranchNodeChildrenReorderedCallback _tmp11_;
-				void* _tmp11__target;
-#line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp5_ = _child_it;
+				GeeIterator* _tmp3_;
+				gpointer _tmp4_;
+				SidebarBranchNode* _tmp5_;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp6_ = gee_iterator_next (_tmp5_);
+				_tmp2_ = _child_it;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				if (!_tmp6_) {
+				if (!gee_iterator_next (_tmp2_)) {
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 					break;
-#line 2481 "Branch.c"
+#line 2351 "Branch.c"
 				}
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp7_ = _child_it;
+				_tmp3_ = _child_it;
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp8_ = gee_iterator_get (_tmp7_);
+				_tmp4_ = gee_iterator_get (_tmp3_);
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				child = (SidebarBranchNode*) _tmp8_;
+				child = (SidebarBranchNode*) _tmp4_;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp9_ = child;
+				_tmp5_ = child;
 #line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp10_ = comparator;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11_ = cb;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				_tmp11__target = cb_target;
-#line 183 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
-				sidebar_branch_node_change_comparator (_tmp9_, _tmp10_, TRUE, _tmp11_, _tmp11__target);
+				sidebar_branch_node_change_comparator (_tmp5_, comparator, TRUE, cb, cb_target);
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 				_sidebar_branch_node_unref0 (child);
-#line 2501 "Branch.c"
+#line 2365 "Branch.c"
 			}
 #line 182 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			_g_object_unref0 (_child_it);
-#line 2505 "Branch.c"
+#line 2369 "Branch.c"
 		}
 	}
 }
 
 
-static void sidebar_branch_value_node_init (GValue* value) {
+static void
+sidebar_branch_value_node_init (GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	value->data[0].v_pointer = NULL;
-#line 2514 "Branch.c"
+#line 2380 "Branch.c"
 }
 
 
-static void sidebar_branch_value_node_free_value (GValue* value) {
+static void
+sidebar_branch_value_node_free_value (GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (value->data[0].v_pointer);
-#line 2523 "Branch.c"
+#line 2391 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_value_node_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+sidebar_branch_value_node_copy_value (const GValue* src_value,
+                                      GValue* dest_value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (src_value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		dest_value->data[0].v_pointer = sidebar_branch_node_ref (src_value->data[0].v_pointer);
-#line 2533 "Branch.c"
+#line 2404 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2537 "Branch.c"
+#line 2408 "Branch.c"
 	}
 }
 
 
-static gpointer sidebar_branch_value_node_peek_pointer (const GValue* value) {
+static gpointer
+sidebar_branch_value_node_peek_pointer (const GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return value->data[0].v_pointer;
-#line 2545 "Branch.c"
+#line 2418 "Branch.c"
 }
 
 
-static gchar* sidebar_branch_value_node_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+sidebar_branch_value_node_collect_value (GValue* value,
+                                         guint n_collect_values,
+                                         GTypeCValue* collect_values,
+                                         guint collect_flags)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (collect_values[0].v_pointer) {
-#line 2552 "Branch.c"
+#line 2430 "Branch.c"
 		SidebarBranchNode * object;
 		object = collect_values[0].v_pointer;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2559 "Branch.c"
+#line 2437 "Branch.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2563 "Branch.c"
+#line 2441 "Branch.c"
 		}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = sidebar_branch_node_ref (object);
-#line 2567 "Branch.c"
+#line 2445 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2571 "Branch.c"
+#line 2449 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return NULL;
-#line 2575 "Branch.c"
+#line 2453 "Branch.c"
 }
 
 
-static gchar* sidebar_branch_value_node_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+sidebar_branch_value_node_lcopy_value (const GValue* value,
+                                       guint n_collect_values,
+                                       GTypeCValue* collect_values,
+                                       guint collect_flags)
+{
 	SidebarBranchNode ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (!object_p) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 2586 "Branch.c"
+#line 2469 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (!value->data[0].v_pointer) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = NULL;
-#line 2592 "Branch.c"
+#line 2475 "Branch.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = value->data[0].v_pointer;
-#line 2596 "Branch.c"
+#line 2479 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		*object_p = sidebar_branch_node_ref (value->data[0].v_pointer);
-#line 2600 "Branch.c"
+#line 2483 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return NULL;
-#line 2604 "Branch.c"
+#line 2487 "Branch.c"
 }
 
 
-static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+sidebar_branch_param_spec_node (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags)
+{
 	SidebarBranchParamSpecNode* spec;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, SIDEBAR_BRANCH_TYPE_NODE), NULL);
@@ -2614,20 +2503,25 @@ static GParamSpec* sidebar_branch_param_spec_node (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return G_PARAM_SPEC (spec);
-#line 2618 "Branch.c"
+#line 2507 "Branch.c"
 }
 
 
-static gpointer sidebar_branch_value_get_node (const GValue* value) {
+static gpointer
+sidebar_branch_value_get_node (const GValue* value)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE), NULL);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return value->data[0].v_pointer;
-#line 2627 "Branch.c"
+#line 2518 "Branch.c"
 }
 
 
-static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) {
+static void
+sidebar_branch_value_set_node (GValue* value,
+                               gpointer v_object)
+{
 	SidebarBranchNode * old;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE));
@@ -2643,22 +2537,25 @@ static void sidebar_branch_value_set_node (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_ref (value->data[0].v_pointer);
-#line 2647 "Branch.c"
+#line 2541 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2651 "Branch.c"
+#line 2545 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (old) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (old);
-#line 2657 "Branch.c"
+#line 2551 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) {
+static void
+sidebar_branch_value_take_node (GValue* value,
+                                gpointer v_object)
+{
 	SidebarBranchNode * old;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, SIDEBAR_BRANCH_TYPE_NODE));
@@ -2672,40 +2569,46 @@ static void sidebar_branch_value_take_node (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = v_object;
-#line 2676 "Branch.c"
+#line 2573 "Branch.c"
 	} else {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		value->data[0].v_pointer = NULL;
-#line 2680 "Branch.c"
+#line 2577 "Branch.c"
 	}
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	if (old) {
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		sidebar_branch_node_unref (old);
-#line 2686 "Branch.c"
+#line 2583 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_node_class_init (SidebarBranchNodeClass * klass) {
+static void
+sidebar_branch_node_class_init (SidebarBranchNodeClass * klass)
+{
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_node_parent_class = g_type_class_peek_parent (klass);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	((SidebarBranchNodeClass *) klass)->finalize = sidebar_branch_node_finalize;
-#line 2696 "Branch.c"
+#line 2595 "Branch.c"
 }
 
 
-static void sidebar_branch_node_instance_init (SidebarBranchNode * self) {
+static void
+sidebar_branch_node_instance_init (SidebarBranchNode * self)
+{
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->children = NULL;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->ref_count = 1;
-#line 2705 "Branch.c"
+#line 2606 "Branch.c"
 }
 
 
-static void sidebar_branch_node_finalize (SidebarBranchNode * obj) {
+static void
+sidebar_branch_node_finalize (SidebarBranchNode * obj)
+{
 	SidebarBranchNode * self;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_BRANCH_TYPE_NODE, SidebarBranchNode);
@@ -2715,11 +2618,13 @@ static void sidebar_branch_node_finalize (SidebarBranchNode * obj) {
 	_g_object_unref0 (self->entry);
 #line 43 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	_g_object_unref0 (self->children);
-#line 2719 "Branch.c"
+#line 2622 "Branch.c"
 }
 
 
-static GType sidebar_branch_node_get_type (void) {
+static GType
+sidebar_branch_node_get_type (void)
+{
 	static volatile gsize sidebar_branch_node_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_branch_node_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { sidebar_branch_value_node_init, sidebar_branch_value_node_free_value, sidebar_branch_value_node_copy_value, sidebar_branch_value_node_peek_pointer, "p", sidebar_branch_value_node_collect_value, "p", sidebar_branch_value_node_lcopy_value };
@@ -2733,18 +2638,22 @@ static GType sidebar_branch_node_get_type (void) {
 }
 
 
-static gpointer sidebar_branch_node_ref (gpointer instance) {
+static gpointer
+sidebar_branch_node_ref (gpointer instance)
+{
 	SidebarBranchNode * self;
 	self = instance;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	return instance;
-#line 2744 "Branch.c"
+#line 2651 "Branch.c"
 }
 
 
-static void sidebar_branch_node_unref (gpointer instance) {
+static void
+sidebar_branch_node_unref (gpointer instance)
+{
 	SidebarBranchNode * self;
 	self = instance;
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2753,12 +2662,14 @@ static void sidebar_branch_node_unref (gpointer instance) {
 		SIDEBAR_BRANCH_NODE_GET_CLASS (self)->finalize (self);
 #line 35 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 2757 "Branch.c"
+#line 2666 "Branch.c"
 	}
 }
 
 
-static void sidebar_branch_class_init (SidebarBranchClass * klass) {
+static void
+sidebar_branch_class_init (SidebarBranchClass * klass)
+{
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_parent_class = g_type_class_peek_parent (klass);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
@@ -2777,11 +2688,13 @@ static void sidebar_branch_class_init (SidebarBranchClass * klass) {
 	sidebar_branch_signals[SIDEBAR_BRANCH_CHILDREN_REORDERED_SIGNAL] = g_signal_new ("children-reordered", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__OBJECT, G_TYPE_NONE, 1, SIDEBAR_TYPE_ENTRY);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	sidebar_branch_signals[SIDEBAR_BRANCH_SHOW_BRANCH_SIGNAL] = g_signal_new ("show-branch", SIDEBAR_TYPE_BRANCH, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN);
-#line 2781 "Branch.c"
+#line 2692 "Branch.c"
 }
 
 
-static void sidebar_branch_instance_init (SidebarBranch * self) {
+static void
+sidebar_branch_instance_init (SidebarBranch * self)
+{
 	GeeHashMap* _tmp0_;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->priv = SIDEBAR_BRANCH_GET_PRIVATE (self);
@@ -2791,11 +2704,13 @@ static void sidebar_branch_instance_init (SidebarBranch * self) {
 	_tmp0_ = gee_hash_map_new (SIDEBAR_TYPE_ENTRY, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, SIDEBAR_BRANCH_TYPE_NODE, (GBoxedCopyFunc) sidebar_branch_node_ref, (GDestroyNotify) sidebar_branch_node_unref, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 192 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self->priv->map = _tmp0_;
-#line 2795 "Branch.c"
+#line 2708 "Branch.c"
 }
 
 
-static void sidebar_branch_finalize (GObject * obj) {
+static void
+sidebar_branch_finalize (GObject * obj)
+{
 	SidebarBranch * self;
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, SIDEBAR_TYPE_BRANCH, SidebarBranch);
@@ -2805,11 +2720,13 @@ static void sidebar_branch_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->map);
 #line 9 "/home/jens/Source/shotwell/src/sidebar/Branch.vala"
 	G_OBJECT_CLASS (sidebar_branch_parent_class)->finalize (obj);
-#line 2809 "Branch.c"
+#line 2724 "Branch.c"
 }
 
 
-GType sidebar_branch_get_type (void) {
+GType
+sidebar_branch_get_type (void)
+{
 	static volatile gsize sidebar_branch_type_id__volatile = 0;
 	if (g_once_init_enter (&sidebar_branch_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (SidebarBranchClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) sidebar_branch_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (SidebarBranch), 0, (GInstanceInitFunc) sidebar_branch_instance_init, NULL };