Merge branch 'feature/upstream' into develop

1 files changed, 7643 insertions, 7249 deletions

diff --git a/src/PhotoPage.c b/src/PhotoPage.c
index 8693b5d..8b5783a 100644
--- a/src/PhotoPage.c
+++ b/src/PhotoPage.c
@@ -1,4 +1,4 @@
-/* PhotoPage.c generated by valac 0.36.6, the Vala compiler
+/* PhotoPage.c generated by valac 0.40.4, the Vala compiler
  * generated from PhotoPage.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
@@ -153,6 +154,11 @@ typedef struct _PageClass PageClass;
 
 typedef struct _SinglePhotoPage SinglePhotoPage;
 typedef struct _SinglePhotoPageClass SinglePhotoPageClass;
+enum  {
+	ZOOM_BUFFER_0_PROPERTY,
+	ZOOM_BUFFER_NUM_PROPERTIES
+};
+static GParamSpec* zoom_buffer_properties[ZOOM_BUFFER_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 #define _background_job_unref0(var) ((var == NULL) ? NULL : (var = (background_job_unref (var), NULL)))
 #define _workers_unref0(var) ((var == NULL) ? NULL : (var = (workers_unref (var), NULL)))
@@ -309,6 +315,11 @@ typedef struct _PixbufCacheClass PixbufCacheClass;
 
 typedef struct _DragAndDropHandler DragAndDropHandler;
 typedef struct _DragAndDropHandlerClass DragAndDropHandlerClass;
+enum  {
+	EDITING_HOST_PAGE_0_PROPERTY,
+	EDITING_HOST_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* editing_host_page_properties[EDITING_HOST_PAGE_NUM_PROPERTIES];
 
 #define TYPE_ALTERATION (alteration_get_type ())
 #define ALTERATION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ALTERATION, Alteration))
@@ -729,6 +740,11 @@ typedef struct _ViewFilterClass ViewFilterClass;
 
 typedef struct _LibraryPhotoPageLibraryPhotoPageViewFilter LibraryPhotoPageLibraryPhotoPageViewFilter;
 typedef struct _LibraryPhotoPageLibraryPhotoPageViewFilterClass LibraryPhotoPageLibraryPhotoPageViewFilterClass;
+enum  {
+	LIBRARY_PHOTO_PAGE_0_PROPERTY,
+	LIBRARY_PHOTO_PAGE_NUM_PROPERTIES
+};
+static GParamSpec* library_photo_page_properties[LIBRARY_PHOTO_PAGE_NUM_PROPERTIES];
 
 #define TYPE_DATABASE_SOURCE_COLLECTION (database_source_collection_get_type ())
 #define DATABASE_SOURCE_COLLECTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_DATABASE_SOURCE_COLLECTION, DatabaseSourceCollection))
@@ -1480,73 +1496,139 @@ ZoomState* zoom_state_dup (const ZoomState* self);
 void zoom_state_free (ZoomState* self);
 gpointer background_job_ref (gpointer instance);
 void background_job_unref (gpointer instance);
-GParamSpec* param_spec_background_job (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_background_job (GValue* value, gpointer v_object);
-void value_take_background_job (GValue* value, gpointer v_object);
+GParamSpec* param_spec_background_job (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags);
+void value_set_background_job (GValue* value,
+                               gpointer v_object);
+void value_take_background_job (GValue* value,
+                                gpointer v_object);
 gpointer value_get_background_job (const GValue* value);
 GType background_job_get_type (void) G_GNUC_CONST;
 static GType zoom_buffer_transformation_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 gpointer workers_ref (gpointer instance);
 void workers_unref (gpointer instance);
-GParamSpec* param_spec_workers (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_workers (GValue* value, gpointer v_object);
-void value_take_workers (GValue* value, gpointer v_object);
+GParamSpec* param_spec_workers (const gchar* name,
+                                const gchar* nick,
+                                const gchar* blurb,
+                                GType object_type,
+                                GParamFlags flags);
+void value_set_workers (GValue* value,
+                        gpointer v_object);
+void value_take_workers (GValue* value,
+                         gpointer v_object);
 gpointer value_get_workers (const GValue* value);
 GType workers_get_type (void) G_GNUC_CONST;
 GType page_get_type (void) G_GNUC_CONST;
 GType single_photo_page_get_type (void) G_GNUC_CONST;
 #define ZOOM_BUFFER_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_ZOOM_BUFFER, ZoomBufferPrivate))
-enum  {
-	ZOOM_BUFFER_DUMMY_PROPERTY
-};
 #define ZOOM_BUFFER_MEGAPIXEL 1048576
 #define ZOOM_BUFFER_USE_REDUCED_THRESHOLD (((gint) 2.0) * ZOOM_BUFFER_MEGAPIXEL)
-ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image);
-ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image);
-Workers* workers_new (guint max_threads, gboolean exclusive);
-Workers* workers_construct (GType object_type, guint max_threads, gboolean exclusive);
-static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, BackgroundJob* job);
+ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page,
+                             Photo* backing_photo,
+                             GdkPixbuf* preview_image);
+ZoomBuffer* zoom_buffer_construct (GType object_type,
+                                   SinglePhotoPage* parent_page,
+                                   Photo* backing_photo,
+                                   GdkPixbuf* preview_image);
+Workers* workers_new (guint max_threads,
+                      gboolean exclusive);
+Workers* workers_construct (GType object_type,
+                            guint max_threads,
+                            gboolean exclusive);
+static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self,
+                                               BackgroundJob* job);
 static GType zoom_buffer_iso_source_fetch_job_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType background_job_job_priority_get_type (void) G_GNUC_CONST;
 GType direction_get_type (void) G_GNUC_CONST;
-void single_photo_page_repaint (SinglePhotoPage* self, Direction* direction);
+void single_photo_page_repaint (SinglePhotoPage* self,
+                                Direction* direction);
 PixelTransformer* photo_get_pixel_transformer (Photo* self);
-static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job);
-static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self);
-static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable);
-static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type, ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable);
-void workers_enqueue (Workers* self, BackgroundJob* job);
-static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, BackgroundJob* job);
-static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, ZoomState* zoom_state, GdkPixbuf* iso_pixbuf, GdkPixbuf* reduced_pixbuf);
-void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self, GdkRectangle* result);
-void zoom_state_get_viewing_rectangle_projection (ZoomState *self, GdkPixbuf* for_pixbuf, GdkRectangle* result);
+static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self,
+                                                 BackgroundJob* job);
+static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job,
+                                                                      gpointer self);
+static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner,
+                                                                 GdkPixbuf* to_transform,
+                                                                 PixelTransformer* transformer,
+                                                                 CompletionCallback completion_callback,
+                                                                 void* completion_callback_target,
+                                                                 GCancellable* cancellable);
+static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type,
+                                                                       ZoomBuffer* owner,
+                                                                       GdkPixbuf* to_transform,
+                                                                       PixelTransformer* transformer,
+                                                                       CompletionCallback completion_callback,
+                                                                       void* completion_callback_target,
+                                                                       GCancellable* cancellable);
+void workers_enqueue (Workers* self,
+                      BackgroundJob* job);
+static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self,
+                                               BackgroundJob* job);
+static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self,
+                                                   ZoomState* zoom_state,
+                                                   GdkPixbuf* iso_pixbuf,
+                                                   GdkPixbuf* reduced_pixbuf);
+void zoom_state_get_viewing_rectangle_wrt_content (ZoomState *self,
+                                                   GdkRectangle* result);
+void zoom_state_get_viewing_rectangle_projection (ZoomState *self,
+                                                  GdkPixbuf* for_pixbuf,
+                                                  GdkRectangle* result);
 gdouble zoom_state_get_zoom_factor (ZoomState *self);
-static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, ZoomState* zoom_state);
-gboolean zoom_state_equals (ZoomState *self, ZoomState* other);
-GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomState* zoom_state);
+static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self,
+                                                                ZoomState* zoom_state);
+gboolean zoom_state_equals (ZoomState *self,
+                            ZoomState* other);
+GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self,
+                                                        ZoomState* zoom_state);
 void background_job_cancel (BackgroundJob* self);
-static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, gpointer self);
-static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, gpointer self);
-static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target);
-static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type, ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target);
+static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job,
+                                                                    gpointer self);
+static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job,
+                                                                    gpointer self);
+static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner,
+                                                                   Photo* to_fetch,
+                                                                   CompletionCallback completion_callback,
+                                                                   void* completion_callback_target);
+static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type,
+                                                                         ZoomBuffer* owner,
+                                                                         Photo* to_fetch,
+                                                                         CompletionCallback completion_callback,
+                                                                         void* completion_callback_target);
 Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self);
-void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_image);
-void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_state);
-GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state);
+void zoom_buffer_update_preview_image (ZoomBuffer* self,
+                                       GdkPixbuf* preview_image);
+void zoom_buffer_flush_demand_cache (ZoomBuffer* self,
+                                     ZoomState* initial_zoom_state);
+GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self,
+                                         ZoomState* zoom_state);
 gdouble zoom_state_get_interpolation_factor (ZoomState *self);
-GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state);
+GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self,
+                                               ZoomState* zoom_state);
 #define ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJobPrivate))
-enum  {
-	ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_DUMMY_PROPERTY
-};
 gpointer abstract_semaphore_ref (gpointer instance);
 void abstract_semaphore_unref (gpointer instance);
-GParamSpec* param_spec_abstract_semaphore (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_abstract_semaphore (GValue* value, gpointer v_object);
-void value_take_abstract_semaphore (GValue* value, gpointer v_object);
+GParamSpec* param_spec_abstract_semaphore (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_abstract_semaphore (GValue* value,
+                                   gpointer v_object);
+void value_take_abstract_semaphore (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_abstract_semaphore (const GValue* value);
 GType abstract_semaphore_get_type (void) G_GNUC_CONST;
-BackgroundJob* background_job_construct (GType object_type, GObject* owner, CompletionCallback callback, void* callback_target, GCancellable* cancellable, CancellationCallback cancellation, void* cancellation_target, AbstractSemaphore* completion_semaphore);
+BackgroundJob* background_job_construct (GType object_type,
+                                         GObject* owner,
+                                         CompletionCallback callback,
+                                         void* callback_target,
+                                         GCancellable* cancellable,
+                                         CancellationCallback cancellation,
+                                         void* cancellation_target,
+                                         AbstractSemaphore* completion_semaphore);
 static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base);
 GType scaling_get_type (void) G_GNUC_CONST;
 GType scale_constraint_get_type (void) G_GNUC_CONST;
@@ -1554,13 +1636,14 @@ Scaling* scaling_dup (const Scaling* self);
 void scaling_free (Scaling* self);
 GType photo_exception_get_type (void) G_GNUC_CONST;
 GType backing_fetch_mode_get_type (void) G_GNUC_CONST;
-GdkPixbuf* photo_get_pixbuf_with_options (Photo* self, Scaling* scaling, PhotoException exceptions, BackingFetchMode fetch_mode, GError** error);
+GdkPixbuf* photo_get_pixbuf_with_options (Photo* self,
+                                          Scaling* scaling,
+                                          PhotoException exceptions,
+                                          BackingFetchMode fetch_mode,
+                                          GError** error);
 void scaling_for_original (Scaling* result);
 static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj);
 #define ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJobPrivate))
-enum  {
-	ZOOM_BUFFER_TRANSFORMATION_JOB_DUMMY_PROPERTY
-};
 static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base);
 static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj);
 static void zoom_buffer_finalize (GObject * obj);
@@ -1568,9 +1651,15 @@ GType page_window_get_type (void) G_GNUC_CONST;
 GType fullscreen_window_get_type (void) G_GNUC_CONST;
 gpointer injection_group_ref (gpointer instance);
 void injection_group_unref (gpointer instance);
-GParamSpec* param_spec_injection_group (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_injection_group (GValue* value, gpointer v_object);
-void value_take_injection_group (GValue* value, gpointer v_object);
+GParamSpec* param_spec_injection_group (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_injection_group (GValue* value,
+                                gpointer v_object);
+void value_take_injection_group (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_injection_group (const GValue* value);
 GType injection_group_get_type (void) G_GNUC_CONST;
 GType single_photo_page_update_reason_get_type (void) G_GNUC_CONST;
@@ -1578,45 +1667,73 @@ GType editing_host_page_get_type (void) G_GNUC_CONST;
 GType data_view_get_type (void) G_GNUC_CONST;
 gpointer data_collection_ref (gpointer instance);
 void data_collection_unref (gpointer instance);
-GParamSpec* param_spec_data_collection (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_data_collection (GValue* value, gpointer v_object);
-void value_take_data_collection (GValue* value, gpointer v_object);
+GParamSpec* param_spec_data_collection (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_data_collection (GValue* value,
+                                gpointer v_object);
+void value_take_data_collection (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_data_collection (const GValue* value);
 GType data_collection_get_type (void) G_GNUC_CONST;
 GType source_collection_get_type (void) G_GNUC_CONST;
 GType view_collection_get_type (void) G_GNUC_CONST;
 gpointer editing_tools_editing_tool_ref (gpointer instance);
 void editing_tools_editing_tool_unref (gpointer instance);
-GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object);
-void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object);
+GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name,
+                                                   const gchar* nick,
+                                                   const gchar* blurb,
+                                                   GType object_type,
+                                                   GParamFlags flags);
+void editing_tools_value_set_editing_tool (GValue* value,
+                                           gpointer v_object);
+void editing_tools_value_take_editing_tool (GValue* value,
+                                            gpointer v_object);
 gpointer editing_tools_value_get_editing_tool (const GValue* value);
 GType editing_tools_editing_tool_get_type (void) G_GNUC_CONST;
 GType pixbuf_cache_get_type (void) G_GNUC_CONST;
 gpointer drag_and_drop_handler_ref (gpointer instance);
 void drag_and_drop_handler_unref (gpointer instance);
-GParamSpec* param_spec_drag_and_drop_handler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_drag_and_drop_handler (GValue* value, gpointer v_object);
-void value_take_drag_and_drop_handler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_drag_and_drop_handler (const gchar* name,
+                                              const gchar* nick,
+                                              const gchar* blurb,
+                                              GType object_type,
+                                              GParamFlags flags);
+void value_set_drag_and_drop_handler (GValue* value,
+                                      gpointer v_object);
+void value_take_drag_and_drop_handler (GValue* value,
+                                       gpointer v_object);
 gpointer value_get_drag_and_drop_handler (const GValue* value);
 GType drag_and_drop_handler_get_type (void) G_GNUC_CONST;
 #define EDITING_HOST_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_EDITING_HOST_PAGE, EditingHostPagePrivate))
-enum  {
-	EDITING_HOST_PAGE_DUMMY_PROPERTY
-};
 gpointer alteration_ref (gpointer instance);
 void alteration_unref (gpointer instance);
-GParamSpec* param_spec_alteration (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_alteration (GValue* value, gpointer v_object);
-void value_take_alteration (GValue* value, gpointer v_object);
+GParamSpec* param_spec_alteration (const gchar* name,
+                                   const gchar* nick,
+                                   const gchar* blurb,
+                                   GType object_type,
+                                   GParamFlags flags);
+void value_set_alteration (GValue* value,
+                           gpointer v_object);
+void value_take_alteration (GValue* value,
+                            gpointer v_object);
 gpointer value_get_alteration (const GValue* value);
 GType alteration_get_type (void) G_GNUC_CONST;
-static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* map);
-static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void editing_host_page_on_photos_altered (EditingHostPage* self,
+                                          GeeMap* map);
+static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                         GeeMap* items,
+                                                                         gpointer self);
 ViewCollection* page_get_view (Page* self);
 static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self);
-static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self);
-static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self);
+static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender,
+                                                                                            GeeIterable* added,
+                                                                                            GeeIterable* removed,
+                                                                                            gpointer self);
+static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender,
+                                                                                            gpointer self);
 #define RESOURCES_PREVIOUS_LABEL _ ("_Previous")
 #define RESOURCES_NEXT_LABEL _ ("_Next")
 #define EDITING_HOST_PAGE_TRINKET_SCALE 20
@@ -1626,63 +1743,99 @@ static void _editing_host_page_on_view_contents_ordering_altered_data_collection
 #define EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR 8
 #define EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT 5
 #define EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT 5
-EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name);
-SinglePhotoPage* single_photo_page_construct (GType object_type, const gchar* page_name, gboolean scale_up_to_viewport);
+EditingHostPage* editing_host_page_construct (GType object_type,
+                                              SourceCollection* sources,
+                                              const gchar* name);
+SinglePhotoPage* single_photo_page_construct (GType object_type,
+                                              const gchar* page_name,
+                                              gboolean scale_up_to_viewport);
 static void editing_host_page_on_viewport_resized (EditingHostPage* self);
-static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self);
+static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender,
+                                                                      GtkAllocation* allocation,
+                                                                      gpointer self);
 GtkToolbar* page_get_toolbar (Page* self);
 #define RESOURCES_ROTATE_CW_LABEL _ ("Rotate")
 #define RESOURCES_CLOCKWISE "object-rotate-right"
 #define RESOURCES_ROTATE_CW_TOOLTIP _ ("Rotate the photos right (press Ctrl to rotate left)")
 void editing_host_page_on_rotate_clockwise (EditingHostPage* self);
-static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
+static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                                     gpointer self);
 #define RESOURCES_CROP_LABEL _ ("Crop")
 #define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
 static void editing_host_page_on_crop_toggled (EditingHostPage* self);
-static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
+static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                        gpointer self);
 #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten")
 #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo")
 static void editing_host_page_on_straighten_toggled (EditingHostPage* self);
-static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
+static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                              gpointer self);
 #define RESOURCES_RED_EYE_LABEL _ ("Red-eye")
 #define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo")
 static void editing_host_page_on_redeye_toggled (EditingHostPage* self);
-static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
+static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                          gpointer self);
 #define RESOURCES_ADJUST "image-adjust"
 #define RESOURCES_ADJUST_LABEL _ ("Adjust")
 #define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
 static void editing_host_page_on_adjust_toggled (EditingHostPage* self);
-static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self);
+static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                          gpointer self);
 #define RESOURCES_ENHANCE_LABEL _ ("Enhance")
 #define RESOURCES_ENHANCE "shotwell-auto-enhance"
 #define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 void editing_host_page_on_enhance (EditingHostPage* self);
-static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
-GdkPixbuf* resources_load_icon (const gchar* name, gint scale);
+static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                            gpointer self);
+GdkPixbuf* resources_load_icon (const gchar* name,
+                                gint scale);
 #define RESOURCES_ICON_ZOOM_OUT "zoom-out.png"
 #define RESOURCES_ICON_ZOOM_SCALE 16
-static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event);
-static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self,
+                                                GdkEventButton* event);
+static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                               GdkEventButton* event,
+                                                                               gpointer self);
 static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self);
-static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, GdkEventButton* event);
-static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, GdkEventButton* event);
-static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event);
-static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
+static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender,
+                                                                              gpointer self);
+static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self,
+                                                      GdkEventButton* event);
+static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                                     GdkEventButton* event,
+                                                                                     gpointer self);
+static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self,
+                                                    GdkEventButton* event);
+static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender,
+                                                                                     GdkEventButton* event,
+                                                                                     gpointer self);
+gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self,
+                                                     GdkEventKey* event);
+static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender,
+                                                                                 GdkEventKey* event,
+                                                                                 gpointer self);
 #define RESOURCES_ICON_ZOOM_IN "zoom-in.png"
-static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event);
-static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self,
+                                               GdkEventButton* event);
+static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                              GdkEventButton* event,
+                                                                              gpointer self);
 void single_photo_page_on_previous_photo (SinglePhotoPage* self);
-static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
+static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                                   gpointer self);
 void single_photo_page_on_next_photo (SinglePhotoPage* self);
-static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
-void single_photo_page_get_zoom_state (SinglePhotoPage* self, ZoomState* result);
-void zoom_state_init_rescale (ZoomState *self, ZoomState* existing, gdouble new_slider_val);
-void single_photo_page_on_interactive_zoom (SinglePhotoPage* self, ZoomState* interactive_zoom_state);
+static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                               gpointer self);
+void single_photo_page_get_zoom_state (SinglePhotoPage* self,
+                                       ZoomState* result);
+void zoom_state_init_rescale (ZoomState *self,
+                              ZoomState* existing,
+                              gdouble new_slider_val);
+void single_photo_page_on_interactive_zoom (SinglePhotoPage* self,
+                                            ZoomState* interactive_zoom_state);
 gboolean zoom_state_is_default (ZoomState *self);
-void single_photo_page_set_zoom_state (SinglePhotoPage* self, ZoomState* zoom_state);
+void single_photo_page_set_zoom_state (SinglePhotoPage* self,
+                                       ZoomState* zoom_state);
 void single_photo_page_cancel_zoom (SinglePhotoPage* self);
 static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self);
 GtkWindow* page_get_container (Page* self);
@@ -1690,23 +1843,46 @@ void fullscreen_window_disable_toolbar_dismissal (FullscreenWindow* self);
 void fullscreen_window_update_toolbar_dismissal (FullscreenWindow* self);
 void editing_host_page_snap_zoom_to_min (EditingHostPage* self);
 void editing_host_page_snap_zoom_to_max (EditingHostPage* self);
-static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result);
-void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self, GdkRectangle* result);
-static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result);
-void subtract_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result);
-static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result);
-void scale_point (GdkPoint* p, gdouble factor, GdkPoint* result);
-void zoom_state_get_viewport_center (ZoomState *self, GdkPoint* result);
-void add_points (GdkPoint* p1, GdkPoint* p2, GdkPoint* result);
-static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self, gdouble interp);
-static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self, gdouble adjustment);
-static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, GdkEventScroll* event, gdouble zoom_increment);
+static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self,
+                                                GdkEventScroll* event,
+                                                GdkPoint* result);
+void zoom_state_get_viewing_rectangle_wrt_screen (ZoomState *self,
+                                                  GdkRectangle* result);
+static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self,
+                                                       GdkEventScroll* event,
+                                                       GdkPoint* result);
+void subtract_points (GdkPoint* p1,
+                      GdkPoint* p2,
+                      GdkPoint* result);
+static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
+                                                   GdkEventScroll* event,
+                                                   GdkPoint* result);
+void scale_point (GdkPoint* p,
+                  gdouble factor,
+                  GdkPoint* result);
+void zoom_state_get_viewport_center (ZoomState *self,
+                                     GdkPoint* result);
+void add_points (GdkPoint* p1,
+                 GdkPoint* p2,
+                 GdkPoint* result);
+static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self,
+                                                     gdouble interp);
+static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self,
+                                                       gdouble adjustment);
+static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self,
+                                                      GdkEventScroll* event,
+                                                      gdouble zoom_increment);
 gboolean zoom_state_is_min (ZoomState *self);
-void zoom_state_init_pan (ZoomState *self, ZoomState* existing, GdkPoint* new_viewport_center);
+void zoom_state_init_pan (ZoomState *self,
+                          ZoomState* existing,
+                          GdkPoint* new_viewport_center);
 void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self);
-void zoom_state_init_rescale_to_isomorphic (ZoomState *self, ZoomState* existing);
-static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event);
-void page_activate_action (Page* self, const gchar* name);
+void zoom_state_init_rescale_to_isomorphic (ZoomState *self,
+                                            ZoomState* existing);
+static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self,
+                                                          GdkEventKey* event);
+void page_activate_action (Page* self,
+                           const gchar* name);
 void editing_host_page_on_increase_size (EditingHostPage* self);
 static void editing_host_page_real_on_increase_size (EditingHostPage* self);
 void editing_host_page_on_decrease_size (EditingHostPage* self);
@@ -1714,247 +1890,498 @@ static void editing_host_page_real_on_decrease_size (EditingHostPage* self);
 static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base);
 void single_photo_page_save_zoom_state (SinglePhotoPage* self);
 static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base);
-static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event);
+static gboolean editing_host_page_real_on_mousewheel_up (Page* base,
+                                                  GdkEventScroll* event);
 gboolean zoom_state_is_max (ZoomState *self);
-static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event);
+static gboolean editing_host_page_real_on_mousewheel_down (Page* base,
+                                                    GdkEventScroll* event);
 static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base);
 void single_photo_page_restore_zoom_state (SinglePhotoPage* self);
 static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base);
-static void editing_host_page_real_set_container (Page* base, GtkWindow* container);
-void page_set_container (Page* self, GtkWindow* container);
+static void editing_host_page_real_set_container (Page* base,
+                                           GtkWindow* container);
+void page_set_container (Page* self,
+                         GtkWindow* container);
 DragAndDropHandler* drag_and_drop_handler_new (Page* page);
-DragAndDropHandler* drag_and_drop_handler_construct (GType object_type, Page* page);
+DragAndDropHandler* drag_and_drop_handler_construct (GType object_type,
+                                                     Page* page);
 ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self);
 gboolean editing_host_page_has_photo (EditingHostPage* self);
 Photo* editing_host_page_get_photo (EditingHostPage* self);
 gint view_collection_get_selected_count (ViewCollection* self);
-DataView* view_collection_get_selected_at (ViewCollection* self, gint index);
+DataView* view_collection_get_selected_at (ViewCollection* self,
+                                           gint index);
 DataSource* data_view_get_source (DataView* self);
-void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo);
-static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* new_photo);
+void editing_host_page_photo_changing (EditingHostPage* self,
+                                       Photo* new_photo);
+static void editing_host_page_real_photo_changing (EditingHostPage* self,
+                                            Photo* new_photo);
 GType photo_file_format_get_type (void) G_GNUC_CONST;
 PhotoFileFormat photo_get_file_format (Photo* self);
-void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missing);
+void editing_host_page_set_photo_missing (EditingHostPage* self,
+                                          gboolean missing);
 GFile* media_source_get_file (MediaSource* self);
-void editing_host_page_update_ui (EditingHostPage* self, gboolean missing);
-static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo);
-DataView* view_collection_get_view_for_source (ViewCollection* self, DataSource* source);
+void editing_host_page_update_ui (EditingHostPage* self,
+                                  gboolean missing);
+static void editing_host_page_set_photo (EditingHostPage* self,
+                                  Photo* photo);
+DataView* view_collection_get_view_for_source (ViewCollection* self,
+                                               DataSource* source);
 void view_collection_unselect_all (ViewCollection* self);
 GType marker_get_type (void) G_GNUC_CONST;
-Marker* data_collection_mark (DataCollection* self, DataObject* object);
-void view_collection_select_marked (ViewCollection* self, Marker* marker);
-DataView* view_collection_get_view_for_source_filtered (ViewCollection* self, DataSource* source);
+Marker* data_collection_mark (DataCollection* self,
+                              DataObject* object);
+void view_collection_select_marked (ViewCollection* self,
+                                    Marker* marker);
+DataView* view_collection_get_view_for_source_filtered (ViewCollection* self,
+                                                        DataSource* source);
 static void editing_host_page_real_realize (GtkWidget* base);
-static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar* caller);
+static void editing_host_page_rebuild_caches (EditingHostPage* self,
+                                       const gchar* caller);
 static void editing_host_page_real_switched_to (Page* base);
 void page_switched_to (Page* self);
-static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_photo);
+static void editing_host_page_replace_photo (EditingHostPage* self,
+                                      Photo* new_photo);
 static void editing_host_page_real_switching_from (Page* base);
 void page_switching_from (Page* self);
 GType command_get_type (void) G_GNUC_CONST;
-static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement);
-void dimensions_init (Dimensions *self, gint width, gint height);
+static void editing_host_page_deactivate_tool (EditingHostPage* self,
+                                        Command* command,
+                                        GdkPixbuf* new_pixbuf,
+                                        Dimensions* new_max_dim,
+                                        gboolean needs_improvement);
+void dimensions_init (Dimensions *self,
+                      gint width,
+                      gint height);
 void data_collection_clear (DataCollection* self);
-static void editing_host_page_real_switching_to_fullscreen (Page* base, FullscreenWindow* fsw);
-void page_switching_to_fullscreen (Page* self, FullscreenWindow* fsw);
+static void editing_host_page_real_switching_to_fullscreen (Page* base,
+                                                     FullscreenWindow* fsw);
+void page_switching_to_fullscreen (Page* self,
+                                   FullscreenWindow* fsw);
 Page* page_window_get_current_page (PageWindow* self);
-static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected);
-static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self);
-static void editing_host_page_real_returning_from_fullscreen (Page* base, FullscreenWindow* fsw);
-void page_returning_from_fullscreen (Page* self, FullscreenWindow* fsw);
-void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable);
-void single_photo_page_get_canvas_scaling (SinglePhotoPage* self, Scaling* result);
-void pixbuf_cache_get_scaling (PixbufCache* self, Scaling* result);
-gboolean scaling_equals (Scaling *self, Scaling* scaling);
+static void editing_host_page_on_selection_changed (EditingHostPage* self,
+                                             GeeIterable* selected);
+static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender,
+                                                                             GeeIterable* selected,
+                                                                             gpointer self);
+static void editing_host_page_real_returning_from_fullscreen (Page* base,
+                                                       FullscreenWindow* fsw);
+void page_returning_from_fullscreen (Page* self,
+                                     FullscreenWindow* fsw);
+void editing_host_page_enable_rotate (EditingHostPage* self,
+                                      gboolean should_enable);
+void single_photo_page_get_canvas_scaling (SinglePhotoPage* self,
+                                           Scaling* result);
+void pixbuf_cache_get_scaling (PixbufCache* self,
+                               Scaling* result);
+gboolean scaling_equals (Scaling *self,
+                         Scaling* scaling);
 gchar* scaling_to_string (Scaling *self);
-static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* photo, GdkPixbuf* pixbuf, GError* err);
-static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self);
+static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self,
+                                          Photo* photo,
+                                          GdkPixbuf* pixbuf,
+                                          GError* err);
+static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender,
+                                                                Photo* photo,
+                                                                GdkPixbuf* pixbuf,
+                                                                GError* err,
+                                                                gpointer self);
 void pixbuf_cache_cancel_all (PixbufCache* self);
 GType pixbuf_cache_photo_type_get_type (void) G_GNUC_CONST;
-PixbufCache* pixbuf_cache_new (SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
-PixbufCache* pixbuf_cache_construct (GType object_type, SourceCollection* sources, PixbufCachePhotoType type, Scaling* scaling, gint max_count, PixbufCacheCacheFilter filter, void* filter_target);
-static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Photo* photo);
-static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self);
-static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller);
+PixbufCache* pixbuf_cache_new (SourceCollection* sources,
+                               PixbufCachePhotoType type,
+                               Scaling* scaling,
+                               gint max_count,
+                               PixbufCacheCacheFilter filter,
+                               void* filter_target);
+PixbufCache* pixbuf_cache_construct (GType object_type,
+                                     SourceCollection* sources,
+                                     PixbufCachePhotoType type,
+                                     Scaling* scaling,
+                                     gint max_count,
+                                     PixbufCacheCacheFilter filter,
+                                     void* filter_target);
+static gboolean editing_host_page_master_cache_filter (EditingHostPage* self,
+                                                Photo* photo);
+static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo,
+                                                                           gpointer self);
+static void editing_host_page_refresh_caches (EditingHostPage* self,
+                                       const gchar* caller);
 gchar* data_object_to_string (DataObject* self);
-static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCollection* controller, Photo* photo);
+static void editing_host_page_prefetch_neighbors (EditingHostPage* self,
+                                           ViewCollection* controller,
+                                           Photo* photo);
 gboolean photo_has_transformations (Photo* self);
 gboolean photo_has_editable (Photo* self);
-gboolean data_source_equals (DataSource* self, DataSource* source);
-void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result);
-GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error);
-void single_photo_page_set_pixbuf (SinglePhotoPage* self, GdkPixbuf* unscaled, Dimensions* max_dim, Direction* direction);
-void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing);
+gboolean data_source_equals (DataSource* self,
+                             DataSource* source);
+void media_source_get_dimensions (MediaSource* self,
+                                  PhotoException disallowed_steps,
+                                  Dimensions* result);
+GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self,
+                                                          Scaling* scaling,
+                                                          Photo* photo,
+                                                          Dimensions* max_dim,
+                                                          GError** error);
+void single_photo_page_set_pixbuf (SinglePhotoPage* self,
+                                   GdkPixbuf* unscaled,
+                                   Dimensions* max_dim,
+                                   Direction* direction);
+void editing_host_page_notify_photo_backing_missing (EditingHostPage* self,
+                                                     Photo* photo,
+                                                     gboolean missing);
 GType pixbuf_cache_pixbuf_cache_batch_get_type (void) G_GNUC_CONST;
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_new (void);
 PixbufCachePixbufCacheBatch* pixbuf_cache_pixbuf_cache_batch_construct (GType object_type);
-gboolean view_collection_get_immediate_neighbors (ViewCollection* self, DataSource* home, DataSource* * next, DataSource* * prev, const gchar* type_selector);
+gboolean view_collection_get_immediate_neighbors (ViewCollection* self,
+                                                  DataSource* home,
+                                                  DataSource* * next,
+                                                  DataSource* * prev,
+                                                  const gchar* type_selector);
 #define PHOTO_TYPENAME "thumb"
-GeeSet* view_collection_get_extended_neighbors (ViewCollection* self, DataSource* home, const gchar* typename);
-void pixbuf_cache_prefetch_batch (PixbufCache* self, PixbufCachePixbufCacheBatch* batch, gboolean force);
-static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, ViewCollection* old_controller, Photo* old_photo, ViewCollection* new_controller, Photo* new_photo);
-void pixbuf_cache_drop (PixbufCache* self, Photo* photo);
-DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source);
-static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self, DataSource* source);
+GeeSet* view_collection_get_extended_neighbors (ViewCollection* self,
+                                                DataSource* home,
+                                                const gchar* typename);
+void pixbuf_cache_prefetch_batch (PixbufCache* self,
+                                  PixbufCachePixbufCacheBatch* batch,
+                                  gboolean force);
+static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
+                                                  ViewCollection* old_controller,
+                                                  Photo* old_photo,
+                                                  ViewCollection* new_controller,
+                                                  Photo* new_photo);
+void pixbuf_cache_drop (PixbufCache* self,
+                        Photo* photo);
+DataView* editing_host_page_create_photo_view (EditingHostPage* self,
+                                               DataSource* source);
+static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self,
+                                                    DataSource* source);
 PhotoView* photo_view_new (PhotoSource* source);
-PhotoView* photo_view_construct (GType object_type, PhotoSource* source);
+PhotoView* photo_view_construct (GType object_type,
+                                 PhotoSource* source);
 GType thumbnail_view_get_type (void) G_GNUC_CONST;
 GType photo_view_get_type (void) G_GNUC_CONST;
-static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source);
-void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo);
-void view_collection_copy_into (ViewCollection* self, ViewCollection* to_copy, CreateView copying_ctor, void* copying_ctor_target, CreateViewPredicate should_copy, void* should_copy_target);
-static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self);
-static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self);
-void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo);
-void view_collection_mirror (ViewCollection* self, ViewCollection* to_mirror, CreateView mirroring_ctor, void* mirroring_ctor_target, CreateViewPredicate should_mirror, void* should_mirror_target);
-static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean missing);
-static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing);
-static void editing_host_page_draw_message (EditingHostPage* self, const gchar* message);
-void single_photo_page_paint_text (SinglePhotoPage* self, PangoLayout* pango_layout, gint x, gint y);
-GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self, Scaling* scaling, GError** error);
+static gboolean editing_host_page_is_photo (EditingHostPage* self,
+                                     DataSource* source);
+void editing_host_page_display_copy_of (EditingHostPage* self,
+                                        ViewCollection* controller,
+                                        Photo* starting_photo);
+void view_collection_copy_into (ViewCollection* self,
+                                ViewCollection* to_copy,
+                                CreateView copying_ctor,
+                                void* copying_ctor_target,
+                                CreateViewPredicate should_copy,
+                                void* should_copy_target);
+static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source,
+                                                            gpointer self);
+static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source,
+                                                            gpointer self);
+void editing_host_page_display_mirror_of (EditingHostPage* self,
+                                          ViewCollection* controller,
+                                          Photo* starting_photo);
+void view_collection_mirror (ViewCollection* self,
+                             ViewCollection* to_mirror,
+                             CreateView mirroring_ctor,
+                             void* mirroring_ctor_target,
+                             CreateViewPredicate should_mirror,
+                             void* should_mirror_target);
+static void editing_host_page_real_update_ui (EditingHostPage* self,
+                                       gboolean missing);
+static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self,
+                                                          Photo* photo,
+                                                          gboolean missing);
+static void editing_host_page_draw_message (EditingHostPage* self,
+                                     const gchar* message);
+void single_photo_page_paint_text (SinglePhotoPage* self,
+                                   PangoLayout* pango_layout,
+                                   gint x,
+                                   gint y);
+GdkPixbuf* media_source_get_preview_pixbuf (MediaSource* self,
+                                            Scaling* scaling,
+                                            GError** error);
 gboolean editing_host_page_get_photo_missing (EditingHostPage* self);
-gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo);
-static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo);
-static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Photo* new_photo);
-GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self, Photo* photo);
+gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self,
+                                                  Photo* old_photo,
+                                                  Photo* new_photo);
+static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self,
+                                                       Photo* old_photo,
+                                                       Photo* new_photo);
+static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self,
+                                              Photo* new_photo);
+GdkPixbuf* pixbuf_cache_get_ready_pixbuf (PixbufCache* self,
+                                          Photo* photo);
 GdkPixbuf* get_placeholder_pixbuf (void);
-GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self, GdkPixbuf* pixbuf, GdkInterpType interp, gboolean scale_up);
-void page_set_page_name (Page* self, const gchar* page_name);
+GdkPixbuf* scaling_perform_on_pixbuf (Scaling *self,
+                                      GdkPixbuf* pixbuf,
+                                      GdkInterpType interp,
+                                      gboolean scale_up);
+void page_set_page_name (Page* self,
+                         const gchar* page_name);
 gchar* data_object_get_name (DataObject* self);
 static void editing_host_page_quick_update_pixbuf (EditingHostPage* self);
 static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base);
-void single_photo_page_get_surface_dim (SinglePhotoPage* self, Dimensions* result);
-void zoom_state_init (ZoomState *self, Dimensions* content_dimensions, Dimensions* viewport_dimensions, gdouble slider_val, GdkPoint* viewport_center);
-void page_set_page_cursor (Page* self, GdkCursorType cursor_type);
-void pixbuf_cache_prefetch (PixbufCache* self, Photo* photo, BackgroundJobJobPriority priority, gboolean force);
+void single_photo_page_get_surface_dim (SinglePhotoPage* self,
+                                        Dimensions* result);
+void zoom_state_init (ZoomState *self,
+                      Dimensions* content_dimensions,
+                      Dimensions* viewport_dimensions,
+                      gdouble slider_val,
+                      GdkPoint* viewport_center);
+void page_set_page_cursor (Page* self,
+                           GdkCursorType cursor_type);
+void pixbuf_cache_prefetch (PixbufCache* self,
+                            Photo* photo,
+                            BackgroundJobJobPriority priority,
+                            gboolean force);
 static gboolean editing_host_page_update_pixbuf (EditingHostPage* self);
-static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect);
-void page_on_resize (Page* self, GdkRectangle* rect);
+static void editing_host_page_real_on_resize (Page* base,
+                                       GdkRectangle* rect);
+void page_on_resize (Page* self,
+                     GdkRectangle* rect);
 static void editing_host_page_track_tool_window (EditingHostPage* self);
-static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect);
-static void editing_host_page_real_update_actions (Page* base, gint selected_count, gint count);
-gint view_collection_get_sources_of_type_count (ViewCollection* self, GType t);
+static void editing_host_page_real_on_resize_finished (Page* base,
+                                                GdkRectangle* rect);
+static void editing_host_page_real_update_actions (Page* base,
+                                            gint selected_count,
+                                            gint count);
+gint view_collection_get_sources_of_type_count (ViewCollection* self,
+                                                GType t);
 gboolean photo_check_can_rotate (Photo* self);
-gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo);
-gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling);
-gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling);
-gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling);
-gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo);
-gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling);
-void page_update_actions (Page* self, gint selected_count, gint count);
-static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey* event);
+gboolean editing_host_page_is_rotate_available (EditingHostPage* self,
+                                                Photo* photo);
+gboolean editing_tools_crop_tool_is_available (Photo* photo,
+                                               Scaling* scaling);
+gboolean editing_tools_redeye_tool_is_available (Photo* photo,
+                                                 Scaling* scaling);
+gboolean editing_tools_adjust_tool_is_available (Photo* photo,
+                                                 Scaling* scaling);
+gboolean editing_host_page_is_enhance_available (EditingHostPage* self,
+                                                 Photo* photo);
+gboolean editing_tools_straighten_tool_is_available (Photo* photo,
+                                                     Scaling* scaling);
+void page_update_actions (Page* self,
+                          gint selected_count,
+                          gint count);
+static gboolean editing_host_page_real_on_shift_pressed (Page* base,
+                                                  GdkEventKey* event);
 gboolean page_get_ctrl_pressed (Page* self);
 gboolean page_get_alt_pressed (Page* self);
 static void editing_host_page_swap_in_original (EditingHostPage* self);
-gboolean page_on_shift_pressed (Page* self, GdkEventKey* event);
-static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKey* event);
+gboolean page_on_shift_pressed (Page* self,
+                                GdkEventKey* event);
+static gboolean editing_host_page_real_on_shift_released (Page* base,
+                                                   GdkEventKey* event);
 static void editing_host_page_swap_out_original (EditingHostPage* self);
-gboolean page_on_shift_released (Page* self, GdkEventKey* event);
-static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* event);
-gboolean page_on_alt_pressed (Page* self, GdkEventKey* event);
-static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* event);
+gboolean page_on_shift_released (Page* self,
+                                 GdkEventKey* event);
+static gboolean editing_host_page_real_on_alt_pressed (Page* base,
+                                                GdkEventKey* event);
+gboolean page_on_alt_pressed (Page* self,
+                              GdkEventKey* event);
+static gboolean editing_host_page_real_on_alt_released (Page* base,
+                                                 GdkEventKey* event);
 gboolean page_get_shift_pressed (Page* self);
-gboolean page_on_alt_released (Page* self, GdkEventKey* event);
-GdkPixbuf* photo_get_prefetched_copy (Photo* self, GError** error);
+gboolean page_on_alt_released (Page* self,
+                               GdkEventKey* event);
+GdkPixbuf* photo_get_prefetched_copy (Photo* self,
+                                      GError** error);
 GType orientation_get_type (void) G_GNUC_CONST;
 Orientation photo_get_original_orientation (Photo* self);
-GdkPixbuf* orientation_rotate_pixbuf (Orientation self, GdkPixbuf* pixbuf);
+GdkPixbuf* orientation_rotate_pixbuf (Orientation self,
+                                      GdkPixbuf* pixbuf);
 GdkPixbuf* single_photo_page_get_unscaled_pixbuf (SinglePhotoPage* self);
-void photo_get_master_dimensions (Photo* self, Dimensions* result);
-static void editing_host_page_activate_tool (EditingHostPage* self, EditingToolsEditingTool* tool);
+void photo_get_master_dimensions (Photo* self,
+                                  Dimensions* result);
+static void editing_host_page_activate_tool (EditingHostPage* self,
+                                      EditingToolsEditingTool* tool);
 gpointer editing_tools_photo_canvas_ref (gpointer instance);
 void editing_tools_photo_canvas_unref (gpointer instance);
-GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object);
-void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object);
+GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name,
+                                                   const gchar* nick,
+                                                   const gchar* blurb,
+                                                   GType object_type,
+                                                   GParamFlags flags);
+void editing_tools_value_set_photo_canvas (GValue* value,
+                                           gpointer v_object);
+void editing_tools_value_take_photo_canvas (GValue* value,
+                                            gpointer v_object);
 gpointer editing_tools_value_get_photo_canvas (const GValue* value);
 GType editing_tools_photo_canvas_get_type (void) G_GNUC_CONST;
 static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page);
-static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type, EditingHostPage* host_page);
+static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type,
+                                                                                   EditingHostPage* host_page);
 static GType editing_host_page_editing_host_canvas_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas);
+void editing_tools_editing_tool_activate (EditingToolsEditingTool* self,
+                                          EditingToolsPhotoCanvas* canvas);
 static void editing_host_page_place_tool_window (EditingHostPage* self);
 GType editing_tools_editing_tool_window_get_type (void) G_GNUC_CONST;
 EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self);
 gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self);
 void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self);
 static void editing_host_page_on_tool_activated (EditingHostPage* self);
-static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self);
+static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender,
+                                                                                gpointer self);
 static void editing_host_page_on_tool_deactivated (EditingHostPage* self);
-static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self);
-static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement);
-static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self);
+static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender,
+                                                                                    gpointer self);
+static void editing_host_page_on_tool_applied (EditingHostPage* self,
+                                        Command* command,
+                                        GdkPixbuf* new_pixbuf,
+                                        Dimensions* new_max_dim,
+                                        gboolean needs_improvement);
+static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender,
+                                                                            Command* command,
+                                                                            GdkPixbuf* new_pixbuf,
+                                                                            Dimensions* new_max_dim,
+                                                                            gboolean needs_improvement,
+                                                                            gpointer self);
 static void editing_host_page_on_tool_cancelled (EditingHostPage* self);
-static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self);
+static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender,
+                                                                                gpointer self);
 static void editing_host_page_on_tool_aborted (EditingHostPage* self);
-static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
+static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender,
+                                                                            gpointer self);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf,
+                            Dimensions* result);
 static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self);
 gpointer command_manager_ref (gpointer instance);
 void command_manager_unref (gpointer instance);
-GParamSpec* param_spec_command_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_command_manager (GValue* value, gpointer v_object);
-void value_take_command_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_command_manager (const gchar* name,
+                                        const gchar* nick,
+                                        const gchar* blurb,
+                                        GType object_type,
+                                        GParamFlags flags);
+void value_set_command_manager (GValue* value,
+                                gpointer v_object);
+void value_take_command_manager (GValue* value,
+                                 gpointer v_object);
 gpointer value_get_command_manager (const GValue* value);
 GType command_manager_get_type (void) G_GNUC_CONST;
 CommandManager* page_get_command_manager (Page* self);
-void command_manager_execute (CommandManager* self, Command* command);
-gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event);
-static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event);
-static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton* event);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
+gboolean editing_host_page_on_double_click (EditingHostPage* self,
+                                            GdkEventButton* event);
+static gboolean editing_host_page_real_on_double_click (EditingHostPage* self,
+                                                 GdkEventButton* event);
+static gboolean editing_host_page_real_on_left_click (Page* base,
+                                               GdkEventButton* event);
 void page_suspend_cursor_hiding (Page* self);
-gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self, gint x, gint y);
-void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y);
-static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventButton* event);
+gboolean single_photo_page_is_inside_pixbuf (SinglePhotoPage* self,
+                                             gint x,
+                                             gint y);
+void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self,
+                                               gint x,
+                                               gint y);
+static gboolean editing_host_page_real_on_left_released (Page* base,
+                                                  GdkEventButton* event);
 ZoomBuffer* single_photo_page_get_zoom_buffer (SinglePhotoPage* self);
 void page_restore_cursor_hiding (Page* self);
-void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y);
-static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButton* event);
-gboolean page_on_context_buttonpress (Page* self, GdkEventButton* event);
+void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self,
+                                                  gint x,
+                                                  gint y);
+static gboolean editing_host_page_real_on_right_click (Page* base,
+                                                GdkEventButton* event);
+gboolean page_on_context_buttonpress (Page* self,
+                                      GdkEventButton* event);
 static gboolean editing_host_page_on_fetch_original (EditingHostPage* self);
 static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self);
 gint data_collection_get_count (DataCollection* self);
 static gboolean editing_host_page_is_panning_possible (EditingHostPage* self);
 gint zoom_state_get_zoomed_width (ZoomState *self);
 gint zoom_state_get_zoomed_height (ZoomState *self);
-static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask);
-void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask);
-void single_photo_page_on_interactive_pan (SinglePhotoPage* self, ZoomState* interactive_zoom_state);
-gboolean page_on_motion (Page* self, GdkEventMotion* event, gint x, gint y, GdkModifierType mask);
+static gboolean editing_host_page_real_on_motion (Page* base,
+                                           GdkEventMotion* event,
+                                           gint x,
+                                           gint y,
+                                           GdkModifierType mask);
+void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self,
+                                           gint x,
+                                           gint y,
+                                           GdkModifierType mask);
+void single_photo_page_on_interactive_pan (SinglePhotoPage* self,
+                                           ZoomState* interactive_zoom_state);
+gboolean page_on_motion (Page* self,
+                         GdkEventMotion* event,
+                         gint x,
+                         gint y,
+                         GdkModifierType mask);
 static gboolean editing_host_page_real_on_leave_notify_event (Page* base);
 gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self);
 gboolean page_on_leave_notify_event (Page* self);
-static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect);
-void page_on_move (Page* self, GdkRectangle* rect);
-static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* rect);
-void page_on_move_finished (Page* self, GdkRectangle* rect);
-static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, GdkEventKey* event);
-static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event);
-static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim);
-void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim);
-static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim);
-void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position);
-void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self, GdkRectangle* result);
-GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale);
-static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale);
-GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale);
-static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale);
-GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale);
-static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale);
-GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale);
-static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale);
-static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim);
-void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx);
-void set_source_color_from_string (cairo_t* ctx, const gchar* spec);
-void single_photo_page_paint (SinglePhotoPage* self, cairo_t* ctx, Dimensions* ctx_dim);
+static void editing_host_page_real_on_move (Page* base,
+                                     GdkRectangle* rect);
+void page_on_move (Page* self,
+                   GdkRectangle* rect);
+static void editing_host_page_real_on_move_finished (Page* base,
+                                              GdkRectangle* rect);
+void page_on_move_finished (Page* self,
+                            GdkRectangle* rect);
+static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
+                                                  GdkEventKey* event);
+static gboolean editing_host_page_real_key_press_event (GtkWidget* base,
+                                                 GdkEventKey* event);
+gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
+                                                 GdkEventKey* event);
+static void editing_host_page_real_new_surface (SinglePhotoPage* base,
+                                         cairo_t* default_ctx,
+                                         Dimensions* dim);
+void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self,
+                                             cairo_t* default_ctx,
+                                             Dimensions* surface_dim);
+static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base,
+                                            GdkPixbuf* pixbuf,
+                                            SinglePhotoPageUpdateReason reason,
+                                            Dimensions* old_dim);
+void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self,
+                                                Dimensions* old_dim,
+                                                GdkPixbuf* scaled,
+                                                GdkRectangle* scaled_position);
+void single_photo_page_get_scaled_pixbuf_position (SinglePhotoPage* self,
+                                                   GdkRectangle* result);
+GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self,
+                                                      gint scale);
+static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self,
+                                                           gint scale);
+GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self,
+                                                   gint scale);
+static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self,
+                                                        gint scale);
+GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self,
+                                                    gint scale);
+static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self,
+                                                         gint scale);
+GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self,
+                                                       gint scale);
+static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self,
+                                                            gint scale);
+static void editing_host_page_real_paint (SinglePhotoPage* base,
+                                   cairo_t* ctx,
+                                   Dimensions* ctx_dim);
+void editing_tools_editing_tool_paint (EditingToolsEditingTool* self,
+                                       cairo_t* ctx);
+void set_source_color_from_string (cairo_t* ctx,
+                                   const gchar* spec);
+void single_photo_page_paint (SinglePhotoPage* self,
+                              cairo_t* ctx,
+                              Dimensions* ctx_dim);
 GType rotation_get_type (void) G_GNUC_CONST;
-static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, const gchar* name, const gchar* description);
+static void editing_host_page_rotate (EditingHostPage* self,
+                               Rotation rotation,
+                               const gchar* name,
+                               const gchar* description);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
 GType rotate_single_command_get_type (void) G_GNUC_CONST;
-RotateSingleCommand* rotate_single_command_new (Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation);
-RotateSingleCommand* rotate_single_command_construct (GType object_type, Photo* photo, Rotation rotation, const gchar* name, const gchar* explanation);
+RotateSingleCommand* rotate_single_command_new (Photo* photo,
+                                                Rotation rotation,
+                                                const gchar* name,
+                                                const gchar* explanation);
+RotateSingleCommand* rotate_single_command_construct (GType object_type,
+                                                      Photo* photo,
+                                                      Rotation rotation,
+                                                      const gchar* name,
+                                                      const gchar* explanation);
 #define RESOURCES_ROTATE_CW_FULL_LABEL _ ("Rotate Right")
 void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self);
 #define RESOURCES_ROTATE_CCW_FULL_LABEL _ ("Rotate Left")
@@ -1964,75 +2391,128 @@ void editing_host_page_on_flip_horizontally (EditingHostPage* self);
 void editing_host_page_on_flip_vertically (EditingHostPage* self);
 #define RESOURCES_VFLIP_LABEL _ ("Flip Vertically")
 void editing_host_page_on_revert (EditingHostPage* self);
-gboolean revert_editable_dialog (GtkWindow* owner, GeeCollection* photos);
+gboolean revert_editable_dialog (GtkWindow* owner,
+                                 GeeCollection* photos);
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
 GeeCollection* view_collection_get_sources (ViewCollection* self);
-void photo_revert_to_master (Photo* self, gboolean notify);
+void photo_revert_to_master (Photo* self,
+                             gboolean notify);
 GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST;
 GType revert_single_command_get_type (void) G_GNUC_CONST;
 RevertSingleCommand* revert_single_command_new (Photo* photo);
-RevertSingleCommand* revert_single_command_construct (GType object_type, Photo* photo);
+RevertSingleCommand* revert_single_command_construct (GType object_type,
+                                                      Photo* photo);
 void editing_host_page_on_edit_title (EditingHostPage* self);
 GType library_photo_get_type (void) G_GNUC_CONST;
 gpointer text_entry_dialog_mediator_ref (gpointer instance);
 void text_entry_dialog_mediator_unref (gpointer instance);
-GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_text_entry_dialog_mediator (GValue* value, gpointer v_object);
-void value_take_text_entry_dialog_mediator (GValue* value, gpointer v_object);
+GParamSpec* param_spec_text_entry_dialog_mediator (const gchar* name,
+                                                   const gchar* nick,
+                                                   const gchar* blurb,
+                                                   GType object_type,
+                                                   GParamFlags flags);
+void value_set_text_entry_dialog_mediator (GValue* value,
+                                           gpointer v_object);
+void value_take_text_entry_dialog_mediator (GValue* value,
+                                            gpointer v_object);
 gpointer value_get_text_entry_dialog_mediator (const GValue* value);
 GType text_entry_dialog_mediator_get_type (void) G_GNUC_CONST;
 GType edit_title_dialog_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_title (MediaSource* self);
 EditTitleDialog* edit_title_dialog_new (const gchar* photo_title);
-EditTitleDialog* edit_title_dialog_construct (GType object_type, const gchar* photo_title);
+EditTitleDialog* edit_title_dialog_construct (GType object_type,
+                                              const gchar* photo_title);
 gchar* edit_title_dialog_execute (EditTitleDialog* self);
 GType edit_title_command_get_type (void) G_GNUC_CONST;
-EditTitleCommand* edit_title_command_new (MediaSource* source, const gchar* new_title);
-EditTitleCommand* edit_title_command_construct (GType object_type, MediaSource* source, const gchar* new_title);
+EditTitleCommand* edit_title_command_new (MediaSource* source,
+                                          const gchar* new_title);
+EditTitleCommand* edit_title_command_construct (GType object_type,
+                                                MediaSource* source,
+                                                const gchar* new_title);
 void editing_host_page_on_edit_comment (EditingHostPage* self);
 gpointer multi_text_entry_dialog_mediator_ref (gpointer instance);
 void multi_text_entry_dialog_mediator_unref (gpointer instance);
-GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object);
-void value_take_multi_text_entry_dialog_mediator (GValue* value, gpointer v_object);
+GParamSpec* param_spec_multi_text_entry_dialog_mediator (const gchar* name,
+                                                         const gchar* nick,
+                                                         const gchar* blurb,
+                                                         GType object_type,
+                                                         GParamFlags flags);
+void value_set_multi_text_entry_dialog_mediator (GValue* value,
+                                                 gpointer v_object);
+void value_take_multi_text_entry_dialog_mediator (GValue* value,
+                                                  gpointer v_object);
 gpointer value_get_multi_text_entry_dialog_mediator (const GValue* value);
 GType multi_text_entry_dialog_mediator_get_type (void) G_GNUC_CONST;
 GType edit_comment_dialog_get_type (void) G_GNUC_CONST;
 gchar* media_source_get_comment (MediaSource* self);
-EditCommentDialog* edit_comment_dialog_new (const gchar* comment, gboolean is_event);
-EditCommentDialog* edit_comment_dialog_construct (GType object_type, const gchar* comment, gboolean is_event);
+EditCommentDialog* edit_comment_dialog_new (const gchar* comment,
+                                            gboolean is_event);
+EditCommentDialog* edit_comment_dialog_construct (GType object_type,
+                                                  const gchar* comment,
+                                                  gboolean is_event);
 gchar* edit_comment_dialog_execute (EditCommentDialog* self);
 GType edit_comment_command_get_type (void) G_GNUC_CONST;
-EditCommentCommand* edit_comment_command_new (MediaSource* source, const gchar* new_comment);
-EditCommentCommand* edit_comment_command_construct (GType object_type, MediaSource* source, const gchar* new_comment);
+EditCommentCommand* edit_comment_command_new (MediaSource* source,
+                                              const gchar* new_comment);
+EditCommentCommand* edit_comment_command_construct (GType object_type,
+                                                    MediaSource* source,
+                                                    const gchar* new_comment);
 void editing_host_page_on_adjust_date_time (EditingHostPage* self);
 GType adjust_date_time_dialog_get_type (void) G_GNUC_CONST;
 GType dateable_get_type (void) G_GNUC_CONST;
 GType direct_photo_page_get_type (void) G_GNUC_CONST;
-AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
-AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type, Dateable* source, gint photo_count, gboolean display_options, gboolean contains_video, gboolean only_video);
-gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self, gint64* time_shift, gboolean* keep_relativity, gboolean* modify_originals);
+AdjustDateTimeDialog* adjust_date_time_dialog_new (Dateable* source,
+                                                   gint photo_count,
+                                                   gboolean display_options,
+                                                   gboolean contains_video,
+                                                   gboolean only_video);
+AdjustDateTimeDialog* adjust_date_time_dialog_construct (GType object_type,
+                                                         Dateable* source,
+                                                         gint photo_count,
+                                                         gboolean display_options,
+                                                         gboolean contains_video,
+                                                         gboolean only_video);
+gboolean adjust_date_time_dialog_execute (AdjustDateTimeDialog* self,
+                                          gint64* time_shift,
+                                          gboolean* keep_relativity,
+                                          gboolean* modify_originals);
 GeeList* view_collection_get_selected (ViewCollection* self);
 GType adjust_date_time_photo_command_get_type (void) G_GNUC_CONST;
-AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable, gint64 time_shift, gboolean modify_original);
-AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type, Dateable* dateable, gint64 time_shift, gboolean modify_original);
+AdjustDateTimePhotoCommand* adjust_date_time_photo_command_new (Dateable* dateable,
+                                                                gint64 time_shift,
+                                                                gboolean modify_original);
+AdjustDateTimePhotoCommand* adjust_date_time_photo_command_construct (GType object_type,
+                                                                      Dateable* dateable,
+                                                                      gint64 time_shift,
+                                                                      gboolean modify_original);
 void editing_host_page_on_set_background (EditingHostPage* self);
 GType set_background_photo_dialog_get_type (void) G_GNUC_CONST;
 SetBackgroundPhotoDialog* set_background_photo_dialog_new (void);
 SetBackgroundPhotoDialog* set_background_photo_dialog_construct (GType object_type);
-gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self, gboolean* desktop_background, gboolean* screensaver);
+gboolean set_background_photo_dialog_execute (SetBackgroundPhotoDialog* self,
+                                              gboolean* desktop_background,
+                                              gboolean* screensaver);
 void page_window_set_busy_cursor (PageWindow* self);
-void desktop_integration_set_background (Photo* photo, gboolean desktop, gboolean screensaver);
+void desktop_integration_set_background (Photo* photo,
+                                         gboolean desktop,
+                                         gboolean screensaver);
 void page_window_set_normal_cursor (PageWindow* self);
-static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event);
+static gboolean editing_host_page_real_on_ctrl_pressed (Page* base,
+                                                 GdkEventKey* event);
 #define RESOURCES_COUNTERCLOCKWISE "object-rotate-left"
 #define RESOURCES_ROTATE_CCW_LABEL _ ("Rotate")
-static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self);
-gboolean page_on_ctrl_pressed (Page* self, GdkEventKey* event);
-static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey* event);
-gboolean page_on_ctrl_released (Page* self, GdkEventKey* event);
-void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleToolButton* toggle, EditingToolsEditingToolFactory factory);
+static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                                            gpointer self);
+gboolean page_on_ctrl_pressed (Page* self,
+                               GdkEventKey* event);
+static gboolean editing_host_page_real_on_ctrl_released (Page* base,
+                                                  GdkEventKey* event);
+gboolean page_on_ctrl_released (Page* self,
+                                GdkEventKey* event);
+void editing_host_page_on_tool_button_toggled (EditingHostPage* self,
+                                               GtkToggleToolButton* toggle,
+                                               EditingToolsEditingToolFactory factory);
 void editing_host_page_toggle_crop (EditingHostPage* self);
 void editing_host_page_toggle_straighten (EditingHostPage* self);
 void editing_host_page_toggle_redeye (EditingHostPage* self);
@@ -2052,29 +2532,45 @@ static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools
 gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self);
 GType enhance_single_command_get_type (void) G_GNUC_CONST;
 EnhanceSingleCommand* enhance_single_command_new (Photo* photo);
-EnhanceSingleCommand* enhance_single_command_construct (GType object_type, Photo* photo);
+EnhanceSingleCommand* enhance_single_command_construct (GType object_type,
+                                                        Photo* photo);
 void editing_host_page_on_copy_adjustments (EditingHostPage* self);
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
-void page_set_action_sensitive (Page* self, const gchar* name, gboolean sensitive);
+void page_set_action_sensitive (Page* self,
+                                const gchar* name,
+                                gboolean sensitive);
 void editing_host_page_on_paste_adjustments (EditingHostPage* self);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
 #define RESOURCES_PASTE_ADJUSTMENTS_LABEL _ ("Paste Color Adjustments")
 #define RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP _ ("Apply copied color adjustments to the selected photos")
-AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
-AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type, Photo* photo, PixelTransformationBundle* transformations, const gchar* name, const gchar* explanation);
+AdjustColorsSingleCommand* adjust_colors_single_command_new (Photo* photo,
+                                                             PixelTransformationBundle* transformations,
+                                                             const gchar* name,
+                                                             const gchar* explanation);
+AdjustColorsSingleCommand* adjust_colors_single_command_construct (GType object_type,
+                                                                   Photo* photo,
+                                                                   PixelTransformationBundle* transformations,
+                                                                   const gchar* name,
+                                                                   const gchar* explanation);
 static void editing_host_page_real_on_next_photo (SinglePhotoPage* base);
-DataView* view_collection_get_next (ViewCollection* self, DataView* view);
+DataView* view_collection_get_next (ViewCollection* self,
+                                    DataView* view);
 static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base);
-DataView* view_collection_get_previous (ViewCollection* self, DataView* view);
+DataView* view_collection_get_previous (ViewCollection* self,
+                                        DataView* view);
 gboolean editing_host_page_has_current_tool (EditingHostPage* self);
 void editing_host_page_unset_view_collection (EditingHostPage* self);
 #define EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvasPrivate))
-enum  {
-	EDITING_HOST_PAGE_EDITING_HOST_CANVAS_DUMMY_PROPERTY
-};
 cairo_t* single_photo_page_get_cairo_context (SinglePhotoPage* self);
 GdkPixbuf* single_photo_page_get_scaled_pixbuf (SinglePhotoPage* self);
-EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type, GtkWindow* container, GdkWindow* drawing_window, Photo* photo, cairo_t* default_ctx, Dimensions* surface_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position);
+EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type,
+                                                               GtkWindow* container,
+                                                               GdkWindow* drawing_window,
+                                                               Photo* photo,
+                                                               cairo_t* default_ctx,
+                                                               Dimensions* surface_dim,
+                                                               GdkPixbuf* scaled,
+                                                               GdkRectangle* scaled_position);
 static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base);
 static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj);
 static void editing_host_page_finalize (GObject * obj);
@@ -2085,134 +2581,280 @@ GType media_page_get_type (void) G_GNUC_CONST;
 GType collection_page_get_type (void) G_GNUC_CONST;
 gpointer view_filter_ref (gpointer instance);
 void view_filter_unref (gpointer instance);
-GParamSpec* param_spec_view_filter (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_view_filter (GValue* value, gpointer v_object);
-void value_take_view_filter (GValue* value, gpointer v_object);
+GParamSpec* param_spec_view_filter (const gchar* name,
+                                    const gchar* nick,
+                                    const gchar* blurb,
+                                    GType object_type,
+                                    GParamFlags flags);
+void value_set_view_filter (GValue* value,
+                            gpointer v_object);
+void value_take_view_filter (GValue* value,
+                             gpointer v_object);
 gpointer value_get_view_filter (const GValue* value);
 GType view_filter_get_type (void) G_GNUC_CONST;
 static GType library_photo_page_library_photo_page_view_filter_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define LIBRARY_PHOTO_PAGE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPagePrivate))
-enum  {
-	LIBRARY_PHOTO_PAGE_DUMMY_PROPERTY
-};
 GType database_source_collection_get_type (void) G_GNUC_CONST;
 GType media_source_collection_get_type (void) G_GNUC_CONST;
 GType library_photo_source_collection_get_type (void) G_GNUC_CONST;
-static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source);
-static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self);
-static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeMap* map);
-static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self,
+                                            DataSource* source);
+static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender,
+                                                                              DataSource* source,
+                                                                              gpointer self);
+static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self,
+                                             GeeMap* map);
+static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                            GeeMap* items,
+                                                                            gpointer self);
 GType configuration_facade_get_type (void) G_GNUC_CONST;
 GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self);
-static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self);
+static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender,
+                                                                                            gpointer self);
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void);
 static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type);
 static void library_photo_page_on_export (LibraryPhotoPage* self);
-static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                     GVariant* parameter,
+                                                                     gpointer self);
 static void library_photo_page_on_print (LibraryPhotoPage* self);
-static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self);
 static void library_photo_page_on_publish (LibraryPhotoPage* self);
-static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
 static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self);
-static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                                  GVariant* parameter,
+                                                                                  gpointer self);
 static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self);
-static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
+static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
+static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
+static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                              GVariant* parameter,
+                                                                              gpointer self);
+static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                                     GVariant* parameter,
+                                                                                     gpointer self);
+static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                               GVariant* parameter,
+                                                                               gpointer self);
+static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                             GVariant* parameter,
+                                                                             gpointer self);
+static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                     GVariant* parameter,
+                                                                     gpointer self);
+static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                              GVariant* parameter,
+                                                                              gpointer self);
+static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                               GVariant* parameter,
+                                                                               gpointer self);
+static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
+static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
+static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
+static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
+static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self);
+static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
+static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                          GVariant* parameter,
+                                                                          gpointer self);
+static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                              GVariant* parameter,
+                                                                              gpointer self);
 static void library_photo_page_on_external_edit (LibraryPhotoPage* self);
-static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
 static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self);
-static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                                GVariant* parameter,
+                                                                                gpointer self);
 static void library_photo_page_on_send_to (LibraryPhotoPage* self);
-static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self);
+static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
 static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self);
-static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                          GVariant* parameter,
+                                                                          gpointer self);
 static void library_photo_page_on_increase_rating (LibraryPhotoPage* self);
-static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                              GVariant* parameter,
+                                                                              gpointer self);
 static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self);
-static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                              GVariant* parameter,
+                                                                              gpointer self);
 static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                            GVariant* parameter,
+                                                                            gpointer self);
 static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self);
 static void library_photo_page_on_rate_one (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self);
 static void library_photo_page_on_rate_two (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self);
 static void library_photo_page_on_rate_three (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                         GVariant* parameter,
+                                                                         gpointer self);
 static void library_photo_page_on_rate_four (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
 static void library_photo_page_on_rate_five (LibraryPhotoPage* self);
-static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
+static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self);
+static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self);
+static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self);
+static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                                  GVariant* parameter,
+                                                                                  gpointer self);
+static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self);
 static void library_photo_page_on_add_tags (LibraryPhotoPage* self);
-static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self);
 static void library_photo_page_on_modify_tags (LibraryPhotoPage* self);
-static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
+static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                          GVariant* parameter,
+                                                                          gpointer self);
 static void library_photo_page_on_slideshow (LibraryPhotoPage* self);
-static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-void page_on_action_toggle (Page* self, GAction* action, GVariant* value);
-static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self);
-static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value);
-static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self);
+static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self);
+void page_on_action_toggle (Page* self,
+                            GAction* action,
+                            GVariant* value);
+static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+                                                              GVariant* parameter,
+                                                              gpointer self);
+static void library_photo_page_on_display_ratings (LibraryPhotoPage* self,
+                                            GSimpleAction* action,
+                                            GVariant* value);
+static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                                  GVariant* value,
+                                                                                  gpointer self);
 LibraryPhotoPage* library_photo_page_new (void);
 LibraryPhotoPage* library_photo_page_construct (GType object_type);
 static void library_photo_page_on_photos_altered (LibraryPhotoPage* self);
-static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
-void view_collection_install_view_filter (ViewCollection* self, ViewFilter* f);
-static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking);
-static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self);
-static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked);
-static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self);
-gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view);
+static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                          GeeMap* items,
+                                                                          gpointer self);
+void view_collection_install_view_filter (ViewCollection* self,
+                                          ViewFilter* f);
+static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self,
+                                            GeeCollection* unlinking);
+static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender,
+                                                                               GeeCollection* unlinking,
+                                                                               gpointer self);
+static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self,
+                                           GeeCollection* relinked);
+static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender,
+                                                                             GeeCollection* relinked,
+                                                                             gpointer self);
+gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self,
+                                                     DataView* view);
 gboolean media_source_is_trashed (MediaSource* self);
-static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames);
-void page_init_collect_ui_filenames (Page* self, GeeList* ui_filenames);
-static void library_photo_page_real_add_actions (Page* base, GActionMap* map);
-void page_add_actions (Page* self, GActionMap* map);
-GAction* page_get_action (Page* self, const gchar* name);
+static void library_photo_page_real_init_collect_ui_filenames (Page* base,
+                                                        GeeList* ui_filenames);
+void page_init_collect_ui_filenames (Page* self,
+                                     GeeList* ui_filenames);
+static void library_photo_page_real_add_actions (Page* base,
+                                          GActionMap* map);
+void page_add_actions (Page* self,
+                       GActionMap* map);
+GAction* page_get_action (Page* self,
+                          const gchar* name);
 gboolean configuration_facade_get_display_photo_ratings (ConfigurationFacade* self);
 static GVariant* _variant_new16 (gboolean value);
 RawDeveloper configuration_facade_get_default_raw_developer (ConfigurationFacade* self);
 static GVariant* _variant_new17 (const gchar* value);
-static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value);
-static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self);
-static void library_photo_page_real_remove_actions (Page* base, GActionMap* map);
-void page_remove_actions (Page* self, GActionMap* map);
-static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1);
-InjectionGroup** page_init_collect_injection_groups (Page* self, int* result_length1);
+static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
+                                                  GSimpleAction* action,
+                                                  GVariant* value);
+static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender,
+                                                                                GVariant* value,
+                                                                                gpointer self);
+static void library_photo_page_real_remove_actions (Page* base,
+                                             GActionMap* map);
+void page_remove_actions (Page* self,
+                          GActionMap* map);
+static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base,
+                                                                        int* result_length1);
+InjectionGroup** page_init_collect_injection_groups (Page* self,
+                                                     int* result_length1);
 InjectionGroup* injection_group_new (const gchar* path);
-InjectionGroup* injection_group_construct (GType object_type, const gchar* path);
-void injection_group_add_menu_item (InjectionGroup* self, const gchar* name, const gchar* action, const gchar* accellerator);
-static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value);
-static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display);
-void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self, gboolean display);
-static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count);
+InjectionGroup* injection_group_construct (GType object_type,
+                                           const gchar* path);
+void injection_group_add_menu_item (InjectionGroup* self,
+                                    const gchar* name,
+                                    const gchar* action,
+                                    const gchar* accellerator);
+static void _vala_array_add86 (InjectionGroup** * array,
+                        int* length,
+                        int* size,
+                        InjectionGroup* value);
+static void _vala_array_add87 (InjectionGroup** * array,
+                        int* length,
+                        int* size,
+                        InjectionGroup* value);
+static void _vala_array_add88 (InjectionGroup** * array,
+                        int* length,
+                        int* size,
+                        InjectionGroup* value);
+static void library_photo_page_set_display_ratings (LibraryPhotoPage* self,
+                                             gboolean display);
+void configuration_facade_set_display_photo_ratings (ConfigurationFacade* self,
+                                                     gboolean display);
+static void library_photo_page_real_update_actions (Page* base,
+                                             gint selected_count,
+                                             gint count);
 PhotoFileFormat photo_get_master_file_format (Photo* self);
 gchar* configuration_facade_get_external_photo_app (ConfigurationFacade* self);
 static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self);
@@ -2220,150 +2862,252 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 gboolean photo_has_color_adjustments (Photo* self);
 static void library_photo_page_update_flag_action (LibraryPhotoPage* self);
 gchar* configuration_facade_get_external_raw_app (ConfigurationFacade* self);
-void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd);
-static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd);
-gboolean raw_developer_is_equivalent (RawDeveloper self, RawDeveloper d);
+void library_photo_page_developer_changed (LibraryPhotoPage* self,
+                                           RawDeveloper rd);
+static void library_photo_page_real_developer_changed (LibraryPhotoPage* self,
+                                                RawDeveloper rd);
+gboolean raw_developer_is_equivalent (RawDeveloper self,
+                                      RawDeveloper d);
 RawDeveloper photo_get_raw_developer (Photo* self);
 gboolean dialogs_confirm_warn_developer_changed (gint number);
 GType multiple_data_source_command_get_type (void) G_GNUC_CONST;
 GType set_raw_developer_command_get_type (void) G_GNUC_CONST;
-SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter, RawDeveloper developer);
-SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type, GeeIterable* iter, RawDeveloper developer);
-void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view);
+SetRawDeveloperCommand* set_raw_developer_command_new (GeeIterable* iter,
+                                                       RawDeveloper developer);
+SetRawDeveloperCommand* set_raw_developer_command_construct (GType object_type,
+                                                             GeeIterable* iter,
+                                                             RawDeveloper developer);
+void library_photo_page_display_for_collection (LibraryPhotoPage* self,
+                                                CollectionPage* return_page,
+                                                Photo* photo,
+                                                ViewCollection* view);
 void library_photo_page_on_page_destroyed (LibraryPhotoPage* self);
-static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self);
+static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender,
+                                                               gpointer self);
 CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self);
 static void library_photo_page_real_switched_to (Page* base);
 static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self);
 static void library_photo_page_real_switching_from (Page* base);
-static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, gint scale);
+static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base,
+                                                            gint scale);
 GType rating_get_type (void) G_GNUC_CONST;
-GdkPixbuf* resources_get_rating_trinket (Rating rating, gint scale);
+GdkPixbuf* resources_get_rating_trinket (Rating rating,
+                                         gint scale);
 Rating media_source_get_rating (MediaSource* self);
-static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base, gint scale);
+static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base,
+                                                          gint scale);
 GType flaggable_get_type (void) G_GNUC_CONST;
 gboolean flaggable_is_flagged (Flaggable* self);
-GdkPixbuf* resources_get_icon (const gchar* name, gint scale);
+GdkPixbuf* resources_get_icon (const gchar* name,
+                               gint scale);
 #define RESOURCES_ICON_FLAGGED_TRINKET "flag-trinket.png"
 #define RESOURCES_DEFAULT_ICON_SCALE 24
-void app_window_go_fullscreen (AppWindow* self, Page* page);
-SlideshowPage* slideshow_page_new (SourceCollection* sources, ViewCollection* controller, Photo* start);
-SlideshowPage* slideshow_page_construct (GType object_type, SourceCollection* sources, ViewCollection* controller, Photo* start);
+void app_window_go_fullscreen (AppWindow* self,
+                               Page* page);
+SlideshowPage* slideshow_page_new (SourceCollection* sources,
+                                   ViewCollection* controller,
+                                   Photo* start);
+SlideshowPage* slideshow_page_construct (GType object_type,
+                                         SourceCollection* sources,
+                                         ViewCollection* controller,
+                                         Photo* start);
 GType slideshow_page_get_type (void) G_GNUC_CONST;
 static void library_photo_page_real_on_increase_size (EditingHostPage* base);
 static void library_photo_page_real_on_decrease_size (EditingHostPage* base);
-static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, GdkEventKey* event);
+static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base,
+                                                           GdkEventKey* event);
 static void library_photo_page_return_to_collection (LibraryPhotoPage* self);
-static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean missing);
-static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, Photo* photo, gboolean missing);
+static void library_photo_page_real_update_ui (EditingHostPage* base,
+                                        gboolean missing);
+static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base,
+                                                           Photo* photo,
+                                                           gboolean missing);
 void media_source_mark_offline (MediaSource* self);
 void media_source_mark_online (MediaSource* self);
-static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event);
+static gboolean library_photo_page_real_key_press_event (GtkWidget* base,
+                                                  GdkEventKey* event);
+static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
+                                                  GdkEventButton* event);
 void fullscreen_window_close (FullscreenWindow* self);
-static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventButton* event);
-gboolean page_on_left_released (Page* self, GdkEventButton* event);
+static gboolean library_photo_page_real_on_left_released (Page* base,
+                                                   GdkEventButton* event);
+gboolean page_on_left_released (Page* self,
+                                GdkEventButton* event);
 static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self);
-static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event);
-gboolean page_popup_context_menu (Page* self, GtkMenu* context_menu, GdkEventButton* event);
+static gboolean library_photo_page_real_on_context_buttonpress (Page* base,
+                                                         GdkEventButton* event);
+gboolean page_popup_context_menu (Page* self,
+                                  GtkMenu* context_menu,
+                                  GdkEventButton* event);
 static gboolean library_photo_page_real_on_context_keypress (Page* base);
 GType library_window_get_type (void) G_GNUC_CONST;
 LibraryWindow* library_window_get_app (void);
-void library_window_switch_to_page (LibraryWindow* self, Page* page);
+void library_window_switch_to_page (LibraryWindow* self,
+                                    Page* page);
 void library_window_switch_to_library_page (LibraryWindow* self);
-void remove_from_app (GeeCollection* sources, const gchar* dialog_title, const gchar* progress_dialog_text);
+void remove_from_app (GeeCollection* sources,
+                      const gchar* dialog_title,
+                      const gchar* progress_dialog_text);
 GType event_page_get_type (void) G_GNUC_CONST;
-void library_window_set_page_switching_enabled (LibraryWindow* self, gboolean should_enable);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources, gboolean to_trash);
-TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type, GeeCollection* sources, gboolean to_trash);
+void library_window_set_page_switching_enabled (LibraryWindow* self,
+                                                gboolean should_enable);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_new (GeeCollection* sources,
+                                                             gboolean to_trash);
+TrashUntrashPhotosCommand* trash_untrash_photos_command_construct (GType object_type,
+                                                                   GeeCollection* sources,
+                                                                   gboolean to_trash);
 GType trash_untrash_photos_command_get_type (void) G_GNUC_CONST;
-FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources, gboolean flag);
-FlagUnflagCommand* flag_unflag_command_construct (GType object_type, GeeCollection* sources, gboolean flag);
+FlagUnflagCommand* flag_unflag_command_new (GeeCollection* sources,
+                                            gboolean flag);
+FlagUnflagCommand* flag_unflag_command_construct (GType object_type,
+                                                  GeeCollection* sources,
+                                                  gboolean flag);
 GType multiple_data_source_at_once_command_get_type (void) G_GNUC_CONST;
 GType flag_unflag_command_get_type (void) G_GNUC_CONST;
-static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, LibraryPhoto* photo);
-void data_collection_remove_marked (DataCollection* self, Marker* m);
+static void library_photo_page_on_photo_removed (LibraryPhotoPage* self,
+                                          LibraryPhoto* photo);
+void data_collection_remove_marked (DataCollection* self,
+                                    Marker* m);
 gpointer print_manager_ref (gpointer instance);
 void print_manager_unref (gpointer instance);
-GParamSpec* param_spec_print_manager (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_print_manager (GValue* value, gpointer v_object);
-void value_take_print_manager (GValue* value, gpointer v_object);
+GParamSpec* param_spec_print_manager (const gchar* name,
+                                      const gchar* nick,
+                                      const gchar* blurb,
+                                      GType object_type,
+                                      GParamFlags flags);
+void value_set_print_manager (GValue* value,
+                              gpointer v_object);
+void value_take_print_manager (GValue* value,
+                               gpointer v_object);
 gpointer value_get_print_manager (const GValue* value);
 GType print_manager_get_type (void) G_GNUC_CONST;
 PrintManager* print_manager_get_instance (void);
-void print_manager_spool_photo (PrintManager* self, GeeCollection* to_print);
-GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self, GType t);
-void photo_open_with_external_editor (Photo* self, GError** error);
-void open_external_editor_error_dialog (GError* err, Photo* photo);
-void photo_open_with_raw_external_editor (Photo* self, GError** error);
-void app_window_error_message (const gchar* message, GtkWindow* parent);
+void print_manager_spool_photo (PrintManager* self,
+                                GeeCollection* to_print);
+GeeList* view_collection_get_selected_sources_of_type (ViewCollection* self,
+                                                       GType t);
+void photo_open_with_external_editor (Photo* self,
+                                      GError** error);
+void open_external_editor_error_dialog (GError* err,
+                                        Photo* photo);
+void photo_open_with_raw_external_editor (Photo* self,
+                                          GError** error);
+void app_window_error_message (const gchar* message,
+                               GtkWindow* parent);
 gchar* resources_launch_editor_failed (GError* err);
 void desktop_integration_send_to (GeeCollection* media);
 GeeList* view_collection_get_selected_sources (ViewCollection* self);
 GType export_dialog_get_type (void) G_GNUC_CONST;
 ExportDialog* export_dialog_new (const gchar* title);
-ExportDialog* export_dialog_construct (GType object_type, const gchar* title);
+ExportDialog* export_dialog_construct (GType object_type,
+                                       const gchar* title);
 GType export_format_parameters_get_type (void) G_GNUC_CONST;
 GType export_format_mode_get_type (void) G_GNUC_CONST;
 GType jpeg_quality_get_type (void) G_GNUC_CONST;
 ExportFormatParameters* export_format_parameters_dup (const ExportFormatParameters* self);
 void export_format_parameters_free (ExportFormatParameters* self);
 void export_format_parameters_last (ExportFormatParameters* result);
-gboolean export_dialog_execute (ExportDialog* self, gint* scale, ScaleConstraint* constraint, ExportFormatParameters* parameters);
+gboolean export_dialog_execute (ExportDialog* self,
+                                gint* scale,
+                                ScaleConstraint* constraint,
+                                ExportFormatParameters* parameters);
 GFile* export_ui_choose_file (const gchar* current_file_basename);
-gchar* photo_get_export_basename_for_parameters (Photo* self, ExportFormatParameters* params);
-void scaling_for_constraint (ScaleConstraint constraint, gint scale, gboolean scale_up, Scaling* result);
-void photo_export (Photo* self, GFile* dest_file, Scaling* scaling, JpegQuality quality, PhotoFileFormat export_format, gboolean direct_copy_unmodified, gboolean export_metadata, GError** error);
-PhotoFileFormat photo_get_export_format_for_parameters (Photo* self, ExportFormatParameters* params);
+gchar* photo_get_export_basename_for_parameters (Photo* self,
+                                                 ExportFormatParameters* params);
+void scaling_for_constraint (ScaleConstraint constraint,
+                             gint scale,
+                             gboolean scale_up,
+                             Scaling* result);
+void photo_export (Photo* self,
+                   GFile* dest_file,
+                   Scaling* scaling,
+                   JpegQuality quality,
+                   PhotoFileFormat export_format,
+                   gboolean direct_copy_unmodified,
+                   gboolean export_metadata,
+                   GError** error);
+PhotoFileFormat photo_get_export_format_for_parameters (Photo* self,
+                                                        ExportFormatParameters* params);
 void publishing_ui_publishing_dialog_go (GeeCollection* to_publish);
 GType set_rating_single_command_get_type (void) G_GNUC_CONST;
-SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source, gboolean is_incrementing);
-SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type, DataSource* source, gboolean is_incrementing);
-static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rating);
-SetRatingSingleCommand* set_rating_single_command_new (DataSource* source, Rating rating);
-SetRatingSingleCommand* set_rating_single_command_construct (GType object_type, DataSource* source, Rating rating);
+SetRatingSingleCommand* set_rating_single_command_new_inc_dec (DataSource* source,
+                                                               gboolean is_incrementing);
+SetRatingSingleCommand* set_rating_single_command_construct_inc_dec (GType object_type,
+                                                                     DataSource* source,
+                                                                     gboolean is_incrementing);
+static void library_photo_page_on_set_rating (LibraryPhotoPage* self,
+                                       Rating rating);
+SetRatingSingleCommand* set_rating_single_command_new (DataSource* source,
+                                                       Rating rating);
+SetRatingSingleCommand* set_rating_single_command_construct (GType object_type,
+                                                             DataSource* source,
+                                                             Rating rating);
 gboolean rating_can_increase (Rating self);
 gboolean rating_can_decrease (Rating self);
 static GVariant* _variant_new18 (const gchar* value);
 static GVariant* _variant_new19 (const gchar* value);
-gboolean alteration_has_subject (Alteration* self, const gchar* subject);
+gboolean alteration_has_subject (Alteration* self,
+                                 const gchar* subject);
 GType tags_dialog_get_type (void) G_GNUC_CONST;
 GType add_tags_dialog_get_type (void) G_GNUC_CONST;
 AddTagsDialog* add_tags_dialog_new (void);
 AddTagsDialog* add_tags_dialog_construct (GType object_type);
-gchar** add_tags_dialog_execute (AddTagsDialog* self, int* result_length1);
+gchar** add_tags_dialog_execute (AddTagsDialog* self,
+                                 int* result_length1);
 gpointer hierarchical_tag_index_ref (gpointer instance);
 void hierarchical_tag_index_unref (gpointer instance);
-GParamSpec* param_spec_hierarchical_tag_index (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_hierarchical_tag_index (GValue* value, gpointer v_object);
-void value_take_hierarchical_tag_index (GValue* value, gpointer v_object);
+GParamSpec* param_spec_hierarchical_tag_index (const gchar* name,
+                                               const gchar* nick,
+                                               const gchar* blurb,
+                                               GType object_type,
+                                               GParamFlags flags);
+void value_set_hierarchical_tag_index (GValue* value,
+                                       gpointer v_object);
+void value_take_hierarchical_tag_index (GValue* value,
+                                        gpointer v_object);
 gpointer value_get_hierarchical_tag_index (const GValue* value);
 GType hierarchical_tag_index_get_type (void) G_GNUC_CONST;
 HierarchicalTagIndex* hierarchical_tag_index_get_global_index (void);
-gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self, gchar** names, int names_length1, int* result_length1);
-AddTagsCommand* add_tags_command_new (gchar** paths, int paths_length1, GeeCollection* sources);
-AddTagsCommand* add_tags_command_construct (GType object_type, gchar** paths, int paths_length1, GeeCollection* sources);
+gchar** hierarchical_tag_index_get_paths_for_names_array (HierarchicalTagIndex* self,
+                                                          gchar** names,
+                                                          int names_length1,
+                                                          int* result_length1);
+AddTagsCommand* add_tags_command_new (gchar** paths,
+                                      int paths_length1,
+                                      GeeCollection* sources);
+AddTagsCommand* add_tags_command_construct (GType object_type,
+                                            gchar** paths,
+                                            int paths_length1,
+                                            GeeCollection* sources);
 GType add_tags_command_get_type (void) G_GNUC_CONST;
 GType modify_tags_dialog_get_type (void) G_GNUC_CONST;
 ModifyTagsDialog* modify_tags_dialog_new (MediaSource* source);
-ModifyTagsDialog* modify_tags_dialog_construct (GType object_type, MediaSource* source);
+ModifyTagsDialog* modify_tags_dialog_construct (GType object_type,
+                                                MediaSource* source);
 GType tag_get_type (void) G_GNUC_CONST;
 GeeArrayList* modify_tags_dialog_execute (ModifyTagsDialog* self);
-ModifyTagsCommand* modify_tags_command_new (MediaSource* media, GeeCollection* new_tag_list);
-ModifyTagsCommand* modify_tags_command_construct (GType object_type, MediaSource* media, GeeCollection* new_tag_list);
+ModifyTagsCommand* modify_tags_command_new (MediaSource* media,
+                                            GeeCollection* new_tag_list);
+ModifyTagsCommand* modify_tags_command_construct (GType object_type,
+                                                  MediaSource* media,
+                                                  GeeCollection* new_tag_list);
 GType modify_tags_command_get_type (void) G_GNUC_CONST;
-enum  {
-	LIBRARY_PHOTO_PAGE_LIBRARY_PHOTO_PAGE_VIEW_FILTER_DUMMY_PROPERTY
-};
-static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view);
+static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base,
+                                                                           DataView* view);
 ViewFilter* view_filter_construct (GType object_type);
 static void library_photo_page_finalize (GObject * obj);
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func);
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func);
+static void _vala_array_destroy (gpointer array,
+                          gint array_length,
+                          GDestroyNotify destroy_func);
+static void _vala_array_free (gpointer array,
+                       gint array_length,
+                       GDestroyNotify destroy_func);
 
 static const GActionEntry LIBRARY_PHOTO_PAGE_entries[45] = {{"Export", _library_photo_page_on_export_gsimple_action_activate_callback}, {"Print", _library_photo_page_on_print_gsimple_action_activate_callback}, {"Publish", _library_photo_page_on_publish_gsimple_action_activate_callback}, {"RemoveFromLibrary", _library_photo_page_on_remove_from_library_gsimple_action_activate_callback}, {"MoveToTrash", _library_photo_page_on_move_to_trash_gsimple_action_activate_callback}, {"PrevPhoto", _single_photo_page_on_previous_photo_gsimple_action_activate_callback}, {"NextPhoto", _single_photo_page_on_next_photo_gsimple_action_activate_callback}, {"RotateClockwise", _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback}, {"RotateCounterclockwise", _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback}, {"FlipHorizontally", _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback}, {"FlipVertically", _editing_host_page_on_flip_vertically_gsimple_action_activate_callback}, {"Enhance", _editing_host_page_on_enhance_gsimple_action_activate_callback}, {"CopyColorAdjustments", _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback}, {"PasteColorAdjustments", _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback}, {"Crop", _editing_host_page_toggle_crop_gsimple_action_activate_callback}, {"Straighten", _editing_host_page_toggle_straighten_gsimple_action_activate_callback}, {"RedEye", _editing_host_page_toggle_redeye_gsimple_action_activate_callback}, {"Adjust", _editing_host_page_toggle_adjust_gsimple_action_activate_callback}, {"Revert", _editing_host_page_on_revert_gsimple_action_activate_callback}, {"EditTitle", _editing_host_page_on_edit_title_gsimple_action_activate_callback}, {"EditComment", _editing_host_page_on_edit_comment_gsimple_action_activate_callback}, {"AdjustDateTime", _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback}, {"ExternalEdit", _library_photo_page_on_external_edit_gsimple_action_activate_callback}, {"ExternalEditRAW", _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback}, {"SendTo", _library_photo_page_on_send_to_gsimple_action_activate_callback}, {"SetBackground", _editing_host_page_on_set_background_gsimple_action_activate_callback}, {"Flag", _library_photo_page_on_flag_unflag_gsimple_action_activate_callback}, {"IncreaseRating", _library_photo_page_on_increase_rating_gsimple_action_activate_callback}, {"DecreaseRating", _library_photo_page_on_decrease_rating_gsimple_action_activate_callback}, {"RateRejected", _library_photo_page_on_rate_rejected_gsimple_action_activate_callback}, {"RateUnrated", _library_photo_page_on_rate_unrated_gsimple_action_activate_callback}, {"RateOne", _library_photo_page_on_rate_one_gsimple_action_activate_callback}, {"RateTwo", _library_photo_page_on_rate_two_gsimple_action_activate_callback}, {"RateThree", _library_photo_page_on_rate_three_gsimple_action_activate_callback}, {"RateFour", _library_photo_page_on_rate_four_gsimple_action_activate_callback}, {"RateFive", _library_photo_page_on_rate_five_gsimple_action_activate_callback}, {"IncreaseSize", _editing_host_page_on_increase_size_gsimple_action_activate_callback}, {"DecreaseSize", _editing_host_page_on_decrease_size_gsimple_action_activate_callback}, {"ZoomFit", _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback}, {"Zoom100", _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback}, {"Zoom200", _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback}, {"AddTags", _library_photo_page_on_add_tags_gsimple_action_activate_callback}, {"ModifyTags", _library_photo_page_on_modify_tags_gsimple_action_activate_callback}, {"Slideshow", _library_photo_page_on_slideshow_gsimple_action_activate_callback}, {"ViewRatings", _page_on_action_toggle_gsimple_action_activate_callback, NULL, "false", _library_photo_page_on_display_ratings_gsimple_action_change_state_callback}};
 
-static GType zoom_buffer_object_state_get_type (void) {
+static GType
+zoom_buffer_object_state_get_type (void)
+{
 	static volatile gsize zoom_buffer_object_state_type_id__volatile = 0;
 	if (g_once_init_enter (&zoom_buffer_object_state_type_id__volatile)) {
 		static const GEnumValue values[] = {{ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED, "ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED", "source-not-loaded"}, {ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS, "ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS", "source-load-in-progress"}, {ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED, "ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED", "source-not-transformed"}, {ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY, "ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY", "transformed-ready"}, {0, NULL, NULL}};
@@ -2375,22 +3119,26 @@ static GType zoom_buffer_object_state_get_type (void) {
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 2382 "PhotoPage.c"
+#line 3128 "PhotoPage.c"
 }
 
 
-ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) {
+ZoomBuffer*
+zoom_buffer_construct (GType object_type,
+                       SinglePhotoPage* parent_page,
+                       Photo* backing_photo,
+                       GdkPixbuf* preview_image)
+{
 	ZoomBuffer * self = NULL;
 	SinglePhotoPage* _tmp0_;
-	SinglePhotoPage* _tmp1_;
-	GdkPixbuf* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	Photo* _tmp4_;
-	Photo* _tmp5_;
-	Workers* _tmp6_;
+	GdkPixbuf* _tmp1_;
+	Photo* _tmp2_;
+	Workers* _tmp3_;
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_SINGLE_PHOTO_PAGE (parent_page), NULL);
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2400,105 +3148,108 @@ ZoomBuffer* zoom_buffer_construct (GType object_type, SinglePhotoPage* parent_pa
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = (ZoomBuffer*) g_object_new (object_type, NULL);
 #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = parent_page;
-#line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (parent_page);
 #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->parent_page);
 #line 86 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->parent_page = _tmp1_;
-#line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = preview_image;
+	self->priv->parent_page = _tmp0_;
 #line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (preview_image);
 #line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->preview_image);
 #line 87 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->preview_image = _tmp3_;
-#line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = backing_photo;
+	self->priv->preview_image = _tmp1_;
 #line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp2_ = _g_object_ref0 (backing_photo);
 #line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->backing_photo);
 #line 88 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->backing_photo = _tmp5_;
+	self->priv->backing_photo = _tmp2_;
 #line 89 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = workers_new ((guint) 2, FALSE);
+	_tmp3_ = workers_new ((guint) 2, FALSE);
 #line 89 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_workers_unref0 (self->priv->workers);
 #line 89 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->workers = _tmp6_;
+	self->priv->workers = _tmp3_;
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 2435 "PhotoPage.c"
+#line 3177 "PhotoPage.c"
 }
 
 
-ZoomBuffer* zoom_buffer_new (SinglePhotoPage* parent_page, Photo* backing_photo, GdkPixbuf* preview_image) {
+ZoomBuffer*
+zoom_buffer_new (SinglePhotoPage* parent_page,
+                 Photo* backing_photo,
+                 GdkPixbuf* preview_image)
+{
 #line 84 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_construct (TYPE_ZOOM_BUFFER, parent_page, backing_photo, preview_image);
-#line 2442 "PhotoPage.c"
+#line 3188 "PhotoPage.c"
 }
 
 
-static gpointer _background_job_ref0 (gpointer self) {
+static gpointer
+_background_job_ref0 (gpointer self)
+{
 #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? background_job_ref (self) : NULL;
-#line 2449 "PhotoPage.c"
+#line 3197 "PhotoPage.c"
 }
 
 
-static void _zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job, gpointer self) {
+static void
+_zoom_buffer_on_iso_transformation_complete_completion_callback (BackgroundJob* job,
+                                                                 gpointer self)
+{
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_iso_transformation_complete ((ZoomBuffer*) self, job);
-#line 2456 "PhotoPage.c"
+#line 3207 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, BackgroundJob* job) {
+static void
+zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self,
+                                          BackgroundJob* job)
+{
 	ZoomBufferIsoSourceFetchJob* fetch_job = NULL;
-	BackgroundJob* _tmp0_;
+	ZoomBufferIsoSourceFetchJob* _tmp0_;
 	ZoomBufferIsoSourceFetchJob* _tmp1_;
-	ZoomBufferIsoSourceFetchJob* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	ZoomBufferIsoSourceFetchJob* _tmp4_;
+	GdkPixbuf* _tmp2_;
+	ZoomBufferIsoSourceFetchJob* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_;
-	GdkPixbuf* _tmp7_;
+	gint _tmp7_;
 	gint _tmp8_;
-	gint _tmp9_;
-	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp9_;
+	gint _tmp10_;
 	gint _tmp11_;
-	gint _tmp12_;
-	gboolean _tmp21_;
+	gboolean _tmp20_;
 	BackgroundJob* transformation_job = NULL;
-	GdkPixbuf* _tmp23_;
-	Photo* _tmp24_;
+	GdkPixbuf* _tmp22_;
+	Photo* _tmp23_;
+	PixelTransformer* _tmp24_;
 	PixelTransformer* _tmp25_;
-	PixelTransformer* _tmp26_;
+	GCancellable* _tmp26_;
 	GCancellable* _tmp27_;
-	GCancellable* _tmp28_;
-	ZoomBufferTransformationJob* _tmp29_;
-	BackgroundJob* _tmp30_;
-	Workers* _tmp31_;
-	BackgroundJob* _tmp32_;
+	ZoomBufferTransformationJob* _tmp28_;
+	BackgroundJob* _tmp29_;
+	Workers* _tmp30_;
+	BackgroundJob* _tmp31_;
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (job));
 #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = job;
-#line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob));
+	_tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (job, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob));
 #line 93 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	fetch_job = _tmp1_;
+	fetch_job = _tmp0_;
 #line 94 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = fetch_job;
+	_tmp1_ = fetch_job;
 #line 94 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_->fetched;
+	_tmp2_ = _tmp1_->fetched;
 #line 94 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 95 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("PhotoPage.vala:95: ZoomBuffer: iso_source_fetch_complete( ): fetch job" \
 " has null image member");
@@ -2506,314 +3257,312 @@ static void zoom_buffer_on_iso_source_fetch_complete (ZoomBuffer* self, Backgrou
 		_background_job_unref0 (fetch_job);
 #line 96 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2509 "PhotoPage.c"
+#line 3260 "PhotoPage.c"
 	}
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = fetch_job;
+	_tmp3_ = fetch_job;
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_->fetched;
+	_tmp4_ = _tmp3_->fetched;
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _g_object_ref0 (_tmp5_);
+	_tmp5_ = _g_object_ref0 (_tmp4_);
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->iso_source_image);
 #line 99 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->iso_source_image = _tmp6_;
+	self->priv->iso_source_image = _tmp5_;
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = self->priv->iso_source_image;
+	_tmp6_ = self->priv->iso_source_image;
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = gdk_pixbuf_get_width (_tmp7_);
+	_tmp7_ = gdk_pixbuf_get_width (_tmp6_);
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = self->priv->iso_source_image;
+	_tmp9_ = self->priv->iso_source_image;
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = gdk_pixbuf_get_height (_tmp10_);
+	_tmp10_ = gdk_pixbuf_get_height (_tmp9_);
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
-#line 2535 "PhotoPage.c"
+	if ((_tmp8_ * _tmp11_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
+#line 3286 "PhotoPage.c"
+		GdkPixbuf* _tmp12_;
 		GdkPixbuf* _tmp13_;
-		GdkPixbuf* _tmp14_;
+		gint _tmp14_;
 		gint _tmp15_;
-		gint _tmp16_;
-		GdkPixbuf* _tmp17_;
+		GdkPixbuf* _tmp16_;
+		gint _tmp17_;
 		gint _tmp18_;
-		gint _tmp19_;
-		GdkPixbuf* _tmp20_;
+		GdkPixbuf* _tmp19_;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = self->priv->iso_source_image;
+		_tmp12_ = self->priv->iso_source_image;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = self->priv->iso_source_image;
+		_tmp13_ = self->priv->iso_source_image;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = gdk_pixbuf_get_width (_tmp14_);
+		_tmp14_ = gdk_pixbuf_get_width (_tmp13_);
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = self->priv->iso_source_image;
+		_tmp16_ = self->priv->iso_source_image;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
+		_tmp17_ = gdk_pixbuf_get_height (_tmp16_);
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = gdk_pixbuf_scale_simple (_tmp13_, _tmp16_ / 2, _tmp19_ / 2, GDK_INTERP_BILINEAR);
+		_tmp19_ = gdk_pixbuf_scale_simple (_tmp12_, _tmp15_ / 2, _tmp18_ / 2, GDK_INTERP_BILINEAR);
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->reduced_source_image);
 #line 101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->reduced_source_image = _tmp20_;
-#line 2564 "PhotoPage.c"
+		self->priv->reduced_source_image = _tmp19_;
+#line 3315 "PhotoPage.c"
 	}
 #line 104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED;
 #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = self->priv->is_interactive_redraw_in_progress;
+	_tmp20_ = self->priv->is_interactive_redraw_in_progress;
 #line 106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp21_) {
-#line 2572 "PhotoPage.c"
-		SinglePhotoPage* _tmp22_;
+	if (!_tmp20_) {
+#line 3323 "PhotoPage.c"
+		SinglePhotoPage* _tmp21_;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = self->priv->parent_page;
+		_tmp21_ = self->priv->parent_page;
 #line 107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_repaint (_tmp22_, NULL);
-#line 2578 "PhotoPage.c"
+		single_photo_page_repaint (_tmp21_, NULL);
+#line 3329 "PhotoPage.c"
 	}
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = self->priv->iso_source_image;
+	_tmp22_ = self->priv->iso_source_image;
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = self->priv->backing_photo;
+	_tmp23_ = self->priv->backing_photo;
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = photo_get_pixel_transformer (_tmp24_);
+	_tmp24_ = photo_get_pixel_transformer (_tmp23_);
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = _tmp25_;
+	_tmp25_ = _tmp24_;
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = g_cancellable_new ();
+	_tmp26_ = g_cancellable_new ();
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = _tmp27_;
+	_tmp27_ = _tmp26_;
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = zoom_buffer_transformation_job_new (self, _tmp23_, _tmp26_, _zoom_buffer_on_iso_transformation_complete_completion_callback, self, _tmp28_);
+	_tmp28_ = zoom_buffer_transformation_job_new (self, _tmp22_, _tmp25_, _zoom_buffer_on_iso_transformation_complete_completion_callback, self, _tmp27_);
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_BACKGROUND_JOB, BackgroundJob);
+	_tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_BACKGROUND_JOB, BackgroundJob);
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp28_);
+	_g_object_unref0 (_tmp27_);
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_pixel_transformer_unref0 (_tmp26_);
+	_pixel_transformer_unref0 (_tmp25_);
 #line 109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	transformation_job = _tmp30_;
+	transformation_job = _tmp29_;
 #line 112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = self->priv->workers;
+	_tmp30_ = self->priv->workers;
 #line 112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp32_ = transformation_job;
+	_tmp31_ = transformation_job;
 #line 112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	workers_enqueue (_tmp31_, _tmp32_);
+	workers_enqueue (_tmp30_, _tmp31_);
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (transformation_job);
 #line 92 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (fetch_job);
-#line 2612 "PhotoPage.c"
+#line 3363 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self, BackgroundJob* job) {
+static void
+zoom_buffer_on_iso_transformation_complete (ZoomBuffer* self,
+                                            BackgroundJob* job)
+{
 	ZoomBufferTransformationJob* transform_job = NULL;
-	BackgroundJob* _tmp0_;
+	ZoomBufferTransformationJob* _tmp0_;
 	ZoomBufferTransformationJob* _tmp1_;
-	ZoomBufferTransformationJob* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	ZoomBufferTransformationJob* _tmp4_;
+	GdkPixbuf* _tmp2_;
+	ZoomBufferTransformationJob* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GdkPixbuf* _tmp5_;
 	GdkPixbuf* _tmp6_;
-	GdkPixbuf* _tmp7_;
+	gint _tmp7_;
 	gint _tmp8_;
-	gint _tmp9_;
-	GdkPixbuf* _tmp10_;
+	GdkPixbuf* _tmp9_;
+	gint _tmp10_;
 	gint _tmp11_;
-	gint _tmp12_;
 #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (job));
 #line 116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = job;
-#line 116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob));
+	_tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (job, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob));
 #line 116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	transform_job = _tmp1_;
+	transform_job = _tmp0_;
 #line 117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = transform_job;
+	_tmp1_ = transform_job;
 #line 117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_->transformed;
+	_tmp2_ = _tmp1_->transformed;
 #line 117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 118 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("PhotoPage.vala:118: %s", "ZoomBuffer: on_iso_transformation_complete( ): completed job has null " "image");
 #line 120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_background_job_unref0 (transform_job);
 #line 120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2653 "PhotoPage.c"
+#line 3404 "PhotoPage.c"
 	}
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = transform_job;
+	_tmp3_ = transform_job;
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_->transformed;
+	_tmp4_ = _tmp3_->transformed;
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _g_object_ref0 (_tmp5_);
+	_tmp5_ = _g_object_ref0 (_tmp4_);
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->iso_transformed_image);
 #line 123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->iso_transformed_image = _tmp6_;
+	self->priv->iso_transformed_image = _tmp5_;
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = self->priv->iso_transformed_image;
+	_tmp6_ = self->priv->iso_transformed_image;
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = gdk_pixbuf_get_width (_tmp7_);
+	_tmp7_ = gdk_pixbuf_get_width (_tmp6_);
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = self->priv->iso_transformed_image;
+	_tmp9_ = self->priv->iso_transformed_image;
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = gdk_pixbuf_get_height (_tmp10_);
+	_tmp10_ = gdk_pixbuf_get_height (_tmp9_);
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((_tmp9_ * _tmp12_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
-#line 2679 "PhotoPage.c"
+	if ((_tmp8_ * _tmp11_) > ZOOM_BUFFER_USE_REDUCED_THRESHOLD) {
+#line 3430 "PhotoPage.c"
+		GdkPixbuf* _tmp12_;
 		GdkPixbuf* _tmp13_;
-		GdkPixbuf* _tmp14_;
+		gint _tmp14_;
 		gint _tmp15_;
-		gint _tmp16_;
-		GdkPixbuf* _tmp17_;
+		GdkPixbuf* _tmp16_;
+		gint _tmp17_;
 		gint _tmp18_;
-		gint _tmp19_;
-		GdkPixbuf* _tmp20_;
+		GdkPixbuf* _tmp19_;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = self->priv->iso_transformed_image;
+		_tmp12_ = self->priv->iso_transformed_image;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = self->priv->iso_transformed_image;
+		_tmp13_ = self->priv->iso_transformed_image;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = gdk_pixbuf_get_width (_tmp14_);
+		_tmp14_ = gdk_pixbuf_get_width (_tmp13_);
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = self->priv->iso_transformed_image;
+		_tmp16_ = self->priv->iso_transformed_image;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
+		_tmp17_ = gdk_pixbuf_get_height (_tmp16_);
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = gdk_pixbuf_scale_simple (_tmp13_, _tmp16_ / 2, _tmp19_ / 2, GDK_INTERP_BILINEAR);
+		_tmp19_ = gdk_pixbuf_scale_simple (_tmp12_, _tmp15_ / 2, _tmp18_ / 2, GDK_INTERP_BILINEAR);
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->reduced_transformed_image);
 #line 125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->reduced_transformed_image = _tmp20_;
-#line 2708 "PhotoPage.c"
+		self->priv->reduced_transformed_image = _tmp19_;
+#line 3459 "PhotoPage.c"
 	}
 #line 129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY;
 #line 115 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (transform_job);
-#line 2714 "PhotoPage.c"
+#line 3465 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_on_demand_transform_complete (ZoomBuffer* self, BackgroundJob* job) {
+static void
+zoom_buffer_on_demand_transform_complete (ZoomBuffer* self,
+                                          BackgroundJob* job)
+{
 	ZoomBufferTransformationJob* transform_job = NULL;
-	BackgroundJob* _tmp0_;
+	ZoomBufferTransformationJob* _tmp0_;
 	ZoomBufferTransformationJob* _tmp1_;
-	ZoomBufferTransformationJob* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	ZoomBufferTransformationJob* _tmp4_;
+	GdkPixbuf* _tmp2_;
+	ZoomBufferTransformationJob* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GdkPixbuf* _tmp5_;
-	GdkPixbuf* _tmp6_;
-	SinglePhotoPage* _tmp7_;
+	SinglePhotoPage* _tmp6_;
 #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_BACKGROUND_JOB (job));
 #line 133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = job;
+	_tmp0_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (job, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob));
 #line 133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _background_job_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob));
-#line 133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	transform_job = _tmp1_;
+	transform_job = _tmp0_;
 #line 134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = transform_job;
+	_tmp1_ = transform_job;
 #line 134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_->transformed;
+	_tmp2_ = _tmp1_->transformed;
 #line 134 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_critical ("PhotoPage.vala:135: %s", "ZoomBuffer: on_demand_transform_complete( ): completed job has null " "image");
 #line 137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_background_job_unref0 (transform_job);
 #line 137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 2750 "PhotoPage.c"
+#line 3501 "PhotoPage.c"
 	}
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = transform_job;
+	_tmp3_ = transform_job;
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_->transformed;
+	_tmp4_ = _tmp3_->transformed;
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _g_object_ref0 (_tmp5_);
+	_tmp5_ = _g_object_ref0 (_tmp4_);
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->demand_transform_cached_pixbuf);
 #line 140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->demand_transform_cached_pixbuf = _tmp6_;
+	self->priv->demand_transform_cached_pixbuf = _tmp5_;
 #line 141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (self->priv->demand_transform_job);
 #line 141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->demand_transform_job = NULL;
 #line 143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = self->priv->parent_page;
+	_tmp6_ = self->priv->parent_page;
 #line 143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_repaint (_tmp7_, NULL);
+	single_photo_page_repaint (_tmp6_, NULL);
 #line 132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_background_job_unref0 (transform_job);
-#line 2772 "PhotoPage.c"
+#line 3523 "PhotoPage.c"
 }
 
 
-static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, ZoomState* zoom_state, GdkPixbuf* iso_pixbuf, GdkPixbuf* reduced_pixbuf) {
+static GdkPixbuf*
+zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self,
+                                        ZoomState* zoom_state,
+                                        GdkPixbuf* iso_pixbuf,
+                                        GdkPixbuf* reduced_pixbuf)
+{
 	GdkPixbuf* result = NULL;
 	GdkRectangle view_rect = {0};
 	GdkRectangle _tmp0_ = {0};
 	GdkRectangle view_rect_proj = {0};
-	GdkPixbuf* _tmp1_;
-	GdkRectangle _tmp2_ = {0};
+	GdkRectangle _tmp1_ = {0};
 	GdkPixbuf* sample_source_pixbuf = NULL;
-	GdkPixbuf* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	gboolean _tmp5_ = FALSE;
-	GdkPixbuf* _tmp6_;
-	GdkRectangle _tmp14_;
-	gint _tmp15_;
+	GdkPixbuf* _tmp2_;
+	gboolean _tmp3_ = FALSE;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
+	GdkRectangle _tmp15_;
 	gint _tmp16_;
-	GdkRectangle _tmp17_;
-	gint _tmp18_;
+	GdkPixbuf* proj_subpixbuf = NULL;
+	GdkPixbuf* _tmp17_;
+	GdkRectangle _tmp18_;
 	gint _tmp19_;
 	GdkRectangle _tmp20_;
 	gint _tmp21_;
-	gint _tmp22_;
-	GdkRectangle _tmp23_;
-	gint _tmp24_;
+	GdkRectangle _tmp22_;
+	gint _tmp23_;
+	GdkRectangle _tmp24_;
 	gint _tmp25_;
-	GdkPixbuf* proj_subpixbuf = NULL;
 	GdkPixbuf* _tmp26_;
+	GdkPixbuf* zoomed = NULL;
 	GdkRectangle _tmp27_;
 	gint _tmp28_;
 	GdkRectangle _tmp29_;
 	gint _tmp30_;
-	GdkRectangle _tmp31_;
-	gint _tmp32_;
-	GdkRectangle _tmp33_;
-	gint _tmp34_;
-	GdkPixbuf* _tmp35_;
-	GdkPixbuf* zoomed = NULL;
-	GdkRectangle _tmp36_;
-	gint _tmp37_;
-	GdkRectangle _tmp38_;
-	gint _tmp39_;
-	GdkPixbuf* _tmp40_;
+	GdkPixbuf* _tmp31_;
 #line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2827,134 +3576,113 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 #line 151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	view_rect = _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = iso_pixbuf;
+	zoom_state_get_viewing_rectangle_projection (zoom_state, iso_pixbuf, &_tmp1_);
 #line 152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_get_viewing_rectangle_projection (zoom_state, _tmp1_, &_tmp2_);
-#line 152 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_rect_proj = _tmp2_;
-#line 154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = iso_pixbuf;
+	view_rect_proj = _tmp1_;
 #line 154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
+	_tmp2_ = _g_object_ref0 (iso_pixbuf);
 #line 154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	sample_source_pixbuf = _tmp4_;
-#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = reduced_pixbuf;
+	sample_source_pixbuf = _tmp2_;
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp6_ != NULL) {
-#line 2845 "PhotoPage.c"
-		gdouble _tmp7_;
-#line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = zoom_state_get_zoom_factor (zoom_state);
+	if (reduced_pixbuf != NULL) {
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = _tmp7_ < 0.5;
-#line 2851 "PhotoPage.c"
+		_tmp3_ = zoom_state_get_zoom_factor (zoom_state) < 0.5;
+#line 3590 "PhotoPage.c"
 	} else {
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = FALSE;
-#line 2855 "PhotoPage.c"
+		_tmp3_ = FALSE;
+#line 3594 "PhotoPage.c"
 	}
 #line 156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp5_) {
-#line 2859 "PhotoPage.c"
-		GdkPixbuf* _tmp8_;
-		GdkPixbuf* _tmp9_;
-		gint _tmp10_;
-		gint _tmp11_;
-		gint _tmp12_;
-		gint _tmp13_;
-#line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = reduced_pixbuf;
+	if (_tmp3_) {
+#line 3598 "PhotoPage.c"
+		GdkPixbuf* _tmp4_;
+		gint _tmp5_;
+		gint _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
 #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = _g_object_ref0 (_tmp8_);
+		_tmp4_ = _g_object_ref0 (reduced_pixbuf);
 #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (sample_source_pixbuf);
 #line 157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		sample_source_pixbuf = _tmp9_;
+		sample_source_pixbuf = _tmp4_;
 #line 158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = view_rect_proj.x;
+		_tmp5_ = view_rect_proj.x;
 #line 158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_rect_proj.x = _tmp10_ / 2;
+		view_rect_proj.x = _tmp5_ / 2;
 #line 159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = view_rect_proj.y;
+		_tmp6_ = view_rect_proj.y;
 #line 159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_rect_proj.y = _tmp11_ / 2;
+		view_rect_proj.y = _tmp6_ / 2;
 #line 160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = view_rect_proj.width;
+		_tmp7_ = view_rect_proj.width;
 #line 160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_rect_proj.width = _tmp12_ / 2;
+		view_rect_proj.width = _tmp7_ / 2;
 #line 161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = view_rect_proj.height;
+		_tmp8_ = view_rect_proj.height;
 #line 161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_rect_proj.height = _tmp13_ / 2;
-#line 2890 "PhotoPage.c"
+		view_rect_proj.height = _tmp8_ / 2;
+#line 3626 "PhotoPage.c"
 	}
 #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = view_rect_proj;
+	_tmp9_ = view_rect_proj;
 #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = _tmp14_.width;
-#line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = CLAMP (_tmp15_, 1, G_MAXINT);
+	_tmp10_ = _tmp9_.width;
 #line 167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_rect_proj.width = _tmp16_;
-#line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = view_rect_proj;
+	view_rect_proj.width = CLAMP (_tmp10_, 1, G_MAXINT);
 #line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _tmp17_.height;
+	_tmp11_ = view_rect_proj;
 #line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = CLAMP (_tmp18_, 1, G_MAXINT);
+	_tmp12_ = _tmp11_.height;
 #line 168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_rect_proj.height = _tmp19_;
+	view_rect_proj.height = CLAMP (_tmp12_, 1, G_MAXINT);
 #line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = view_rect;
+	_tmp13_ = view_rect;
 #line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = _tmp20_.width;
+	_tmp14_ = _tmp13_.width;
 #line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = CLAMP (_tmp21_, 1, G_MAXINT);
-#line 170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_rect.width = _tmp22_;
-#line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = view_rect;
+	view_rect.width = CLAMP (_tmp14_, 1, G_MAXINT);
 #line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = _tmp23_.height;
+	_tmp15_ = view_rect;
 #line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = CLAMP (_tmp24_, 1, G_MAXINT);
+	_tmp16_ = _tmp15_.height;
 #line 171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_rect.height = _tmp25_;
+	view_rect.height = CLAMP (_tmp16_, 1, G_MAXINT);
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = sample_source_pixbuf;
+	_tmp17_ = sample_source_pixbuf;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = view_rect_proj;
+	_tmp18_ = view_rect_proj;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = _tmp27_.x;
+	_tmp19_ = _tmp18_.x;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = view_rect_proj;
+	_tmp20_ = view_rect_proj;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = _tmp29_.y;
+	_tmp21_ = _tmp20_.y;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = view_rect_proj;
+	_tmp22_ = view_rect_proj;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp32_ = _tmp31_.width;
+	_tmp23_ = _tmp22_.width;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = view_rect_proj;
+	_tmp24_ = view_rect_proj;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp34_ = _tmp33_.height;
+	_tmp25_ = _tmp24_.height;
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_ = gdk_pixbuf_new_subpixbuf (_tmp26_, _tmp28_, _tmp30_, _tmp32_, _tmp34_);
+	_tmp26_ = gdk_pixbuf_new_subpixbuf (_tmp17_, _tmp19_, _tmp21_, _tmp23_, _tmp25_);
 #line 173 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	proj_subpixbuf = _tmp35_;
+	proj_subpixbuf = _tmp26_;
 #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp36_ = view_rect;
+	_tmp27_ = view_rect;
 #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp37_ = _tmp36_.width;
+	_tmp28_ = _tmp27_.width;
 #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_ = view_rect;
+	_tmp29_ = view_rect;
 #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39_ = _tmp38_.height;
+	_tmp30_ = _tmp29_.height;
 #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp40_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp37_, _tmp39_, GDK_INTERP_BILINEAR);
+	_tmp31_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp28_, _tmp30_, GDK_INTERP_BILINEAR);
 #line 176 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoomed = _tmp40_;
+	zoomed = _tmp31_;
 #line 179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_vala_assert (zoomed != NULL, "zoomed != null");
 #line 181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2965,24 +3693,30 @@ static GdkPixbuf* zoom_buffer_get_view_projection_pixbuf (ZoomBuffer* self, Zoom
 	_g_object_unref0 (sample_source_pixbuf);
 #line 181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 2968 "PhotoPage.c"
+#line 3696 "PhotoPage.c"
 }
 
 
-static void _zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job, gpointer self) {
+static void
+_zoom_buffer_on_demand_transform_complete_completion_callback (BackgroundJob* job,
+                                                               gpointer self)
+{
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_demand_transform_complete ((ZoomBuffer*) self, job);
-#line 2975 "PhotoPage.c"
+#line 3706 "PhotoPage.c"
 }
 
 
-static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self, ZoomState* zoom_state) {
+static GdkPixbuf*
+zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffer* self,
+                                                     ZoomState* zoom_state)
+{
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_;
-	ZoomBufferTransformationJob* _tmp97_;
-	ZoomBufferTransformationJob* _tmp119_;
-	ZoomState _tmp136_;
-	GdkPixbuf* _tmp137_;
+	ZoomBufferTransformationJob* _tmp86_;
+	ZoomBufferTransformationJob* _tmp107_;
+	ZoomState _tmp124_;
+	GdkPixbuf* _tmp125_;
 #line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 184 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -2991,98 +3725,93 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 	_tmp0_ = self->priv->demand_transform_cached_pixbuf;
 #line 185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 2994 "PhotoPage.c"
+#line 3728 "PhotoPage.c"
 		ZoomState _tmp1_;
-		gboolean _tmp2_;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->demand_transform_zoom_state;
 #line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = zoom_state_equals (zoom_state, &_tmp1_);
-#line 186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp2_) {
-#line 3003 "PhotoPage.c"
+		if (zoom_state_equals (zoom_state, &_tmp1_)) {
+#line 3734 "PhotoPage.c"
+			GdkPixbuf* _tmp2_;
 			GdkPixbuf* _tmp3_;
-			GdkPixbuf* _tmp4_;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp3_ = self->priv->demand_transform_cached_pixbuf;
+			_tmp2_ = self->priv->demand_transform_cached_pixbuf;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp4_ = _g_object_ref0 (_tmp3_);
+			_tmp3_ = _g_object_ref0 (_tmp2_);
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			result = _tmp4_;
+			result = _tmp3_;
 #line 190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3014 "PhotoPage.c"
+#line 3745 "PhotoPage.c"
 		} else {
-			gdouble _tmp5_;
-			gdouble _tmp6_;
 #line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp5_ = zoom_state_get_zoom_factor (zoom_state);
-#line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = zoom_state_get_zoom_factor (&self->priv->demand_transform_zoom_state);
-#line 191 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp5_ == _tmp6_) {
-#line 3024 "PhotoPage.c"
+			if (zoom_state_get_zoom_factor (zoom_state) == zoom_state_get_zoom_factor (&self->priv->demand_transform_zoom_state)) {
+#line 3749 "PhotoPage.c"
 				GdkRectangle curr_rect = {0};
-				GdkRectangle _tmp7_ = {0};
+				GdkRectangle _tmp4_ = {0};
 				GdkRectangle pre_rect = {0};
-				GdkRectangle _tmp8_ = {0};
+				GdkRectangle _tmp5_ = {0};
 				GdkRectangle transfer_src_rect = {0};
 				GdkRectangle transfer_dest_rect = {0};
-				GdkRectangle _tmp9_;
-				gint _tmp10_;
-				GdkRectangle _tmp11_;
-				gint _tmp12_;
-				GdkRectangle _tmp13_;
-				gint _tmp14_;
+				GdkRectangle _tmp6_;
+				gint _tmp7_;
+				GdkRectangle _tmp8_;
+				gint _tmp9_;
+				GdkRectangle _tmp10_;
+				gint _tmp11_;
+				GdkRectangle _tmp12_;
+				gint _tmp13_;
+				GdkRectangle _tmp14_;
 				gint _tmp15_;
 				GdkRectangle _tmp16_;
 				gint _tmp17_;
+				gint transfer_src_right = 0;
 				GdkRectangle _tmp18_;
 				gint _tmp19_;
 				GdkRectangle _tmp20_;
 				gint _tmp21_;
-				gint _tmp22_;
-				gint transfer_src_right = 0;
-				GdkRectangle _tmp23_;
-				gint _tmp24_;
-				GdkRectangle _tmp25_;
+				GdkRectangle _tmp22_;
+				gint _tmp23_;
+				GdkRectangle _tmp24_;
+				gint _tmp25_;
 				gint _tmp26_;
 				GdkRectangle _tmp27_;
 				gint _tmp28_;
+				gint transfer_src_bottom = 0;
 				GdkRectangle _tmp29_;
 				gint _tmp30_;
-				gint _tmp31_;
+				GdkRectangle _tmp31_;
 				gint _tmp32_;
 				GdkRectangle _tmp33_;
 				gint _tmp34_;
-				gint transfer_src_bottom = 0;
 				GdkRectangle _tmp35_;
 				gint _tmp36_;
-				GdkRectangle _tmp37_;
-				gint _tmp38_;
-				GdkRectangle _tmp39_;
-				gint _tmp40_;
-				GdkRectangle _tmp41_;
-				gint _tmp42_;
+				gint _tmp37_;
+				GdkRectangle _tmp38_;
+				gint _tmp39_;
+				GdkRectangle _tmp40_;
+				gint _tmp41_;
+				GdkRectangle _tmp42_;
 				gint _tmp43_;
-				gint _tmp44_;
-				GdkRectangle _tmp45_;
-				gint _tmp46_;
-				GdkRectangle _tmp47_;
-				gint _tmp48_;
-				GdkRectangle _tmp49_;
-				gint _tmp50_;
-				GdkRectangle _tmp51_;
-				gint _tmp52_;
+				GdkRectangle _tmp44_;
+				gint _tmp45_;
+				GdkRectangle _tmp46_;
+				gint _tmp47_;
+				GdkRectangle _tmp48_;
+				gint _tmp49_;
+				GdkRectangle _tmp50_;
+				gint _tmp51_;
+				gint transfer_dest_right = 0;
+				GdkRectangle _tmp52_;
 				gint _tmp53_;
 				GdkRectangle _tmp54_;
 				gint _tmp55_;
 				GdkRectangle _tmp56_;
 				gint _tmp57_;
-				GdkRectangle _tmp58_;
-				gint _tmp59_;
+				gint _tmp58_;
+				GdkRectangle _tmp59_;
 				gint _tmp60_;
-				gint transfer_dest_right = 0;
+				gint transfer_dest_bottom = 0;
 				GdkRectangle _tmp61_;
 				gint _tmp62_;
 				GdkRectangle _tmp63_;
@@ -3090,467 +3819,442 @@ static GdkPixbuf* zoom_buffer_get_zoomed_image_source_not_transformed (ZoomBuffe
 				GdkRectangle _tmp65_;
 				gint _tmp66_;
 				gint _tmp67_;
-				gint _tmp68_;
-				GdkRectangle _tmp69_;
-				gint _tmp70_;
-				gint transfer_dest_bottom = 0;
-				GdkRectangle _tmp71_;
-				gint _tmp72_;
+				GdkRectangle _tmp68_;
+				gint _tmp69_;
+				GdkPixbuf* composited_result = NULL;
+				ZoomState _tmp70_;
+				GdkPixbuf* _tmp71_;
+				GdkPixbuf* _tmp72_;
 				GdkRectangle _tmp73_;
 				gint _tmp74_;
 				GdkRectangle _tmp75_;
 				gint _tmp76_;
-				gint _tmp77_;
+				GdkRectangle _tmp77_;
 				gint _tmp78_;
 				GdkRectangle _tmp79_;
 				gint _tmp80_;
-				GdkPixbuf* composited_result = NULL;
-				ZoomState _tmp81_;
-				GdkPixbuf* _tmp82_;
-				GdkPixbuf* _tmp83_;
+				GdkPixbuf* _tmp81_;
+				GdkRectangle _tmp82_;
+				gint _tmp83_;
 				GdkRectangle _tmp84_;
 				gint _tmp85_;
-				GdkRectangle _tmp86_;
-				gint _tmp87_;
-				GdkRectangle _tmp88_;
-				gint _tmp89_;
-				GdkRectangle _tmp90_;
-				gint _tmp91_;
-				GdkPixbuf* _tmp92_;
-				GdkRectangle _tmp93_;
-				gint _tmp94_;
-				GdkRectangle _tmp95_;
-				gint _tmp96_;
 #line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp7_);
+				zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp4_);
 #line 202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				curr_rect = _tmp7_;
+				curr_rect = _tmp4_;
 #line 203 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				zoom_state_get_viewing_rectangle_wrt_content (&self->priv->demand_transform_zoom_state, &_tmp8_);
+				zoom_state_get_viewing_rectangle_wrt_content (&self->priv->demand_transform_zoom_state, &_tmp5_);
 #line 203 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				pre_rect = _tmp8_;
+				pre_rect = _tmp5_;
 #line 205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				memset (&transfer_src_rect, 0, sizeof (GdkRectangle));
 #line 206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				memset (&transfer_dest_rect, 0, sizeof (GdkRectangle));
 #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp9_ = curr_rect;
+				_tmp6_ = curr_rect;
 #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp10_ = _tmp9_.x;
+				_tmp7_ = _tmp6_.x;
 #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp11_ = pre_rect;
+				_tmp8_ = pre_rect;
 #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp12_ = _tmp11_.x;
+				_tmp9_ = _tmp8_.x;
 #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp13_ = pre_rect;
+				_tmp10_ = pre_rect;
 #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp14_ = _tmp13_.width;
+				_tmp11_ = _tmp10_.width;
 #line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp15_ = CLAMP (_tmp10_ - _tmp12_, 0, _tmp14_);
-#line 208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_src_rect.x = _tmp15_;
-#line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp16_ = curr_rect;
+				transfer_src_rect.x = CLAMP (_tmp7_ - _tmp9_, 0, _tmp11_);
 #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp17_ = _tmp16_.y;
+				_tmp12_ = curr_rect;
 #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp18_ = pre_rect;
+				_tmp13_ = _tmp12_.y;
 #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp19_ = _tmp18_.y;
+				_tmp14_ = pre_rect;
 #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp20_ = pre_rect;
+				_tmp15_ = _tmp14_.y;
 #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp21_ = _tmp20_.height;
+				_tmp16_ = pre_rect;
 #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp22_ = CLAMP (_tmp17_ - _tmp19_, 0, _tmp21_);
+				_tmp17_ = _tmp16_.height;
 #line 209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_src_rect.y = _tmp22_;
-#line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp23_ = curr_rect;
+				transfer_src_rect.y = CLAMP (_tmp13_ - _tmp15_, 0, _tmp17_);
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp24_ = _tmp23_.x;
+				_tmp18_ = curr_rect;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp25_ = curr_rect;
+				_tmp19_ = _tmp18_.x;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp26_ = _tmp25_.width;
+				_tmp20_ = curr_rect;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp27_ = pre_rect;
+				_tmp21_ = _tmp20_.width;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp28_ = _tmp27_.width;
+				_tmp22_ = pre_rect;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp29_ = pre_rect;
+				_tmp23_ = _tmp22_.width;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp30_ = _tmp29_.width;
+				_tmp24_ = pre_rect;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp31_ = CLAMP ((_tmp24_ + _tmp26_) - _tmp28_, 0, _tmp30_);
+				_tmp25_ = _tmp24_.width;
 #line 210 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_src_right = _tmp31_;
+				transfer_src_right = CLAMP ((_tmp19_ + _tmp21_) - _tmp23_, 0, _tmp25_);
 #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp32_ = transfer_src_right;
+				_tmp26_ = transfer_src_right;
 #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp33_ = transfer_src_rect;
+				_tmp27_ = transfer_src_rect;
 #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp34_ = _tmp33_.x;
+				_tmp28_ = _tmp27_.x;
 #line 212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_src_rect.width = _tmp32_ - _tmp34_;
+				transfer_src_rect.width = _tmp26_ - _tmp28_;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp35_ = curr_rect;
+				_tmp29_ = curr_rect;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp36_ = _tmp35_.y;
+				_tmp30_ = _tmp29_.y;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp37_ = curr_rect;
+				_tmp31_ = curr_rect;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp38_ = _tmp37_.height;
+				_tmp32_ = _tmp31_.height;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp39_ = pre_rect;
+				_tmp33_ = pre_rect;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp40_ = _tmp39_.width;
+				_tmp34_ = _tmp33_.width;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp41_ = pre_rect;
+				_tmp35_ = pre_rect;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp42_ = _tmp41_.height;
+				_tmp36_ = _tmp35_.height;
 #line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp43_ = CLAMP ((_tmp36_ + _tmp38_) - _tmp40_, 0, _tmp42_);
-#line 213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_src_bottom = _tmp43_;
+				transfer_src_bottom = CLAMP ((_tmp30_ + _tmp32_) - _tmp34_, 0, _tmp36_);
 #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp44_ = transfer_src_bottom;
+				_tmp37_ = transfer_src_bottom;
 #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp45_ = transfer_src_rect;
+				_tmp38_ = transfer_src_rect;
 #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp46_ = _tmp45_.y;
+				_tmp39_ = _tmp38_.y;
 #line 215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_src_rect.height = _tmp44_ - _tmp46_;
-#line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp47_ = pre_rect;
+				transfer_src_rect.height = _tmp37_ - _tmp39_;
 #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp48_ = _tmp47_.x;
+				_tmp40_ = pre_rect;
 #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp49_ = curr_rect;
+				_tmp41_ = _tmp40_.x;
 #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp50_ = _tmp49_.x;
+				_tmp42_ = curr_rect;
 #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp51_ = curr_rect;
+				_tmp43_ = _tmp42_.x;
 #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp52_ = _tmp51_.width;
+				_tmp44_ = curr_rect;
 #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp53_ = CLAMP (_tmp48_ - _tmp50_, 0, _tmp52_);
+				_tmp45_ = _tmp44_.width;
 #line 217 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_dest_rect.x = _tmp53_;
-#line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp54_ = pre_rect;
+				transfer_dest_rect.x = CLAMP (_tmp41_ - _tmp43_, 0, _tmp45_);
 #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp55_ = _tmp54_.y;
+				_tmp46_ = pre_rect;
 #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp56_ = curr_rect;
+				_tmp47_ = _tmp46_.y;
 #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp57_ = _tmp56_.y;
+				_tmp48_ = curr_rect;
 #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp58_ = curr_rect;
+				_tmp49_ = _tmp48_.y;
 #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp59_ = _tmp58_.height;
+				_tmp50_ = curr_rect;
 #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp60_ = CLAMP (_tmp55_ - _tmp57_, 0, _tmp59_);
+				_tmp51_ = _tmp50_.height;
 #line 218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_dest_rect.y = _tmp60_;
+				transfer_dest_rect.y = CLAMP (_tmp47_ - _tmp49_, 0, _tmp51_);
 #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp61_ = transfer_dest_rect;
+				_tmp52_ = transfer_dest_rect;
 #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp62_ = _tmp61_.x;
+				_tmp53_ = _tmp52_.x;
 #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp63_ = transfer_src_rect;
+				_tmp54_ = transfer_src_rect;
 #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp64_ = _tmp63_.width;
-#line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp65_ = curr_rect;
+				_tmp55_ = _tmp54_.width;
 #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp66_ = _tmp65_.width;
+				_tmp56_ = curr_rect;
 #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp67_ = CLAMP (_tmp62_ + _tmp64_, 0, _tmp66_);
+				_tmp57_ = _tmp56_.width;
 #line 219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_dest_right = _tmp67_;
+				transfer_dest_right = CLAMP (_tmp53_ + _tmp55_, 0, _tmp57_);
 #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp68_ = transfer_dest_right;
+				_tmp58_ = transfer_dest_right;
 #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp69_ = transfer_dest_rect;
+				_tmp59_ = transfer_dest_rect;
 #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp70_ = _tmp69_.x;
+				_tmp60_ = _tmp59_.x;
 #line 221 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_dest_rect.width = _tmp68_ - _tmp70_;
-#line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp71_ = transfer_dest_rect;
+				transfer_dest_rect.width = _tmp58_ - _tmp60_;
 #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp72_ = _tmp71_.y;
+				_tmp61_ = transfer_dest_rect;
 #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp73_ = transfer_src_rect;
+				_tmp62_ = _tmp61_.y;
 #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp74_ = _tmp73_.height;
+				_tmp63_ = transfer_src_rect;
 #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp75_ = curr_rect;
+				_tmp64_ = _tmp63_.height;
 #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp76_ = _tmp75_.height;
+				_tmp65_ = curr_rect;
 #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp77_ = CLAMP (_tmp72_ + _tmp74_, 0, _tmp76_);
+				_tmp66_ = _tmp65_.height;
 #line 222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_dest_bottom = _tmp77_;
+				transfer_dest_bottom = CLAMP (_tmp62_ + _tmp64_, 0, _tmp66_);
 #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp78_ = transfer_dest_bottom;
+				_tmp67_ = transfer_dest_bottom;
 #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp79_ = transfer_dest_rect;
+				_tmp68_ = transfer_dest_rect;
 #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp80_ = _tmp79_.y;
+				_tmp69_ = _tmp68_.y;
 #line 224 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				transfer_dest_rect.height = _tmp78_ - _tmp80_;
+				transfer_dest_rect.height = _tmp67_ - _tmp69_;
 #line 226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp81_ = *zoom_state;
+				_tmp70_ = *zoom_state;
 #line 226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp82_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp81_);
+				_tmp71_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp70_);
 #line 226 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				composited_result = _tmp82_;
+				composited_result = _tmp71_;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp83_ = self->priv->demand_transform_cached_pixbuf;
+				_tmp72_ = self->priv->demand_transform_cached_pixbuf;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp84_ = transfer_src_rect;
+				_tmp73_ = transfer_src_rect;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp85_ = _tmp84_.x;
+				_tmp74_ = _tmp73_.x;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp86_ = transfer_src_rect;
+				_tmp75_ = transfer_src_rect;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp87_ = _tmp86_.y;
+				_tmp76_ = _tmp75_.y;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp88_ = transfer_dest_rect;
+				_tmp77_ = transfer_dest_rect;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp89_ = _tmp88_.width;
+				_tmp78_ = _tmp77_.width;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp90_ = transfer_dest_rect;
+				_tmp79_ = transfer_dest_rect;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp91_ = _tmp90_.height;
+				_tmp80_ = _tmp79_.height;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp92_ = composited_result;
+				_tmp81_ = composited_result;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp93_ = transfer_dest_rect;
+				_tmp82_ = transfer_dest_rect;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp94_ = _tmp93_.x;
+				_tmp83_ = _tmp82_.x;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp95_ = transfer_dest_rect;
+				_tmp84_ = transfer_dest_rect;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp96_ = _tmp95_.y;
+				_tmp85_ = _tmp84_.y;
 #line 227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				gdk_pixbuf_copy_area (_tmp83_, _tmp85_, _tmp87_, _tmp89_, _tmp91_, _tmp92_, _tmp94_, _tmp96_);
+				gdk_pixbuf_copy_area (_tmp72_, _tmp74_, _tmp76_, _tmp78_, _tmp80_, _tmp81_, _tmp83_, _tmp85_);
 #line 231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = composited_result;
 #line 231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 3344 "PhotoPage.c"
+#line 4045 "PhotoPage.c"
 			}
 		}
 	}
 #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp97_ = self->priv->demand_transform_job;
+	_tmp86_ = self->priv->demand_transform_job;
 #line 242 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp97_ != NULL) {
-#line 3352 "PhotoPage.c"
-		ZoomState _tmp98_;
-		gboolean _tmp99_;
-#line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp98_ = self->priv->demand_transform_zoom_state;
+	if (_tmp86_ != NULL) {
+#line 4053 "PhotoPage.c"
+		ZoomState _tmp87_;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp99_ = zoom_state_equals (zoom_state, &_tmp98_);
+		_tmp87_ = self->priv->demand_transform_zoom_state;
 #line 243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp99_) {
-#line 3361 "PhotoPage.c"
-			ZoomState _tmp100_;
-			GdkPixbuf* _tmp101_;
+		if (zoom_state_equals (zoom_state, &_tmp87_)) {
+#line 4059 "PhotoPage.c"
+			ZoomState _tmp88_;
+			GdkPixbuf* _tmp89_;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp100_ = *zoom_state;
+			_tmp88_ = *zoom_state;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp101_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp100_);
+			_tmp89_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp88_);
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			result = _tmp101_;
+			result = _tmp89_;
 #line 244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3372 "PhotoPage.c"
+#line 4070 "PhotoPage.c"
 		} else {
-			ZoomBufferTransformationJob* _tmp102_;
+			ZoomBufferTransformationJob* _tmp90_;
 			GdkPixbuf* zoomed = NULL;
-			ZoomState _tmp103_;
-			GdkPixbuf* _tmp104_;
-			GdkPixbuf* _tmp105_;
+			ZoomState _tmp91_;
+			GdkPixbuf* _tmp92_;
+			GdkPixbuf* _tmp93_;
+			GdkPixbuf* _tmp94_;
+			GdkPixbuf* _tmp95_;
+			Photo* _tmp96_;
+			PixelTransformer* _tmp97_;
+			PixelTransformer* _tmp98_;
+			GCancellable* _tmp99_;
+			GCancellable* _tmp100_;
+			ZoomBufferTransformationJob* _tmp101_;
+			ZoomState _tmp102_;
+			Workers* _tmp103_;
+			ZoomBufferTransformationJob* _tmp104_;
+			ZoomState _tmp105_;
 			GdkPixbuf* _tmp106_;
-			GdkPixbuf* _tmp107_;
-			Photo* _tmp108_;
-			PixelTransformer* _tmp109_;
-			PixelTransformer* _tmp110_;
-			GCancellable* _tmp111_;
-			GCancellable* _tmp112_;
-			ZoomBufferTransformationJob* _tmp113_;
-			ZoomState _tmp114_;
-			Workers* _tmp115_;
-			ZoomBufferTransformationJob* _tmp116_;
-			ZoomState _tmp117_;
-			GdkPixbuf* _tmp118_;
 #line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp102_ = self->priv->demand_transform_job;
+			_tmp90_ = self->priv->demand_transform_job;
 #line 246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp102_, TYPE_BACKGROUND_JOB, BackgroundJob));
+			background_job_cancel (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_background_job_unref0 (self->priv->demand_transform_job);
 #line 247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			self->priv->demand_transform_job = NULL;
 #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp103_ = *zoom_state;
+			_tmp91_ = *zoom_state;
 #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp104_ = self->priv->iso_source_image;
+			_tmp92_ = self->priv->iso_source_image;
 #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp105_ = self->priv->reduced_source_image;
+			_tmp93_ = self->priv->reduced_source_image;
 #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp106_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp103_, _tmp104_, _tmp105_);
+			_tmp94_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp91_, _tmp92_, _tmp93_);
 #line 249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			zoomed = _tmp106_;
+			zoomed = _tmp94_;
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp107_ = zoomed;
+			_tmp95_ = zoomed;
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp108_ = self->priv->backing_photo;
+			_tmp96_ = self->priv->backing_photo;
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp109_ = photo_get_pixel_transformer (_tmp108_);
+			_tmp97_ = photo_get_pixel_transformer (_tmp96_);
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp110_ = _tmp109_;
+			_tmp98_ = _tmp97_;
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp111_ = g_cancellable_new ();
+			_tmp99_ = g_cancellable_new ();
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp112_ = _tmp111_;
+			_tmp100_ = _tmp99_;
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp113_ = zoom_buffer_transformation_job_new (self, _tmp107_, _tmp110_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp112_);
+			_tmp101_ = zoom_buffer_transformation_job_new (self, _tmp95_, _tmp98_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp100_);
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_background_job_unref0 (self->priv->demand_transform_job);
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			self->priv->demand_transform_job = _tmp113_;
+			self->priv->demand_transform_job = _tmp101_;
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp112_);
+			_g_object_unref0 (_tmp100_);
 #line 252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_pixel_transformer_unref0 (_tmp110_);
+			_pixel_transformer_unref0 (_tmp98_);
 #line 255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp114_ = *zoom_state;
+			_tmp102_ = *zoom_state;
 #line 255 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			self->priv->demand_transform_zoom_state = _tmp114_;
+			self->priv->demand_transform_zoom_state = _tmp102_;
 #line 256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp115_ = self->priv->workers;
+			_tmp103_ = self->priv->workers;
 #line 256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp116_ = self->priv->demand_transform_job;
+			_tmp104_ = self->priv->demand_transform_job;
 #line 256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			workers_enqueue (_tmp115_, G_TYPE_CHECK_INSTANCE_CAST (_tmp116_, TYPE_BACKGROUND_JOB, BackgroundJob));
+			workers_enqueue (_tmp103_, G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp117_ = *zoom_state;
+			_tmp105_ = *zoom_state;
 #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp118_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp117_);
+			_tmp106_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp105_);
 #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			result = _tmp118_;
+			result = _tmp106_;
 #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (zoomed);
 #line 258 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3452 "PhotoPage.c"
+#line 4150 "PhotoPage.c"
 		}
 	}
 #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp119_ = self->priv->demand_transform_job;
+	_tmp107_ = self->priv->demand_transform_job;
 #line 263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp119_ == NULL) {
-#line 3459 "PhotoPage.c"
+	if (_tmp107_ == NULL) {
+#line 4157 "PhotoPage.c"
 		GdkPixbuf* zoomed = NULL;
-		ZoomState _tmp120_;
-		GdkPixbuf* _tmp121_;
-		GdkPixbuf* _tmp122_;
+		ZoomState _tmp108_;
+		GdkPixbuf* _tmp109_;
+		GdkPixbuf* _tmp110_;
+		GdkPixbuf* _tmp111_;
+		GdkPixbuf* _tmp112_;
+		Photo* _tmp113_;
+		PixelTransformer* _tmp114_;
+		PixelTransformer* _tmp115_;
+		GCancellable* _tmp116_;
+		GCancellable* _tmp117_;
+		ZoomBufferTransformationJob* _tmp118_;
+		ZoomState _tmp119_;
+		Workers* _tmp120_;
+		ZoomBufferTransformationJob* _tmp121_;
+		ZoomState _tmp122_;
 		GdkPixbuf* _tmp123_;
-		GdkPixbuf* _tmp124_;
-		Photo* _tmp125_;
-		PixelTransformer* _tmp126_;
-		PixelTransformer* _tmp127_;
-		GCancellable* _tmp128_;
-		GCancellable* _tmp129_;
-		ZoomBufferTransformationJob* _tmp130_;
-		ZoomState _tmp131_;
-		Workers* _tmp132_;
-		ZoomBufferTransformationJob* _tmp133_;
-		ZoomState _tmp134_;
-		GdkPixbuf* _tmp135_;
 #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp120_ = *zoom_state;
+		_tmp108_ = *zoom_state;
 #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp121_ = self->priv->iso_source_image;
+		_tmp109_ = self->priv->iso_source_image;
 #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp122_ = self->priv->reduced_source_image;
+		_tmp110_ = self->priv->reduced_source_image;
 #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp123_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp120_, _tmp121_, _tmp122_);
+		_tmp111_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp108_, _tmp109_, _tmp110_);
 #line 264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		zoomed = _tmp123_;
+		zoomed = _tmp111_;
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp124_ = zoomed;
+		_tmp112_ = zoomed;
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp125_ = self->priv->backing_photo;
+		_tmp113_ = self->priv->backing_photo;
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp126_ = photo_get_pixel_transformer (_tmp125_);
+		_tmp114_ = photo_get_pixel_transformer (_tmp113_);
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp127_ = _tmp126_;
+		_tmp115_ = _tmp114_;
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp128_ = g_cancellable_new ();
+		_tmp116_ = g_cancellable_new ();
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp129_ = _tmp128_;
+		_tmp117_ = _tmp116_;
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp130_ = zoom_buffer_transformation_job_new (self, _tmp124_, _tmp127_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp129_);
+		_tmp118_ = zoom_buffer_transformation_job_new (self, _tmp112_, _tmp115_, _zoom_buffer_on_demand_transform_complete_completion_callback, self, _tmp117_);
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_background_job_unref0 (self->priv->demand_transform_job);
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->demand_transform_job = _tmp130_;
+		self->priv->demand_transform_job = _tmp118_;
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp129_);
+		_g_object_unref0 (_tmp117_);
 #line 267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_pixel_transformer_unref0 (_tmp127_);
+		_pixel_transformer_unref0 (_tmp115_);
 #line 271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp131_ = *zoom_state;
+		_tmp119_ = *zoom_state;
 #line 271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->demand_transform_zoom_state = _tmp131_;
+		self->priv->demand_transform_zoom_state = _tmp119_;
 #line 273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp132_ = self->priv->workers;
+		_tmp120_ = self->priv->workers;
 #line 273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp133_ = self->priv->demand_transform_job;
+		_tmp121_ = self->priv->demand_transform_job;
 #line 273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		workers_enqueue (_tmp132_, G_TYPE_CHECK_INSTANCE_CAST (_tmp133_, TYPE_BACKGROUND_JOB, BackgroundJob));
+		workers_enqueue (_tmp120_, G_TYPE_CHECK_INSTANCE_CAST (_tmp121_, TYPE_BACKGROUND_JOB, BackgroundJob));
 #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp134_ = *zoom_state;
+		_tmp122_ = *zoom_state;
 #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp135_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp134_);
+		_tmp123_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp122_);
 #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		result = _tmp135_;
+		result = _tmp123_;
 #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (zoomed);
 #line 275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 3529 "PhotoPage.c"
+#line 4227 "PhotoPage.c"
 	}
 #line 283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_critical ("PhotoPage.vala:283: %s", "ZoomBuffer: get_zoomed_image( ): in SOURCE-NOT-TRANSFORMED but can't t" \
 "ransform " "on-screen projection on-demand; using preview image");
 #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp136_ = *zoom_state;
+	_tmp124_ = *zoom_state;
 #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp137_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp136_);
+	_tmp125_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp124_);
 #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp137_;
+	result = _tmp125_;
 #line 285 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3541 "PhotoPage.c"
+#line 4239 "PhotoPage.c"
 }
 
 
-static void _zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job, gpointer self) {
+static void
+_zoom_buffer_on_iso_source_fetch_complete_completion_callback (BackgroundJob* job,
+                                                               gpointer self)
+{
 #line 290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_on_iso_source_fetch_complete ((ZoomBuffer*) self, job);
-#line 3548 "PhotoPage.c"
+#line 4249 "PhotoPage.c"
 }
 
 
-GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomState* zoom_state) {
+GdkPixbuf*
+zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self,
+                                             ZoomState* zoom_state)
+{
 	GdkPixbuf* result = NULL;
 	ZoomBufferObjectState _tmp0_;
 	GdkRectangle view_rect = {0};
@@ -3560,27 +4264,25 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 	GdkRectangle _tmp7_ = {0};
 	GdkRectangle _tmp8_;
 	gint _tmp9_;
-	gint _tmp10_;
-	GdkRectangle _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
 	GdkPixbuf* proj_subpixbuf = NULL;
-	GdkPixbuf* _tmp14_;
+	GdkPixbuf* _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
 	GdkRectangle _tmp15_;
 	gint _tmp16_;
 	GdkRectangle _tmp17_;
 	gint _tmp18_;
 	GdkRectangle _tmp19_;
 	gint _tmp20_;
-	GdkRectangle _tmp21_;
-	gint _tmp22_;
-	GdkPixbuf* _tmp23_;
+	GdkPixbuf* _tmp21_;
 	GdkPixbuf* zoomed = NULL;
+	GdkRectangle _tmp22_;
+	gint _tmp23_;
 	GdkRectangle _tmp24_;
 	gint _tmp25_;
-	GdkRectangle _tmp26_;
-	gint _tmp27_;
-	GdkPixbuf* _tmp28_;
+	GdkPixbuf* _tmp26_;
 #line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 288 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3589,7 +4291,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 	_tmp0_ = self->priv->object_state;
 #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED) {
-#line 3591 "PhotoPage.c"
+#line 4293 "PhotoPage.c"
 		BackgroundJob* iso_source_fetch_job = NULL;
 		Photo* _tmp1_;
 		ZoomBufferIsoSourceFetchJob* _tmp2_;
@@ -3611,7 +4313,7 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 		self->priv->object_state = ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS;
 #line 289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_background_job_unref0 (iso_source_fetch_job);
-#line 3613 "PhotoPage.c"
+#line 4315 "PhotoPage.c"
 	}
 #line 296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_state_get_viewing_rectangle_wrt_content (zoom_state, &_tmp5_);
@@ -3628,62 +4330,60 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image_internal (ZoomBuffer* self, ZoomSt
 #line 300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp9_ = _tmp8_.width;
 #line 300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = CLAMP (_tmp9_, 1, G_MAXINT);
-#line 300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_rect_proj.width = _tmp10_;
-#line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = view_rect_proj;
+	view_rect_proj.width = CLAMP (_tmp9_, 1, G_MAXINT);
 #line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_.height;
+	_tmp10_ = view_rect_proj;
 #line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = CLAMP (_tmp12_, 1, G_MAXINT);
+	_tmp11_ = _tmp10_.height;
 #line 301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_rect_proj.height = _tmp13_;
+	view_rect_proj.height = CLAMP (_tmp11_, 1, G_MAXINT);
+#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp12_ = self->priv->preview_image;
+#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_tmp13_ = view_rect_proj;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = self->priv->preview_image;
+	_tmp14_ = _tmp13_.x;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp15_ = view_rect_proj;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = _tmp15_.x;
+	_tmp16_ = _tmp15_.y;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp17_ = view_rect_proj;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _tmp17_.y;
+	_tmp18_ = _tmp17_.width;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp19_ = view_rect_proj;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = _tmp19_.width;
+	_tmp20_ = _tmp19_.height;
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = view_rect_proj;
+	_tmp21_ = gdk_pixbuf_new_subpixbuf (_tmp12_, _tmp14_, _tmp16_, _tmp18_, _tmp20_);
 #line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = _tmp21_.height;
-#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = gdk_pixbuf_new_subpixbuf (_tmp14_, _tmp16_, _tmp18_, _tmp20_, _tmp22_);
-#line 303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	proj_subpixbuf = _tmp23_;
+	proj_subpixbuf = _tmp21_;
 #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = view_rect;
+	_tmp22_ = view_rect;
 #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = _tmp24_.width;
+	_tmp23_ = _tmp22_.width;
 #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = view_rect;
+	_tmp24_ = view_rect;
 #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = _tmp26_.height;
+	_tmp25_ = _tmp24_.height;
 #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp25_, _tmp27_, GDK_INTERP_BILINEAR);
+	_tmp26_ = gdk_pixbuf_scale_simple (proj_subpixbuf, _tmp23_, _tmp25_, GDK_INTERP_BILINEAR);
 #line 306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoomed = _tmp28_;
+	zoomed = _tmp26_;
 #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = zoomed;
 #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (proj_subpixbuf);
 #line 309 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3681 "PhotoPage.c"
+#line 4379 "PhotoPage.c"
 }
 
 
-Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
+Photo*
+zoom_buffer_get_backing_photo (ZoomBuffer* self)
+{
 	Photo* result = NULL;
 	Photo* _tmp0_;
 	Photo* _tmp1_;
@@ -3697,31 +4397,33 @@ Photo* zoom_buffer_get_backing_photo (ZoomBuffer* self) {
 	result = _tmp1_;
 #line 313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3699 "PhotoPage.c"
+#line 4399 "PhotoPage.c"
 }
 
 
-void zoom_buffer_update_preview_image (ZoomBuffer* self, GdkPixbuf* preview_image) {
+void
+zoom_buffer_update_preview_image (ZoomBuffer* self,
+                                  GdkPixbuf* preview_image)
+{
 	GdkPixbuf* _tmp0_;
-	GdkPixbuf* _tmp1_;
 #line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 316 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (preview_image));
 #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = preview_image;
-#line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (preview_image);
 #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->preview_image);
 #line 317 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->preview_image = _tmp1_;
-#line 3718 "PhotoPage.c"
+	self->priv->preview_image = _tmp0_;
+#line 4418 "PhotoPage.c"
 }
 
 
-void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_state) {
-	ZoomState* _tmp0_;
+void
+zoom_buffer_flush_demand_cache (ZoomBuffer* self,
+                                ZoomState* initial_zoom_state)
+{
 #line 322 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_ZOOM_BUFFER (self));
 #line 323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3729,33 +4431,30 @@ void zoom_buffer_flush_demand_cache (ZoomBuffer* self, ZoomState* initial_zoom_s
 #line 323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->demand_transform_cached_pixbuf = NULL;
 #line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = initial_zoom_state;
-#line 324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_ != NULL) {
-#line 3734 "PhotoPage.c"
-		ZoomState* _tmp1_;
-		ZoomState _tmp2_;
-		GdkPixbuf* _tmp3_;
-		GdkPixbuf* _tmp4_;
-#line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = initial_zoom_state;
+	if (initial_zoom_state != NULL) {
+#line 4434 "PhotoPage.c"
+		ZoomState _tmp0_;
+		GdkPixbuf* _tmp1_;
+		GdkPixbuf* _tmp2_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = *_tmp1_;
+		_tmp0_ = *initial_zoom_state;
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = zoom_buffer_get_zoomed_image (self, &_tmp2_);
+		_tmp1_ = zoom_buffer_get_zoomed_image (self, &_tmp0_);
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp2_ = _tmp1_;
 #line 325 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
-#line 3749 "PhotoPage.c"
+		_g_object_unref0 (_tmp2_);
+#line 4446 "PhotoPage.c"
 	}
 }
 
 
-GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state) {
+GdkPixbuf*
+zoom_buffer_get_zoomed_image (ZoomBuffer* self,
+                              ZoomState* zoom_state)
+{
 	GdkPixbuf* result = NULL;
-	gdouble _tmp0_;
-	ZoomBufferObjectState _tmp3_;
+	ZoomBufferObjectState _tmp2_;
 #line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (self), NULL);
 #line 328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3763,104 +4462,105 @@ GdkPixbuf* zoom_buffer_get_zoomed_image (ZoomBuffer* self, ZoomState* zoom_state
 #line 329 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_interactive_redraw_in_progress = FALSE;
 #line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = zoom_state_get_interpolation_factor (zoom_state);
-#line 333 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_ == 0.0) {
-#line 3768 "PhotoPage.c"
-		ZoomState _tmp1_;
-		GdkPixbuf* _tmp2_;
+	if (zoom_state_get_interpolation_factor (zoom_state) == 0.0) {
+#line 4465 "PhotoPage.c"
+		ZoomState _tmp0_;
+		GdkPixbuf* _tmp1_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = *zoom_state;
+		_tmp0_ = *zoom_state;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp1_);
+		_tmp1_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp0_);
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		result = _tmp2_;
+		result = _tmp1_;
 #line 334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 3779 "PhotoPage.c"
+#line 4476 "PhotoPage.c"
 	}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = self->priv->object_state;
+	_tmp2_ = self->priv->object_state;
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	switch (_tmp3_) {
+	switch (_tmp2_) {
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_LOADED:
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_LOAD_IN_PROGRESS:
-#line 3789 "PhotoPage.c"
+#line 4486 "PhotoPage.c"
 		{
-			ZoomState _tmp4_;
-			GdkPixbuf* _tmp5_;
+			ZoomState _tmp3_;
+			GdkPixbuf* _tmp4_;
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp4_ = *zoom_state;
+			_tmp3_ = *zoom_state;
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp5_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp4_);
+			_tmp4_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp3_);
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			result = _tmp5_;
+			result = _tmp4_;
 #line 340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3801 "PhotoPage.c"
+#line 4498 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_SOURCE_NOT_TRANSFORMED:
-#line 3805 "PhotoPage.c"
+#line 4502 "PhotoPage.c"
 		{
-			ZoomState _tmp6_;
-			GdkPixbuf* _tmp7_;
+			ZoomState _tmp5_;
+			GdkPixbuf* _tmp6_;
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = *zoom_state;
+			_tmp5_ = *zoom_state;
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp7_ = zoom_buffer_get_zoomed_image_source_not_transformed (self, &_tmp6_);
+			_tmp6_ = zoom_buffer_get_zoomed_image_source_not_transformed (self, &_tmp5_);
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			result = _tmp7_;
+			result = _tmp6_;
 #line 343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3817 "PhotoPage.c"
+#line 4514 "PhotoPage.c"
 		}
 #line 337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		case ZOOM_BUFFER_OBJECT_STATE_TRANSFORMED_READY:
-#line 3821 "PhotoPage.c"
+#line 4518 "PhotoPage.c"
 		{
-			ZoomState _tmp8_;
+			ZoomState _tmp7_;
+			GdkPixbuf* _tmp8_;
 			GdkPixbuf* _tmp9_;
 			GdkPixbuf* _tmp10_;
-			GdkPixbuf* _tmp11_;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp8_ = *zoom_state;
+			_tmp7_ = *zoom_state;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = self->priv->iso_transformed_image;
+			_tmp8_ = self->priv->iso_transformed_image;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp10_ = self->priv->reduced_transformed_image;
+			_tmp9_ = self->priv->reduced_transformed_image;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp11_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp8_, _tmp9_, _tmp10_);
+			_tmp10_ = zoom_buffer_get_view_projection_pixbuf (self, &_tmp7_, _tmp8_, _tmp9_);
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			result = _tmp11_;
+			result = _tmp10_;
 #line 348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3839 "PhotoPage.c"
+#line 4536 "PhotoPage.c"
 		}
 		default:
 		{
-			ZoomState _tmp12_;
-			GdkPixbuf* _tmp13_;
+			ZoomState _tmp11_;
+			GdkPixbuf* _tmp12_;
 #line 352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			g_critical ("PhotoPage.vala:352: ZoomBuffer: get_zoomed_image( ): object is an inco" \
 "nsistent state");
 #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp12_ = *zoom_state;
+			_tmp11_ = *zoom_state;
 #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp13_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp12_);
+			_tmp12_ = zoom_buffer_get_zoom_preview_image_internal (self, &_tmp11_);
 #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			result = _tmp13_;
+			result = _tmp12_;
 #line 353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 3855 "PhotoPage.c"
+#line 4552 "PhotoPage.c"
 		}
 	}
 }
 
 
-GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom_state) {
+GdkPixbuf*
+zoom_buffer_get_zoom_preview_image (ZoomBuffer* self,
+                                    ZoomState* zoom_state)
+{
 	GdkPixbuf* result = NULL;
 	ZoomState _tmp0_;
 	GdkPixbuf* _tmp1_;
@@ -3878,56 +4578,57 @@ GdkPixbuf* zoom_buffer_get_zoom_preview_image (ZoomBuffer* self, ZoomState* zoom
 	result = _tmp1_;
 #line 360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 3879 "PhotoPage.c"
+#line 4579 "PhotoPage.c"
 }
 
 
-static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_construct (GType object_type, ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) {
+static ZoomBufferIsoSourceFetchJob*
+zoom_buffer_iso_source_fetch_job_construct (GType object_type,
+                                            ZoomBuffer* owner,
+                                            Photo* to_fetch,
+                                            CompletionCallback completion_callback,
+                                            void* completion_callback_target)
+{
 	ZoomBufferIsoSourceFetchJob* self = NULL;
-	ZoomBuffer* _tmp0_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	Photo* _tmp2_;
-	Photo* _tmp3_;
+	Photo* _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL);
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (to_fetch), NULL);
 #line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = owner;
-#line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = completion_callback;
-#line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1__target = completion_callback_target;
-#line 22 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = (ZoomBufferIsoSourceFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, NULL, NULL, NULL, NULL);
-#line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = to_fetch;
+	self = (ZoomBufferIsoSourceFetchJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), completion_callback, completion_callback_target, NULL, NULL, NULL, NULL);
 #line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp0_ = _g_object_ref0 (to_fetch);
 #line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->to_fetch);
 #line 24 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->to_fetch = _tmp3_;
+	self->priv->to_fetch = _tmp0_;
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 3912 "PhotoPage.c"
+#line 4606 "PhotoPage.c"
 }
 
 
-static ZoomBufferIsoSourceFetchJob* zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner, Photo* to_fetch, CompletionCallback completion_callback, void* completion_callback_target) {
+static ZoomBufferIsoSourceFetchJob*
+zoom_buffer_iso_source_fetch_job_new (ZoomBuffer* owner,
+                                      Photo* to_fetch,
+                                      CompletionCallback completion_callback,
+                                      void* completion_callback_target)
+{
 #line 20 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_iso_source_fetch_job_construct (ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, owner, to_fetch, completion_callback, completion_callback_target);
-#line 3919 "PhotoPage.c"
+#line 4618 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base) {
+static void
+zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
+{
 	ZoomBufferIsoSourceFetchJob * self;
 	GError * _inner_error_ = NULL;
 #line 27 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob);
-#line 3928 "PhotoPage.c"
+#line 4629 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_;
@@ -3944,7 +4645,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		_tmp0_ = _tmp3_;
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 3945 "PhotoPage.c"
+#line 4646 "PhotoPage.c"
 			goto __catch255_g_error;
 		}
 #line 29 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3957,7 +4658,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		self->fetched = _tmp4_;
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 3958 "PhotoPage.c"
+#line 4659 "PhotoPage.c"
 	}
 	goto __finally255;
 	__catch255_g_error:
@@ -3972,7 +4673,7 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 "m backing photo");
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (fetch_error);
-#line 3972 "PhotoPage.c"
+#line 4673 "PhotoPage.c"
 	}
 	__finally255:
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3983,12 +4684,14 @@ static void zoom_buffer_iso_source_fetch_job_real_execute (BackgroundJob* base)
 		g_clear_error (&_inner_error_);
 #line 28 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 3983 "PhotoPage.c"
+#line 4684 "PhotoPage.c"
 	}
 }
 
 
-static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetchJobClass * klass) {
+static void
+zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetchJobClass * klass)
+{
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_iso_source_fetch_job_parent_class = g_type_class_peek_parent (klass);
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -3997,20 +4700,24 @@ static void zoom_buffer_iso_source_fetch_job_class_init (ZoomBufferIsoSourceFetc
 	g_type_class_add_private (klass, sizeof (ZoomBufferIsoSourceFetchJobPrivate));
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_iso_source_fetch_job_real_execute;
-#line 3997 "PhotoPage.c"
+#line 4700 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceFetchJob * self) {
+static void
+zoom_buffer_iso_source_fetch_job_instance_init (ZoomBufferIsoSourceFetchJob * self)
+{
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = ZOOM_BUFFER_ISO_SOURCE_FETCH_JOB_GET_PRIVATE (self);
 #line 18 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->fetched = NULL;
-#line 4006 "PhotoPage.c"
+#line 4711 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) {
+static void
+zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj)
+{
 	ZoomBufferIsoSourceFetchJob * self;
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_ISO_SOURCE_FETCH_JOB, ZoomBufferIsoSourceFetchJob);
@@ -4020,11 +4727,13 @@ static void zoom_buffer_iso_source_fetch_job_finalize (BackgroundJob * obj) {
 	_g_object_unref0 (self->fetched);
 #line 15 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	BACKGROUND_JOB_CLASS (zoom_buffer_iso_source_fetch_job_parent_class)->finalize (obj);
-#line 4020 "PhotoPage.c"
+#line 4727 "PhotoPage.c"
 }
 
 
-static GType zoom_buffer_iso_source_fetch_job_get_type (void) {
+static GType
+zoom_buffer_iso_source_fetch_job_get_type (void)
+{
 	static volatile gsize zoom_buffer_iso_source_fetch_job_type_id__volatile = 0;
 	if (g_once_init_enter (&zoom_buffer_iso_source_fetch_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ZoomBufferIsoSourceFetchJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) zoom_buffer_iso_source_fetch_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ZoomBufferIsoSourceFetchJob), 0, (GInstanceInitFunc) zoom_buffer_iso_source_fetch_job_instance_init, NULL };
@@ -4036,27 +4745,29 @@ static GType zoom_buffer_iso_source_fetch_job_get_type (void) {
 }
 
 
-static gpointer _pixel_transformer_ref0 (gpointer self) {
+static gpointer
+_pixel_transformer_ref0 (gpointer self)
+{
 #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? pixel_transformer_ref (self) : NULL;
-#line 4039 "PhotoPage.c"
+#line 4750 "PhotoPage.c"
 }
 
 
-static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GType object_type, ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) {
+static ZoomBufferTransformationJob*
+zoom_buffer_transformation_job_construct (GType object_type,
+                                          ZoomBuffer* owner,
+                                          GdkPixbuf* to_transform,
+                                          PixelTransformer* transformer,
+                                          CompletionCallback completion_callback,
+                                          void* completion_callback_target,
+                                          GCancellable* cancellable)
+{
 	ZoomBufferTransformationJob* self = NULL;
-	ZoomBuffer* _tmp0_;
-	CompletionCallback _tmp1_;
-	void* _tmp1__target;
-	GCancellable* _tmp2_;
-	GCancellable* _tmp3_;
-	GCancellable* _tmp4_;
-	GdkPixbuf* _tmp5_;
-	GdkPixbuf* _tmp6_;
-	PixelTransformer* _tmp7_;
-	PixelTransformer* _tmp8_;
-	GdkPixbuf* _tmp9_;
-	GdkPixbuf* _tmp10_;
+	GCancellable* _tmp0_;
+	GdkPixbuf* _tmp1_;
+	PixelTransformer* _tmp2_;
+	GdkPixbuf* _tmp3_;
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_ZOOM_BUFFER (owner), NULL);
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4066,61 +4777,54 @@ static ZoomBufferTransformationJob* zoom_buffer_transformation_job_construct (GT
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (G_IS_CANCELLABLE (cancellable), NULL);
 #line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = owner;
-#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = completion_callback;
-#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1__target = completion_callback_target;
-#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = cancellable;
-#line 51 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = (ZoomBufferTransformationJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, G_TYPE_OBJECT, GObject), _tmp1_, _tmp1__target, _tmp2_, NULL, NULL, NULL);
-#line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = cancellable;
+	self = (ZoomBufferTransformationJob*) background_job_construct (object_type, G_TYPE_CHECK_INSTANCE_CAST (owner, G_TYPE_OBJECT, GObject), completion_callback, completion_callback_target, cancellable, NULL, NULL, NULL);
 #line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _g_object_ref0 (_tmp3_);
+	_tmp0_ = _g_object_ref0 (cancellable);
 #line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancellable);
 #line 53 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->cancellable = _tmp4_;
+	self->priv->cancellable = _tmp0_;
 #line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = to_transform;
-#line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _g_object_ref0 (_tmp5_);
+	_tmp1_ = _g_object_ref0 (to_transform);
 #line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->to_transform);
 #line 54 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->to_transform = _tmp6_;
-#line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = transformer;
+	self->priv->to_transform = _tmp1_;
 #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _pixel_transformer_ref0 (_tmp7_);
+	_tmp2_ = _pixel_transformer_ref0 (transformer);
 #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
 #line 55 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->transformer = _tmp8_;
-#line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = to_transform;
+	self->priv->transformer = _tmp2_;
 #line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = gdk_pixbuf_copy (_tmp9_);
+	_tmp3_ = gdk_pixbuf_copy (to_transform);
 #line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->transformed);
 #line 56 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->transformed = _tmp10_;
+	self->transformed = _tmp3_;
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4109 "PhotoPage.c"
+#line 4804 "PhotoPage.c"
 }
 
 
-static ZoomBufferTransformationJob* zoom_buffer_transformation_job_new (ZoomBuffer* owner, GdkPixbuf* to_transform, PixelTransformer* transformer, CompletionCallback completion_callback, void* completion_callback_target, GCancellable* cancellable) {
+static ZoomBufferTransformationJob*
+zoom_buffer_transformation_job_new (ZoomBuffer* owner,
+                                    GdkPixbuf* to_transform,
+                                    PixelTransformer* transformer,
+                                    CompletionCallback completion_callback,
+                                    void* completion_callback_target,
+                                    GCancellable* cancellable)
+{
 #line 49 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return zoom_buffer_transformation_job_construct (ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, owner, to_transform, transformer, completion_callback, completion_callback_target, cancellable);
-#line 4116 "PhotoPage.c"
+#line 4818 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
+static void
+zoom_buffer_transformation_job_real_execute (BackgroundJob* base)
+{
 	ZoomBufferTransformationJob * self;
 	PixelTransformer* _tmp0_;
 #line 59 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4129,7 +4833,7 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 	_tmp0_ = self->priv->transformer;
 #line 60 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 4129 "PhotoPage.c"
+#line 4833 "PhotoPage.c"
 		PixelTransformer* _tmp1_;
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
@@ -4144,12 +4848,14 @@ static void zoom_buffer_transformation_job_real_execute (BackgroundJob* base) {
 		_tmp4_ = self->priv->cancellable;
 #line 61 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		pixel_transformer_transform_to_other_pixbuf (_tmp1_, _tmp2_, _tmp3_, _tmp4_, -1);
-#line 4144 "PhotoPage.c"
+#line 4848 "PhotoPage.c"
 	}
 }
 
 
-static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJobClass * klass) {
+static void
+zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJobClass * klass)
+{
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_transformation_job_parent_class = g_type_class_peek_parent (klass);
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4158,20 +4864,24 @@ static void zoom_buffer_transformation_job_class_init (ZoomBufferTransformationJ
 	g_type_class_add_private (klass, sizeof (ZoomBufferTransformationJobPrivate));
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((BackgroundJobClass *) klass)->execute = (void (*) (BackgroundJob *)) zoom_buffer_transformation_job_real_execute;
-#line 4158 "PhotoPage.c"
+#line 4864 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_transformation_job_instance_init (ZoomBufferTransformationJob * self) {
+static void
+zoom_buffer_transformation_job_instance_init (ZoomBufferTransformationJob * self)
+{
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = ZOOM_BUFFER_TRANSFORMATION_JOB_GET_PRIVATE (self);
 #line 47 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->transformed = NULL;
-#line 4167 "PhotoPage.c"
+#line 4875 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj) {
+static void
+zoom_buffer_transformation_job_finalize (BackgroundJob * obj)
+{
 	ZoomBufferTransformationJob * self;
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, ZOOM_BUFFER_TYPE_TRANSFORMATION_JOB, ZoomBufferTransformationJob);
@@ -4185,11 +4895,13 @@ static void zoom_buffer_transformation_job_finalize (BackgroundJob * obj) {
 	_g_object_unref0 (self->transformed);
 #line 42 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	BACKGROUND_JOB_CLASS (zoom_buffer_transformation_job_parent_class)->finalize (obj);
-#line 4185 "PhotoPage.c"
+#line 4895 "PhotoPage.c"
 }
 
 
-static GType zoom_buffer_transformation_job_get_type (void) {
+static GType
+zoom_buffer_transformation_job_get_type (void)
+{
 	static volatile gsize zoom_buffer_transformation_job_type_id__volatile = 0;
 	if (g_once_init_enter (&zoom_buffer_transformation_job_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ZoomBufferTransformationJobClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) zoom_buffer_transformation_job_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ZoomBufferTransformationJob), 0, (GInstanceInitFunc) zoom_buffer_transformation_job_instance_init, NULL };
@@ -4201,18 +4913,22 @@ static GType zoom_buffer_transformation_job_get_type (void) {
 }
 
 
-static void zoom_buffer_class_init (ZoomBufferClass * klass) {
+static void
+zoom_buffer_class_init (ZoomBufferClass * klass)
+{
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	zoom_buffer_parent_class = g_type_class_peek_parent (klass);
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_type_class_add_private (klass, sizeof (ZoomBufferPrivate));
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = zoom_buffer_finalize;
-#line 4208 "PhotoPage.c"
+#line 4922 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_instance_init (ZoomBuffer * self) {
+static void
+zoom_buffer_instance_init (ZoomBuffer * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = ZOOM_BUFFER_GET_PRIVATE (self);
 #line 69 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4237,11 +4953,13 @@ static void zoom_buffer_instance_init (ZoomBuffer * self) {
 	self->priv->workers = NULL;
 #line 82 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_interactive_redraw_in_progress = FALSE;
-#line 4237 "PhotoPage.c"
+#line 4953 "PhotoPage.c"
 }
 
 
-static void zoom_buffer_finalize (GObject * obj) {
+static void
+zoom_buffer_finalize (GObject * obj)
+{
 	ZoomBuffer * self;
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_ZOOM_BUFFER, ZoomBuffer);
@@ -4267,11 +4985,13 @@ static void zoom_buffer_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->parent_page);
 #line 7 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (zoom_buffer_parent_class)->finalize (obj);
-#line 4267 "PhotoPage.c"
+#line 4985 "PhotoPage.c"
 }
 
 
-GType zoom_buffer_get_type (void) {
+GType
+zoom_buffer_get_type (void)
+{
 	static volatile gsize zoom_buffer_type_id__volatile = 0;
 	if (g_once_init_enter (&zoom_buffer_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (ZoomBufferClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) zoom_buffer_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (ZoomBuffer), 0, (GInstanceInitFunc) zoom_buffer_instance_init, NULL };
@@ -4283,172 +5003,241 @@ GType zoom_buffer_get_type (void) {
 }
 
 
-static void _editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_editing_host_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                    GeeMap* items,
+                                                                    gpointer self)
+{
 #line 551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_photos_altered ((EditingHostPage*) self, items);
-#line 4286 "PhotoPage.c"
+#line 5010 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender, GeeIterable* added, GeeIterable* removed, gpointer self) {
+static void
+_editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered (DataCollection* _sender,
+                                                                                       GeeIterable* added,
+                                                                                       GeeIterable* removed,
+                                                                                       gpointer self)
+{
 #line 553 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4293 "PhotoPage.c"
+#line 5022 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender, gpointer self) {
+static void
+_editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed (DataCollection* _sender,
+                                                                                       gpointer self)
+{
 #line 554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_view_contents_ordering_altered ((EditingHostPage*) self);
-#line 4300 "PhotoPage.c"
+#line 5032 "PhotoPage.c"
 }
 
 
-static gpointer _data_collection_ref0 (gpointer self) {
+static gpointer
+_data_collection_ref0 (gpointer self)
+{
 #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? data_collection_ref (self) : NULL;
-#line 4307 "PhotoPage.c"
+#line 5041 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
+static void
+_editing_host_page_on_viewport_resized_gtk_widget_size_allocate (GtkWidget* _sender,
+                                                                 GtkAllocation* allocation,
+                                                                 gpointer self)
+{
 #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_viewport_resized ((EditingHostPage*) self);
-#line 4314 "PhotoPage.c"
+#line 5052 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
+static void
+_editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                                gpointer self)
+{
 #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 4321 "PhotoPage.c"
+#line 5062 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
+static void
+_editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                   gpointer self)
+{
 #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_crop_toggled ((EditingHostPage*) self);
-#line 4328 "PhotoPage.c"
+#line 5072 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
+static void
+_editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                         gpointer self)
+{
 #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_straighten_toggled ((EditingHostPage*) self);
-#line 4335 "PhotoPage.c"
+#line 5082 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
+static void
+_editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                     gpointer self)
+{
 #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_redeye_toggled ((EditingHostPage*) self);
-#line 4342 "PhotoPage.c"
+#line 5092 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender, gpointer self) {
+static void
+_editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled (GtkToggleToolButton* _sender,
+                                                                     gpointer self)
+{
 #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_toggled ((EditingHostPage*) self);
-#line 4349 "PhotoPage.c"
+#line 5102 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
+static void
+_editing_host_page_on_enhance_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                       gpointer self)
+{
 #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 4356 "PhotoPage.c"
+#line 5112 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_editing_host_page_on_zoom_out_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                      GdkEventButton* event,
+                                                                      gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_on_zoom_out_pressed ((EditingHostPage*) self, event);
 #line 506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4365 "PhotoPage.c"
+#line 5125 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed (GtkRange* _sender,
+                                                                         gpointer self)
+{
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_zoom_slider_value_changed ((EditingHostPage*) self);
-#line 4372 "PhotoPage.c"
+#line 5135 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                            GdkEventButton* event,
+                                                                            gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_begin ((EditingHostPage*) self, event);
 #line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4381 "PhotoPage.c"
+#line 5148 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event (GtkWidget* _sender,
+                                                                            GdkEventButton* event,
+                                                                            gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_drag_end ((EditingHostPage*) self, event);
 #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4390 "PhotoPage.c"
+#line 5161 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
+static gboolean
+_editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event (GtkWidget* _sender,
+                                                                        GdkEventKey* event,
+                                                                        gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_on_zoom_slider_key_press ((EditingHostPage*) self, event);
 #line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4399 "PhotoPage.c"
+#line 5174 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_editing_host_page_on_zoom_in_pressed_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                     GdkEventButton* event,
+                                                                     gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_on_zoom_in_pressed ((EditingHostPage*) self, event);
 #line 528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 4408 "PhotoPage.c"
+#line 5187 "PhotoPage.c"
 }
 
 
-static void _single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
+static void
+_single_photo_page_on_previous_photo_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                              gpointer self)
+{
 #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 4415 "PhotoPage.c"
+#line 5197 "PhotoPage.c"
 }
 
 
-static void _single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
+static void
+_single_photo_page_on_next_photo_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                          gpointer self)
+{
 #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 4422 "PhotoPage.c"
+#line 5207 "PhotoPage.c"
 }
 
 
-EditingHostPage* editing_host_page_construct (GType object_type, SourceCollection* sources, const gchar* name) {
+EditingHostPage*
+editing_host_page_construct (GType object_type,
+                             SourceCollection* sources,
+                             const gchar* name)
+{
 	EditingHostPage * self = NULL;
-	const gchar* _tmp0_;
-	SourceCollection* _tmp1_;
-	SourceCollection* _tmp2_;
-	SourceCollection* _tmp3_;
+	SourceCollection* _tmp0_;
+	ViewCollection* _tmp1_;
+	ViewCollection* _tmp2_;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
-	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	GtkViewport* _tmp8_;
+	GtkViewport* _tmp5_;
 	GtkToolbar* toolbar = NULL;
-	GtkToolbar* _tmp9_;
+	GtkToolbar* _tmp6_;
+	GtkToolButton* _tmp7_;
+	GtkToolButton* _tmp8_;
+	GtkToolButton* _tmp9_;
 	GtkToolButton* _tmp10_;
 	GtkToolButton* _tmp11_;
 	GtkToolButton* _tmp12_;
-	GtkToolButton* _tmp13_;
-	GtkToolButton* _tmp14_;
-	GtkToolButton* _tmp15_;
 	GtkBindingSet* binding_set = NULL;
-	GtkToolButton* _tmp16_;
-	GObjectClass* _tmp17_;
-	GtkBindingSet* _tmp18_;
+	GtkToolButton* _tmp13_;
+	GObjectClass* _tmp14_;
+	GtkBindingSet* _tmp15_;
+	GtkToggleToolButton* _tmp16_;
+	GtkToggleToolButton* _tmp17_;
+	GtkToggleToolButton* _tmp18_;
 	GtkToggleToolButton* _tmp19_;
 	GtkToggleToolButton* _tmp20_;
 	GtkToggleToolButton* _tmp21_;
@@ -4474,299 +5263,290 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	GtkToggleToolButton* _tmp41_;
 	GtkToggleToolButton* _tmp42_;
 	GtkToggleToolButton* _tmp43_;
-	GtkToggleToolButton* _tmp44_;
-	GtkToggleToolButton* _tmp45_;
-	GtkToggleToolButton* _tmp46_;
+	GtkToolButton* _tmp44_;
+	GtkToolButton* _tmp45_;
+	GtkToolButton* _tmp46_;
 	GtkToolButton* _tmp47_;
 	GtkToolButton* _tmp48_;
 	GtkToolButton* _tmp49_;
-	GtkToolButton* _tmp50_;
-	GtkToolButton* _tmp51_;
-	GtkToolButton* _tmp52_;
 	GtkSeparatorToolItem* separator = NULL;
-	GtkSeparatorToolItem* _tmp53_;
+	GtkSeparatorToolItem* _tmp50_;
 	GtkBox* zoom_group = NULL;
-	GtkBox* _tmp54_;
+	GtkBox* _tmp51_;
 	GtkImage* zoom_out = NULL;
-	GdkPixbuf* _tmp55_;
-	GdkPixbuf* _tmp56_;
-	GtkImage* _tmp57_;
-	GtkImage* _tmp58_;
+	GdkPixbuf* _tmp52_;
+	GdkPixbuf* _tmp53_;
+	GtkImage* _tmp54_;
+	GtkImage* _tmp55_;
 	GtkEventBox* zoom_out_box = NULL;
-	GtkEventBox* _tmp59_;
-	GtkAdjustment* _tmp60_;
-	GtkAdjustment* _tmp61_;
+	GtkEventBox* _tmp56_;
+	GtkAdjustment* _tmp57_;
+	GtkAdjustment* _tmp58_;
+	GtkScale* _tmp59_;
+	GtkScale* _tmp60_;
+	GtkScale* _tmp61_;
 	GtkScale* _tmp62_;
 	GtkScale* _tmp63_;
 	GtkScale* _tmp64_;
 	GtkScale* _tmp65_;
 	GtkScale* _tmp66_;
-	GtkScale* _tmp67_;
-	GtkScale* _tmp68_;
-	GtkScale* _tmp69_;
 	GtkImage* zoom_in = NULL;
-	GdkPixbuf* _tmp70_;
-	GdkPixbuf* _tmp71_;
-	GtkImage* _tmp72_;
-	GtkImage* _tmp73_;
+	GdkPixbuf* _tmp67_;
+	GdkPixbuf* _tmp68_;
+	GtkImage* _tmp69_;
+	GtkImage* _tmp70_;
 	GtkEventBox* zoom_in_box = NULL;
-	GtkEventBox* _tmp74_;
+	GtkEventBox* _tmp71_;
 	GtkToolItem* group_wrapper = NULL;
-	GtkToolItem* _tmp75_;
+	GtkToolItem* _tmp72_;
+	GtkToolButton* _tmp73_;
+	GtkToolButton* _tmp74_;
+	GtkToolButton* _tmp75_;
 	GtkToolButton* _tmp76_;
 	GtkToolButton* _tmp77_;
 	GtkToolButton* _tmp78_;
 	GtkToolButton* _tmp79_;
 	GtkToolButton* _tmp80_;
-	GtkToolButton* _tmp81_;
-	GtkToolButton* _tmp82_;
-	GtkToolButton* _tmp83_;
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_SOURCE_COLLECTION (sources), NULL);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = name;
-#line 418 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = (EditingHostPage*) single_photo_page_construct (object_type, _tmp0_, FALSE);
-#line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = sources;
+	self = (EditingHostPage*) single_photo_page_construct (object_type, name, FALSE);
 #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _data_collection_ref0 (_tmp1_);
+	_tmp0_ = _data_collection_ref0 (sources);
 #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->sources);
 #line 420 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->sources = _tmp2_;
-#line 423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = sources;
+	self->priv->sources = _tmp0_;
 #line 423 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (sources, TYPE_DATA_COLLECTION, DataCollection), "items-altered", (GCallback) _editing_host_page_on_photos_altered_data_collection_items_altered, self, 0);
 #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_COLLECTION, DataCollection), "contents-altered", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_contents_altered, self, 0);
 #line 426 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp2_);
 #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = _tmp3_;
 #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), "ordering-changed", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), "ordering-changed", (GCallback) _editing_host_page_on_view_contents_ordering_altered_data_collection_ordering_changed, self, 0);
 #line 427 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp7_);
+	_data_collection_unref0 (_tmp4_);
 #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
+	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
 #line 431 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _editing_host_page_on_viewport_resized_gtk_widget_size_allocate, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _editing_host_page_on_viewport_resized_gtk_widget_size_allocate, self, 0);
 #line 434 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp6_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 434 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	toolbar = _tmp9_;
+	toolbar = _tmp6_;
 #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ROTATE_CW_LABEL);
+	_tmp7_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ROTATE_CW_LABEL);
 #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp10_);
+	g_object_ref_sink (_tmp7_);
 #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->rotate_button);
 #line 437 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->rotate_button = _tmp10_;
+	self->priv->rotate_button = _tmp7_;
 #line 438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = self->priv->rotate_button;
+	_tmp8_ = self->priv->rotate_button;
 #line 438 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp11_, RESOURCES_CLOCKWISE);
+	gtk_tool_button_set_icon_name (_tmp8_, RESOURCES_CLOCKWISE);
 #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = self->priv->rotate_button;
+	_tmp9_ = self->priv->rotate_button;
 #line 439 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ROTATE_CW_TOOLTIP);
 #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = self->priv->rotate_button;
+	_tmp10_ = self->priv->rotate_button;
 #line 440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp13_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
+	g_signal_connect_object (_tmp10_, "clicked", (GCallback) _editing_host_page_on_rotate_clockwise_gtk_tool_button_clicked, self, 0);
 #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = self->priv->rotate_button;
+	_tmp11_ = self->priv->rotate_button;
 #line 441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = self->priv->rotate_button;
+	_tmp12_ = self->priv->rotate_button;
 #line 442 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = self->priv->rotate_button;
+	_tmp13_ = self->priv->rotate_button;
 #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, G_TYPE_OBJECT, GObject));
+	_tmp14_ = G_OBJECT_GET_CLASS (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, G_TYPE_OBJECT, GObject));
 #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = gtk_binding_set_by_class (_tmp17_);
+	_tmp15_ = gtk_binding_set_by_class ((gpointer) _tmp14_);
 #line 443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	binding_set = _tmp18_;
+	binding_set = _tmp15_;
 #line 444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_KP_Space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
 #line 445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_binding_entry_add_signal (binding_set, (guint) GDK_KEY_space, GDK_CONTROL_MASK, "clicked", (guint) 0, NULL);
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	_tmp16_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp19_);
+	g_object_ref_sink (_tmp16_);
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->crop_button);
 #line 448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->crop_button = _tmp19_;
+	self->priv->crop_button = _tmp16_;
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = self->priv->crop_button;
+	_tmp17_ = self->priv->crop_button;
 #line 449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_tool_button_get_type (), GtkToolButton), "crop");
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_tool_button_get_type (), GtkToolButton), "crop");
 #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = self->priv->crop_button;
+	_tmp18_ = self->priv->crop_button;
 #line 450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_CROP_LABEL);
 #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = self->priv->crop_button;
+	_tmp19_ = self->priv->crop_button;
 #line 451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_CROP_TOOLTIP);
 #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = self->priv->crop_button;
+	_tmp20_ = self->priv->crop_button;
 #line 452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp23_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	g_signal_connect_object (_tmp20_, "toggled", (GCallback) _editing_host_page_on_crop_toggled_gtk_toggle_tool_button_toggled, self, 0);
 #line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = self->priv->crop_button;
+	_tmp21_ = self->priv->crop_button;
 #line 453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = self->priv->crop_button;
+	_tmp22_ = self->priv->crop_button;
 #line 454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	_tmp23_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp26_);
+	g_object_ref_sink (_tmp23_);
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->straighten_button);
 #line 457 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->straighten_button = _tmp26_;
+	self->priv->straighten_button = _tmp23_;
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = self->priv->straighten_button;
+	_tmp24_ = self->priv->straighten_button;
 #line 458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_tool_button_get_type (), GtkToolButton), "straighten");
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_tool_button_get_type (), GtkToolButton), "straighten");
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = self->priv->straighten_button;
+	_tmp25_ = self->priv->straighten_button;
 #line 459 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_STRAIGHTEN_LABEL);
 #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = self->priv->straighten_button;
+	_tmp26_ = self->priv->straighten_button;
 #line 460 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_STRAIGHTEN_TOOLTIP);
 #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = self->priv->straighten_button;
+	_tmp27_ = self->priv->straighten_button;
 #line 461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp30_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	g_signal_connect_object (_tmp27_, "toggled", (GCallback) _editing_host_page_on_straighten_toggled_gtk_toggle_tool_button_toggled, self, 0);
 #line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = self->priv->straighten_button;
+	_tmp28_ = self->priv->straighten_button;
 #line 462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp32_ = self->priv->straighten_button;
+	_tmp29_ = self->priv->straighten_button;
 #line 463 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	_tmp30_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp33_);
+	g_object_ref_sink (_tmp30_);
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->redeye_button);
 #line 466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->redeye_button = _tmp33_;
+	self->priv->redeye_button = _tmp30_;
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp34_ = self->priv->redeye_button;
+	_tmp31_ = self->priv->redeye_button;
 #line 467 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_tool_button_get_type (), GtkToolButton), "redeye");
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_tool_button_get_type (), GtkToolButton), "redeye");
 #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_ = self->priv->redeye_button;
+	_tmp32_ = self->priv->redeye_button;
 #line 468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_RED_EYE_LABEL);
 #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp36_ = self->priv->redeye_button;
+	_tmp33_ = self->priv->redeye_button;
 #line 469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_RED_EYE_TOOLTIP);
 #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp37_ = self->priv->redeye_button;
+	_tmp34_ = self->priv->redeye_button;
 #line 470 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp37_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	g_signal_connect_object (_tmp34_, "toggled", (GCallback) _editing_host_page_on_redeye_toggled_gtk_toggle_tool_button_toggled, self, 0);
 #line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_ = self->priv->redeye_button;
+	_tmp35_ = self->priv->redeye_button;
 #line 471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39_ = self->priv->redeye_button;
+	_tmp36_ = self->priv->redeye_button;
 #line 472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp40_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
+	_tmp37_ = (GtkToggleToolButton*) gtk_toggle_tool_button_new ();
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp40_);
+	g_object_ref_sink (_tmp37_);
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->adjust_button);
 #line 475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->adjust_button = _tmp40_;
+	self->priv->adjust_button = _tmp37_;
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_ = self->priv->adjust_button;
+	_tmp38_ = self->priv->adjust_button;
 #line 476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
+	gtk_tool_button_set_icon_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST);
 #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp42_ = self->priv->adjust_button;
+	_tmp39_ = self->priv->adjust_button;
 #line 477 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
+	gtk_tool_button_set_label (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_tool_button_get_type (), GtkToolButton), RESOURCES_ADJUST_LABEL);
 #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp43_ = self->priv->adjust_button;
+	_tmp40_ = self->priv->adjust_button;
 #line 478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ADJUST_TOOLTIP);
 #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_ = self->priv->adjust_button;
+	_tmp41_ = self->priv->adjust_button;
 #line 479 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp44_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
+	g_signal_connect_object (_tmp41_, "toggled", (GCallback) _editing_host_page_on_adjust_toggled_gtk_toggle_tool_button_toggled, self, 0);
 #line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp45_ = self->priv->adjust_button;
+	_tmp42_ = self->priv->adjust_button;
 #line 480 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = self->priv->adjust_button;
+	_tmp43_ = self->priv->adjust_button;
 #line 481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
+	_tmp44_ = (GtkToolButton*) gtk_tool_button_new (NULL, RESOURCES_ENHANCE_LABEL);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp47_);
+	g_object_ref_sink (_tmp44_);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->enhance_button);
 #line 484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->enhance_button = _tmp47_;
+	self->priv->enhance_button = _tmp44_;
 #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp48_ = self->priv->enhance_button;
+	_tmp45_ = self->priv->enhance_button;
 #line 485 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp48_, RESOURCES_ENHANCE);
+	gtk_tool_button_set_icon_name (_tmp45_, RESOURCES_ENHANCE);
 #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp49_ = self->priv->enhance_button;
+	_tmp46_ = self->priv->enhance_button;
 #line 486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_tool_item_get_type (), GtkToolItem), RESOURCES_ENHANCE_TOOLTIP);
 #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_ = self->priv->enhance_button;
+	_tmp47_ = self->priv->enhance_button;
 #line 487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp50_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
+	g_signal_connect_object (_tmp47_, "clicked", (GCallback) _editing_host_page_on_enhance_gtk_tool_button_clicked, self, 0);
 #line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp51_ = self->priv->enhance_button;
+	_tmp48_ = self->priv->enhance_button;
 #line 488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp51_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
+	gtk_tool_item_set_is_important (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp52_ = self->priv->enhance_button;
+	_tmp49_ = self->priv->enhance_button;
 #line 489 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp49_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
+	_tmp50_ = (GtkSeparatorToolItem*) gtk_separator_tool_item_new ();
 #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp53_);
+	g_object_ref_sink (_tmp50_);
 #line 492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	separator = _tmp53_;
+	separator = _tmp50_;
 #line 493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_tool_item_set_expand (G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), TRUE);
 #line 494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4774,31 +5554,31 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 495 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (separator, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp54_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	_tmp51_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 #line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp54_);
+	g_object_ref_sink (_tmp51_);
 #line 497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_group = _tmp54_;
+	zoom_group = _tmp51_;
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp55_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
+	_tmp52_ = resources_load_icon (RESOURCES_ICON_ZOOM_OUT, RESOURCES_ICON_ZOOM_SCALE);
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_ = _tmp55_;
+	_tmp53_ = _tmp52_;
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp57_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp56_);
+	_tmp54_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp53_);
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp57_);
+	g_object_ref_sink (_tmp54_);
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp58_ = _tmp57_;
+	_tmp55_ = _tmp54_;
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp56_);
+	_g_object_unref0 (_tmp53_);
 #line 499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out = _tmp58_;
+	zoom_out = _tmp55_;
 #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_ = (GtkEventBox*) gtk_event_box_new ();
+	_tmp56_ = (GtkEventBox*) gtk_event_box_new ();
 #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp59_);
+	g_object_ref_sink (_tmp56_);
 #line 501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_out_box = _tmp59_;
+	zoom_out_box = _tmp56_;
 #line 502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_above_child (zoom_out_box, TRUE);
 #line 503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4810,69 +5590,69 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_out_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp60_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
+	_tmp57_ = gtk_adjustment_new (0.0, 0.0, 1.1, 0.1, 0.1, 0.1);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp60_);
+	g_object_ref_sink (_tmp57_);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp61_ = _tmp60_;
+	_tmp58_ = _tmp57_;
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp61_);
+	_tmp59_ = (GtkScale*) gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, _tmp58_);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp62_);
+	g_object_ref_sink (_tmp59_);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_slider);
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->zoom_slider = _tmp62_;
+	self->priv->zoom_slider = _tmp59_;
 #line 511 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp61_);
+	_g_object_unref0 (_tmp58_);
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp63_ = self->priv->zoom_slider;
+	_tmp60_ = self->priv->zoom_slider;
 #line 512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_scale_set_draw_value (_tmp63_, FALSE);
+	gtk_scale_set_draw_value (_tmp60_, FALSE);
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp64_ = self->priv->zoom_slider;
+	_tmp61_ = self->priv->zoom_slider;
 #line 513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), 120, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp61_, gtk_widget_get_type (), GtkWidget), 120, -1);
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp65_ = self->priv->zoom_slider;
+	_tmp62_ = self->priv->zoom_slider;
 #line 514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
 #line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp66_ = self->priv->zoom_slider;
+	_tmp63_ = self->priv->zoom_slider;
 #line 515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_host_page_on_zoom_slider_drag_begin_gtk_widget_button_press_event, self, 0);
 #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp67_ = self->priv->zoom_slider;
+	_tmp64_ = self->priv->zoom_slider;
 #line 516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_widget_get_type (), GtkWidget), "button-release-event", (GCallback) _editing_host_page_on_zoom_slider_drag_end_gtk_widget_button_release_event, self, 0);
 #line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp68_ = self->priv->zoom_slider;
+	_tmp65_ = self->priv->zoom_slider;
 #line 517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp68_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp65_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_host_page_on_zoom_slider_key_press_gtk_widget_key_press_event, self, 0);
 #line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp69_ = self->priv->zoom_slider;
+	_tmp66_ = self->priv->zoom_slider;
 #line 519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp69_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
+	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp70_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
+	_tmp67_ = resources_load_icon (RESOURCES_ICON_ZOOM_IN, RESOURCES_ICON_ZOOM_SCALE);
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp71_ = _tmp70_;
+	_tmp68_ = _tmp67_;
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp72_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp71_);
+	_tmp69_ = (GtkImage*) gtk_image_new_from_pixbuf (_tmp68_);
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp72_);
+	g_object_ref_sink (_tmp69_);
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp73_ = _tmp72_;
+	_tmp70_ = _tmp69_;
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp71_);
+	_g_object_unref0 (_tmp68_);
 #line 521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in = _tmp73_;
+	zoom_in = _tmp70_;
 #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp74_ = (GtkEventBox*) gtk_event_box_new ();
+	_tmp71_ = (GtkEventBox*) gtk_event_box_new ();
 #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp74_);
+	g_object_ref_sink (_tmp71_);
 #line 523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_in_box = _tmp74_;
+	zoom_in_box = _tmp71_;
 #line 524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_event_box_set_above_child (zoom_in_box, TRUE);
 #line 525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4884,47 +5664,47 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 #line 530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_box_pack_start (zoom_group, G_TYPE_CHECK_INSTANCE_CAST (zoom_in_box, gtk_widget_get_type (), GtkWidget), FALSE, FALSE, (guint) 0);
 #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp75_ = gtk_tool_item_new ();
+	_tmp72_ = gtk_tool_item_new ();
 #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp75_);
+	g_object_ref_sink (_tmp72_);
 #line 532 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	group_wrapper = _tmp75_;
+	group_wrapper = _tmp72_;
 #line 533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (group_wrapper, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (zoom_group, gtk_widget_get_type (), GtkWidget));
 #line 535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toolbar_insert (toolbar, group_wrapper, -1);
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp76_ = self->priv->prev_button;
+	_tmp73_ = self->priv->prev_button;
 #line 538 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), _ ("Previous photo"));
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp73_, gtk_tool_item_get_type (), GtkToolItem), _ ("Previous photo"));
 #line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp77_ = self->priv->prev_button;
+	_tmp74_ = self->priv->prev_button;
 #line 539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp77_, "go-previous");
+	gtk_tool_button_set_icon_name (_tmp74_, "go-previous");
 #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp78_ = self->priv->prev_button;
+	_tmp75_ = self->priv->prev_button;
 #line 540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp78_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+	g_signal_connect_object (_tmp75_, "clicked", (GCallback) _single_photo_page_on_previous_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp79_ = self->priv->prev_button;
+	_tmp76_ = self->priv->prev_button;
 #line 541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp79_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp76_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp80_ = self->priv->next_button;
+	_tmp77_ = self->priv->next_button;
 #line 544 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), _ ("Next photo"));
+	gtk_tool_item_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, gtk_tool_item_get_type (), GtkToolItem), _ ("Next photo"));
 #line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp81_ = self->priv->next_button;
+	_tmp78_ = self->priv->next_button;
 #line 545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_tool_button_set_icon_name (_tmp81_, "go-next");
+	gtk_tool_button_set_icon_name (_tmp78_, "go-next");
 #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp82_ = self->priv->next_button;
+	_tmp79_ = self->priv->next_button;
 #line 546 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp82_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
+	g_signal_connect_object (_tmp79_, "clicked", (GCallback) _single_photo_page_on_next_photo_gtk_tool_button_clicked, G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), 0);
 #line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp83_ = self->priv->next_button;
+	_tmp80_ = self->priv->next_button;
 #line 547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp83_, gtk_tool_item_get_type (), GtkToolItem), -1);
+	gtk_toolbar_insert (toolbar, G_TYPE_CHECK_INSTANCE_CAST (_tmp80_, gtk_tool_item_get_type (), GtkToolItem), -1);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (group_wrapper);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4943,16 +5723,17 @@ EditingHostPage* editing_host_page_construct (GType object_type, SourceCollectio
 	_g_object_unref0 (toolbar);
 #line 417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 4943 "PhotoPage.c"
+#line 5723 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self) {
+static void
+editing_host_page_on_zoom_slider_value_changed (EditingHostPage* self)
+{
 	ZoomState new_zoom_state = {0};
 	ZoomState _tmp0_ = {0};
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 #line 557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -4960,60 +5741,55 @@ static void editing_host_page_on_zoom_slider_value_changed (EditingHostPage* sel
 #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
 #line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_rescale (&new_zoom_state, &_tmp0_, _tmp2_);
+	zoom_state_init_rescale (&new_zoom_state, &_tmp0_, gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = self->priv->enable_interactive_zoom_refresh;
+	_tmp2_ = self->priv->enable_interactive_zoom_refresh;
 #line 560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_) {
-#line 4967 "PhotoPage.c"
-		ZoomState _tmp4_;
-		gboolean _tmp5_;
+	if (_tmp2_) {
+#line 5746 "PhotoPage.c"
+		ZoomState _tmp3_;
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = new_zoom_state;
+		_tmp3_ = new_zoom_state;
 #line 561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
-#line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = zoom_state_is_default (&new_zoom_state);
+		single_photo_page_on_interactive_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
 #line 563 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp5_) {
-#line 4978 "PhotoPage.c"
-			ZoomState _tmp6_;
+		if (zoom_state_is_default (&new_zoom_state)) {
+#line 5754 "PhotoPage.c"
+			ZoomState _tmp4_;
 #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = new_zoom_state;
+			_tmp4_ = new_zoom_state;
 #line 564 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
-#line 4984 "PhotoPage.c"
+			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
+#line 5760 "PhotoPage.c"
 		}
 	} else {
-		gboolean _tmp7_;
-#line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = zoom_state_is_default (&new_zoom_state);
 #line 566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp7_) {
+		if (zoom_state_is_default (&new_zoom_state)) {
 #line 567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 4994 "PhotoPage.c"
+#line 5767 "PhotoPage.c"
 		} else {
-			ZoomState _tmp8_;
+			ZoomState _tmp5_;
 #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp8_ = new_zoom_state;
+			_tmp5_ = new_zoom_state;
 #line 569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
-#line 5001 "PhotoPage.c"
+			single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
+#line 5774 "PhotoPage.c"
 		}
 #line 571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 5005 "PhotoPage.c"
+#line 5778 "PhotoPage.c"
 	}
 #line 574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5009 "PhotoPage.c"
+#line 5782 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self, GdkEventButton* event) {
+static gboolean
+editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* self,
+                                             GdkEventButton* event)
+{
 	gboolean result = FALSE;
 	GtkWindow* _tmp0_;
 	GtkWindow* _tmp1_;
@@ -5034,7 +5810,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 	_g_object_unref0 (_tmp1_);
 #line 580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5034 "PhotoPage.c"
+#line 5810 "PhotoPage.c"
 		GtkWindow* _tmp3_;
 		FullscreenWindow* _tmp4_;
 #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5045,17 +5821,20 @@ static gboolean editing_host_page_on_zoom_slider_drag_begin (EditingHostPage* se
 		fullscreen_window_disable_toolbar_dismissal (_tmp4_);
 #line 581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5045 "PhotoPage.c"
+#line 5821 "PhotoPage.c"
 	}
 #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5051 "PhotoPage.c"
+#line 5827 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self, GdkEventButton* event) {
+static gboolean
+editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self,
+                                           GdkEventButton* event)
+{
 	gboolean result = FALSE;
 	GtkWindow* _tmp0_;
 	GtkWindow* _tmp1_;
@@ -5063,8 +5842,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	ZoomState zoom_state = {0};
 	ZoomState _tmp5_ = {0};
 	GtkScale* _tmp6_;
-	gdouble _tmp7_;
-	ZoomState _tmp8_;
+	ZoomState _tmp7_;
 #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5081,7 +5859,7 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 	_g_object_unref0 (_tmp1_);
 #line 589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 5081 "PhotoPage.c"
+#line 5859 "PhotoPage.c"
 		GtkWindow* _tmp3_;
 		FullscreenWindow* _tmp4_;
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5092,31 +5870,32 @@ static gboolean editing_host_page_on_zoom_slider_drag_end (EditingHostPage* self
 		fullscreen_window_update_toolbar_dismissal (_tmp4_);
 #line 590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp4_);
-#line 5092 "PhotoPage.c"
+#line 5870 "PhotoPage.c"
 	}
 #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
 #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp6_ = self->priv->zoom_slider;
 #line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange));
-#line 592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_rescale (&zoom_state, &_tmp5_, _tmp7_);
+	zoom_state_init_rescale (&zoom_state, &_tmp5_, gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange)));
 #line 593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = zoom_state;
+	_tmp7_ = zoom_state;
 #line 593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
+	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
 #line 595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5112 "PhotoPage.c"
+#line 5888 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, GdkEventButton* event) {
+static gboolean
+editing_host_page_on_zoom_out_pressed (EditingHostPage* self,
+                                       GdkEventButton* event)
+{
 	gboolean result = FALSE;
 #line 600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
@@ -5128,11 +5907,14 @@ static gboolean editing_host_page_on_zoom_out_pressed (EditingHostPage* self, Gd
 	result = TRUE;
 #line 602 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5128 "PhotoPage.c"
+#line 5907 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, GdkEventButton* event) {
+static gboolean
+editing_host_page_on_zoom_in_pressed (EditingHostPage* self,
+                                      GdkEventButton* event)
+{
 	gboolean result = FALSE;
 #line 605 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
@@ -5144,40 +5926,40 @@ static gboolean editing_host_page_on_zoom_in_pressed (EditingHostPage* self, Gdk
 	result = TRUE;
 #line 607 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5144 "PhotoPage.c"
+#line 5926 "PhotoPage.c"
 }
 
 
-static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) {
+static void
+editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self,
+                                           GdkEventScroll* event,
+                                           GdkPoint* result)
+{
 	GdkPoint cursor_wrt_canvas = {0};
 	GdkPoint _tmp0_ = {0};
-	GdkEventScroll* _tmp1_;
+	gdouble _tmp1_;
 	gdouble _tmp2_;
-	GdkEventScroll* _tmp3_;
-	gdouble _tmp4_;
 	GdkRectangle viewport_wrt_canvas = {0};
-	ZoomState _tmp5_ = {0};
-	GdkRectangle _tmp6_ = {0};
+	ZoomState _tmp3_ = {0};
+	GdkRectangle _tmp4_ = {0};
 	GdkPoint _result_ = {0};
-	GdkPoint _tmp7_ = {0};
-	GdkPoint _tmp8_;
+	GdkPoint _tmp5_ = {0};
+	GdkPoint _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
 	gint _tmp9_;
-	GdkRectangle _tmp10_;
+	GdkPoint _tmp10_;
 	gint _tmp11_;
-	GdkPoint _tmp12_;
+	GdkRectangle _tmp12_;
 	gint _tmp13_;
-	GdkRectangle _tmp14_;
+	GdkPoint _tmp14_;
 	gint _tmp15_;
-	gint _tmp16_;
-	GdkPoint _tmp17_;
-	gint _tmp18_;
-	GdkRectangle _tmp19_;
-	gint _tmp20_;
-	GdkPoint _tmp21_;
-	gint _tmp22_;
-	GdkRectangle _tmp23_;
-	gint _tmp24_;
-	gint _tmp25_;
+	GdkRectangle _tmp16_;
+	gint _tmp17_;
+	GdkPoint _tmp18_;
+	gint _tmp19_;
+	GdkRectangle _tmp20_;
+	gint _tmp21_;
 #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5187,157 +5969,151 @@ static void editing_host_page_get_cursor_wrt_viewport (EditingHostPage* self, Gd
 #line 611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	cursor_wrt_canvas = _tmp0_;
 #line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = event;
-#line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_->x;
+	_tmp1_ = event->x;
 #line 612 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_canvas.x = (gint) _tmp2_;
+	cursor_wrt_canvas.x = (gint) _tmp1_;
 #line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = event;
+	_tmp2_ = event->y;
 #line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_->y;
-#line 613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_canvas.y = (gint) _tmp4_;
+	cursor_wrt_canvas.y = (gint) _tmp2_;
 #line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
 #line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp5_, &_tmp6_);
+	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp3_, &_tmp4_);
 #line 615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_wrt_canvas = _tmp6_;
+	viewport_wrt_canvas = _tmp4_;
 #line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_.x = 0;
+	_tmp5_.x = 0;
 #line 616 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_result_ = _tmp7_;
+	_result_ = _tmp5_;
 #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = cursor_wrt_canvas;
+	_tmp6_ = cursor_wrt_canvas;
 #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_.x;
+	_tmp7_ = _tmp6_.x;
 #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = viewport_wrt_canvas;
+	_tmp8_ = viewport_wrt_canvas;
 #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = _tmp10_.x;
+	_tmp9_ = _tmp8_.x;
 #line 617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_result_.x = _tmp9_ - _tmp11_;
+	_result_.x = _tmp7_ - _tmp9_;
 #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _result_;
+	_tmp10_ = _result_;
 #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = _tmp12_.x;
-#line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = viewport_wrt_canvas;
+	_tmp11_ = _tmp10_.x;
 #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = _tmp14_.width;
+	_tmp12_ = viewport_wrt_canvas;
 #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = CLAMP (_tmp13_, 0, _tmp15_);
+	_tmp13_ = _tmp12_.width;
 #line 618 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_result_.x = _tmp16_;
+	_result_.x = CLAMP (_tmp11_, 0, _tmp13_);
 #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = cursor_wrt_canvas;
+	_tmp14_ = cursor_wrt_canvas;
 #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _tmp17_.y;
+	_tmp15_ = _tmp14_.y;
 #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = viewport_wrt_canvas;
+	_tmp16_ = viewport_wrt_canvas;
 #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = _tmp19_.y;
+	_tmp17_ = _tmp16_.y;
 #line 619 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_result_.y = _tmp18_ - _tmp20_;
-#line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = _result_;
+	_result_.y = _tmp15_ - _tmp17_;
 #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = _tmp21_.y;
+	_tmp18_ = _result_;
 #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = viewport_wrt_canvas;
+	_tmp19_ = _tmp18_.y;
 #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = _tmp23_.height;
+	_tmp20_ = viewport_wrt_canvas;
 #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = CLAMP (_tmp22_, 0, _tmp24_);
+	_tmp21_ = _tmp20_.height;
 #line 620 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_result_.y = _tmp25_;
+	_result_.y = CLAMP (_tmp19_, 0, _tmp21_);
 #line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	*result = _result_;
 #line 622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5256 "PhotoPage.c"
+#line 6030 "PhotoPage.c"
 }
 
 
-static void editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) {
+static void
+editing_host_page_get_cursor_wrt_viewport_center (EditingHostPage* self,
+                                                  GdkEventScroll* event,
+                                                  GdkPoint* result)
+{
 	GdkPoint cursor_wrt_viewport = {0};
-	GdkEventScroll* _tmp0_;
-	GdkPoint _tmp1_ = {0};
+	GdkPoint _tmp0_ = {0};
 	GdkRectangle viewport_wrt_canvas = {0};
-	ZoomState _tmp2_ = {0};
-	GdkRectangle _tmp3_ = {0};
+	ZoomState _tmp1_ = {0};
+	GdkRectangle _tmp2_ = {0};
 	GdkPoint viewport_center = {0};
-	GdkPoint _tmp4_ = {0};
-	GdkRectangle _tmp5_;
-	gint _tmp6_;
-	GdkRectangle _tmp7_;
-	gint _tmp8_;
+	GdkPoint _tmp3_ = {0};
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkPoint _tmp8_;
 	GdkPoint _tmp9_;
-	GdkPoint _tmp10_;
-	GdkPoint _tmp11_ = {0};
+	GdkPoint _tmp10_ = {0};
 #line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 625 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (event != NULL);
 #line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = event;
+	editing_host_page_get_cursor_wrt_viewport (self, event, &_tmp0_);
 #line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_get_cursor_wrt_viewport (self, _tmp0_, &_tmp1_);
-#line 626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_viewport = _tmp1_;
+	cursor_wrt_viewport = _tmp0_;
 #line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
 #line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp2_, &_tmp3_);
+	zoom_state_get_viewing_rectangle_wrt_screen (&_tmp1_, &_tmp2_);
 #line 627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_wrt_canvas = _tmp3_;
+	viewport_wrt_canvas = _tmp2_;
 #line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_.x = 0;
+	_tmp3_.x = 0;
 #line 629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center = _tmp4_;
+	viewport_center = _tmp3_;
 #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = viewport_wrt_canvas;
+	_tmp4_ = viewport_wrt_canvas;
 #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_.width;
+	_tmp5_ = _tmp4_.width;
 #line 630 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center.x = _tmp6_ / 2;
+	viewport_center.x = _tmp5_ / 2;
 #line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = viewport_wrt_canvas;
+	_tmp6_ = viewport_wrt_canvas;
 #line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_.height;
+	_tmp7_ = _tmp6_.height;
 #line 631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center.y = _tmp8_ / 2;
+	viewport_center.y = _tmp7_ / 2;
 #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = cursor_wrt_viewport;
+	_tmp8_ = cursor_wrt_viewport;
 #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = viewport_center;
+	_tmp9_ = viewport_center;
 #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	subtract_points (&_tmp9_, &_tmp10_, &_tmp11_);
+	subtract_points (&_tmp8_, &_tmp9_, &_tmp10_);
 #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	*result = _tmp11_;
+	*result = _tmp10_;
 #line 633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5318 "PhotoPage.c"
+#line 6093 "PhotoPage.c"
 }
 
 
-static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self, GdkEventScroll* event, GdkPoint* result) {
+static void
+editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
+                                              GdkEventScroll* event,
+                                              GdkPoint* result)
+{
 	GdkPoint viewport_center_iso = {0};
 	ZoomState _tmp0_ = {0};
 	GdkPoint _tmp1_ = {0};
 	ZoomState _tmp2_ = {0};
-	gdouble _tmp3_;
-	GdkPoint _tmp4_ = {0};
+	GdkPoint _tmp3_ = {0};
 	GdkPoint cursor_wrt_center_iso = {0};
-	GdkEventScroll* _tmp5_;
+	GdkPoint _tmp4_ = {0};
+	ZoomState _tmp5_ = {0};
 	GdkPoint _tmp6_ = {0};
-	ZoomState _tmp7_ = {0};
-	gdouble _tmp8_;
+	GdkPoint _tmp7_;
+	GdkPoint _tmp8_;
 	GdkPoint _tmp9_ = {0};
-	GdkPoint _tmp10_;
-	GdkPoint _tmp11_;
-	GdkPoint _tmp12_ = {0};
 #line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 636 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5349,126 +6125,106 @@ static void editing_host_page_get_iso_pixel_under_cursor (EditingHostPage* self,
 #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
 #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = zoom_state_get_zoom_factor (&_tmp2_);
-#line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scale_point (&_tmp1_, 1.0 / _tmp3_, &_tmp4_);
+	scale_point (&_tmp1_, 1.0 / zoom_state_get_zoom_factor (&_tmp2_), &_tmp3_);
 #line 637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	viewport_center_iso = _tmp4_;
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = event;
+	viewport_center_iso = _tmp3_;
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp5_, &_tmp6_);
+	editing_host_page_get_cursor_wrt_viewport_center (self, event, &_tmp4_);
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
-#line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = zoom_state_get_zoom_factor (&_tmp7_);
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scale_point (&_tmp6_, 1.0 / _tmp8_, &_tmp9_);
+	scale_point (&_tmp4_, 1.0 / zoom_state_get_zoom_factor (&_tmp5_), &_tmp6_);
 #line 640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_center_iso = _tmp9_;
+	cursor_wrt_center_iso = _tmp6_;
 #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = viewport_center_iso;
+	_tmp7_ = viewport_center_iso;
 #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = cursor_wrt_center_iso;
+	_tmp8_ = cursor_wrt_center_iso;
 #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	add_points (&_tmp10_, &_tmp11_, &_tmp12_);
+	add_points (&_tmp7_, &_tmp8_, &_tmp9_);
 #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	*result = _tmp12_;
+	*result = _tmp9_;
 #line 643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return;
-#line 5376 "PhotoPage.c"
+#line 6146 "PhotoPage.c"
 }
 
 
-static gdouble editing_host_page_snap_interpolation_factor (EditingHostPage* self, gdouble interp) {
+static gdouble
+editing_host_page_snap_interpolation_factor (EditingHostPage* self,
+                                             gdouble interp)
+{
 	gdouble result = 0.0;
-	gdouble _tmp0_;
-	gdouble _tmp2_;
 #line 646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
 #line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = interp;
-#line 647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_ < 0.03) {
+	if (interp < 0.03) {
 #line 648 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		interp = 0.0;
-#line 5392 "PhotoPage.c"
+#line 6161 "PhotoPage.c"
 	} else {
-		gdouble _tmp1_;
-#line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = interp;
 #line 649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp1_ > 0.97) {
+		if (interp > 0.97) {
 #line 650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			interp = 1.0;
-#line 5401 "PhotoPage.c"
+#line 6167 "PhotoPage.c"
 		}
 	}
 #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = interp;
-#line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp2_;
+	result = interp;
 #line 652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5410 "PhotoPage.c"
+#line 6174 "PhotoPage.c"
 }
 
 
-static gdouble editing_host_page_adjust_interpolation_factor (EditingHostPage* self, gdouble adjustment) {
+static gdouble
+editing_host_page_adjust_interpolation_factor (EditingHostPage* self,
+                                               gdouble adjustment)
+{
 	gdouble result = 0.0;
 	ZoomState _tmp0_ = {0};
-	gdouble _tmp1_;
-	gdouble _tmp2_;
-	gdouble _tmp3_;
 #line 655 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), 0.0);
 #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp0_);
 #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = zoom_state_get_interpolation_factor (&_tmp0_);
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = adjustment;
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_snap_interpolation_factor (self, _tmp1_ + _tmp2_);
-#line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp3_;
+	result = editing_host_page_snap_interpolation_factor (self, zoom_state_get_interpolation_factor (&_tmp0_) + adjustment);
 #line 656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5434 "PhotoPage.c"
+#line 6192 "PhotoPage.c"
 }
 
 
-static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self, GdkEventScroll* event, gdouble zoom_increment) {
+static void
+editing_host_page_zoom_about_event_cursor_point (EditingHostPage* self,
+                                                 GdkEventScroll* event,
+                                                 gdouble zoom_increment)
+{
 	gboolean _tmp0_;
 	GdkPoint cursor_wrt_viewport_center = {0};
-	GdkEventScroll* _tmp1_;
-	GdkPoint _tmp2_ = {0};
+	GdkPoint _tmp1_ = {0};
 	GdkPoint iso_pixel_under_cursor = {0};
-	GdkEventScroll* _tmp3_;
-	GdkPoint _tmp4_ = {0};
+	GdkPoint _tmp2_ = {0};
 	gdouble interp = 0.0;
-	gdouble _tmp5_;
+	GtkScale* _tmp3_;
+	guint _tmp4_;
+	GtkScale* _tmp5_;
 	gdouble _tmp6_;
 	GtkScale* _tmp7_;
-	guint _tmp8_;
-	GtkScale* _tmp9_;
-	gdouble _tmp10_;
-	GtkScale* _tmp11_;
 	ZoomState new_zoom_state = {0};
-	ZoomState _tmp12_ = {0};
-	gdouble _tmp13_;
-	gboolean _tmp14_;
+	ZoomState _tmp8_ = {0};
+	gdouble _tmp9_;
 	GdkPoint new_zoomed_old_cursor = {0};
-	GdkPoint _tmp15_;
-	gdouble _tmp16_;
-	GdkPoint _tmp17_ = {0};
+	GdkPoint _tmp10_;
+	GdkPoint _tmp11_ = {0};
 	GdkPoint desired_new_viewport_center = {0};
-	GdkPoint _tmp18_;
-	GdkPoint _tmp19_;
-	GdkPoint _tmp20_ = {0};
-	ZoomState _tmp21_;
-	GdkPoint _tmp22_;
-	ZoomState _tmp23_;
+	GdkPoint _tmp12_;
+	GdkPoint _tmp13_;
+	GdkPoint _tmp14_ = {0};
+	ZoomState _tmp15_;
+	GdkPoint _tmp16_;
+	ZoomState _tmp17_;
 #line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5479,52 +6235,42 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 	if (_tmp0_) {
 #line 661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5479 "PhotoPage.c"
+#line 6235 "PhotoPage.c"
 	}
 #line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = event;
+	editing_host_page_get_cursor_wrt_viewport_center (self, event, &_tmp1_);
 #line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_get_cursor_wrt_viewport_center (self, _tmp1_, &_tmp2_);
-#line 663 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	cursor_wrt_viewport_center = _tmp2_;
-#line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = event;
+	cursor_wrt_viewport_center = _tmp1_;
 #line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_get_iso_pixel_under_cursor (self, _tmp3_, &_tmp4_);
+	editing_host_page_get_iso_pixel_under_cursor (self, event, &_tmp2_);
 #line 664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	iso_pixel_under_cursor = _tmp4_;
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = zoom_increment;
+	iso_pixel_under_cursor = _tmp2_;
 #line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = editing_host_page_adjust_interpolation_factor (self, _tmp5_);
-#line 666 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	interp = _tmp6_;
+	interp = editing_host_page_adjust_interpolation_factor (self, zoom_increment);
 #line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = self->priv->zoom_slider;
+	_tmp3_ = self->priv->zoom_slider;
 #line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
+	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp4_, NULL, FALSE);
 #line 667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp4_, 0, NULL, (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self);
 #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = self->priv->zoom_slider;
+	_tmp5_ = self->priv->zoom_slider;
 #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = interp;
+	_tmp6_ = interp;
 #line 668 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), _tmp10_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), _tmp6_);
 #line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = self->priv->zoom_slider;
+	_tmp7_ = self->priv->zoom_slider;
 #line 669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
 #line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_);
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
 #line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = interp;
+	_tmp9_ = interp;
 #line 671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_rescale (&new_zoom_state, &_tmp12_, _tmp13_);
-#line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = zoom_state_is_min (&new_zoom_state);
+	zoom_state_init_rescale (&new_zoom_state, &_tmp8_, _tmp9_);
 #line 673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_) {
+	if (zoom_state_is_min (&new_zoom_state)) {
 #line 674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5533,43 +6279,43 @@ static void editing_host_page_zoom_about_event_cursor_point (EditingHostPage* se
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 5533 "PhotoPage.c"
+#line 6279 "PhotoPage.c"
 	}
 #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = iso_pixel_under_cursor;
+	_tmp10_ = iso_pixel_under_cursor;
 #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = zoom_state_get_zoom_factor (&new_zoom_state);
+	scale_point (&_tmp10_, zoom_state_get_zoom_factor (&new_zoom_state), &_tmp11_);
 #line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scale_point (&_tmp15_, _tmp16_, &_tmp17_);
-#line 680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	new_zoomed_old_cursor = _tmp17_;
+	new_zoomed_old_cursor = _tmp11_;
 #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = new_zoomed_old_cursor;
+	_tmp12_ = new_zoomed_old_cursor;
 #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = cursor_wrt_viewport_center;
+	_tmp13_ = cursor_wrt_viewport_center;
 #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	subtract_points (&_tmp18_, &_tmp19_, &_tmp20_);
+	subtract_points (&_tmp12_, &_tmp13_, &_tmp14_);
 #line 682 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	desired_new_viewport_center = _tmp20_;
+	desired_new_viewport_center = _tmp14_;
 #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = new_zoom_state;
+	_tmp15_ = new_zoom_state;
 #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = desired_new_viewport_center;
+	_tmp16_ = desired_new_viewport_center;
 #line 685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_pan (&new_zoom_state, &_tmp21_, &_tmp22_);
+	zoom_state_init_pan (&new_zoom_state, &_tmp15_, &_tmp16_);
 #line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = new_zoom_state;
+	_tmp17_ = new_zoom_state;
 #line 687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
+	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_);
 #line 688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
-#line 5565 "PhotoPage.c"
+#line 6309 "PhotoPage.c"
 }
 
 
-void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
+void
+editing_host_page_snap_zoom_to_min (EditingHostPage* self)
+{
 	GtkScale* _tmp0_;
 #line 693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -5577,11 +6323,13 @@ void editing_host_page_snap_zoom_to_min (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #line 694 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 5577 "PhotoPage.c"
+#line 6323 "PhotoPage.c"
 }
 
 
-void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
+void
+editing_host_page_snap_zoom_to_max (EditingHostPage* self)
+{
 	GtkScale* _tmp0_;
 #line 697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -5589,15 +6337,16 @@ void editing_host_page_snap_zoom_to_max (EditingHostPage* self) {
 	_tmp0_ = self->priv->zoom_slider;
 #line 698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 1.0);
-#line 5589 "PhotoPage.c"
+#line 6337 "PhotoPage.c"
 }
 
 
-void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
+void
+editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self)
+{
 	ZoomState iso_state = {0};
 	ZoomState _tmp0_ = {0};
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
 #line 701 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5607,53 +6356,51 @@ void editing_host_page_snap_zoom_to_isomorphic (EditingHostPage* self) {
 #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->zoom_slider;
 #line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = zoom_state_get_interpolation_factor (&iso_state);
-#line 703 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), _tmp2_);
-#line 5610 "PhotoPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), zoom_state_get_interpolation_factor (&iso_state));
+#line 6357 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_on_zoom_slider_key_press (EditingHostPage* self,
+                                                 GdkEventKey* event)
+{
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	guint _tmp1_;
+	guint _tmp0_;
+	const gchar* _tmp1_;
 	const gchar* _tmp2_;
-	const gchar* _tmp3_;
-	GQuark _tmp5_ = 0U;
+	GQuark _tmp4_ = 0U;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label0 = 0;
+	static GQuark _tmp3_label0 = 0;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label1 = 0;
+	static GQuark _tmp3_label1 = 0;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label2 = 0;
+	static GQuark _tmp3_label2 = 0;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label3 = 0;
+	static GQuark _tmp3_label3 = 0;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label4 = 0;
+	static GQuark _tmp3_label4 = 0;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label5 = 0;
+	static GQuark _tmp3_label5 = 0;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label6 = 0;
+	static GQuark _tmp3_label6 = 0;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp4_label7 = 0;
+	static GQuark _tmp3_label7 = 0;
 #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = event;
-#line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _tmp0_->keyval;
+	_tmp0_ = event->keyval;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gdk_keyval_name (_tmp1_);
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp2_ = _tmp1_;
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
+	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("equal")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("plus"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Add"))))) {
+	if (((_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("equal")))) || (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("plus"))))) || (_tmp4_ == ((0 != _tmp3_label2) ? _tmp3_label2 : (_tmp3_label2 = g_quark_from_static_string ("KP_Add"))))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5653 "PhotoPage.c"
+#line 6400 "PhotoPage.c"
 			default:
 			{
 #line 711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5662,13 +6409,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 712 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5662 "PhotoPage.c"
+#line 6409 "PhotoPage.c"
 			}
 		}
-	} else if (((_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("minus")))) || (_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
+	} else if (((_tmp4_ == ((0 != _tmp3_label3) ? _tmp3_label3 : (_tmp3_label3 = g_quark_from_static_string ("minus")))) || (_tmp4_ == ((0 != _tmp3_label4) ? _tmp3_label4 : (_tmp3_label4 = g_quark_from_static_string ("underscore"))))) || (_tmp4_ == ((0 != _tmp3_label5) ? _tmp3_label5 : (_tmp3_label5 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5668 "PhotoPage.c"
+#line 6415 "PhotoPage.c"
 			default:
 			{
 #line 717 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5677,13 +6424,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5677 "PhotoPage.c"
+#line 6424 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("KP_Divide")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label6) ? _tmp3_label6 : (_tmp3_label6 = g_quark_from_static_string ("KP_Divide")))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5683 "PhotoPage.c"
+#line 6430 "PhotoPage.c"
 			default:
 			{
 #line 721 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5692,13 +6439,13 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5692 "PhotoPage.c"
+#line 6439 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("KP_Multiply")))) {
+	} else if (_tmp4_ == ((0 != _tmp3_label7) ? _tmp3_label7 : (_tmp3_label7 = g_quark_from_static_string ("KP_Multiply")))) {
 #line 707 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 5698 "PhotoPage.c"
+#line 6445 "PhotoPage.c"
 			default:
 			{
 #line 725 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5707,7 +6454,7 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 				result = TRUE;
 #line 726 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 5707 "PhotoPage.c"
+#line 6454 "PhotoPage.c"
 			}
 		}
 	}
@@ -5715,67 +6462,73 @@ static gboolean editing_host_page_real_on_zoom_slider_key_press (EditingHostPage
 	result = FALSE;
 #line 729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5715 "PhotoPage.c"
+#line 6462 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_on_zoom_slider_key_press (EditingHostPage* self, GdkEventKey* event) {
+gboolean
+editing_host_page_on_zoom_slider_key_press (EditingHostPage* self,
+                                            GdkEventKey* event)
+{
 #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 706 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_zoom_slider_key_press (self, event);
-#line 5724 "PhotoPage.c"
+#line 6474 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_on_increase_size (EditingHostPage* self) {
+static void
+editing_host_page_real_on_increase_size (EditingHostPage* self)
+{
 	GtkScale* _tmp0_;
-	gdouble _tmp1_;
 #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
 #line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5737 "PhotoPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), editing_host_page_adjust_interpolation_factor (self, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE));
+#line 6486 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_increase_size (EditingHostPage* self) {
+void
+editing_host_page_on_increase_size (EditingHostPage* self)
+{
 #line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 732 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_increase_size (self);
-#line 5746 "PhotoPage.c"
+#line 6497 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_on_decrease_size (EditingHostPage* self) {
+static void
+editing_host_page_real_on_decrease_size (EditingHostPage* self)
+{
 	GtkScale* _tmp0_;
-	gdouble _tmp1_;
 #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
 #line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
-#line 737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), _tmp1_);
-#line 5759 "PhotoPage.c"
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), editing_host_page_adjust_interpolation_factor (self, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE));
+#line 6509 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_decrease_size (EditingHostPage* self) {
+void
+editing_host_page_on_decrease_size (EditingHostPage* self)
+{
 #line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->on_decrease_size (self);
-#line 5768 "PhotoPage.c"
+#line 6520 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
+static void
+editing_host_page_real_save_zoom_state (SinglePhotoPage* base)
+{
 	EditingHostPage * self;
 	GtkScale* _tmp0_;
-	gdouble _tmp1_;
 #line 740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5783,14 +6536,14 @@ static void editing_host_page_real_save_zoom_state (SinglePhotoPage* base) {
 #line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->zoom_slider;
 #line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
-#line 742 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->saved_slider_val = _tmp1_;
-#line 5786 "PhotoPage.c"
+	self->priv->saved_slider_val = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange));
+#line 6537 "PhotoPage.c"
 }
 
 
-static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base) {
+static ZoomBuffer*
+editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base)
+{
 	EditingHostPage * self;
 	ZoomBuffer* result = NULL;
 	ZoomBuffer* _tmp0_;
@@ -5805,17 +6558,18 @@ static ZoomBuffer* editing_host_page_real_get_zoom_buffer (SinglePhotoPage* base
 	result = _tmp1_;
 #line 746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5805 "PhotoPage.c"
+#line 6558 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScroll* event) {
+static gboolean
+editing_host_page_real_on_mousewheel_up (Page* base,
+                                         GdkEventScroll* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-	gboolean _tmp2_;
-	GdkEventScroll* _tmp5_;
 #line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5823,22 +6577,17 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp2_) {
+	if (zoom_state_is_max (&_tmp1_)) {
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5828 "PhotoPage.c"
+#line 6580 "PhotoPage.c"
 	} else {
-		GtkScale* _tmp3_;
-		gboolean _tmp4_;
-#line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = self->priv->zoom_slider;
+		GtkScale* _tmp2_;
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
+		_tmp2_ = self->priv->zoom_slider;
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp4_;
-#line 5838 "PhotoPage.c"
+		_tmp0_ = !gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+#line 6587 "PhotoPage.c"
 	}
 #line 750 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5846,27 +6595,26 @@ static gboolean editing_host_page_real_on_mousewheel_up (Page* base, GdkEventScr
 		result = FALSE;
 #line 751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5846 "PhotoPage.c"
+#line 6595 "PhotoPage.c"
 	}
 #line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = event;
-#line 753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
+	editing_host_page_zoom_about_event_cursor_point (self, event, EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5856 "PhotoPage.c"
+#line 6603 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventScroll* event) {
+static gboolean
+editing_host_page_real_on_mousewheel_down (Page* base,
+                                           GdkEventScroll* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-	gboolean _tmp2_;
-	GdkEventScroll* _tmp5_;
 #line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5874,22 +6622,17 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = zoom_state_is_min (&_tmp1_);
-#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp2_) {
+	if (zoom_state_is_min (&_tmp1_)) {
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 5879 "PhotoPage.c"
+#line 6625 "PhotoPage.c"
 	} else {
-		GtkScale* _tmp3_;
-		gboolean _tmp4_;
-#line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = self->priv->zoom_slider;
+		GtkScale* _tmp2_;
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
+		_tmp2_ = self->priv->zoom_slider;
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp4_;
-#line 5889 "PhotoPage.c"
+		_tmp0_ = !gtk_widget_get_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
+#line 6632 "PhotoPage.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -5897,21 +6640,21 @@ static gboolean editing_host_page_real_on_mousewheel_down (Page* base, GdkEventS
 		result = FALSE;
 #line 759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 5897 "PhotoPage.c"
+#line 6640 "PhotoPage.c"
 	}
 #line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = event;
-#line 761 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_zoom_about_event_cursor_point (self, _tmp5_, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
+	editing_host_page_zoom_about_event_cursor_point (self, event, -EDITING_HOST_PAGE_ZOOM_INCREMENT_SIZE);
 #line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5907 "PhotoPage.c"
+#line 6648 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
+static void
+editing_host_page_real_restore_zoom_state (SinglePhotoPage* base)
+{
 	EditingHostPage * self;
 	GtkScale* _tmp0_;
 	guint _tmp1_;
@@ -5938,11 +6681,13 @@ static void editing_host_page_real_restore_zoom_state (SinglePhotoPage* base) {
 	_tmp4_ = self->priv->zoom_slider;
 #line 770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
-#line 5938 "PhotoPage.c"
+#line 6681 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base) {
+static gboolean
+editing_host_page_real_is_zoom_supported (SinglePhotoPage* base)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 #line 773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -5951,40 +6696,39 @@ static gboolean editing_host_page_real_is_zoom_supported (SinglePhotoPage* base)
 	result = TRUE;
 #line 774 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5951 "PhotoPage.c"
+#line 6696 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_set_container (Page* base, GtkWindow* container) {
+static void
+editing_host_page_real_set_container (Page* base,
+                                      GtkWindow* container)
+{
 	EditingHostPage * self;
-	GtkWindow* _tmp0_;
-	GtkWindow* _tmp1_;
 #line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 777 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GTK_IS_WINDOW (container));
 #line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = container;
-#line 778 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
-#line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = container;
+	PAGE_CLASS (editing_host_page_parent_class)->set_container (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), container);
 #line 781 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_FULLSCREEN_WINDOW)) {
-#line 5971 "PhotoPage.c"
-		DragAndDropHandler* _tmp2_;
+	if (!G_TYPE_CHECK_INSTANCE_TYPE (container, TYPE_FULLSCREEN_WINDOW)) {
+#line 6713 "PhotoPage.c"
+		DragAndDropHandler* _tmp0_;
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp0_ = drag_and_drop_handler_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_drag_and_drop_handler_unref0 (self->priv->dnd_handler);
 #line 782 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->dnd_handler = _tmp2_;
-#line 5979 "PhotoPage.c"
+		self->priv->dnd_handler = _tmp0_;
+#line 6721 "PhotoPage.c"
 	}
 }
 
 
-ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
+ViewCollection*
+editing_host_page_get_parent_view (EditingHostPage* self)
+{
 	ViewCollection* result = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -5998,11 +6742,13 @@ ViewCollection* editing_host_page_get_parent_view (EditingHostPage* self) {
 	result = _tmp1_;
 #line 786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 5998 "PhotoPage.c"
+#line 6742 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_has_photo (EditingHostPage* self) {
+gboolean
+editing_host_page_has_photo (EditingHostPage* self)
+{
 	gboolean result = FALSE;
 	Photo* _tmp0_;
 	Photo* _tmp1_;
@@ -6021,25 +6767,25 @@ gboolean editing_host_page_has_photo (EditingHostPage* self) {
 	result = _tmp2_;
 #line 790 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6021 "PhotoPage.c"
+#line 6767 "PhotoPage.c"
 }
 
 
-Photo* editing_host_page_get_photo (EditingHostPage* self) {
+Photo*
+editing_host_page_get_photo (EditingHostPage* self)
+{
 	Photo* result = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
 	ViewCollection* _tmp5_;
-	gint _tmp6_;
-	ViewCollection* _tmp7_;
-	ViewCollection* _tmp8_;
-	DataView* _tmp9_;
-	DataView* _tmp10_;
-	DataSource* _tmp11_;
-	Photo* _tmp12_;
+	ViewCollection* _tmp6_;
+	DataView* _tmp7_;
+	DataView* _tmp8_;
+	DataSource* _tmp9_;
+	Photo* _tmp10_;
 #line 793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6047,129 +6793,120 @@ Photo* editing_host_page_get_photo (EditingHostPage* self) {
 #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_ == 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) == 0;
 #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = NULL;
 #line 796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 6058 "PhotoPage.c"
+#line 6802 "PhotoPage.c"
 	}
 #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = view_collection_get_selected_count (_tmp5_);
+	_tmp4_ = _tmp3_;
 #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp6_ == 1, "get_view().get_selected_count() == 1");
+	_vala_assert (view_collection_get_selected_count (_tmp4_) == 1, "get_view().get_selected_count() == 1");
 #line 800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp6_ = _tmp5_;
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = view_collection_get_selected_at (_tmp8_, 0);
+	_tmp7_ = view_collection_get_selected_at (_tmp6_, 0);
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = data_view_get_source (_tmp10_);
+	_tmp9_ = data_view_get_source (_tmp8_);
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo);
+	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo);
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp8_);
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp8_);
+	_data_collection_unref0 (_tmp6_);
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp12_;
+	result = _tmp10_;
 #line 801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6090 "PhotoPage.c"
+#line 6832 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_photo_changing (EditingHostPage* self, Photo* new_photo) {
-	Photo* _tmp0_;
-	PhotoFileFormat _tmp1_;
-	gboolean _tmp6_;
+static void
+editing_host_page_real_photo_changing (EditingHostPage* self,
+                                       Photo* new_photo)
+{
+	gboolean _tmp2_;
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
 #line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = new_photo;
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = photo_get_file_format (_tmp0_);
-#line 808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp1_ == PHOTO_FILE_FORMAT_RAW) {
+	if (photo_get_file_format (new_photo) == PHOTO_FILE_FORMAT_RAW) {
 #line 809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, FALSE);
-#line 6108 "PhotoPage.c"
+#line 6847 "PhotoPage.c"
 	} else {
-		Photo* _tmp2_;
-		GFile* _tmp3_;
-		GFile* _tmp4_;
-		gboolean _tmp5_;
+		GFile* _tmp0_;
+		GFile* _tmp1_;
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = new_photo;
-#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp0_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_MEDIA_SOURCE, MediaSource));
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = g_file_query_exists (_tmp4_, NULL);
+		_tmp1_ = _tmp0_;
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_set_photo_missing (self, !_tmp5_);
+		editing_host_page_set_photo_missing (self, !g_file_query_exists (_tmp1_, NULL));
 #line 811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
-#line 6126 "PhotoPage.c"
+		_g_object_unref0 (_tmp1_);
+#line 6859 "PhotoPage.c"
 	}
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = self->priv->photo_missing;
+	_tmp2_ = self->priv->photo_missing;
 #line 813 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_update_ui (self, _tmp6_);
-#line 6132 "PhotoPage.c"
+	editing_host_page_update_ui (self, _tmp2_);
+#line 6865 "PhotoPage.c"
 }
 
 
-void editing_host_page_photo_changing (EditingHostPage* self, Photo* new_photo) {
+void
+editing_host_page_photo_changing (EditingHostPage* self,
+                                  Photo* new_photo)
+{
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 805 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->photo_changing (self, new_photo);
-#line 6141 "PhotoPage.c"
+#line 6877 "PhotoPage.c"
 }
 
 
-static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
+static void
+editing_host_page_set_photo (EditingHostPage* self,
+                             Photo* photo)
+{
 	GtkScale* _tmp0_;
 	guint _tmp1_;
 	GtkScale* _tmp2_;
 	GtkScale* _tmp3_;
-	Photo* _tmp4_;
 	DataView* view = NULL;
+	ViewCollection* _tmp4_;
 	ViewCollection* _tmp5_;
-	ViewCollection* _tmp6_;
-	Photo* _tmp7_;
+	DataView* _tmp6_;
+	DataView* _tmp7_;
 	DataView* _tmp8_;
-	DataView* _tmp9_;
-	DataView* _tmp10_;
+	ViewCollection* _tmp9_;
+	ViewCollection* _tmp10_;
+	Marker* marker = NULL;
 	ViewCollection* _tmp11_;
 	ViewCollection* _tmp12_;
-	Marker* marker = NULL;
-	ViewCollection* _tmp13_;
-	ViewCollection* _tmp14_;
-	DataView* _tmp15_;
-	Marker* _tmp16_;
-	Marker* _tmp17_;
-	ViewCollection* _tmp18_;
+	DataView* _tmp13_;
+	Marker* _tmp14_;
+	Marker* _tmp15_;
+	ViewCollection* _tmp16_;
+	ViewCollection* _tmp17_;
+	Marker* _tmp18_;
 	ViewCollection* _tmp19_;
-	Marker* _tmp20_;
-	ViewCollection* _tmp21_;
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6189,121 +6926,116 @@ static void editing_host_page_set_photo (EditingHostPage* self, Photo* photo) {
 #line 819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_host_page_on_zoom_slider_value_changed_gtk_range_value_changed, self, 0);
 #line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = photo;
-#line 821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_photo_changing (self, _tmp4_);
+	editing_host_page_photo_changing (self, photo);
 #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = photo;
+	_tmp5_ = _tmp4_;
 #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
+	_tmp6_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource));
 #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp7_ = _tmp6_;
 #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp6_);
+	_data_collection_unref0 (_tmp5_);
 #line 822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view = _tmp9_;
+	view = _tmp7_;
 #line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = view;
+	_tmp8_ = view;
 #line 823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp10_ != NULL, "view != null");
+	_vala_assert (_tmp8_ != NULL, "view != null");
 #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp10_ = _tmp9_;
 #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_collection_unselect_all (_tmp12_);
+	view_collection_unselect_all (_tmp10_);
 #line 826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp12_);
+	_data_collection_unref0 (_tmp10_);
 #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp12_ = _tmp11_;
 #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = view;
+	_tmp13_ = view;
 #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_OBJECT, DataObject));
+	_tmp14_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_OBJECT, DataObject));
 #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = _tmp16_;
+	_tmp15_ = _tmp14_;
 #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp14_);
+	_data_collection_unref0 (_tmp12_);
 #line 827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	marker = _tmp17_;
+	marker = _tmp15_;
 #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp16_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = _tmp18_;
+	_tmp17_ = _tmp16_;
 #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = marker;
+	_tmp18_ = marker;
 #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view_collection_select_marked (_tmp19_, _tmp20_);
+	view_collection_select_marked (_tmp17_, _tmp18_);
 #line 828 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp19_);
+	_data_collection_unref0 (_tmp17_);
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = self->priv->parent_view;
+	_tmp19_ = self->priv->parent_view;
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp21_ != NULL) {
-#line 6246 "PhotoPage.c"
-		ViewCollection* _tmp22_;
+	if (_tmp19_ != NULL) {
+#line 6979 "PhotoPage.c"
+		ViewCollection* _tmp20_;
 		DataView* view_in_parent = NULL;
-		ViewCollection* _tmp23_;
-		Photo* _tmp24_;
-		DataView* _tmp25_;
-		DataView* _tmp26_;
+		ViewCollection* _tmp21_;
+		DataView* _tmp22_;
+		DataView* _tmp23_;
 #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = self->priv->parent_view;
+		_tmp20_ = self->priv->parent_view;
 #line 833 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_collection_unselect_all (_tmp22_);
+		view_collection_unselect_all (_tmp20_);
 #line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = self->priv->parent_view;
+		_tmp21_ = self->priv->parent_view;
 #line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = photo;
+		_tmp22_ = view_collection_get_view_for_source_filtered (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource));
 #line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = view_collection_get_view_for_source_filtered (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource));
-#line 834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_in_parent = _tmp25_;
+		view_in_parent = _tmp22_;
 #line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = view_in_parent;
+		_tmp23_ = view_in_parent;
 #line 835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (NULL != _tmp26_) {
-#line 6269 "PhotoPage.c"
-			ViewCollection* _tmp27_;
-			ViewCollection* _tmp28_;
-			DataView* _tmp29_;
-			Marker* _tmp30_;
-			Marker* _tmp31_;
+		if (NULL != _tmp23_) {
+#line 6999 "PhotoPage.c"
+			ViewCollection* _tmp24_;
+			ViewCollection* _tmp25_;
+			DataView* _tmp26_;
+			Marker* _tmp27_;
+			Marker* _tmp28_;
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp27_ = self->priv->parent_view;
+			_tmp24_ = self->priv->parent_view;
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp28_ = self->priv->parent_view;
+			_tmp25_ = self->priv->parent_view;
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp29_ = view_in_parent;
+			_tmp26_ = view_in_parent;
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp30_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
+			_tmp27_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject));
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp31_ = _tmp30_;
+			_tmp28_ = _tmp27_;
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			view_collection_select_marked (_tmp27_, _tmp31_);
+			view_collection_select_marked (_tmp24_, _tmp28_);
 #line 836 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp31_);
-#line 6289 "PhotoPage.c"
+			_g_object_unref0 (_tmp28_);
+#line 7019 "PhotoPage.c"
 		}
 #line 832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (view_in_parent);
-#line 6293 "PhotoPage.c"
+#line 7023 "PhotoPage.c"
 	}
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (marker);
 #line 816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (view);
-#line 6299 "PhotoPage.c"
+#line 7029 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_realize (GtkWidget* base) {
+static void
+editing_host_page_real_realize (GtkWidget* base)
+{
 	EditingHostPage * self;
 #line 840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
@@ -6311,14 +7043,15 @@ static void editing_host_page_real_realize (GtkWidget* base) {
 	GTK_WIDGET_CLASS (editing_host_page_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget));
 #line 843 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "realize");
-#line 6311 "PhotoPage.c"
+#line 7043 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_switched_to (Page* base) {
+static void
+editing_host_page_real_switched_to (Page* base)
+{
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
 #line 846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6326,46 +7059,45 @@ static void editing_host_page_real_switched_to (Page* base) {
 #line 849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "switched_to");
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (self);
-#line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp1_) {
-#line 6329 "PhotoPage.c"
-		gboolean _tmp2_;
+	if (editing_host_page_has_photo (self)) {
+#line 7060 "PhotoPage.c"
+		gboolean _tmp1_;
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = self->priv->pixbuf_dirty;
+		_tmp1_ = self->priv->pixbuf_dirty;
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp2_;
-#line 6335 "PhotoPage.c"
+		_tmp0_ = _tmp1_;
+#line 7066 "PhotoPage.c"
 	} else {
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 6339 "PhotoPage.c"
+#line 7070 "PhotoPage.c"
 	}
 #line 852 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 6343 "PhotoPage.c"
+#line 7074 "PhotoPage.c"
+		Photo* _tmp2_;
 		Photo* _tmp3_;
-		Photo* _tmp4_;
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_host_page_get_photo (self);
+		_tmp2_ = editing_host_page_get_photo (self);
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_replace_photo (self, _tmp4_);
+		editing_host_page_replace_photo (self, _tmp3_);
 #line 853 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
-#line 6354 "PhotoPage.c"
+		_g_object_unref0 (_tmp3_);
+#line 7085 "PhotoPage.c"
 	}
 }
 
 
-static void editing_host_page_real_switching_from (Page* base) {
+static void
+editing_host_page_real_switching_from (Page* base)
+{
 	EditingHostPage * self;
 	Dimensions _tmp0_ = {0};
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_;
+	ViewCollection* _tmp12_;
 	ViewCollection* _tmp13_;
-	ViewCollection* _tmp14_;
 #line 856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6379,300 +7111,303 @@ static void editing_host_page_real_switching_from (Page* base) {
 #line 862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_has_photo (self);
-#line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp2_) {
-#line 6382 "PhotoPage.c"
-		ViewCollection* _tmp3_;
+	if (editing_host_page_has_photo (self)) {
+#line 7112 "PhotoPage.c"
+		ViewCollection* _tmp2_;
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = self->priv->parent_view;
+		_tmp2_ = self->priv->parent_view;
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = _tmp3_ != NULL;
-#line 6388 "PhotoPage.c"
+		_tmp1_ = _tmp2_ != NULL;
+#line 7118 "PhotoPage.c"
 	} else {
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6392 "PhotoPage.c"
+#line 7122 "PhotoPage.c"
 	}
 #line 869 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 6396 "PhotoPage.c"
+#line 7126 "PhotoPage.c"
+		ViewCollection* _tmp3_;
 		ViewCollection* _tmp4_;
 		ViewCollection* _tmp5_;
-		ViewCollection* _tmp6_;
+		Photo* _tmp6_;
 		Photo* _tmp7_;
-		Photo* _tmp8_;
+		DataView* _tmp8_;
 		DataView* _tmp9_;
-		DataView* _tmp10_;
+		Marker* _tmp10_;
 		Marker* _tmp11_;
-		Marker* _tmp12_;
+#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp3_ = self->priv->parent_view;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp4_ = self->priv->parent_view;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = self->priv->parent_view;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = self->priv->parent_view;
-#line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = editing_host_page_get_photo (self);
+		_tmp6_ = editing_host_page_get_photo (self);
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource));
+		_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp9_ = _tmp8_;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_OBJECT, DataObject));
+		_tmp10_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_OBJECT, DataObject));
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp11_ = _tmp10_;
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_collection_select_marked (_tmp4_, _tmp12_);
+		view_collection_select_marked (_tmp3_, _tmp11_);
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp12_);
+		_g_object_unref0 (_tmp11_);
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp10_);
+		_g_object_unref0 (_tmp9_);
 #line 870 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp8_);
-#line 6432 "PhotoPage.c"
+		_g_object_unref0 (_tmp7_);
+#line 7162 "PhotoPage.c"
 	}
 #line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
 #line 873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
 #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATA_COLLECTION, DataCollection));
+	data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection));
 #line 874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp14_);
-#line 6446 "PhotoPage.c"
+	_data_collection_unref0 (_tmp13_);
+#line 7176 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender, GeeIterable* selected, gpointer self) {
+static void
+_editing_host_page_on_selection_changed_view_collection_items_selected (ViewCollection* _sender,
+                                                                        GeeIterable* selected,
+                                                                        gpointer self)
+{
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_selection_changed ((EditingHostPage*) self, selected);
-#line 6453 "PhotoPage.c"
+#line 7187 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_switching_to_fullscreen (Page* base, FullscreenWindow* fsw) {
+static void
+editing_host_page_real_switching_to_fullscreen (Page* base,
+                                                FullscreenWindow* fsw)
+{
 	EditingHostPage * self;
-	FullscreenWindow* _tmp0_;
-	Dimensions _tmp1_ = {0};
+	Dimensions _tmp0_ = {0};
 	Page* page = NULL;
-	FullscreenWindow* _tmp2_;
-	Page* _tmp3_;
-	Page* _tmp4_;
+	Page* _tmp1_;
+	Page* _tmp2_;
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
 #line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = fsw;
-#line 878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
+	PAGE_CLASS (editing_host_page_parent_class)->switching_to_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), fsw);
 #line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dimensions_init (&_tmp1_, 0, 0);
+	dimensions_init (&_tmp0_, 0, 0);
 #line 880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->is_pan_in_progress = FALSE;
 #line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = fsw;
-#line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp1_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (fsw, TYPE_PAGE_WINDOW, PageWindow));
 #line 885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page = _tmp3_;
+	page = _tmp1_;
 #line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = page;
+	_tmp2_ = page;
 #line 886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_ != NULL) {
-#line 6491 "PhotoPage.c"
-		Page* _tmp5_;
-		ViewCollection* _tmp6_;
-		ViewCollection* _tmp7_;
+	if (_tmp2_ != NULL) {
+#line 7222 "PhotoPage.c"
+		Page* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = page;
+		_tmp3_ = page;
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = page_get_view (_tmp5_);
+		_tmp4_ = page_get_view (_tmp3_);
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = _tmp4_;
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_signal_connect_object (_tmp7_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
+		g_signal_connect_object (_tmp5_, "items-selected", (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self, 0);
 #line 887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp7_);
-#line 6505 "PhotoPage.c"
+		_data_collection_unref0 (_tmp5_);
+#line 7236 "PhotoPage.c"
 	}
 #line 877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6509 "PhotoPage.c"
+#line 7240 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_returning_from_fullscreen (Page* base, FullscreenWindow* fsw) {
+static void
+editing_host_page_real_returning_from_fullscreen (Page* base,
+                                                  FullscreenWindow* fsw)
+{
 	EditingHostPage * self;
-	FullscreenWindow* _tmp0_;
 	Page* page = NULL;
-	FullscreenWindow* _tmp1_;
-	Page* _tmp2_;
-	Page* _tmp3_;
+	Page* _tmp0_;
+	Page* _tmp1_;
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_FULLSCREEN_WINDOW (fsw));
 #line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = fsw;
-#line 891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp0_);
+	PAGE_CLASS (editing_host_page_parent_class)->returning_from_fullscreen (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), fsw);
 #line 893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = fsw;
-#line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
+	_tmp0_ = page_window_get_current_page (G_TYPE_CHECK_INSTANCE_CAST (fsw, TYPE_PAGE_WINDOW, PageWindow));
 #line 895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page = _tmp2_;
+	page = _tmp0_;
 #line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = page;
+	_tmp1_ = page;
 #line 896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_ != NULL) {
-#line 6540 "PhotoPage.c"
-		Page* _tmp4_;
-		ViewCollection* _tmp5_;
-		ViewCollection* _tmp6_;
-		guint _tmp7_;
+	if (_tmp1_ != NULL) {
+#line 7268 "PhotoPage.c"
+		Page* _tmp2_;
+		ViewCollection* _tmp3_;
+		ViewCollection* _tmp4_;
+		guint _tmp5_;
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = page;
+		_tmp2_ = page;
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = page_get_view (_tmp4_);
+		_tmp3_ = page_get_view (_tmp2_);
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = _tmp3_;
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp7_, NULL, FALSE);
+		g_signal_parse_name ("items-selected", TYPE_VIEW_COLLECTION, &_tmp5_, NULL, FALSE);
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_signal_handlers_disconnect_matched (_tmp6_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp7_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self);
+		g_signal_handlers_disconnect_matched (_tmp4_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp5_, 0, NULL, (GCallback) _editing_host_page_on_selection_changed_view_collection_items_selected, self);
 #line 897 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp6_);
-#line 6557 "PhotoPage.c"
+		_data_collection_unref0 (_tmp4_);
+#line 7285 "PhotoPage.c"
 	}
 #line 890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (page);
-#line 6561 "PhotoPage.c"
+#line 7289 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_selection_changed (EditingHostPage* self, GeeIterable* selected) {
+static void
+editing_host_page_on_selection_changed (EditingHostPage* self,
+                                        GeeIterable* selected)
+{
 #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_ITERABLE (selected));
-#line 6570 "PhotoPage.c"
+#line 7301 "PhotoPage.c"
 	{
 		GeeIterator* _view_it = NULL;
-		GeeIterable* _tmp0_;
-		GeeIterator* _tmp1_;
-#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = selected;
+		GeeIterator* _tmp0_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = gee_iterable_iterator (_tmp0_);
+		_tmp0_ = gee_iterable_iterator (selected);
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_view_it = _tmp1_;
+		_view_it = _tmp0_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 6583 "PhotoPage.c"
-			gboolean _tmp2_;
+#line 7311 "PhotoPage.c"
 			DataView* view = NULL;
-			gpointer _tmp3_;
-			DataView* _tmp4_;
-			DataSource* _tmp5_;
-			Photo* _tmp6_;
-#line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp2_ = gee_iterator_next (_view_it);
+			gpointer _tmp1_;
+			DataView* _tmp2_;
+			DataSource* _tmp3_;
+			Photo* _tmp4_;
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (!_tmp2_) {
+			if (!gee_iterator_next (_view_it)) {
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 6596 "PhotoPage.c"
+#line 7321 "PhotoPage.c"
 			}
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp3_ = gee_iterator_get (_view_it);
+			_tmp1_ = gee_iterator_get (_view_it);
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			view = (DataView*) _tmp3_;
+			view = (DataView*) _tmp1_;
 #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp4_ = view;
+			_tmp2_ = view;
 #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp5_ = data_view_get_source (_tmp4_);
+			_tmp3_ = data_view_get_source (_tmp2_);
 #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PHOTO, Photo);
+			_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo);
 #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_replace_photo (self, _tmp6_);
+			editing_host_page_replace_photo (self, _tmp4_);
 #line 902 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp6_);
+			_g_object_unref0 (_tmp4_);
 #line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (view);
 #line 903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 6616 "PhotoPage.c"
+#line 7341 "PhotoPage.c"
 		}
 #line 901 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_view_it);
-#line 6620 "PhotoPage.c"
+#line 7345 "PhotoPage.c"
 	}
 }
 
 
-void editing_host_page_enable_rotate (EditingHostPage* self, gboolean should_enable) {
+void
+editing_host_page_enable_rotate (EditingHostPage* self,
+                                 gboolean should_enable)
+{
 	GtkToolButton* _tmp0_;
-	gboolean _tmp1_;
 #line 907 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->rotate_button;
 #line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = should_enable;
-#line 908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 6636 "PhotoPage.c"
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), should_enable);
+#line 7361 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender, Photo* photo, GdkPixbuf* pixbuf, GError* err, gpointer self) {
+static void
+_editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched (PixbufCache* _sender,
+                                                           Photo* photo,
+                                                           GdkPixbuf* pixbuf,
+                                                           GError* err,
+                                                           gpointer self)
+{
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_pixbuf_fetched ((EditingHostPage*) self, photo, pixbuf, err);
-#line 6643 "PhotoPage.c"
+#line 7374 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo, gpointer self) {
+static gboolean
+_editing_host_page_master_cache_filter_pixbuf_cache_cache_filter (Photo* photo,
+                                                                  gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_master_cache_filter ((EditingHostPage*) self, photo);
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6652 "PhotoPage.c"
+#line 7386 "PhotoPage.c"
 }
 
 
-static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar* caller) {
+static void
+editing_host_page_rebuild_caches (EditingHostPage* self,
+                                  const gchar* caller)
+{
 	Scaling scaling = {0};
 	Scaling _tmp0_ = {0};
 	gboolean _tmp1_ = FALSE;
 	PixbufCache* _tmp2_;
-	const gchar* _tmp7_;
-	gchar* _tmp8_;
-	gchar* _tmp9_;
-	PixbufCache* _tmp10_;
-	SourceCollection* _tmp14_;
-	Scaling _tmp15_;
-	PixbufCache* _tmp16_;
-	PixbufCache* _tmp17_;
-	SourceCollection* _tmp18_;
-	Scaling _tmp19_;
-	PixbufCache* _tmp20_;
-	const gchar* _tmp21_;
+	gchar* _tmp6_;
+	gchar* _tmp7_;
+	PixbufCache* _tmp8_;
+	SourceCollection* _tmp12_;
+	Scaling _tmp13_;
+	PixbufCache* _tmp14_;
+	PixbufCache* _tmp15_;
+	SourceCollection* _tmp16_;
+	Scaling _tmp17_;
+	PixbufCache* _tmp18_;
 #line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 914 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6685,11 +7420,10 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 	_tmp2_ = self->priv->cache;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 6685 "PhotoPage.c"
+#line 7420 "PhotoPage.c"
 		PixbufCache* _tmp3_;
 		Scaling _tmp4_ = {0};
 		Scaling _tmp5_;
-		gboolean _tmp6_;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = self->priv->cache;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -6697,190 +7431,171 @@ static void editing_host_page_rebuild_caches (EditingHostPage* self, const gchar
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = scaling;
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = scaling_equals (&_tmp4_, &_tmp5_);
-#line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = _tmp6_;
-#line 6700 "PhotoPage.c"
+		_tmp1_ = scaling_equals (&_tmp4_, &_tmp5_);
+#line 7432 "PhotoPage.c"
 	} else {
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 6704 "PhotoPage.c"
+#line 7436 "PhotoPage.c"
 	}
 #line 918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
 #line 919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6710 "PhotoPage.c"
+#line 7442 "PhotoPage.c"
 	}
 #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = caller;
+	_tmp6_ = scaling_to_string (&scaling);
 #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = scaling_to_string (&scaling);
-#line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp7_ = _tmp6_;
 #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_debug ("PhotoPage.vala:921: Rebuild pixbuf caches: %s (%s)", _tmp7_, _tmp9_);
+	g_debug ("PhotoPage.vala:921: Rebuild pixbuf caches: %s (%s)", caller, _tmp7_);
 #line 921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp9_);
+	_g_free0 (_tmp7_);
 #line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = self->priv->cache;
+	_tmp8_ = self->priv->cache;
 #line 925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp10_ != NULL) {
-#line 6726 "PhotoPage.c"
+	if (_tmp8_ != NULL) {
+#line 7456 "PhotoPage.c"
+		PixbufCache* _tmp9_;
+		guint _tmp10_;
 		PixbufCache* _tmp11_;
-		guint _tmp12_;
-		PixbufCache* _tmp13_;
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = self->priv->cache;
+		_tmp9_ = self->priv->cache;
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp12_, NULL, FALSE);
+		g_signal_parse_name ("fetched", TYPE_PIXBUF_CACHE, &_tmp10_, NULL, FALSE);
 #line 926 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_signal_handlers_disconnect_matched (_tmp11_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp12_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self);
+		g_signal_handlers_disconnect_matched (_tmp9_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self);
 #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = self->priv->cache;
+		_tmp11_ = self->priv->cache;
 #line 927 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		pixbuf_cache_cancel_all (_tmp13_);
-#line 6740 "PhotoPage.c"
+		pixbuf_cache_cancel_all (_tmp11_);
+#line 7470 "PhotoPage.c"
 	}
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = self->priv->sources;
+	_tmp12_ = self->priv->sources;
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = scaling;
+	_tmp13_ = scaling;
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = pixbuf_cache_new (_tmp14_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp15_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL);
+	_tmp14_ = pixbuf_cache_new (_tmp12_, PIXBUF_CACHE_PHOTO_TYPE_BASELINE, &_tmp13_, EDITING_HOST_PAGE_PIXBUF_CACHE_COUNT, NULL, NULL);
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cache);
 #line 930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->cache = _tmp16_;
+	self->priv->cache = _tmp14_;
 #line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = self->priv->cache;
+	_tmp15_ = self->priv->cache;
 #line 931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp17_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0);
+	g_signal_connect_object (_tmp15_, "fetched", (GCallback) _editing_host_page_on_pixbuf_fetched_pixbuf_cache_fetched, self, 0);
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = self->priv->sources;
+	_tmp16_ = self->priv->sources;
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = scaling;
+	_tmp17_ = scaling;
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = pixbuf_cache_new (_tmp18_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp19_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self);
+	_tmp18_ = pixbuf_cache_new (_tmp16_, PIXBUF_CACHE_PHOTO_TYPE_MASTER, &_tmp17_, EDITING_HOST_PAGE_ORIGINAL_PIXBUF_CACHE_COUNT, _editing_host_page_master_cache_filter_pixbuf_cache_cache_filter, self);
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->master_cache);
 #line 933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->master_cache = _tmp20_;
-#line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = caller;
+	self->priv->master_cache = _tmp18_;
 #line 936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_refresh_caches (self, _tmp21_);
-#line 6770 "PhotoPage.c"
+	editing_host_page_refresh_caches (self, caller);
+#line 7498 "PhotoPage.c"
 }
 
 
-static void editing_host_page_refresh_caches (EditingHostPage* self, const gchar* caller) {
-	gboolean _tmp0_;
+static void
+editing_host_page_refresh_caches (EditingHostPage* self,
+                                  const gchar* caller)
+{
 #line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 940 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (caller != NULL);
 #line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (self);
-#line 941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
-#line 6784 "PhotoPage.c"
-		const gchar* _tmp1_;
-		Photo* _tmp2_;
-		Photo* _tmp3_;
-		gchar* _tmp4_;
-		gchar* _tmp5_;
-		ViewCollection* _tmp6_;
-		ViewCollection* _tmp7_;
-		Photo* _tmp8_;
-		Photo* _tmp9_;
-#line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = caller;
+	if (editing_host_page_has_photo (self)) {
+#line 7512 "PhotoPage.c"
+		Photo* _tmp0_;
+		Photo* _tmp1_;
+		gchar* _tmp2_;
+		gchar* _tmp3_;
+		ViewCollection* _tmp4_;
+		ViewCollection* _tmp5_;
+		Photo* _tmp6_;
+		Photo* _tmp7_;
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = editing_host_page_get_photo (self);
+		_tmp0_ = editing_host_page_get_photo (self);
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp2_;
+		_tmp1_ = _tmp0_;
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
+		_tmp2_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = _tmp2_;
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_debug ("PhotoPage.vala:942: Refresh pixbuf caches (%s): prefetching neighbors " \
-"of %s", _tmp1_, _tmp5_);
+"of %s", caller, _tmp3_);
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp3_);
 #line 942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
+		_g_object_unref0 (_tmp1_);
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = _tmp4_;
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = editing_host_page_get_photo (self);
+		_tmp6_ = editing_host_page_get_photo (self);
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = _tmp8_;
+		_tmp7_ = _tmp6_;
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_prefetch_neighbors (self, _tmp7_, _tmp9_);
+		editing_host_page_prefetch_neighbors (self, _tmp5_, _tmp7_);
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp9_);
+		_g_object_unref0 (_tmp7_);
 #line 944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp7_);
-#line 6824 "PhotoPage.c"
+		_data_collection_unref0 (_tmp5_);
+#line 7549 "PhotoPage.c"
 	} else {
-		const gchar* _tmp10_;
-#line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = caller;
 #line 946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", _tmp10_);
-#line 6831 "PhotoPage.c"
+		g_debug ("PhotoPage.vala:946: Refresh pixbuf caches (%s): (no photo)", caller);
+#line 7553 "PhotoPage.c"
 	}
 }
 
 
-static gboolean editing_host_page_master_cache_filter (EditingHostPage* self, Photo* photo) {
+static gboolean
+editing_host_page_master_cache_filter (EditingHostPage* self,
+                                       Photo* photo)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
-	Photo* _tmp1_;
-	gboolean _tmp2_;
 #line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = photo;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = photo_has_transformations (_tmp1_);
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp2_) {
+	if (photo_has_transformations (photo)) {
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 6853 "PhotoPage.c"
+#line 7572 "PhotoPage.c"
 	} else {
-		Photo* _tmp3_;
-		gboolean _tmp4_;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = photo;
-#line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = photo_has_editable (_tmp3_);
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp4_;
-#line 6863 "PhotoPage.c"
+		_tmp0_ = photo_has_editable (photo);
+#line 7576 "PhotoPage.c"
 	}
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp0_;
 #line 951 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 6869 "PhotoPage.c"
+#line 7582 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* photo, GdkPixbuf* pixbuf, GError* err) {
+static void
+editing_host_page_on_pixbuf_fetched (EditingHostPage* self,
+                                     Photo* photo,
+                                     GdkPixbuf* pixbuf,
+                                     GError* err)
+{
 	Photo* _tmp0_;
 	Photo* _tmp1_;
-	Photo* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-	GdkPixbuf* _tmp5_;
+	gboolean _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -6889,174 +7604,148 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 #line 954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((pixbuf == NULL) || GDK_IS_PIXBUF (pixbuf));
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = photo;
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_get_photo (self);
-#line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp0_ = editing_host_page_get_photo (self);
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource));
+	_tmp1_ = _tmp0_;
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = !_tmp3_;
+	_tmp2_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 956 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_) {
+	if (_tmp2_) {
 #line 957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 6903 "PhotoPage.c"
+#line 7614 "PhotoPage.c"
 	}
 #line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = pixbuf;
-#line 959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp5_ != NULL) {
-#line 6909 "PhotoPage.c"
-		gboolean _tmp6_ = FALSE;
-		ZoomBuffer* _tmp7_;
+	if (pixbuf != NULL) {
+#line 7618 "PhotoPage.c"
+		gboolean _tmp3_ = FALSE;
+		ZoomBuffer* _tmp4_;
 		Dimensions max_dim = {0};
-		Photo* _tmp15_;
-		Dimensions _tmp16_ = {0};
-		EditingToolsEditingTool* _tmp17_;
-		GdkPixbuf* _tmp31_;
-		Dimensions _tmp32_;
-		Photo* _tmp33_;
-#line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = self->priv->zoom_buffer;
+		Dimensions _tmp9_ = {0};
+		EditingToolsEditingTool* _tmp10_;
+		Dimensions _tmp22_;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp7_ != NULL) {
-#line 6923 "PhotoPage.c"
-			ZoomBuffer* _tmp8_;
-			Photo* _tmp9_;
-			Photo* _tmp10_;
-			Photo* _tmp11_;
+		_tmp4_ = self->priv->zoom_buffer;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp8_ = self->priv->zoom_buffer;
+		if (_tmp4_ != NULL) {
+#line 7629 "PhotoPage.c"
+			ZoomBuffer* _tmp5_;
+			Photo* _tmp6_;
+			Photo* _tmp7_;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = zoom_buffer_get_backing_photo (_tmp8_);
+			_tmp5_ = self->priv->zoom_buffer;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp10_ = _tmp9_;
+			_tmp6_ = zoom_buffer_get_backing_photo (_tmp5_);
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp11_ = photo;
+			_tmp7_ = _tmp6_;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = _tmp10_ == _tmp11_;
+			_tmp3_ = _tmp7_ == photo;
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp10_);
-#line 6940 "PhotoPage.c"
+			_g_object_unref0 (_tmp7_);
+#line 7643 "PhotoPage.c"
 		} else {
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = FALSE;
-#line 6944 "PhotoPage.c"
+			_tmp3_ = FALSE;
+#line 7647 "PhotoPage.c"
 		}
 #line 961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp6_) {
-#line 6948 "PhotoPage.c"
-			Photo* _tmp12_;
-			GdkPixbuf* _tmp13_;
-			ZoomBuffer* _tmp14_;
-#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp12_ = photo;
-#line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp13_ = pixbuf;
+		if (_tmp3_) {
+#line 7651 "PhotoPage.c"
+			ZoomBuffer* _tmp8_;
 #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp14_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, _tmp13_);
+			_tmp8_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), photo, pixbuf);
 #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (self->priv->zoom_buffer);
 #line 962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			self->priv->zoom_buffer = _tmp14_;
-#line 6962 "PhotoPage.c"
+			self->priv->zoom_buffer = _tmp8_;
+#line 7659 "PhotoPage.c"
 		}
 #line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = photo;
-#line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp16_);
+		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp9_);
 #line 966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		max_dim = _tmp16_;
+		max_dim = _tmp9_;
 #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = self->priv->current_tool;
+		_tmp10_ = self->priv->current_tool;
 #line 967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp17_ != NULL) {
-#line 6974 "PhotoPage.c"
+		if (_tmp10_ != NULL) {
+#line 7669 "PhotoPage.c"
 			{
 				Dimensions tool_pixbuf_dim = {0};
 				GdkPixbuf* tool_pixbuf = NULL;
-				EditingToolsEditingTool* _tmp18_;
-				Scaling _tmp19_ = {0};
-				Photo* _tmp20_;
-				Dimensions _tmp21_ = {0};
-				GdkPixbuf* _tmp22_;
-				GdkPixbuf* _tmp23_;
+				EditingToolsEditingTool* _tmp11_;
+				Scaling _tmp12_ = {0};
+				Dimensions _tmp13_ = {0};
+				GdkPixbuf* _tmp14_;
+				GdkPixbuf* _tmp15_;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp18_ = self->priv->current_tool;
+				_tmp11_ = self->priv->current_tool;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp19_);
+				single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp12_);
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp20_ = photo;
+				_tmp14_ = editing_tools_editing_tool_get_display_pixbuf (_tmp11_, &_tmp12_, photo, &_tmp13_, &_inner_error_);
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp22_ = editing_tools_editing_tool_get_display_pixbuf (_tmp18_, &_tmp19_, _tmp20_, &_tmp21_, &_inner_error_);
+				tool_pixbuf_dim = _tmp13_;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				tool_pixbuf_dim = _tmp21_;
-#line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				tool_pixbuf = _tmp22_;
+				tool_pixbuf = _tmp14_;
 #line 970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 6998 "PhotoPage.c"
+#line 7690 "PhotoPage.c"
 					goto __catch256_g_error;
 				}
 #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp23_ = tool_pixbuf;
+				_tmp15_ = tool_pixbuf;
 #line 973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				if (_tmp23_ != NULL) {
-#line 7005 "PhotoPage.c"
-					GdkPixbuf* _tmp24_;
-					Dimensions _tmp25_;
+				if (_tmp15_ != NULL) {
+#line 7697 "PhotoPage.c"
+					GdkPixbuf* _tmp16_;
+					Dimensions _tmp17_;
 #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-					_tmp24_ = tool_pixbuf;
+					_tmp16_ = tool_pixbuf;
 #line 974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-					pixbuf = _tmp24_;
+					pixbuf = _tmp16_;
 #line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-					_tmp25_ = tool_pixbuf_dim;
+					_tmp17_ = tool_pixbuf_dim;
 #line 975 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-					max_dim = _tmp25_;
-#line 7016 "PhotoPage.c"
+					max_dim = _tmp17_;
+#line 7708 "PhotoPage.c"
 				}
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (tool_pixbuf);
-#line 7020 "PhotoPage.c"
+#line 7712 "PhotoPage.c"
 			}
 			goto __finally256;
 			__catch256_g_error:
 			{
 				GError* err = NULL;
-				Photo* _tmp26_;
-				gchar* _tmp27_;
-				gchar* _tmp28_;
-				GError* _tmp29_;
-				const gchar* _tmp30_;
+				gchar* _tmp18_;
+				gchar* _tmp19_;
+				GError* _tmp20_;
+				const gchar* _tmp21_;
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				err = _inner_error_;
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_inner_error_ = NULL;
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp26_ = photo;
-#line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp27_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_DATA_OBJECT, DataObject));
+				_tmp18_ = data_object_to_string (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_OBJECT, DataObject));
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp28_ = _tmp27_;
+				_tmp19_ = _tmp18_;
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp29_ = err;
+				_tmp20_ = err;
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp30_ = _tmp29_->message;
+				_tmp21_ = _tmp20_->message;
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				g_warning ("PhotoPage.vala:978: Unable to fetch tool pixbuf for %s: %s", _tmp28_, _tmp30_);
+				g_warning ("PhotoPage.vala:978: Unable to fetch tool pixbuf for %s: %s", _tmp19_, _tmp21_);
 #line 978 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_free0 (_tmp28_);
+				_g_free0 (_tmp19_);
 #line 979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				editing_host_page_set_photo_missing (self, TRUE);
 #line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_error_free0 (err);
 #line 981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7055 "PhotoPage.c"
+#line 7744 "PhotoPage.c"
 			}
 			__finally256:
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7067,68 +7756,57 @@ static void editing_host_page_on_pixbuf_fetched (EditingHostPage* self, Photo* p
 				g_clear_error (&_inner_error_);
 #line 968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return;
-#line 7066 "PhotoPage.c"
+#line 7755 "PhotoPage.c"
 			}
 		}
 #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = pixbuf;
+		_tmp22_ = max_dim;
 #line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = max_dim;
-#line 985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp31_, &_tmp32_, NULL);
+		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), pixbuf, &_tmp22_, NULL);
 #line 986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
 #line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = photo;
-#line 988 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_PHOTO, Photo), FALSE);
-#line 7081 "PhotoPage.c"
+		editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), FALSE);
+#line 7766 "PhotoPage.c"
 	} else {
-		GError* _tmp34_;
-#line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = err;
 #line 989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp34_ != NULL) {
-#line 7088 "PhotoPage.c"
-			Photo* _tmp35_;
+		if (err != NULL) {
 #line 992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_set_photo_missing (self, TRUE);
 #line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp35_ = photo;
-#line 995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_PHOTO, Photo), TRUE);
-#line 7096 "PhotoPage.c"
+			editing_host_page_notify_photo_backing_missing (self, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_PHOTO, Photo), TRUE);
+#line 7774 "PhotoPage.c"
 		}
 	}
 }
 
 
-static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCollection* controller, Photo* photo) {
+static void
+editing_host_page_prefetch_neighbors (EditingHostPage* self,
+                                      ViewCollection* controller,
+                                      Photo* photo)
+{
 	PixbufCachePixbufCacheBatch* normal_batch = NULL;
 	PixbufCachePixbufCacheBatch* _tmp0_;
 	PixbufCachePixbufCacheBatch* master_batch = NULL;
 	PixbufCachePixbufCacheBatch* _tmp1_;
 	PixbufCachePixbufCacheBatch* _tmp2_;
-	Photo* _tmp3_;
-	PixbufCachePixbufCacheBatch* _tmp4_;
-	Photo* _tmp5_;
+	PixbufCachePixbufCacheBatch* _tmp3_;
 	DataSource* next_source = NULL;
 	DataSource* prev_source = NULL;
-	ViewCollection* _tmp6_;
-	Photo* _tmp7_;
-	DataSource* _tmp8_ = NULL;
-	DataSource* _tmp9_ = NULL;
-	gboolean _tmp10_;
+	DataSource* _tmp4_ = NULL;
+	DataSource* _tmp5_ = NULL;
+	gboolean _tmp6_;
 	Photo* next = NULL;
-	DataSource* _tmp11_;
-	Photo* _tmp12_;
+	DataSource* _tmp7_;
+	Photo* _tmp8_;
 	Photo* prev = NULL;
-	DataSource* _tmp13_;
-	Photo* _tmp14_;
-	PixbufCache* _tmp39_;
-	PixbufCachePixbufCacheBatch* _tmp40_;
-	PixbufCache* _tmp41_;
-	PixbufCachePixbufCacheBatch* _tmp42_;
+	DataSource* _tmp9_;
+	Photo* _tmp10_;
+	PixbufCache* _tmp30_;
+	PixbufCachePixbufCacheBatch* _tmp31_;
+	PixbufCache* _tmp32_;
+	PixbufCachePixbufCacheBatch* _tmp33_;
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7146,31 +7824,23 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 #line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = normal_batch;
 #line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = photo;
-#line 1003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), _tmp3_);
+	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_HIGHEST), photo);
 #line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = master_batch;
+	_tmp3_ = master_batch;
 #line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = photo;
-#line 1004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), _tmp5_);
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = controller;
-#line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = photo;
+	gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOW), photo);
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = view_collection_get_immediate_neighbors (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), &_tmp8_, &_tmp9_, PHOTO_TYPENAME);
+	_tmp6_ = view_collection_get_immediate_neighbors (controller, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), &_tmp4_, &_tmp5_, PHOTO_TYPENAME);
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (next_source);
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	next_source = _tmp8_;
+	next_source = _tmp4_;
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev_source);
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	prev_source = _tmp9_;
+	prev_source = _tmp5_;
 #line 1007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp10_) {
+	if (!_tmp6_) {
 #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (prev_source);
 #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7181,157 +7851,142 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 		_g_object_unref0 (normal_batch);
 #line 1008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 7180 "PhotoPage.c"
+#line 7850 "PhotoPage.c"
 	}
 #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = next_source;
+	_tmp7_ = next_source;
 #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_PHOTO, Photo));
+	_tmp8_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO, Photo));
 #line 1010 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	next = _tmp12_;
+	next = _tmp8_;
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = prev_source;
+	_tmp9_ = prev_source;
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PHOTO, Photo));
+	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO, Photo));
 #line 1011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	prev = _tmp14_;
-#line 7194 "PhotoPage.c"
+	prev = _tmp10_;
+#line 7864 "PhotoPage.c"
 	{
 		GeeIterator* _neighbor_source_it = NULL;
-		ViewCollection* _tmp15_;
-		Photo* _tmp16_;
-		GeeSet* _tmp17_;
-		GeeSet* _tmp18_;
-		GeeIterator* _tmp19_;
-		GeeIterator* _tmp20_;
-#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = controller;
-#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = photo;
+		GeeSet* _tmp11_;
+		GeeSet* _tmp12_;
+		GeeIterator* _tmp13_;
+		GeeIterator* _tmp14_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = view_collection_get_extended_neighbors (_tmp15_, G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
+		_tmp11_ = view_collection_get_extended_neighbors (controller, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = _tmp17_;
+		_tmp12_ = _tmp11_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp13_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp19_;
+		_tmp14_ = _tmp13_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp18_);
+		_g_object_unref0 (_tmp12_);
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_neighbor_source_it = _tmp20_;
+		_neighbor_source_it = _tmp14_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7221 "PhotoPage.c"
-			GeeIterator* _tmp21_;
-			gboolean _tmp22_;
+#line 7885 "PhotoPage.c"
+			GeeIterator* _tmp15_;
 			DataSource* neighbor_source = NULL;
-			GeeIterator* _tmp23_;
-			gpointer _tmp24_;
+			GeeIterator* _tmp16_;
+			gpointer _tmp17_;
 			Photo* neighbor = NULL;
-			DataSource* _tmp25_;
-			Photo* _tmp26_;
+			DataSource* _tmp18_;
+			Photo* _tmp19_;
 			BackgroundJobJobPriority priority = 0;
-			gboolean _tmp27_ = FALSE;
-			Photo* _tmp28_;
+			gboolean _tmp20_ = FALSE;
+			Photo* _tmp21_;
+			Photo* _tmp22_;
+			PixbufCachePixbufCacheBatch* _tmp25_;
+			BackgroundJobJobPriority _tmp26_;
+			Photo* _tmp27_;
+			PixbufCachePixbufCacheBatch* _tmp28_;
 			Photo* _tmp29_;
-			gboolean _tmp30_;
-			PixbufCachePixbufCacheBatch* _tmp34_;
-			BackgroundJobJobPriority _tmp35_;
-			Photo* _tmp36_;
-			PixbufCachePixbufCacheBatch* _tmp37_;
-			Photo* _tmp38_;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp21_ = _neighbor_source_it;
+			_tmp15_ = _neighbor_source_it;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp22_ = gee_iterator_next (_tmp21_);
-#line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (!_tmp22_) {
+			if (!gee_iterator_next (_tmp15_)) {
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7248 "PhotoPage.c"
+#line 7908 "PhotoPage.c"
 			}
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp23_ = _neighbor_source_it;
+			_tmp16_ = _neighbor_source_it;
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp24_ = gee_iterator_get (_tmp23_);
+			_tmp17_ = gee_iterator_get (_tmp16_);
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			neighbor_source = (DataSource*) _tmp24_;
+			neighbor_source = (DataSource*) _tmp17_;
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp25_ = neighbor_source;
+			_tmp18_ = neighbor_source;
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp26_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_PHOTO, Photo));
+			_tmp19_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_PHOTO, Photo));
 #line 1015 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			neighbor = _tmp26_;
+			neighbor = _tmp19_;
 #line 1017 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			priority = BACKGROUND_JOB_JOB_PRIORITY_NORMAL;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp28_ = neighbor;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp29_ = next;
+			_tmp21_ = neighbor;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp30_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_SOURCE, DataSource));
+			_tmp22_ = next;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp30_) {
+			if (data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_DATA_SOURCE, DataSource))) {
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp27_ = TRUE;
-#line 7274 "PhotoPage.c"
+				_tmp20_ = TRUE;
+#line 7932 "PhotoPage.c"
 			} else {
-				Photo* _tmp31_;
-				Photo* _tmp32_;
-				gboolean _tmp33_;
-#line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp31_ = neighbor;
+				Photo* _tmp23_;
+				Photo* _tmp24_;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp32_ = prev;
+				_tmp23_ = neighbor;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp33_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_SOURCE, DataSource));
+				_tmp24_ = prev;
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp27_ = _tmp33_;
-#line 7287 "PhotoPage.c"
+				_tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_DATA_SOURCE, DataSource));
+#line 7942 "PhotoPage.c"
 			}
 #line 1018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp27_) {
+			if (_tmp20_) {
 #line 1019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				priority = BACKGROUND_JOB_JOB_PRIORITY_HIGH;
-#line 7293 "PhotoPage.c"
+#line 7948 "PhotoPage.c"
 			}
 #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp34_ = normal_batch;
+			_tmp25_ = normal_batch;
 #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp35_ = priority;
+			_tmp26_ = priority;
 #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp36_ = neighbor;
+			_tmp27_ = neighbor;
 #line 1021 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp35_), _tmp36_);
+			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) _tmp26_), _tmp27_);
 #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp37_ = master_batch;
+			_tmp28_ = master_batch;
 #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp38_ = neighbor;
+			_tmp29_ = neighbor;
 #line 1022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp38_);
+			gee_multi_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, GEE_TYPE_MULTI_MAP, GeeMultiMap), (gpointer) ((gintptr) BACKGROUND_JOB_JOB_PRIORITY_LOWEST), _tmp29_);
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor);
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (neighbor_source);
-#line 7313 "PhotoPage.c"
+#line 7968 "PhotoPage.c"
 		}
 #line 1014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_neighbor_source_it);
-#line 7317 "PhotoPage.c"
+#line 7972 "PhotoPage.c"
 	}
 #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39_ = self->priv->cache;
+	_tmp30_ = self->priv->cache;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp40_ = normal_batch;
+	_tmp31_ = normal_batch;
 #line 1025 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	pixbuf_cache_prefetch_batch (_tmp39_, _tmp40_, FALSE);
+	pixbuf_cache_prefetch_batch (_tmp30_, _tmp31_, FALSE);
 #line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_ = self->priv->master_cache;
+	_tmp32_ = self->priv->master_cache;
 #line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp42_ = master_batch;
+	_tmp33_ = master_batch;
 #line 1026 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	pixbuf_cache_prefetch_batch (_tmp41_, _tmp42_, FALSE);
+	pixbuf_cache_prefetch_batch (_tmp32_, _tmp33_, FALSE);
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (prev);
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7344,23 +7999,23 @@ static void editing_host_page_prefetch_neighbors (EditingHostPage* self, ViewCol
 	_g_object_unref0 (master_batch);
 #line 999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (normal_batch);
-#line 7343 "PhotoPage.c"
+#line 7998 "PhotoPage.c"
 }
 
 
-static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self, ViewCollection* old_controller, Photo* old_photo, ViewCollection* new_controller, Photo* new_photo) {
+static void
+editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
+                                             ViewCollection* old_controller,
+                                             Photo* old_photo,
+                                             ViewCollection* new_controller,
+                                             Photo* new_photo)
+{
 	GeeSet* old_neighbors = NULL;
-	ViewCollection* _tmp0_;
-	Photo* _tmp1_;
-	GeeSet* _tmp2_;
+	GeeSet* _tmp0_;
 	GeeSet* new_neighbors = NULL;
-	ViewCollection* _tmp3_;
-	Photo* _tmp4_;
-	GeeSet* _tmp5_;
-	gboolean _tmp23_ = FALSE;
-	GeeSet* _tmp24_;
-	Photo* _tmp25_;
-	gboolean _tmp26_;
+	GeeSet* _tmp1_;
+	gboolean _tmp15_ = FALSE;
+	GeeSet* _tmp16_;
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7372,243 +8027,212 @@ static void editing_host_page_cancel_prefetch_neighbors (EditingHostPage* self,
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
 #line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = old_controller;
+	_tmp0_ = view_collection_get_extended_neighbors (old_controller, G_TYPE_CHECK_INSTANCE_CAST (old_photo, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = old_photo;
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = view_collection_get_extended_neighbors (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_SET, GeeSet);
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = new_controller;
+	old_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, GEE_TYPE_SET, GeeSet);
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = new_photo;
+	_tmp1_ = view_collection_get_extended_neighbors (new_controller, G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
 #line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = view_collection_get_extended_neighbors (_tmp3_, G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), PHOTO_TYPENAME);
-#line 1035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_SET, GeeSet);
-#line 7386 "PhotoPage.c"
+	new_neighbors = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_SET, GeeSet);
+#line 8033 "PhotoPage.c"
 	{
 		GeeIterator* _old_neighbor_it = NULL;
-		GeeSet* _tmp6_;
-		GeeIterator* _tmp7_;
+		GeeSet* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = old_neighbors;
+		_tmp2_ = old_neighbors;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_ITERABLE, GeeIterable));
+		_tmp3_ = gee_iterable_iterator (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ITERABLE, GeeIterable));
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_old_neighbor_it = _tmp7_;
+		_old_neighbor_it = _tmp3_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 7399 "PhotoPage.c"
-			GeeIterator* _tmp8_;
-			gboolean _tmp9_;
+#line 8046 "PhotoPage.c"
+			GeeIterator* _tmp4_;
 			Photo* old_neighbor = NULL;
-			GeeIterator* _tmp10_;
-			gpointer _tmp11_;
-			gboolean _tmp12_ = FALSE;
-			GeeSet* _tmp13_;
-			Photo* _tmp14_;
-			gboolean _tmp15_;
-#line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp8_ = _old_neighbor_it;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			gboolean _tmp7_ = FALSE;
+			GeeSet* _tmp8_;
+			Photo* _tmp9_;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = gee_iterator_next (_tmp8_);
+			_tmp4_ = _old_neighbor_it;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (!_tmp9_) {
+			if (!gee_iterator_next (_tmp4_)) {
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 7417 "PhotoPage.c"
+#line 8060 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp10_ = _old_neighbor_it;
+			_tmp5_ = _old_neighbor_it;
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp11_ = gee_iterator_get (_tmp10_);
+			_tmp6_ = gee_iterator_get (_tmp5_);
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			old_neighbor = (Photo*) _tmp11_;
-#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp13_ = new_neighbors;
+			old_neighbor = (Photo*) _tmp6_;
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp14_ = old_neighbor;
+			_tmp8_ = new_neighbors;
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp15_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, GEE_TYPE_COLLECTION, GeeCollection), _tmp14_);
+			_tmp9_ = old_neighbor;
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (!_tmp15_) {
-#line 7433 "PhotoPage.c"
-				Photo* _tmp16_;
-				Photo* _tmp17_;
-				gboolean _tmp18_;
+			if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection), _tmp9_)) {
+#line 8074 "PhotoPage.c"
+				Photo* _tmp10_;
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp16_ = new_photo;
+				_tmp10_ = old_neighbor;
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp17_ = old_neighbor;
-#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
-#line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp12_ = !_tmp18_;
-#line 7445 "PhotoPage.c"
+				_tmp7_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
+#line 8080 "PhotoPage.c"
 			} else {
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp12_ = FALSE;
-#line 7449 "PhotoPage.c"
+				_tmp7_ = FALSE;
+#line 8084 "PhotoPage.c"
 			}
 #line 1041 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp12_) {
-#line 7453 "PhotoPage.c"
-				PixbufCache* _tmp19_;
-				Photo* _tmp20_;
-				PixbufCache* _tmp21_;
-				Photo* _tmp22_;
+			if (_tmp7_) {
+#line 8088 "PhotoPage.c"
+				PixbufCache* _tmp11_;
+				Photo* _tmp12_;
+				PixbufCache* _tmp13_;
+				Photo* _tmp14_;
 #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp19_ = self->priv->cache;
+				_tmp11_ = self->priv->cache;
 #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp20_ = old_neighbor;
+				_tmp12_ = old_neighbor;
 #line 1042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				pixbuf_cache_drop (_tmp19_, _tmp20_);
+				pixbuf_cache_drop (_tmp11_, _tmp12_);
 #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp21_ = self->priv->master_cache;
+				_tmp13_ = self->priv->master_cache;
 #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp22_ = old_neighbor;
+				_tmp14_ = old_neighbor;
 #line 1043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				pixbuf_cache_drop (_tmp21_, _tmp22_);
-#line 7470 "PhotoPage.c"
+				pixbuf_cache_drop (_tmp13_, _tmp14_);
+#line 8105 "PhotoPage.c"
 			}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (old_neighbor);
-#line 7474 "PhotoPage.c"
+#line 8109 "PhotoPage.c"
 		}
 #line 1038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_old_neighbor_it);
-#line 7478 "PhotoPage.c"
+#line 8113 "PhotoPage.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = new_neighbors;
+	_tmp16_ = new_neighbors;
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = old_photo;
+	if (!gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GEE_TYPE_COLLECTION, GeeCollection), old_photo)) {
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = gee_collection_contains (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_COLLECTION, GeeCollection), _tmp25_);
-#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp26_) {
-#line 7488 "PhotoPage.c"
-		Photo* _tmp27_;
-		Photo* _tmp28_;
-		gboolean _tmp29_;
-#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = new_photo;
-#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = old_photo;
-#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, TYPE_DATA_SOURCE, DataSource));
-#line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = !_tmp29_;
-#line 7500 "PhotoPage.c"
+		_tmp15_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (old_photo, TYPE_DATA_SOURCE, DataSource));
+#line 8121 "PhotoPage.c"
 	} else {
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = FALSE;
-#line 7504 "PhotoPage.c"
+		_tmp15_ = FALSE;
+#line 8125 "PhotoPage.c"
 	}
 #line 1048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp23_) {
-#line 7508 "PhotoPage.c"
-		PixbufCache* _tmp30_;
-		Photo* _tmp31_;
-		PixbufCache* _tmp32_;
-		Photo* _tmp33_;
-#line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = self->priv->cache;
+	if (_tmp15_) {
+#line 8129 "PhotoPage.c"
+		PixbufCache* _tmp17_;
+		PixbufCache* _tmp18_;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = old_photo;
+		_tmp17_ = self->priv->cache;
 #line 1049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		pixbuf_cache_drop (_tmp30_, _tmp31_);
+		pixbuf_cache_drop (_tmp17_, old_photo);
 #line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = self->priv->master_cache;
+		_tmp18_ = self->priv->master_cache;
 #line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = old_photo;
-#line 1050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		pixbuf_cache_drop (_tmp32_, _tmp33_);
-#line 7525 "PhotoPage.c"
+		pixbuf_cache_drop (_tmp18_, old_photo);
+#line 8140 "PhotoPage.c"
 	}
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (new_neighbors);
 #line 1031 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_neighbors);
-#line 7531 "PhotoPage.c"
+#line 8146 "PhotoPage.c"
 }
 
 
-static DataView* editing_host_page_real_create_photo_view (EditingHostPage* self, DataSource* source) {
+static DataView*
+editing_host_page_real_create_photo_view (EditingHostPage* self,
+                                          DataSource* source)
+{
 	DataView* result = NULL;
-	DataSource* _tmp0_;
-	PhotoView* _tmp1_;
+	PhotoView* _tmp0_;
 #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), NULL);
 #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = source;
+	_tmp0_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_PHOTO_SOURCE, PhotoSource));
 #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = photo_view_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PHOTO_SOURCE, PhotoSource));
-#line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_VIEW, DataView);
+	result = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_DATA_VIEW, DataView);
 #line 1055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7549 "PhotoPage.c"
+#line 8164 "PhotoPage.c"
 }
 
 
-DataView* editing_host_page_create_photo_view (EditingHostPage* self, DataSource* source) {
+DataView*
+editing_host_page_create_photo_view (EditingHostPage* self,
+                                     DataSource* source)
+{
 #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1054 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->create_photo_view (self, source);
-#line 7558 "PhotoPage.c"
+#line 8176 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_is_photo (EditingHostPage* self, DataSource* source) {
+static gboolean
+editing_host_page_is_photo (EditingHostPage* self,
+                            DataSource* source)
+{
 	gboolean result = FALSE;
-	DataSource* _tmp0_;
 #line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_SOURCE (source), FALSE);
 #line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = source;
-#line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_PHOTO_SOURCE);
+	result = G_TYPE_CHECK_INSTANCE_TYPE (source, TYPE_PHOTO_SOURCE);
 #line 1059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7575 "PhotoPage.c"
+#line 8193 "PhotoPage.c"
 }
 
 
-static DataView* _editing_host_page_create_photo_view_create_view (DataSource* source, gpointer self) {
+static DataView*
+_editing_host_page_create_photo_view_create_view (DataSource* source,
+                                                  gpointer self)
+{
 	DataView* result;
 	result = editing_host_page_create_photo_view ((EditingHostPage*) self, source);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7584 "PhotoPage.c"
+#line 8205 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_is_photo_create_view_predicate (DataSource* source, gpointer self) {
+static gboolean
+_editing_host_page_is_photo_create_view_predicate (DataSource* source,
+                                                   gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_is_photo ((EditingHostPage*) self, source);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 7593 "PhotoPage.c"
+#line 8217 "PhotoPage.c"
 }
 
 
-void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) {
-	ViewCollection* _tmp0_;
-	Photo* _tmp1_;
-	DataView* _tmp2_;
-	DataView* _tmp3_;
-	gboolean _tmp4_ = FALSE;
-	ViewCollection* _tmp5_;
-	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	gboolean _tmp8_;
-	Photo* _tmp18_;
+void
+editing_host_page_display_copy_of (EditingHostPage* self,
+                                   ViewCollection* controller,
+                                   Photo* starting_photo)
+{
+	DataView* _tmp0_;
+	DataView* _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	gboolean _tmp5_;
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7616,101 +8240,84 @@ void editing_host_page_display_copy_of (EditingHostPage* self, ViewCollection* c
 #line 1062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
 #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = controller;
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = starting_photo;
+	_tmp0_ = view_collection_get_view_for_source (controller, G_TYPE_CHECK_INSTANCE_CAST (starting_photo, TYPE_DATA_SOURCE, DataSource));
 #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
+	_vala_assert (_tmp1_ != NULL, "controller.get_view_for_source(starting_photo) != null");
 #line 1063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = controller;
-#line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_g_object_unref0 (_tmp1_);
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp5_ != _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp7_);
+	_tmp5_ = controller != _tmp4_;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp8_) {
-#line 7638 "PhotoPage.c"
-		ViewCollection* _tmp9_;
-		ViewCollection* _tmp10_;
+	_data_collection_unref0 (_tmp4_);
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = controller;
+	if (_tmp5_) {
+#line 8256 "PhotoPage.c"
+		ViewCollection* _tmp6_;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = self->priv->parent_view;
+		_tmp6_ = self->priv->parent_view;
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7647 "PhotoPage.c"
+		_tmp2_ = controller != _tmp6_;
+#line 8262 "PhotoPage.c"
 	} else {
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = FALSE;
-#line 7651 "PhotoPage.c"
+		_tmp2_ = FALSE;
+#line 8266 "PhotoPage.c"
 	}
 #line 1065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_) {
-#line 7655 "PhotoPage.c"
+	if (_tmp2_) {
+#line 8270 "PhotoPage.c"
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
 		ViewCollection* _tmp11_;
-		ViewCollection* _tmp12_;
-		ViewCollection* _tmp13_;
-		ViewCollection* _tmp14_;
-		ViewCollection* _tmp15_;
-		ViewCollection* _tmp16_;
-		ViewCollection* _tmp17_;
 #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp8_ = _tmp7_;
 #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
+		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp12_);
+		_data_collection_unref0 (_tmp8_);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = controller;
+		_tmp10_ = _tmp9_;
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_collection_copy_into (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
+		view_collection_copy_into (_tmp10_, controller, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
 #line 1067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp14_);
-#line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = controller;
+		_data_collection_unref0 (_tmp10_);
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = _data_collection_ref0 (_tmp16_);
+		_tmp11_ = _data_collection_ref0 (controller);
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->parent_view = _tmp17_;
-#line 7689 "PhotoPage.c"
+		self->priv->parent_view = _tmp11_;
+#line 8298 "PhotoPage.c"
 	}
 #line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = starting_photo;
-#line 1071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_replace_photo (self, _tmp18_);
-#line 7695 "PhotoPage.c"
+	editing_host_page_replace_photo (self, starting_photo);
+#line 8302 "PhotoPage.c"
 }
 
 
-void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection* controller, Photo* starting_photo) {
-	ViewCollection* _tmp0_;
-	Photo* _tmp1_;
-	DataView* _tmp2_;
-	DataView* _tmp3_;
-	gboolean _tmp4_ = FALSE;
-	ViewCollection* _tmp5_;
-	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	gboolean _tmp8_;
-	Photo* _tmp18_;
+void
+editing_host_page_display_mirror_of (EditingHostPage* self,
+                                     ViewCollection* controller,
+                                     Photo* starting_photo)
+{
+	DataView* _tmp0_;
+	DataView* _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	gboolean _tmp5_;
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -7718,419 +8325,401 @@ void editing_host_page_display_mirror_of (EditingHostPage* self, ViewCollection*
 #line 1074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (starting_photo));
 #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = controller;
+	_tmp0_ = view_collection_get_view_for_source (controller, G_TYPE_CHECK_INSTANCE_CAST (starting_photo, TYPE_DATA_SOURCE, DataSource));
 #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = starting_photo;
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = view_collection_get_view_for_source (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_SOURCE, DataSource));
-#line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp3_ != NULL, "controller.get_view_for_source(starting_photo) != null");
+	_vala_assert (_tmp1_ != NULL, "controller.get_view_for_source(starting_photo) != null");
 #line 1075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = controller;
+	_g_object_unref0 (_tmp1_);
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = _tmp3_;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp5_ != _tmp7_;
+	_tmp5_ = controller != _tmp4_;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp7_);
+	_data_collection_unref0 (_tmp4_);
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp8_) {
-#line 7740 "PhotoPage.c"
-		ViewCollection* _tmp9_;
-		ViewCollection* _tmp10_;
-#line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = controller;
+	if (_tmp5_) {
+#line 8341 "PhotoPage.c"
+		ViewCollection* _tmp6_;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = self->priv->parent_view;
+		_tmp6_ = self->priv->parent_view;
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp9_ != _tmp10_;
-#line 7749 "PhotoPage.c"
+		_tmp2_ = controller != _tmp6_;
+#line 8347 "PhotoPage.c"
 	} else {
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = FALSE;
-#line 7753 "PhotoPage.c"
+		_tmp2_ = FALSE;
+#line 8351 "PhotoPage.c"
 	}
 #line 1077 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_) {
-#line 7757 "PhotoPage.c"
+	if (_tmp2_) {
+#line 8355 "PhotoPage.c"
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		ViewCollection* _tmp9_;
+		ViewCollection* _tmp10_;
 		ViewCollection* _tmp11_;
-		ViewCollection* _tmp12_;
-		ViewCollection* _tmp13_;
-		ViewCollection* _tmp14_;
-		ViewCollection* _tmp15_;
-		ViewCollection* _tmp16_;
-		ViewCollection* _tmp17_;
 #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp8_ = _tmp7_;
 #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_COLLECTION, DataCollection));
+		data_collection_clear (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection));
 #line 1078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp12_);
-#line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_data_collection_unref0 (_tmp8_);
 #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = controller;
+		_tmp10_ = _tmp9_;
 #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		view_collection_mirror (_tmp14_, _tmp15_, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
+		view_collection_mirror (_tmp10_, controller, _editing_host_page_create_photo_view_create_view, self, _editing_host_page_is_photo_create_view_predicate, self);
 #line 1079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp14_);
-#line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = controller;
+		_data_collection_unref0 (_tmp10_);
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = _data_collection_ref0 (_tmp16_);
+		_tmp11_ = _data_collection_ref0 (controller);
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_data_collection_unref0 (self->priv->parent_view);
 #line 1080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->parent_view = _tmp17_;
-#line 7791 "PhotoPage.c"
+		self->priv->parent_view = _tmp11_;
+#line 8383 "PhotoPage.c"
 	}
 #line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = starting_photo;
-#line 1083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_replace_photo (self, _tmp18_);
-#line 7797 "PhotoPage.c"
+	editing_host_page_replace_photo (self, starting_photo);
+#line 8387 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_update_ui (EditingHostPage* self, gboolean missing) {
+static void
+editing_host_page_real_update_ui (EditingHostPage* self,
+                                  gboolean missing)
+{
 	gboolean sensitivity = FALSE;
-	gboolean _tmp0_;
-	GtkToolButton* _tmp1_;
+	GtkToolButton* _tmp0_;
+	GtkToggleToolButton* _tmp1_;
 	GtkToggleToolButton* _tmp2_;
 	GtkToggleToolButton* _tmp3_;
 	GtkToggleToolButton* _tmp4_;
-	GtkToggleToolButton* _tmp5_;
-	GtkToolButton* _tmp6_;
-	GtkScale* _tmp7_;
-	Dimensions _tmp8_ = {0};
-#line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = missing;
+	GtkToolButton* _tmp5_;
+	GtkScale* _tmp6_;
+	Dimensions _tmp7_ = {0};
 #line 1087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	sensitivity = !_tmp0_;
+	sensitivity = !missing;
 #line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = self->priv->rotate_button;
+	_tmp0_ = self->priv->rotate_button;
 #line 1089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = self->priv->crop_button;
+	_tmp1_ = self->priv->crop_button;
 #line 1090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = self->priv->straighten_button;
+	_tmp2_ = self->priv->straighten_button;
 #line 1091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = self->priv->redeye_button;
+	_tmp3_ = self->priv->redeye_button;
 #line 1092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = self->priv->adjust_button;
+	_tmp4_ = self->priv->adjust_button;
 #line 1093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = self->priv->enhance_button;
+	_tmp5_ = self->priv->enhance_button;
 #line 1094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = self->priv->zoom_slider;
+	_tmp6_ = self->priv->zoom_slider;
 #line 1095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), sensitivity);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), sensitivity);
 #line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dimensions_init (&_tmp8_, 0, 0);
+	dimensions_init (&_tmp7_, 0, 0);
 #line 1097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp8_, FALSE);
-#line 7848 "PhotoPage.c"
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp7_, FALSE);
+#line 8438 "PhotoPage.c"
 }
 
 
-void editing_host_page_update_ui (EditingHostPage* self, gboolean missing) {
+void
+editing_host_page_update_ui (EditingHostPage* self,
+                             gboolean missing)
+{
 #line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->update_ui (self, missing);
-#line 7857 "PhotoPage.c"
+#line 8450 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
+static void
+editing_host_page_real_notify_photo_backing_missing (EditingHostPage* self,
+                                                     Photo* photo,
+                                                     gboolean missing)
+{
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
-#line 7864 "PhotoPage.c"
+#line 8461 "PhotoPage.c"
 }
 
 
-void editing_host_page_notify_photo_backing_missing (EditingHostPage* self, Photo* photo, gboolean missing) {
+void
+editing_host_page_notify_photo_backing_missing (EditingHostPage* self,
+                                                Photo* photo,
+                                                gboolean missing)
+{
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_HOST_PAGE_GET_CLASS (self)->notify_photo_backing_missing (self, photo, missing);
-#line 7873 "PhotoPage.c"
+#line 8474 "PhotoPage.c"
 }
 
 
-static void editing_host_page_draw_message (EditingHostPage* self, const gchar* message) {
+static void
+editing_host_page_draw_message (EditingHostPage* self,
+                                const gchar* message)
+{
 	PangoLayout* pango_layout = NULL;
-	const gchar* _tmp0_;
-	PangoLayout* _tmp1_;
+	PangoLayout* _tmp0_;
 	gint text_width = 0;
 	gint text_height = 0;
-	PangoLayout* _tmp2_;
+	PangoLayout* _tmp1_;
+	gint _tmp2_ = 0;
 	gint _tmp3_ = 0;
-	gint _tmp4_ = 0;
 	GtkAllocation allocation = {0};
-	GtkAllocation _tmp5_ = {0};
+	GtkAllocation _tmp4_ = {0};
 	gint x = 0;
-	GtkAllocation _tmp6_;
+	GtkAllocation _tmp5_;
+	gint _tmp6_;
 	gint _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_ = 0;
-	gint _tmp10_;
+	gint _tmp8_ = 0;
+	gint _tmp9_;
 	gint y = 0;
-	GtkAllocation _tmp12_;
+	GtkAllocation _tmp11_;
+	gint _tmp12_;
 	gint _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_ = 0;
-	gint _tmp16_;
-	PangoLayout* _tmp18_;
+	gint _tmp14_ = 0;
+	gint _tmp15_;
+	PangoLayout* _tmp17_;
+	gint _tmp18_;
 	gint _tmp19_;
-	gint _tmp20_;
 #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (message != NULL);
 #line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = message;
+	_tmp0_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), message);
 #line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = gtk_widget_create_pango_layout (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 1106 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	pango_layout = _tmp1_;
+	pango_layout = _tmp0_;
 #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = pango_layout;
+	_tmp1_ = pango_layout;
 #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	pango_layout_get_pixel_size (_tmp2_, &_tmp3_, &_tmp4_);
+	pango_layout_get_pixel_size (_tmp1_, &_tmp2_, &_tmp3_);
 #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	text_width = _tmp3_;
+	text_width = _tmp2_;
 #line 1108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	text_height = _tmp4_;
+	text_height = _tmp3_;
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp5_);
+	gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), &_tmp4_);
 #line 1111 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	allocation = _tmp5_;
+	allocation = _tmp4_;
 #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = allocation;
+	_tmp5_ = allocation;
 #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_.width;
+	_tmp6_ = _tmp5_.width;
 #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = text_width;
+	_tmp7_ = text_width;
 #line 1113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	x = _tmp7_ - _tmp8_;
+	x = _tmp6_ - _tmp7_;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = x;
+	_tmp9_ = x;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp10_ > 0) {
-#line 7937 "PhotoPage.c"
-		gint _tmp11_;
+	if (_tmp9_ > 0) {
+#line 8538 "PhotoPage.c"
+		gint _tmp10_;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = x;
+		_tmp10_ = x;
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = _tmp11_ / 2;
-#line 7943 "PhotoPage.c"
+		_tmp8_ = _tmp10_ / 2;
+#line 8544 "PhotoPage.c"
 	} else {
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = 0;
-#line 7947 "PhotoPage.c"
+		_tmp8_ = 0;
+#line 8548 "PhotoPage.c"
 	}
 #line 1114 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	x = _tmp9_;
+	x = _tmp8_;
 #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = allocation;
+	_tmp11_ = allocation;
 #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = _tmp12_.height;
+	_tmp12_ = _tmp11_.height;
 #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = text_height;
+	_tmp13_ = text_height;
 #line 1116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = _tmp13_ - _tmp14_;
+	y = _tmp12_ - _tmp13_;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = y;
+	_tmp15_ = y;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp16_ > 0) {
-#line 7963 "PhotoPage.c"
-		gint _tmp17_;
+	if (_tmp15_ > 0) {
+#line 8564 "PhotoPage.c"
+		gint _tmp16_;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = y;
+		_tmp16_ = y;
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = _tmp17_ / 2;
-#line 7969 "PhotoPage.c"
+		_tmp14_ = _tmp16_ / 2;
+#line 8570 "PhotoPage.c"
 	} else {
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = 0;
-#line 7973 "PhotoPage.c"
+		_tmp14_ = 0;
+#line 8574 "PhotoPage.c"
 	}
 #line 1117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = _tmp15_;
+	y = _tmp14_;
 #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = pango_layout;
+	_tmp17_ = pango_layout;
 #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = x;
+	_tmp18_ = x;
 #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = y;
+	_tmp19_ = y;
 #line 1119 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp18_, _tmp19_, _tmp20_);
+	single_photo_page_paint_text (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp17_, _tmp18_, _tmp19_);
 #line 1104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pango_layout);
-#line 7987 "PhotoPage.c"
+#line 8588 "PhotoPage.c"
 }
 
 
-void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missing) {
+void
+editing_host_page_set_photo_missing (EditingHostPage* self,
+                                     gboolean missing)
+{
 	gboolean _tmp0_;
-	gboolean _tmp1_;
-	gboolean _tmp2_;
 	Photo* photo = NULL;
-	Photo* _tmp3_;
-	Photo* _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	gboolean _tmp3_;
 	GError * _inner_error_ = NULL;
 #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->photo_missing;
 #line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = missing;
-#line 1124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_ == _tmp1_) {
+	if (_tmp0_ == missing) {
 #line 1125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8011 "PhotoPage.c"
+#line 8610 "PhotoPage.c"
 	}
 #line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = missing;
-#line 1127 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->photo_missing = _tmp2_;
+	self->priv->photo_missing = missing;
 #line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_get_photo (self);
+	_tmp1_ = editing_host_page_get_photo (self);
 #line 1129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo = _tmp3_;
+	photo = _tmp1_;
 #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = photo;
+	_tmp2_ = photo;
 #line 1130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_ == NULL) {
+	if (_tmp2_ == NULL) {
 #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
 #line 1131 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8029 "PhotoPage.c"
+#line 8626 "PhotoPage.c"
 	}
 #line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = missing;
-#line 1133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_update_ui (self, _tmp5_);
+	editing_host_page_update_ui (self, missing);
 #line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = self->priv->photo_missing;
+	_tmp3_ = self->priv->photo_missing;
 #line 1135 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp6_) {
-#line 8039 "PhotoPage.c"
+	if (_tmp3_) {
+#line 8634 "PhotoPage.c"
 		{
 			GdkPixbuf* pixbuf = NULL;
-			Photo* _tmp7_;
-			Scaling _tmp8_ = {0};
+			Photo* _tmp4_;
+			Scaling _tmp5_ = {0};
+			GdkPixbuf* _tmp6_;
+			GdkPixbuf* _tmp7_;
+			GdkPixbuf* _tmp8_;
 			GdkPixbuf* _tmp9_;
 			GdkPixbuf* _tmp10_;
 			GdkPixbuf* _tmp11_;
-			gint _tmp12_;
-			GdkPixbuf* _tmp13_;
-			gint _tmp14_;
-			GdkPixbuf* _tmp15_;
-			GdkPixbuf* _tmp16_;
-			Photo* _tmp17_;
-			Dimensions _tmp18_ = {0};
+			Photo* _tmp12_;
+			Dimensions _tmp13_ = {0};
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp7_ = photo;
+			_tmp4_ = photo;
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
+			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp8_, &_inner_error_);
+			_tmp6_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp5_, &_inner_error_);
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			pixbuf = _tmp9_;
+			pixbuf = _tmp6_;
 #line 1137 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8064 "PhotoPage.c"
+#line 8657 "PhotoPage.c"
 				goto __catch257_g_error;
 			}
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp10_ = pixbuf;
+			_tmp7_ = pixbuf;
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp11_ = pixbuf;
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp12_ = gdk_pixbuf_get_width (_tmp11_);
-#line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp13_ = pixbuf;
+			_tmp8_ = pixbuf;
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp14_ = gdk_pixbuf_get_height (_tmp13_);
+			_tmp9_ = pixbuf;
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp15_ = gdk_pixbuf_composite_color_simple (_tmp10_, _tmp12_, _tmp14_, GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0);
+			_tmp10_ = gdk_pixbuf_composite_color_simple (_tmp7_, gdk_pixbuf_get_width (_tmp8_), gdk_pixbuf_get_height (_tmp9_), GDK_INTERP_NEAREST, 100, 2, (guint32) 0, (guint32) 0);
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
 #line 1139 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			pixbuf = _tmp15_;
+			pixbuf = _tmp10_;
 #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp16_ = pixbuf;
+			_tmp11_ = pixbuf;
 #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp17_ = photo;
+			_tmp12_ = photo;
 #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp18_);
+			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp13_);
 #line 1142 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp16_, &_tmp18_, NULL);
+			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp11_, &_tmp13_, NULL);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
-#line 8093 "PhotoPage.c"
+#line 8682 "PhotoPage.c"
 		}
 		goto __finally257;
 		__catch257_g_error:
 		{
 			GError* err = NULL;
-			GdkPixbuf* _tmp19_;
-			GdkPixbuf* _tmp20_;
-			Photo* _tmp21_;
-			Dimensions _tmp22_ = {0};
-			GError* _tmp23_;
-			const gchar* _tmp24_;
+			GdkPixbuf* _tmp14_;
+			GdkPixbuf* _tmp15_;
+			Photo* _tmp16_;
+			Dimensions _tmp17_ = {0};
+			GError* _tmp18_;
+			const gchar* _tmp19_;
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_inner_error_ = NULL;
 #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp19_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1);
+			_tmp14_ = gdk_pixbuf_new (GDK_COLORSPACE_RGB, FALSE, 8, 1, 1);
 #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp20_ = _tmp19_;
+			_tmp15_ = _tmp14_;
 #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp21_ = photo;
+			_tmp16_ = photo;
 #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp22_);
+			media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp17_);
 #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp20_, &_tmp22_, NULL);
+			single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp15_, &_tmp17_, NULL);
 #line 1144 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp20_);
+			_g_object_unref0 (_tmp15_);
 #line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp23_ = err;
+			_tmp18_ = err;
 #line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp24_ = _tmp23_->message;
+			_tmp19_ = _tmp18_->message;
 #line 1145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1145: %s", _tmp24_);
+			g_warning ("PhotoPage.vala:1145: %s", _tmp19_);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8129 "PhotoPage.c"
+#line 8718 "PhotoPage.c"
 		}
 		__finally257:
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8143,16 +8732,18 @@ void editing_host_page_set_photo_missing (EditingHostPage* self, gboolean missin
 			g_clear_error (&_inner_error_);
 #line 1136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8142 "PhotoPage.c"
+#line 8731 "PhotoPage.c"
 		}
 	}
 #line 1123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 8147 "PhotoPage.c"
+#line 8736 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
+gboolean
+editing_host_page_get_photo_missing (EditingHostPage* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 1150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8163,11 +8754,15 @@ gboolean editing_host_page_get_photo_missing (EditingHostPage* self) {
 	result = _tmp0_;
 #line 1151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8162 "PhotoPage.c"
+#line 8753 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
+static gboolean
+editing_host_page_real_confirm_replace_photo (EditingHostPage* self,
+                                              Photo* old_photo,
+                                              Photo* new_photo)
+{
 	gboolean result = FALSE;
 #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail ((old_photo == NULL) || IS_PHOTO (old_photo), FALSE);
@@ -8177,27 +8772,33 @@ static gboolean editing_host_page_real_confirm_replace_photo (EditingHostPage* s
 	result = TRUE;
 #line 1155 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8176 "PhotoPage.c"
+#line 8771 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_confirm_replace_photo (EditingHostPage* self, Photo* old_photo, Photo* new_photo) {
+gboolean
+editing_host_page_confirm_replace_photo (EditingHostPage* self,
+                                         Photo* old_photo,
+                                         Photo* new_photo)
+{
 #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1154 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->confirm_replace_photo (self, old_photo, new_photo);
-#line 8185 "PhotoPage.c"
+#line 8784 "PhotoPage.c"
 }
 
 
-static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Photo* new_photo) {
+static GdkPixbuf*
+editing_host_page_get_zoom_pixbuf (EditingHostPage* self,
+                                   Photo* new_photo)
+{
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* pixbuf = NULL;
 	PixbufCache* _tmp0_;
-	Photo* _tmp1_;
+	GdkPixbuf* _tmp1_;
 	GdkPixbuf* _tmp2_;
-	GdkPixbuf* _tmp3_;
-	GdkPixbuf* _tmp11_;
+	GdkPixbuf* _tmp9_;
 	GError * _inner_error_ = NULL;
 #line 1158 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
@@ -8206,66 +8807,61 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->cache;
 #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = new_photo;
+	_tmp1_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, new_photo);
 #line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = pixbuf_cache_get_ready_pixbuf (_tmp0_, _tmp1_);
-#line 1159 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	pixbuf = _tmp2_;
+	pixbuf = _tmp1_;
 #line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = pixbuf;
+	_tmp2_ = pixbuf;
 #line 1160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_ == NULL) {
-#line 8214 "PhotoPage.c"
+	if (_tmp2_ == NULL) {
+#line 8813 "PhotoPage.c"
 		{
-			GdkPixbuf* _tmp4_ = NULL;
-			Photo* _tmp5_;
-			Scaling _tmp6_ = {0};
-			GdkPixbuf* _tmp7_;
-			GdkPixbuf* _tmp8_;
-#line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp5_ = new_photo;
+			GdkPixbuf* _tmp3_ = NULL;
+			Scaling _tmp4_ = {0};
+			GdkPixbuf* _tmp5_;
+			GdkPixbuf* _tmp6_;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
+			single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp7_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource), &_tmp6_, &_inner_error_);
+			_tmp5_ = media_source_get_preview_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_MEDIA_SOURCE, MediaSource), &_tmp4_, &_inner_error_);
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp4_ = _tmp7_;
+			_tmp3_ = _tmp5_;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8231 "PhotoPage.c"
+#line 8827 "PhotoPage.c"
 				goto __catch258_g_error;
 			}
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp8_ = _tmp4_;
+			_tmp6_ = _tmp3_;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp4_ = NULL;
+			_tmp3_ = NULL;
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (pixbuf);
 #line 1162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			pixbuf = _tmp8_;
+			pixbuf = _tmp6_;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp4_);
-#line 8244 "PhotoPage.c"
+			_g_object_unref0 (_tmp3_);
+#line 8840 "PhotoPage.c"
 		}
 		goto __finally258;
 		__catch258_g_error:
 		{
 			GError* err = NULL;
-			GError* _tmp9_;
-			const gchar* _tmp10_;
+			GError* _tmp7_;
+			const gchar* _tmp8_;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			err = _inner_error_;
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_inner_error_ = NULL;
 #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = err;
+			_tmp7_ = err;
 #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp10_ = _tmp9_->message;
+			_tmp8_ = _tmp7_->message;
 #line 1164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			g_warning ("PhotoPage.vala:1164: %s", _tmp10_);
+			g_warning ("PhotoPage.vala:1164: %s", _tmp8_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_error_free0 (err);
-#line 8264 "PhotoPage.c"
+#line 8860 "PhotoPage.c"
 		}
 		__finally258:
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8278,311 +8874,268 @@ static GdkPixbuf* editing_host_page_get_zoom_pixbuf (EditingHostPage* self, Phot
 			g_clear_error (&_inner_error_);
 #line 1161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return NULL;
-#line 8277 "PhotoPage.c"
+#line 8873 "PhotoPage.c"
 		}
 	}
 #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = pixbuf;
+	_tmp9_ = pixbuf;
 #line 1167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp11_ == NULL) {
-#line 8284 "PhotoPage.c"
+	if (_tmp9_ == NULL) {
+#line 8880 "PhotoPage.c"
+		GdkPixbuf* _tmp10_;
+		Scaling _tmp11_ = {0};
 		GdkPixbuf* _tmp12_;
-		Scaling _tmp13_ = {0};
+		GdkPixbuf* _tmp13_;
 		GdkPixbuf* _tmp14_;
-		GdkPixbuf* _tmp15_;
-		GdkPixbuf* _tmp16_;
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = get_placeholder_pixbuf ();
+		_tmp10_ = get_placeholder_pixbuf ();
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
 #line 1168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		pixbuf = _tmp12_;
+		pixbuf = _tmp10_;
 #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_);
+		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
 #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = pixbuf;
+		_tmp12_ = pixbuf;
 #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = scaling_perform_on_pixbuf (&_tmp13_, _tmp14_, GDK_INTERP_NEAREST, TRUE);
+		_tmp13_ = scaling_perform_on_pixbuf (&_tmp11_, _tmp12_, GDK_INTERP_NEAREST, TRUE);
 #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp14_ = _tmp13_;
 #line 1169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp16_);
-#line 8306 "PhotoPage.c"
+		_g_object_unref0 (_tmp14_);
+#line 8902 "PhotoPage.c"
 	}
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = pixbuf;
 #line 1171 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 8312 "PhotoPage.c"
+#line 8908 "PhotoPage.c"
 }
 
 
-static void editing_host_page_replace_photo (EditingHostPage* self, Photo* new_photo) {
+static void
+editing_host_page_replace_photo (EditingHostPage* self,
+                                 Photo* new_photo)
+{
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	Photo* _tmp2_;
 	Photo* _tmp3_;
-	Photo* _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
-	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_ = FALSE;
-	gboolean _tmp16_;
-	Dimensions _tmp26_ = {0};
+	gboolean _tmp4_;
+	gboolean _tmp10_ = FALSE;
+	gboolean _tmp11_ = FALSE;
+	Dimensions _tmp17_ = {0};
 	Photo* old_photo = NULL;
-	Photo* _tmp27_;
-	Photo* _tmp28_;
-	Photo* _tmp29_;
-	gchar* _tmp30_;
-	gchar* _tmp31_;
-	Photo* _tmp32_;
-	GFile* _tmp33_;
-	GFile* _tmp34_;
-	gboolean _tmp35_;
-	Photo* _tmp36_;
-	Photo* _tmp43_;
-	Photo* _tmp44_;
-	GdkPixbuf* _tmp45_;
-	GdkPixbuf* _tmp46_;
-	ZoomBuffer* _tmp47_;
+	Photo* _tmp18_;
+	gchar* _tmp19_;
+	gchar* _tmp20_;
+	GFile* _tmp21_;
+	GFile* _tmp22_;
+	Photo* _tmp23_;
+	GdkPixbuf* _tmp29_;
+	GdkPixbuf* _tmp30_;
+	ZoomBuffer* _tmp31_;
 #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (new_photo));
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = new_photo;
-#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_get_photo (self);
-#line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = editing_host_page_get_photo (self);
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
+	_tmp3_ = _tmp2_;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_SOURCE, DataSource));
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp6_) {
-#line 8362 "PhotoPage.c"
-		gboolean _tmp7_;
+	if (_tmp4_) {
+#line 8948 "PhotoPage.c"
+		gboolean _tmp5_;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = self->priv->pixbuf_dirty;
+		_tmp5_ = self->priv->pixbuf_dirty;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = !_tmp7_;
-#line 8368 "PhotoPage.c"
+		_tmp1_ = !_tmp5_;
+#line 8954 "PhotoPage.c"
 	} else {
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 8372 "PhotoPage.c"
+#line 8958 "PhotoPage.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 8376 "PhotoPage.c"
-		gboolean _tmp8_;
+#line 8962 "PhotoPage.c"
+		gboolean _tmp6_;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = self->priv->photo_missing;
+		_tmp6_ = self->priv->photo_missing;
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp8_;
-#line 8382 "PhotoPage.c"
+		_tmp0_ = !_tmp6_;
+#line 8968 "PhotoPage.c"
 	} else {
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 8386 "PhotoPage.c"
+#line 8972 "PhotoPage.c"
 	}
 #line 1179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 8390 "PhotoPage.c"
-		Photo* _tmp9_;
-		Photo* _tmp10_;
-		GdkPixbuf* _tmp11_;
-		GdkPixbuf* _tmp12_;
-		ZoomBuffer* _tmp13_;
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = new_photo;
-#line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = new_photo;
+#line 8976 "PhotoPage.c"
+		GdkPixbuf* _tmp7_;
+		GdkPixbuf* _tmp8_;
+		ZoomBuffer* _tmp9_;
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = editing_host_page_get_zoom_pixbuf (self, _tmp10_);
+		_tmp7_ = editing_host_page_get_zoom_pixbuf (self, new_photo);
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp8_ = _tmp7_;
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp9_, _tmp12_);
+		_tmp9_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), new_photo, _tmp8_);
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->zoom_buffer);
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->zoom_buffer = _tmp13_;
+		self->priv->zoom_buffer = _tmp9_;
 #line 1180 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp12_);
+		_g_object_unref0 (_tmp8_);
 #line 1181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8414 "PhotoPage.c"
+#line 8994 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = editing_host_page_has_photo (self);
-#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp16_) {
-#line 8420 "PhotoPage.c"
-		Photo* _tmp17_;
-		Photo* _tmp18_;
-		Photo* _tmp19_;
-		gboolean _tmp20_;
-#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = new_photo;
-#line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = editing_host_page_get_photo (self);
+	if (editing_host_page_has_photo (self)) {
+#line 8998 "PhotoPage.c"
+		Photo* _tmp12_;
+		Photo* _tmp13_;
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp12_ = editing_host_page_get_photo (self);
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_DATA_SOURCE, DataSource));
+		_tmp13_ = _tmp12_;
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = !_tmp20_;
+		_tmp11_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_SOURCE, DataSource));
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp19_);
-#line 8437 "PhotoPage.c"
+		_g_object_unref0 (_tmp13_);
+#line 9009 "PhotoPage.c"
 	} else {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = FALSE;
-#line 8441 "PhotoPage.c"
+		_tmp11_ = FALSE;
+#line 9013 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp15_) {
+	if (_tmp11_) {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = editing_host_page_confirm_replace_photo != NULL;
-#line 8447 "PhotoPage.c"
+		_tmp10_ = editing_host_page_confirm_replace_photo != NULL;
+#line 9019 "PhotoPage.c"
 	} else {
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = FALSE;
-#line 8451 "PhotoPage.c"
+		_tmp10_ = FALSE;
+#line 9023 "PhotoPage.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_) {
-#line 8455 "PhotoPage.c"
-		Photo* _tmp21_;
-		Photo* _tmp22_;
-		Photo* _tmp23_;
-		gboolean _tmp24_;
-		gboolean _tmp25_;
-#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = editing_host_page_get_photo (self);
-#line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = _tmp21_;
+	if (_tmp10_) {
+#line 9027 "PhotoPage.c"
+		Photo* _tmp14_;
+		Photo* _tmp15_;
+		gboolean _tmp16_;
 #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = new_photo;
+		_tmp14_ = editing_host_page_get_photo (self);
 #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = editing_host_page_confirm_replace_photo (self, _tmp22_, _tmp23_);
+		_tmp15_ = _tmp14_;
 #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = !_tmp24_;
+		_tmp16_ = !editing_host_page_confirm_replace_photo (self, _tmp15_, new_photo);
 #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp22_);
+		_g_object_unref0 (_tmp15_);
 #line 1186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp25_) {
+		if (_tmp16_) {
 #line 1187 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 8477 "PhotoPage.c"
+#line 9043 "PhotoPage.c"
 		}
 	}
 #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dimensions_init (&_tmp26_, 0, 0);
+	dimensions_init (&_tmp17_, 0, 0);
 #line 1190 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp26_, FALSE);
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp17_, FALSE);
 #line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = editing_host_page_get_photo (self);
+	_tmp18_ = editing_host_page_get_photo (self);
 #line 1193 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	old_photo = _tmp27_;
-#line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = new_photo;
+	old_photo = _tmp18_;
 #line 1194 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_set_photo (self, _tmp28_);
-#line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = new_photo;
+	editing_host_page_set_photo (self, new_photo);
 #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, TYPE_DATA_OBJECT, DataObject));
+	_tmp19_ = data_object_get_name (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_DATA_OBJECT, DataObject));
 #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = _tmp30_;
+	_tmp20_ = _tmp19_;
 #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp31_);
+	page_set_page_name (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp20_);
 #line 1195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp31_);
+	_g_free0 (_tmp20_);
 #line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
 #line 1198 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->swapped = NULL;
 #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp32_ = new_photo;
-#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp34_ = _tmp33_;
+	_tmp21_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (new_photo, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_ = g_file_query_exists (_tmp34_, NULL);
+	_tmp22_ = _tmp21_;
 #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_set_photo_missing (self, !_tmp35_);
+	editing_host_page_set_photo_missing (self, !g_file_query_exists (_tmp22_, NULL));
 #line 1201 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp34_);
+	_g_object_unref0 (_tmp22_);
 #line 1202 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
 #line 1206 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rebuild_caches (self, "replace_photo");
 #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp36_ = old_photo;
+	_tmp23_ = old_photo;
 #line 1208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp36_ != NULL) {
-#line 8526 "PhotoPage.c"
-		ViewCollection* _tmp37_;
-		ViewCollection* _tmp38_;
-		Photo* _tmp39_;
-		ViewCollection* _tmp40_;
-		ViewCollection* _tmp41_;
-		Photo* _tmp42_;
-#line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	if (_tmp23_ != NULL) {
+#line 9084 "PhotoPage.c"
+		ViewCollection* _tmp24_;
+		ViewCollection* _tmp25_;
+		Photo* _tmp26_;
+		ViewCollection* _tmp27_;
+		ViewCollection* _tmp28_;
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp38_ = _tmp37_;
+		_tmp24_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp39_ = old_photo;
+		_tmp25_ = _tmp24_;
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp40_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp26_ = old_photo;
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp41_ = _tmp40_;
+		_tmp27_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp42_ = new_photo;
+		_tmp28_ = _tmp27_;
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_cancel_prefetch_neighbors (self, _tmp38_, _tmp39_, _tmp41_, _tmp42_);
+		editing_host_page_cancel_prefetch_neighbors (self, _tmp25_, _tmp26_, _tmp28_, new_photo);
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp41_);
+		_data_collection_unref0 (_tmp28_);
 #line 1209 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp38_);
-#line 8551 "PhotoPage.c"
+		_data_collection_unref0 (_tmp25_);
+#line 9106 "PhotoPage.c"
 	}
 #line 1211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp43_ = new_photo;
-#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_ = new_photo;
-#line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp45_ = editing_host_page_get_zoom_pixbuf (self, _tmp44_);
+	_tmp29_ = editing_host_page_get_zoom_pixbuf (self, new_photo);
 #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = _tmp45_;
+	_tmp30_ = _tmp29_;
 #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp43_, _tmp46_);
+	_tmp31_ = zoom_buffer_new (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), new_photo, _tmp30_);
 #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->zoom_buffer);
 #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->zoom_buffer = _tmp47_;
+	self->priv->zoom_buffer = _tmp31_;
 #line 1213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp46_);
+	_g_object_unref0 (_tmp30_);
 #line 1215 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_quick_update_pixbuf (self);
 #line 1218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "replace_photo");
 #line 1174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (old_photo);
-#line 8577 "PhotoPage.c"
+#line 9128 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
+static void
+editing_host_page_real_cancel_zoom (SinglePhotoPage* base)
+{
 	EditingHostPage * self;
 	GtkScale* _tmp0_;
 	guint _tmp1_;
@@ -8621,7 +9174,7 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 	_g_object_unref0 (_tmp5_);
 #line 1228 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
-#line 8620 "PhotoPage.c"
+#line 9173 "PhotoPage.c"
 		Photo* _tmp7_;
 		Photo* _tmp8_;
 		Dimensions _tmp9_ = {0};
@@ -8641,13 +9194,13 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
 #line 1229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp8_);
-#line 8640 "PhotoPage.c"
+#line 9193 "PhotoPage.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp13_ != NULL) {
-#line 8646 "PhotoPage.c"
+#line 9199 "PhotoPage.c"
 		GtkDrawingArea* _tmp14_;
 		GdkWindow* _tmp15_;
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8656,25 +9209,27 @@ static void editing_host_page_real_cancel_zoom (SinglePhotoPage* base) {
 		_tmp15_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget));
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = _tmp15_ != NULL;
-#line 8655 "PhotoPage.c"
+#line 9208 "PhotoPage.c"
 	} else {
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp12_ = FALSE;
-#line 8659 "PhotoPage.c"
+#line 9212 "PhotoPage.c"
 	}
 #line 1235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp12_) {
 #line 1236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 8665 "PhotoPage.c"
+#line 9218 "PhotoPage.c"
 	}
 #line 1238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 8669 "PhotoPage.c"
+#line 9222 "PhotoPage.c"
 }
 
 
-static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
+static void
+editing_host_page_quick_update_pixbuf (EditingHostPage* self)
+{
 	GdkPixbuf* pixbuf = NULL;
 	PixbufCache* _tmp0_;
 	Photo* _tmp1_;
@@ -8714,7 +9269,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_tmp5_ = pixbuf;
 #line 1243 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_ != NULL) {
-#line 8713 "PhotoPage.c"
+#line 9268 "PhotoPage.c"
 		GdkPixbuf* _tmp6_;
 		Photo* _tmp7_;
 		Photo* _tmp8_;
@@ -8737,7 +9292,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (pixbuf);
 #line 1247 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8736 "PhotoPage.c"
+#line 9291 "PhotoPage.c"
 	}
 #line 1250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
@@ -8763,7 +9318,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	_g_free0 (_tmp14_);
 #line 1252 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp12_);
-#line 8762 "PhotoPage.c"
+#line 9317 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp17_ = NULL;
 		Photo* _tmp18_;
@@ -8790,7 +9345,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_tmp17_ = _tmp22_;
 #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8789 "PhotoPage.c"
+#line 9344 "PhotoPage.c"
 			goto __catch259_g_error;
 		}
 #line 1257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8805,7 +9360,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (_tmp24_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp17_);
-#line 8804 "PhotoPage.c"
+#line 9359 "PhotoPage.c"
 	}
 	goto __finally259;
 	__catch259_g_error:
@@ -8825,7 +9380,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_warning ("PhotoPage.vala:1259: %s", _tmp27_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8824 "PhotoPage.c"
+#line 9379 "PhotoPage.c"
 	}
 	__finally259:
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8838,7 +9393,7 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 8837 "PhotoPage.c"
+#line 9392 "PhotoPage.c"
 	}
 #line 1262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp28_ = self->priv->cache;
@@ -8854,11 +9409,13 @@ static void editing_host_page_quick_update_pixbuf (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = FALSE;
 #line 1241 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (pixbuf);
-#line 8853 "PhotoPage.c"
+#line 9408 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
+static gboolean
+editing_host_page_update_pixbuf (EditingHostPage* self)
+{
 	gboolean result = FALSE;
 	Photo* photo = NULL;
 	Photo* _tmp0_;
@@ -8887,7 +9444,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_g_object_unref0 (photo);
 #line 1276 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 8886 "PhotoPage.c"
+#line 9443 "PhotoPage.c"
 	}
 #line 1278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	pixbuf = NULL;
@@ -8897,7 +9454,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
 #line 1279 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp3_;
-#line 8896 "PhotoPage.c"
+#line 9453 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp4_ = {0};
@@ -8911,7 +9468,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		_tmp5_ = self->priv->current_tool;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp5_ != NULL) {
-#line 8910 "PhotoPage.c"
+#line 9467 "PhotoPage.c"
 			GdkPixbuf* _tmp6_ = NULL;
 			EditingToolsEditingTool* _tmp7_;
 			Scaling _tmp8_ = {0};
@@ -8933,7 +9490,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp6_ = _tmp11_;
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8932 "PhotoPage.c"
+#line 9489 "PhotoPage.c"
 				goto __catch260_g_error;
 			}
 #line 1284 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -8946,19 +9503,19 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			pixbuf = _tmp12_;
 #line 1283 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp6_);
-#line 8945 "PhotoPage.c"
+#line 9502 "PhotoPage.c"
 		}
 #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp13_ = pixbuf;
 #line 1286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp13_ != NULL) {
-#line 8951 "PhotoPage.c"
+#line 9508 "PhotoPage.c"
 			Dimensions _tmp14_;
 #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp14_ = tool_pixbuf_dim;
 #line 1287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			max_dim = _tmp14_;
-#line 8957 "PhotoPage.c"
+#line 9514 "PhotoPage.c"
 		}
 	}
 	goto __finally260;
@@ -8981,12 +9538,12 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		editing_host_page_set_photo_missing (self, TRUE);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 8980 "PhotoPage.c"
+#line 9537 "PhotoPage.c"
 	}
 	__finally260:
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 8985 "PhotoPage.c"
+#line 9542 "PhotoPage.c"
 		gboolean _tmp17_ = FALSE;
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (pixbuf);
@@ -8998,20 +9555,20 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1281 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return _tmp17_;
-#line 8997 "PhotoPage.c"
+#line 9554 "PhotoPage.c"
 	}
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp18_ = self->priv->photo_missing;
 #line 1293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp18_) {
-#line 9003 "PhotoPage.c"
+#line 9560 "PhotoPage.c"
 		GdkPixbuf* _tmp19_;
 		GdkPixbuf* _tmp23_;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp19_ = pixbuf;
 #line 1295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp19_ == NULL) {
-#line 9010 "PhotoPage.c"
+#line 9567 "PhotoPage.c"
 			PixbufCache* _tmp20_;
 			Photo* _tmp21_;
 			GdkPixbuf* _tmp22_;
@@ -9025,13 +9582,13 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_g_object_unref0 (pixbuf);
 #line 1296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf = _tmp22_;
-#line 9024 "PhotoPage.c"
+#line 9581 "PhotoPage.c"
 		}
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp23_ = pixbuf;
 #line 1299 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp23_ == NULL) {
-#line 9030 "PhotoPage.c"
+#line 9587 "PhotoPage.c"
 			PixbufCache* _tmp24_;
 			Photo* _tmp25_;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9040,28 +9597,28 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 			_tmp25_ = photo;
 #line 1300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			pixbuf_cache_prefetch (_tmp24_, _tmp25_, BACKGROUND_JOB_JOB_PRIORITY_NORMAL, FALSE);
-#line 9039 "PhotoPage.c"
+#line 9596 "PhotoPage.c"
 		}
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp27_ = self->priv->photo_missing;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!_tmp27_) {
-#line 9046 "PhotoPage.c"
+#line 9603 "PhotoPage.c"
 		GdkPixbuf* _tmp28_;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = pixbuf;
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = _tmp28_ != NULL;
-#line 9052 "PhotoPage.c"
+#line 9609 "PhotoPage.c"
 	} else {
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = FALSE;
-#line 9056 "PhotoPage.c"
+#line 9613 "PhotoPage.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp26_) {
-#line 9060 "PhotoPage.c"
+#line 9617 "PhotoPage.c"
 		GdkPixbuf* _tmp29_;
 		Dimensions _tmp30_;
 #line 1304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9072,7 +9629,7 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp29_, &_tmp30_, NULL);
 #line 1305 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = FALSE;
-#line 9071 "PhotoPage.c"
+#line 9628 "PhotoPage.c"
 	}
 #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
@@ -9082,11 +9639,14 @@ static gboolean editing_host_page_update_pixbuf (EditingHostPage* self) {
 	_g_object_unref0 (photo);
 #line 1312 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9081 "PhotoPage.c"
+#line 9638 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
+static void
+editing_host_page_real_on_resize (Page* base,
+                                  GdkRectangle* rect)
+{
 	EditingHostPage * self;
 	GdkRectangle _tmp0_;
 #line 1315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9099,11 +9659,14 @@ static void editing_host_page_real_on_resize (Page* base, GdkRectangle* rect) {
 	PAGE_CLASS (editing_host_page_parent_class)->on_resize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
 #line 1318 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_track_tool_window (self);
-#line 9098 "PhotoPage.c"
+#line 9658 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle* rect) {
+static void
+editing_host_page_real_on_resize_finished (Page* base,
+                                           GdkRectangle* rect)
+{
 	EditingHostPage * self;
 #line 1321 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
@@ -9115,11 +9678,13 @@ static void editing_host_page_real_on_resize_finished (Page* base, GdkRectangle*
 	self->priv->pixbuf_dirty = TRUE;
 #line 1328 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9114 "PhotoPage.c"
+#line 9677 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
+static void
+editing_host_page_on_viewport_resized (EditingHostPage* self)
+{
 #line 1331 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9128,52 +9693,53 @@ static void editing_host_page_on_viewport_resized (EditingHostPage* self) {
 	self->priv->pixbuf_dirty = TRUE;
 #line 1337 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_pixbuf (self);
-#line 9127 "PhotoPage.c"
+#line 9692 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+editing_host_page_real_update_actions (Page* base,
+                                       gint selected_count,
+                                       gint count)
+{
 	EditingHostPage * self;
 	gboolean multiple_photos = FALSE;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
-	GtkToolButton* _tmp4_;
-	gboolean _tmp5_;
-	GtkToolButton* _tmp6_;
-	gboolean _tmp7_;
+	gboolean _tmp2_;
+	GtkToolButton* _tmp3_;
+	gboolean _tmp4_;
+	GtkToolButton* _tmp5_;
+	gboolean _tmp6_;
 	Photo* photo = NULL;
-	Photo* _tmp8_;
+	Photo* _tmp7_;
 	Scaling scaling = {0};
-	Scaling _tmp9_ = {0};
+	Scaling _tmp8_ = {0};
+	gboolean _tmp9_ = FALSE;
 	gboolean _tmp10_ = FALSE;
 	gboolean _tmp11_ = FALSE;
-	gboolean _tmp12_ = FALSE;
-	Photo* _tmp13_;
-	GtkToolButton* _tmp19_;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_ = FALSE;
-	Photo* _tmp22_;
-	GtkToggleToolButton* _tmp27_;
-	gboolean _tmp28_ = FALSE;
-	gboolean _tmp29_ = FALSE;
-	Photo* _tmp30_;
-	GtkToggleToolButton* _tmp35_;
-	gboolean _tmp36_ = FALSE;
-	gboolean _tmp37_ = FALSE;
-	Photo* _tmp38_;
-	GtkToggleToolButton* _tmp43_;
+	Photo* _tmp12_;
+	GtkToolButton* _tmp16_;
+	gboolean _tmp17_ = FALSE;
+	gboolean _tmp18_ = FALSE;
+	Photo* _tmp19_;
+	GtkToggleToolButton* _tmp23_;
+	gboolean _tmp24_ = FALSE;
+	gboolean _tmp25_ = FALSE;
+	Photo* _tmp26_;
+	GtkToggleToolButton* _tmp30_;
+	gboolean _tmp31_ = FALSE;
+	gboolean _tmp32_ = FALSE;
+	Photo* _tmp33_;
+	GtkToggleToolButton* _tmp37_;
+	gboolean _tmp38_ = FALSE;
+	gboolean _tmp39_ = FALSE;
+	Photo* _tmp40_;
+	GtkToolButton* _tmp43_;
 	gboolean _tmp44_ = FALSE;
 	gboolean _tmp45_ = FALSE;
 	Photo* _tmp46_;
-	GtkToolButton* _tmp50_;
-	gboolean _tmp51_ = FALSE;
-	gboolean _tmp52_ = FALSE;
-	Photo* _tmp53_;
-	GtkToggleToolButton* _tmp58_;
-	gint _tmp59_;
-	gint _tmp60_;
+	GtkToggleToolButton* _tmp50_;
 #line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9181,375 +9747,334 @@ static void editing_host_page_real_update_actions (Page* base, gint selected_cou
 #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO);
-#line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_ > 1;
+	_tmp2_ = view_collection_get_sources_of_type_count (_tmp1_, TYPE_PHOTO) > 1;
 #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 1341 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	multiple_photos = _tmp3_;
+	multiple_photos = _tmp2_;
 #line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = self->priv->prev_button;
+	_tmp3_ = self->priv->prev_button;
 #line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = multiple_photos;
+	_tmp4_ = multiple_photos;
 #line 1343 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _tmp5_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = self->priv->next_button;
+	_tmp5_ = self->priv->next_button;
 #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = multiple_photos;
+	_tmp6_ = multiple_photos;
 #line 1344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), _tmp7_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _tmp6_);
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = editing_host_page_get_photo (self);
+	_tmp7_ = editing_host_page_get_photo (self);
 #line 1346 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo = _tmp8_;
+	photo = _tmp7_;
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
+	single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
 #line 1347 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling = _tmp9_;
+	scaling = _tmp8_;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = photo;
+	_tmp12_ = photo;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp13_ != NULL) {
-#line 9211 "PhotoPage.c"
-		gboolean _tmp14_;
+	if (_tmp12_ != NULL) {
+#line 9775 "PhotoPage.c"
+		gboolean _tmp13_;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = self->priv->photo_missing;
+		_tmp13_ = self->priv->photo_missing;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = !_tmp14_;
-#line 9217 "PhotoPage.c"
+		_tmp11_ = !_tmp13_;
+#line 9781 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = FALSE;
-#line 9221 "PhotoPage.c"
+		_tmp11_ = FALSE;
+#line 9785 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp12_) {
-#line 9225 "PhotoPage.c"
-		Photo* _tmp15_;
-		gboolean _tmp16_;
-#line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = photo;
+	if (_tmp11_) {
+#line 9789 "PhotoPage.c"
+		Photo* _tmp14_;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = photo_check_can_rotate (_tmp15_);
+		_tmp14_ = photo;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = _tmp16_;
-#line 9234 "PhotoPage.c"
+		_tmp10_ = photo_check_can_rotate (_tmp14_);
+#line 9795 "PhotoPage.c"
 	} else {
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = FALSE;
-#line 9238 "PhotoPage.c"
+		_tmp10_ = FALSE;
+#line 9799 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp11_) {
-#line 9242 "PhotoPage.c"
-		Photo* _tmp17_;
-		gboolean _tmp18_;
-#line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = photo;
+	if (_tmp10_) {
+#line 9803 "PhotoPage.c"
+		Photo* _tmp15_;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = editing_host_page_is_rotate_available (self, _tmp17_);
+		_tmp15_ = photo;
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = _tmp18_;
-#line 9251 "PhotoPage.c"
+		_tmp9_ = editing_host_page_is_rotate_available (self, _tmp15_);
+#line 9809 "PhotoPage.c"
 	} else {
 #line 1350 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = FALSE;
-#line 9255 "PhotoPage.c"
+		_tmp9_ = FALSE;
+#line 9813 "PhotoPage.c"
 	}
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = self->priv->rotate_button;
+	_tmp16_ = self->priv->rotate_button;
 #line 1349 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), _tmp10_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), _tmp9_);
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = photo;
+	_tmp19_ = photo;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp22_ != NULL) {
-#line 9265 "PhotoPage.c"
-		gboolean _tmp23_;
+	if (_tmp19_ != NULL) {
+#line 9823 "PhotoPage.c"
+		gboolean _tmp20_;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = self->priv->photo_missing;
+		_tmp20_ = self->priv->photo_missing;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = !_tmp23_;
-#line 9271 "PhotoPage.c"
+		_tmp18_ = !_tmp20_;
+#line 9829 "PhotoPage.c"
 	} else {
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = FALSE;
-#line 9275 "PhotoPage.c"
+		_tmp18_ = FALSE;
+#line 9833 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp21_) {
-#line 9279 "PhotoPage.c"
-		Photo* _tmp24_;
-		Scaling _tmp25_;
-		gboolean _tmp26_;
-#line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = photo;
+	if (_tmp18_) {
+#line 9837 "PhotoPage.c"
+		Photo* _tmp21_;
+		Scaling _tmp22_;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = scaling;
+		_tmp21_ = photo;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = editing_tools_crop_tool_is_available (_tmp24_, &_tmp25_);
+		_tmp22_ = scaling;
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp26_;
-#line 9291 "PhotoPage.c"
+		_tmp17_ = editing_tools_crop_tool_is_available (_tmp21_, &_tmp22_);
+#line 9846 "PhotoPage.c"
 	} else {
 #line 1352 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = FALSE;
-#line 9295 "PhotoPage.c"
+		_tmp17_ = FALSE;
+#line 9850 "PhotoPage.c"
 	}
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = self->priv->crop_button;
+	_tmp23_ = self->priv->crop_button;
 #line 1351 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), _tmp20_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), _tmp17_);
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = photo;
+	_tmp26_ = photo;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp30_ != NULL) {
-#line 9305 "PhotoPage.c"
-		gboolean _tmp31_;
+	if (_tmp26_ != NULL) {
+#line 9860 "PhotoPage.c"
+		gboolean _tmp27_;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = self->priv->photo_missing;
+		_tmp27_ = self->priv->photo_missing;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = !_tmp31_;
-#line 9311 "PhotoPage.c"
+		_tmp25_ = !_tmp27_;
+#line 9866 "PhotoPage.c"
 	} else {
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = FALSE;
-#line 9315 "PhotoPage.c"
+		_tmp25_ = FALSE;
+#line 9870 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp29_) {
-#line 9319 "PhotoPage.c"
-		Photo* _tmp32_;
-		Scaling _tmp33_;
-		gboolean _tmp34_;
-#line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = photo;
+	if (_tmp25_) {
+#line 9874 "PhotoPage.c"
+		Photo* _tmp28_;
+		Scaling _tmp29_;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = scaling;
+		_tmp28_ = photo;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = editing_tools_redeye_tool_is_available (_tmp32_, &_tmp33_);
+		_tmp29_ = scaling;
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = _tmp34_;
-#line 9331 "PhotoPage.c"
+		_tmp24_ = editing_tools_redeye_tool_is_available (_tmp28_, &_tmp29_);
+#line 9883 "PhotoPage.c"
 	} else {
 #line 1354 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = FALSE;
-#line 9335 "PhotoPage.c"
+		_tmp24_ = FALSE;
+#line 9887 "PhotoPage.c"
 	}
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_ = self->priv->redeye_button;
+	_tmp30_ = self->priv->redeye_button;
 #line 1353 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), _tmp28_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), _tmp24_);
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp38_ = photo;
+	_tmp33_ = photo;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp38_ != NULL) {
-#line 9345 "PhotoPage.c"
-		gboolean _tmp39_;
+	if (_tmp33_ != NULL) {
+#line 9897 "PhotoPage.c"
+		gboolean _tmp34_;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp39_ = self->priv->photo_missing;
+		_tmp34_ = self->priv->photo_missing;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = !_tmp39_;
-#line 9351 "PhotoPage.c"
+		_tmp32_ = !_tmp34_;
+#line 9903 "PhotoPage.c"
 	} else {
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = FALSE;
-#line 9355 "PhotoPage.c"
+		_tmp32_ = FALSE;
+#line 9907 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp37_) {
-#line 9359 "PhotoPage.c"
-		Photo* _tmp40_;
-		Scaling _tmp41_;
-		gboolean _tmp42_;
-#line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp40_ = photo;
+	if (_tmp32_) {
+#line 9911 "PhotoPage.c"
+		Photo* _tmp35_;
+		Scaling _tmp36_;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp41_ = scaling;
+		_tmp35_ = photo;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp42_ = editing_tools_adjust_tool_is_available (_tmp40_, &_tmp41_);
+		_tmp36_ = scaling;
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = _tmp42_;
-#line 9371 "PhotoPage.c"
+		_tmp31_ = editing_tools_adjust_tool_is_available (_tmp35_, &_tmp36_);
+#line 9920 "PhotoPage.c"
 	} else {
 #line 1356 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = FALSE;
-#line 9375 "PhotoPage.c"
+		_tmp31_ = FALSE;
+#line 9924 "PhotoPage.c"
 	}
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp43_ = self->priv->adjust_button;
+	_tmp37_ = self->priv->adjust_button;
 #line 1355 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp36_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), _tmp31_);
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = photo;
+	_tmp40_ = photo;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp46_ != NULL) {
-#line 9385 "PhotoPage.c"
-		gboolean _tmp47_;
+	if (_tmp40_ != NULL) {
+#line 9934 "PhotoPage.c"
+		gboolean _tmp41_;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp47_ = self->priv->photo_missing;
+		_tmp41_ = self->priv->photo_missing;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp45_ = !_tmp47_;
-#line 9391 "PhotoPage.c"
+		_tmp39_ = !_tmp41_;
+#line 9940 "PhotoPage.c"
 	} else {
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp45_ = FALSE;
-#line 9395 "PhotoPage.c"
+		_tmp39_ = FALSE;
+#line 9944 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp45_) {
-#line 9399 "PhotoPage.c"
-		Photo* _tmp48_;
-		gboolean _tmp49_;
-#line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp48_ = photo;
+	if (_tmp39_) {
+#line 9948 "PhotoPage.c"
+		Photo* _tmp42_;
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp49_ = editing_host_page_is_enhance_available (self, _tmp48_);
+		_tmp42_ = photo;
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp44_ = _tmp49_;
-#line 9408 "PhotoPage.c"
+		_tmp38_ = editing_host_page_is_enhance_available (self, _tmp42_);
+#line 9954 "PhotoPage.c"
 	} else {
 #line 1358 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp44_ = FALSE;
-#line 9412 "PhotoPage.c"
+		_tmp38_ = FALSE;
+#line 9958 "PhotoPage.c"
 	}
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp50_ = self->priv->enhance_button;
+	_tmp43_ = self->priv->enhance_button;
 #line 1357 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_);
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), _tmp38_);
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_ = photo;
+	_tmp46_ = photo;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp53_ != NULL) {
-#line 9422 "PhotoPage.c"
-		gboolean _tmp54_;
+	if (_tmp46_ != NULL) {
+#line 9968 "PhotoPage.c"
+		gboolean _tmp47_;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp54_ = self->priv->photo_missing;
+		_tmp47_ = self->priv->photo_missing;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp52_ = !_tmp54_;
-#line 9428 "PhotoPage.c"
+		_tmp45_ = !_tmp47_;
+#line 9974 "PhotoPage.c"
 	} else {
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp52_ = FALSE;
-#line 9432 "PhotoPage.c"
+		_tmp45_ = FALSE;
+#line 9978 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp52_) {
-#line 9436 "PhotoPage.c"
-		Photo* _tmp55_;
-		Scaling _tmp56_;
-		gboolean _tmp57_;
-#line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp55_ = photo;
+	if (_tmp45_) {
+#line 9982 "PhotoPage.c"
+		Photo* _tmp48_;
+		Scaling _tmp49_;
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp56_ = scaling;
+		_tmp48_ = photo;
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp57_ = editing_tools_straighten_tool_is_available (_tmp55_, &_tmp56_);
+		_tmp49_ = scaling;
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp51_ = _tmp57_;
-#line 9448 "PhotoPage.c"
+		_tmp44_ = editing_tools_straighten_tool_is_available (_tmp48_, &_tmp49_);
+#line 9991 "PhotoPage.c"
 	} else {
 #line 1360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp51_ = FALSE;
-#line 9452 "PhotoPage.c"
+		_tmp44_ = FALSE;
+#line 9995 "PhotoPage.c"
 	}
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp58_ = self->priv->straighten_button;
+	_tmp50_ = self->priv->straighten_button;
 #line 1359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_widget_get_type (), GtkWidget), _tmp51_);
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp59_ = selected_count;
-#line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp60_ = count;
+	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_widget_get_type (), GtkWidget), _tmp44_);
 #line 1362 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp59_, _tmp60_);
+	PAGE_CLASS (editing_host_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), selected_count, count);
 #line 1340 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 9466 "PhotoPage.c"
+#line 10005 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_shift_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_on_shift_pressed (Page* base,
+                                         GdkEventKey* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
 	EditingToolsEditingTool* _tmp3_;
-	GdkEventKey* _tmp7_;
-	gboolean _tmp8_;
 #line 1365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = self->priv->current_tool;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp3_ == NULL) {
-#line 9485 "PhotoPage.c"
-		gboolean _tmp4_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = !_tmp4_;
-#line 9491 "PhotoPage.c"
+		_tmp2_ = !page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 10027 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = FALSE;
-#line 9495 "PhotoPage.c"
+#line 10031 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 9499 "PhotoPage.c"
-		gboolean _tmp5_;
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = !_tmp5_;
-#line 9505 "PhotoPage.c"
+		_tmp1_ = !page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 10037 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9509 "PhotoPage.c"
+#line 10041 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9513 "PhotoPage.c"
-		gboolean _tmp6_;
-#line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = editing_host_page_has_photo (self);
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp6_;
-#line 9519 "PhotoPage.c"
+		_tmp0_ = editing_host_page_has_photo (self);
+#line 10047 "PhotoPage.c"
 	} else {
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9523 "PhotoPage.c"
+#line 10051 "PhotoPage.c"
 	}
 #line 1367 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1368 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9529 "PhotoPage.c"
+#line 10057 "PhotoPage.c"
 	}
 #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = event;
-#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp8_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event);
 #line 1370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9539 "PhotoPage.c"
+#line 10063 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_on_shift_released (Page* base,
+                                          GdkEventKey* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_;
-	GdkEventKey* _tmp1_;
-	gboolean _tmp2_;
 #line 1373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9558,26 +10083,23 @@ static gboolean editing_host_page_real_on_shift_released (Page* base, GdkEventKe
 	if (_tmp0_ == NULL) {
 #line 1375 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9557 "PhotoPage.c"
+#line 10082 "PhotoPage.c"
 	}
 #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = event;
-#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp2_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_shift_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event);
 #line 1377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9567 "PhotoPage.c"
+#line 10088 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_on_alt_pressed (Page* base,
+                                       GdkEventKey* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_;
-	GdkEventKey* _tmp1_;
-	gboolean _tmp2_;
 #line 1380 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9586,91 +10108,77 @@ static gboolean editing_host_page_real_on_alt_pressed (Page* base, GdkEventKey*
 	if (_tmp0_ == NULL) {
 #line 1382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 9585 "PhotoPage.c"
+#line 10107 "PhotoPage.c"
 	}
 #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = event;
-#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp1_);
-#line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp2_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event);
 #line 1384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9595 "PhotoPage.c"
+#line 10113 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_alt_released (Page* base, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_on_alt_released (Page* base,
+                                        GdkEventKey* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
 	EditingToolsEditingTool* _tmp2_;
-	GdkEventKey* _tmp5_;
-	gboolean _tmp6_;
 #line 1387 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = self->priv->current_tool;
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ == NULL) {
-#line 9613 "PhotoPage.c"
-		gboolean _tmp3_;
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = _tmp3_;
-#line 9619 "PhotoPage.c"
+		_tmp1_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 10134 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = FALSE;
-#line 9623 "PhotoPage.c"
+#line 10138 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
-#line 9627 "PhotoPage.c"
-		gboolean _tmp4_;
-#line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp4_;
-#line 9633 "PhotoPage.c"
+		_tmp0_ = !page_get_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 10144 "PhotoPage.c"
 	} else {
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 9637 "PhotoPage.c"
+#line 10148 "PhotoPage.c"
 	}
 #line 1388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 1389 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 9643 "PhotoPage.c"
+#line 10154 "PhotoPage.c"
 	}
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = event;
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp5_);
-#line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp6_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_alt_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event);
 #line 1391 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 9653 "PhotoPage.c"
+#line 10160 "PhotoPage.c"
 }
 
 
-static void editing_host_page_swap_in_original (EditingHostPage* self) {
+static void
+editing_host_page_swap_in_original (EditingHostPage* self)
+{
 	GdkPixbuf* original = NULL;
-	GdkPixbuf* _tmp9_;
-	GtkScale* _tmp10_;
-	gdouble _tmp11_;
-	GdkPixbuf* _tmp12_;
-	Photo* _tmp13_;
-	Photo* _tmp14_;
-	Dimensions _tmp15_ = {0};
+	GdkPixbuf* _tmp8_;
+	GtkScale* _tmp9_;
+	GdkPixbuf* _tmp10_;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
+	Dimensions _tmp13_ = {0};
 	GError * _inner_error_ = NULL;
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
-#line 9669 "PhotoPage.c"
+#line 10177 "PhotoPage.c"
 	{
 		GdkPixbuf* _tmp0_ = NULL;
 		Photo* _tmp1_;
@@ -9679,8 +10187,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		GdkPixbuf* _tmp4_;
 		Photo* _tmp5_;
 		Photo* _tmp6_;
-		Orientation _tmp7_;
-		GdkPixbuf* _tmp8_;
+		GdkPixbuf* _tmp7_;
 #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = editing_host_page_get_photo (self);
 #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9695,7 +10202,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_tmp0_ = _tmp4_;
 #line 1398 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9694 "PhotoPage.c"
+#line 10201 "PhotoPage.c"
 			goto __catch261_g_error;
 		}
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9703,18 +10210,16 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = _tmp5_;
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = photo_get_original_orientation (_tmp6_);
-#line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = orientation_rotate_pixbuf (_tmp7_, _tmp0_);
+		_tmp7_ = orientation_rotate_pixbuf (photo_get_original_orientation (_tmp6_), _tmp0_);
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (original);
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		original = _tmp8_;
+		original = _tmp7_;
 #line 1397 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp6_);
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 9713 "PhotoPage.c"
+#line 10218 "PhotoPage.c"
 	}
 	goto __finally261;
 	__catch261_g_error:
@@ -9730,7 +10235,7 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		_g_object_unref0 (original);
 #line 1400 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9729 "PhotoPage.c"
+#line 10234 "PhotoPage.c"
 	}
 	__finally261:
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9743,45 +10248,45 @@ static void editing_host_page_swap_in_original (EditingHostPage* self) {
 		g_clear_error (&_inner_error_);
 #line 1396 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9742 "PhotoPage.c"
+#line 10247 "PhotoPage.c"
 	}
 #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+	_tmp8_ = single_photo_page_get_unscaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->swapped);
 #line 1404 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->swapped = _tmp9_;
+	self->priv->swapped = _tmp8_;
 #line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = self->priv->zoom_slider;
-#line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange));
+	_tmp9_ = self->priv->zoom_slider;
 #line 1408 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp11_ != 0.0) {
+	if (gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange)) != 0.0) {
 #line 1409 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_save_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1410 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 9760 "PhotoPage.c"
+#line 10263 "PhotoPage.c"
 	}
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = original;
+	_tmp10_ = original;
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = editing_host_page_get_photo (self);
+	_tmp11_ = editing_host_page_get_photo (self);
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp12_ = _tmp11_;
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo_get_master_dimensions (_tmp14_, &_tmp15_);
+	photo_get_master_dimensions (_tmp12_, &_tmp13_);
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp12_, &_tmp15_, NULL);
+	single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp10_, &_tmp13_, NULL);
 #line 1413 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp12_);
 #line 1394 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (original);
-#line 9776 "PhotoPage.c"
+#line 10279 "PhotoPage.c"
 }
 
 
-static void editing_host_page_swap_out_original (EditingHostPage* self) {
+static void
+editing_host_page_swap_out_original (EditingHostPage* self)
+{
 	GdkPixbuf* _tmp0_;
 #line 1416 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -9789,7 +10294,7 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 	_tmp0_ = self->priv->swapped;
 #line 1417 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 9788 "PhotoPage.c"
+#line 10293 "PhotoPage.c"
 		GdkPixbuf* _tmp1_;
 		Photo* _tmp2_;
 		Photo* _tmp3_;
@@ -9814,19 +10319,24 @@ static void editing_host_page_swap_out_original (EditingHostPage* self) {
 		_g_object_unref0 (self->priv->swapped);
 #line 1424 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->swapped = NULL;
-#line 9813 "PhotoPage.c"
+#line 10318 "PhotoPage.c"
 	}
 }
 
 
-static gpointer _editing_tools_editing_tool_ref0 (gpointer self) {
+static gpointer
+_editing_tools_editing_tool_ref0 (gpointer self)
+{
 #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? editing_tools_editing_tool_ref (self) : NULL;
-#line 9821 "PhotoPage.c"
+#line 10328 "PhotoPage.c"
 }
 
 
-static void editing_host_page_activate_tool (EditingHostPage* self, EditingToolsEditingTool* tool) {
+static void
+editing_host_page_activate_tool (EditingHostPage* self,
+                                 EditingToolsEditingTool* tool)
+{
 	Dimensions _tmp0_ = {0};
 	GdkPixbuf* _tmp1_;
 	GdkPixbuf* unscaled = NULL;
@@ -9835,13 +10345,12 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	Photo* _tmp3_;
 	Dimensions _tmp4_ = {0};
 	Dimensions _tmp5_;
-	GdkPixbuf* _tmp22_;
+	GdkPixbuf* _tmp21_;
 	EditingToolsPhotoCanvas* photo_canvas = NULL;
-	EditingHostPageEditingHostCanvas* _tmp25_;
+	EditingHostPageEditingHostCanvas* _tmp24_;
+	EditingToolsEditingTool* _tmp25_;
 	EditingToolsEditingTool* _tmp26_;
-	EditingToolsEditingTool* _tmp27_;
-	EditingToolsEditingTool* _tmp28_;
-	EditingToolsPhotoCanvas* _tmp29_;
+	EditingToolsPhotoCanvas* _tmp27_;
 	GError * _inner_error_ = NULL;
 #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -9873,106 +10382,103 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_g_object_unref0 (_tmp3_);
 #line 1443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	max_dim = _tmp5_;
-#line 9872 "PhotoPage.c"
+#line 10381 "PhotoPage.c"
 	{
 		Dimensions tool_pixbuf_dim = {0};
 		Dimensions _tmp6_ = {0};
 		GdkPixbuf* _tmp7_ = NULL;
-		EditingToolsEditingTool* _tmp8_;
-		Scaling _tmp9_ = {0};
+		Scaling _tmp8_ = {0};
+		Photo* _tmp9_;
 		Photo* _tmp10_;
-		Photo* _tmp11_;
-		Dimensions _tmp12_ = {0};
+		Dimensions _tmp11_ = {0};
+		GdkPixbuf* _tmp12_;
 		GdkPixbuf* _tmp13_;
 		GdkPixbuf* _tmp14_;
 		GdkPixbuf* _tmp15_;
-		GdkPixbuf* _tmp16_;
 #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_.width = 0;
 #line 1445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		tool_pixbuf_dim = _tmp6_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = tool;
-#line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
+		single_photo_page_get_canvas_scaling (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = editing_host_page_get_photo (self);
+		_tmp9_ = editing_host_page_get_photo (self);
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = editing_tools_editing_tool_get_display_pixbuf (_tmp8_, &_tmp9_, _tmp11_, &_tmp12_, &_inner_error_);
+		_tmp12_ = editing_tools_editing_tool_get_display_pixbuf (tool, &_tmp8_, _tmp10_, &_tmp11_, &_inner_error_);
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		tool_pixbuf_dim = _tmp12_;
+		tool_pixbuf_dim = _tmp11_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp13_ = _tmp12_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp11_);
+		_g_object_unref0 (_tmp10_);
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = _tmp14_;
+		_tmp7_ = _tmp13_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 9910 "PhotoPage.c"
+#line 10416 "PhotoPage.c"
 			goto __catch262_g_error;
 		}
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = _tmp7_;
+		_tmp14_ = _tmp7_;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = NULL;
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
 #line 1446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		unscaled = _tmp15_;
+		unscaled = _tmp14_;
 #line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = unscaled;
+		_tmp15_ = unscaled;
 #line 1448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp16_ != NULL) {
-#line 9925 "PhotoPage.c"
-			Dimensions _tmp17_;
+		if (_tmp15_ != NULL) {
+#line 10431 "PhotoPage.c"
+			Dimensions _tmp16_;
 #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp17_ = tool_pixbuf_dim;
+			_tmp16_ = tool_pixbuf_dim;
 #line 1449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			max_dim = _tmp17_;
-#line 9931 "PhotoPage.c"
+			max_dim = _tmp16_;
+#line 10437 "PhotoPage.c"
 		}
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp7_);
-#line 9935 "PhotoPage.c"
+#line 10441 "PhotoPage.c"
 	}
 	goto __finally262;
 	__catch262_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp18_;
-		const gchar* _tmp19_;
+		GError* _tmp17_;
+		const gchar* _tmp18_;
+		GtkToggleToolButton* _tmp19_;
 		GtkToggleToolButton* _tmp20_;
-		GtkToggleToolButton* _tmp21_;
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
 #line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = err;
+		_tmp17_ = err;
 #line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_->message;
+		_tmp18_ = _tmp17_->message;
 #line 1451 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_warning ("PhotoPage.vala:1451: %s", _tmp19_);
+		g_warning ("PhotoPage.vala:1451: %s", _tmp18_);
 #line 1452 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_set_photo_missing (self, TRUE);
 #line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = self->priv->current_editing_toggle;
+		_tmp19_ = self->priv->current_editing_toggle;
 #line 1455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_vala_assert (_tmp20_ != NULL, "current_editing_toggle != null");
+		_vala_assert (_tmp19_ != NULL, "current_editing_toggle != null");
 #line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = self->priv->current_editing_toggle;
+		_tmp20_ = self->priv->current_editing_toggle;
 #line 1456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gtk_toggle_tool_button_set_active (_tmp21_, FALSE);
+		gtk_toggle_tool_button_set_active (_tmp20_, FALSE);
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (unscaled);
 #line 1458 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9971 "PhotoPage.c"
+#line 10477 "PhotoPage.c"
 	}
 	__finally262:
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -9985,41 +10491,39 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 		g_clear_error (&_inner_error_);
 #line 1444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 9984 "PhotoPage.c"
+#line 10490 "PhotoPage.c"
 	}
 #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = unscaled;
+	_tmp21_ = unscaled;
 #line 1461 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp22_ != NULL) {
-#line 9990 "PhotoPage.c"
-		GdkPixbuf* _tmp23_;
-		Dimensions _tmp24_;
+	if (_tmp21_ != NULL) {
+#line 10496 "PhotoPage.c"
+		GdkPixbuf* _tmp22_;
+		Dimensions _tmp23_;
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = unscaled;
+		_tmp22_ = unscaled;
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = max_dim;
+		_tmp23_ = max_dim;
 #line 1462 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp23_, &_tmp24_, NULL);
-#line 9999 "PhotoPage.c"
+		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp22_, &_tmp23_, NULL);
+#line 10505 "PhotoPage.c"
 	}
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = editing_host_page_editing_host_canvas_new (self);
+	_tmp24_ = editing_host_page_editing_host_canvas_new (self);
 #line 1465 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
+	photo_canvas = G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
 #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = tool;
-#line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = _editing_tools_editing_tool_ref0 (_tmp26_);
+	_tmp25_ = _editing_tools_editing_tool_ref0 (tool);
 #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (self->priv->current_tool);
 #line 1468 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_tool = _tmp27_;
+	self->priv->current_tool = _tmp25_;
 #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = self->priv->current_tool;
+	_tmp26_ = self->priv->current_tool;
 #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = photo_canvas;
+	_tmp27_ = photo_canvas;
 #line 1469 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_activate (_tmp28_, _tmp29_);
+	editing_tools_editing_tool_activate (_tmp26_, _tmp27_);
 #line 1472 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_place_tool_window (self);
 #line 1475 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10028,55 +10532,82 @@ static void editing_host_page_activate_tool (EditingHostPage* self, EditingTools
 	_editing_tools_photo_canvas_unref0 (photo_canvas);
 #line 1428 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (unscaled);
-#line 10027 "PhotoPage.c"
+#line 10531 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender, gpointer self) {
+static void
+_editing_host_page_on_tool_activated_editing_tools_editing_tool_activated (EditingToolsEditingTool* _sender,
+                                                                           gpointer self)
+{
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_activated ((EditingHostPage*) self);
-#line 10034 "PhotoPage.c"
+#line 10541 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
+static void
+_editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender,
+                                                                               gpointer self)
+{
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_deactivated ((EditingHostPage*) self);
-#line 10041 "PhotoPage.c"
+#line 10551 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement, gpointer self) {
+static void
+_editing_host_page_on_tool_applied_editing_tools_editing_tool_applied (EditingToolsEditingTool* _sender,
+                                                                       Command* command,
+                                                                       GdkPixbuf* new_pixbuf,
+                                                                       Dimensions* new_max_dim,
+                                                                       gboolean needs_improvement,
+                                                                       gpointer self)
+{
 #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_applied ((EditingHostPage*) self, command, new_pixbuf, new_max_dim, needs_improvement);
-#line 10048 "PhotoPage.c"
+#line 10565 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender, gpointer self) {
+static void
+_editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled (EditingToolsEditingTool* _sender,
+                                                                           gpointer self)
+{
 #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_cancelled ((EditingHostPage*) self);
-#line 10055 "PhotoPage.c"
+#line 10575 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender, gpointer self) {
+static void
+_editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted (EditingToolsEditingTool* _sender,
+                                                                       gpointer self)
+{
 #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_aborted ((EditingHostPage*) self);
-#line 10062 "PhotoPage.c"
+#line 10585 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_update_pixbuf_gsource_func (gpointer self) {
+static gboolean
+_editing_host_page_update_pixbuf_gsource_func (gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_update_pixbuf ((EditingHostPage*) self);
 #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10071 "PhotoPage.c"
+#line 10596 "PhotoPage.c"
 }
 
 
-static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) {
+static void
+editing_host_page_deactivate_tool (EditingHostPage* self,
+                                   Command* command,
+                                   GdkPixbuf* new_pixbuf,
+                                   Dimensions* new_max_dim,
+                                   gboolean needs_improvement)
+{
 	EditingToolsEditingTool* _tmp0_;
 	EditingToolsEditingTool* tool = NULL;
 	EditingToolsEditingTool* _tmp1_;
@@ -10086,22 +10617,19 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	EditingToolsEditingToolWindow* _tmp4_;
 	gboolean _tmp5_ = FALSE;
 	EditingToolsEditingToolWindow* _tmp6_;
+	EditingToolsEditingTool* _tmp23_;
 	EditingToolsEditingTool* _tmp24_;
-	EditingToolsEditingTool* _tmp25_;
-	guint _tmp26_;
-	EditingToolsEditingTool* _tmp27_;
-	guint _tmp28_;
-	EditingToolsEditingTool* _tmp29_;
-	guint _tmp30_;
-	EditingToolsEditingTool* _tmp31_;
-	guint _tmp32_;
-	EditingToolsEditingTool* _tmp33_;
-	guint _tmp34_;
+	guint _tmp25_;
+	EditingToolsEditingTool* _tmp26_;
+	guint _tmp27_;
+	EditingToolsEditingTool* _tmp28_;
+	guint _tmp29_;
+	EditingToolsEditingTool* _tmp30_;
+	guint _tmp31_;
+	EditingToolsEditingTool* _tmp32_;
+	guint _tmp33_;
 	GdkPixbuf* replacement = NULL;
-	GdkPixbuf* _tmp35_;
-	GdkPixbuf* _tmp43_;
-	gboolean _tmp46_;
-	Command* _tmp47_;
+	GdkPixbuf* _tmp40_;
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10116,7 +10644,7 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	if (_tmp0_ == NULL) {
 #line 1481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10115 "PhotoPage.c"
+#line 10643 "PhotoPage.c"
 	}
 #line 1483 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -10138,117 +10666,114 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_tmp6_ = tool_window;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_ != NULL) {
-#line 10137 "PhotoPage.c"
+#line 10665 "PhotoPage.c"
 		EditingToolsEditingToolWindow* _tmp7_;
-		gboolean _tmp8_;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = tool_window;
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
-#line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = _tmp8_;
-#line 10146 "PhotoPage.c"
+		_tmp5_ = editing_tools_editing_tool_window_has_user_moved (_tmp7_);
+#line 10671 "PhotoPage.c"
 	} else {
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp5_ = FALSE;
-#line 10150 "PhotoPage.c"
+#line 10675 "PhotoPage.c"
 	}
 #line 1488 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp5_) {
-#line 10154 "PhotoPage.c"
+#line 10679 "PhotoPage.c"
 		gint last_location_x = 0;
 		gint last_location_y = 0;
-		EditingToolsEditingToolWindow* _tmp9_;
+		EditingToolsEditingToolWindow* _tmp8_;
+		gint _tmp9_ = 0;
 		gint _tmp10_ = 0;
-		gint _tmp11_ = 0;
-		GeeHashMap* _tmp12_;
-		EditingToolsEditingTool* _tmp13_;
-		const gchar* _tmp14_;
+		GeeHashMap* _tmp11_;
+		EditingToolsEditingTool* _tmp12_;
+		const gchar* _tmp13_;
+		gchar* _tmp14_;
 		gchar* _tmp15_;
-		gchar* _tmp16_;
-		gint _tmp17_;
-		GeeHashMap* _tmp18_;
-		EditingToolsEditingTool* _tmp19_;
-		const gchar* _tmp20_;
+		gint _tmp16_;
+		GeeHashMap* _tmp17_;
+		EditingToolsEditingTool* _tmp18_;
+		const gchar* _tmp19_;
+		gchar* _tmp20_;
 		gchar* _tmp21_;
-		gchar* _tmp22_;
-		gint _tmp23_;
+		gint _tmp22_;
 #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = tool_window;
+		_tmp8_ = tool_window;
 #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_window_get_type (), GtkWindow), &_tmp10_, &_tmp11_);
+		gtk_window_get_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), &_tmp9_, &_tmp10_);
 #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		last_location_x = _tmp10_;
+		last_location_x = _tmp9_;
 #line 1490 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		last_location_y = _tmp11_;
+		last_location_y = _tmp10_;
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = self->priv->last_locations;
+		_tmp11_ = self->priv->last_locations;
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = tool;
+		_tmp12_ = tool;
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _tmp13_->name;
+		_tmp13_ = _tmp12_->name;
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = g_strconcat (_tmp14_, "_x", NULL);
+		_tmp14_ = g_strconcat (_tmp13_, "_x", NULL);
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp15_ = _tmp14_;
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = last_location_x;
+		_tmp16_ = last_location_x;
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp16_, (gpointer) ((gintptr) _tmp17_));
+		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_, (gpointer) ((gintptr) _tmp16_));
 #line 1491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp16_);
+		_g_free0 (_tmp15_);
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = self->priv->last_locations;
+		_tmp17_ = self->priv->last_locations;
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = tool;
+		_tmp18_ = tool;
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp19_->name;
+		_tmp19_ = _tmp18_->name;
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = g_strconcat (_tmp20_, "_y", NULL);
+		_tmp20_ = g_strconcat (_tmp19_, "_y", NULL);
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = _tmp21_;
+		_tmp21_ = _tmp20_;
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = last_location_y;
+		_tmp22_ = last_location_y;
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_, (gpointer) ((gintptr) _tmp23_));
+		gee_abstract_map_set (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_, (gpointer) ((gintptr) _tmp22_));
 #line 1492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp22_);
-#line 10212 "PhotoPage.c"
+		_g_free0 (_tmp21_);
+#line 10737 "PhotoPage.c"
 	}
 #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = tool;
+	_tmp23_ = tool;
 #line 1497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_deactivate (_tmp24_);
+	editing_tools_editing_tool_deactivate (_tmp23_);
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = tool;
+	_tmp24_ = tool;
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp26_, NULL, FALSE);
+	g_signal_parse_name ("activated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp25_, NULL, FALSE);
 #line 1499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (_tmp25_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp26_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self);
+	g_signal_handlers_disconnect_matched (_tmp24_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp25_, 0, NULL, (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self);
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = tool;
+	_tmp26_ = tool;
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp28_, NULL, FALSE);
+	g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp27_, NULL, FALSE);
 #line 1500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (_tmp27_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp28_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self);
+	g_signal_handlers_disconnect_matched (_tmp26_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp27_, 0, NULL, (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self);
 #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = tool;
+	_tmp28_ = tool;
 #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp30_, NULL, FALSE);
+	g_signal_parse_name ("applied", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp29_, NULL, FALSE);
 #line 1501 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (_tmp29_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp30_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self);
+	g_signal_handlers_disconnect_matched (_tmp28_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp29_, 0, NULL, (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self);
 #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = tool;
+	_tmp30_ = tool;
 #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp32_, NULL, FALSE);
+	g_signal_parse_name ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp31_, NULL, FALSE);
 #line 1502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (_tmp31_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp32_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self);
+	g_signal_handlers_disconnect_matched (_tmp30_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp31_, 0, NULL, (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self);
 #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = tool;
+	_tmp32_ = tool;
 #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp34_, NULL, FALSE);
+	g_signal_parse_name ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp33_, NULL, FALSE);
 #line 1503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_handlers_disconnect_matched (_tmp33_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp34_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self);
+	g_signal_handlers_disconnect_matched (_tmp32_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp33_, 0, NULL, (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self);
 #line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
 #line 1505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10260,103 +10785,91 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 #line 1512 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	replacement = NULL;
 #line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_ = new_pixbuf;
-#line 1513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp35_ != NULL) {
-#line 10262 "PhotoPage.c"
-		GdkPixbuf* _tmp36_;
-		GdkPixbuf* _tmp37_;
-#line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = new_pixbuf;
+	if (new_pixbuf != NULL) {
+#line 10785 "PhotoPage.c"
+		GdkPixbuf* _tmp34_;
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = _g_object_ref0 (_tmp36_);
+		_tmp34_ = _g_object_ref0 (new_pixbuf);
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (replacement);
 #line 1514 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		replacement = _tmp37_;
-#line 10273 "PhotoPage.c"
+		replacement = _tmp34_;
+#line 10793 "PhotoPage.c"
 	} else {
-		GdkPixbuf* _tmp38_;
+		GdkPixbuf* _tmp35_;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp38_ = self->priv->cancel_editing_pixbuf;
+		_tmp35_ = self->priv->cancel_editing_pixbuf;
 #line 1515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp38_ != NULL) {
-#line 10280 "PhotoPage.c"
-			GdkPixbuf* _tmp39_;
-			GdkPixbuf* _tmp40_;
-			GdkPixbuf* _tmp41_;
-			Dimensions _tmp42_ = {0};
+		if (_tmp35_ != NULL) {
+#line 10800 "PhotoPage.c"
+			GdkPixbuf* _tmp36_;
+			GdkPixbuf* _tmp37_;
+			GdkPixbuf* _tmp38_;
+			Dimensions _tmp39_ = {0};
 #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp39_ = self->priv->cancel_editing_pixbuf;
+			_tmp36_ = self->priv->cancel_editing_pixbuf;
 #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp40_ = _g_object_ref0 (_tmp39_);
+			_tmp37_ = _g_object_ref0 (_tmp36_);
 #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (replacement);
 #line 1516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			replacement = _tmp40_;
+			replacement = _tmp37_;
 #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp41_ = replacement;
+			_tmp38_ = replacement;
 #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			dimensions_for_pixbuf (_tmp41_, &_tmp42_);
+			dimensions_for_pixbuf (_tmp38_, &_tmp39_);
 #line 1517 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			*new_max_dim = _tmp42_;
+			*new_max_dim = _tmp39_;
 #line 1518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = FALSE;
-#line 10301 "PhotoPage.c"
+#line 10821 "PhotoPage.c"
 		} else {
 #line 1520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			needs_improvement = TRUE;
-#line 10305 "PhotoPage.c"
+#line 10825 "PhotoPage.c"
 		}
 	}
 #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp43_ = replacement;
+	_tmp40_ = replacement;
 #line 1523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp43_ != NULL) {
-#line 10312 "PhotoPage.c"
-		GdkPixbuf* _tmp44_;
-		Dimensions _tmp45_;
+	if (_tmp40_ != NULL) {
+#line 10832 "PhotoPage.c"
+		GdkPixbuf* _tmp41_;
+		Dimensions _tmp42_;
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp44_ = replacement;
+		_tmp41_ = replacement;
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp45_ = *new_max_dim;
+		_tmp42_ = *new_max_dim;
 #line 1524 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp44_, &_tmp45_, NULL);
-#line 10321 "PhotoPage.c"
+		single_photo_page_set_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp41_, &_tmp42_, NULL);
+#line 10841 "PhotoPage.c"
 	}
 #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->cancel_editing_pixbuf);
 #line 1525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->cancel_editing_pixbuf = NULL;
 #line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = needs_improvement;
-#line 1528 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp46_) {
+	if (needs_improvement) {
 #line 1529 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->pixbuf_dirty = TRUE;
 #line 1530 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_update_pixbuf_gsource_func, g_object_ref (self), g_object_unref);
-#line 10335 "PhotoPage.c"
+#line 10853 "PhotoPage.c"
 	}
 #line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp47_ = command;
-#line 1534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp47_ != NULL) {
-#line 10341 "PhotoPage.c"
-		CommandManager* _tmp48_;
-		CommandManager* _tmp49_;
-		Command* _tmp50_;
-#line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp48_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	if (command != NULL) {
+#line 10857 "PhotoPage.c"
+		CommandManager* _tmp43_;
+		CommandManager* _tmp44_;
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp49_ = _tmp48_;
+		_tmp43_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp50_ = command;
+		_tmp44_ = _tmp43_;
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		command_manager_execute (_tmp49_, _tmp50_);
+		command_manager_execute (_tmp44_, command);
 #line 1535 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_command_manager_unref0 (_tmp49_);
-#line 10355 "PhotoPage.c"
+		_command_manager_unref0 (_tmp44_);
+#line 10868 "PhotoPage.c"
 	}
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (replacement);
@@ -10364,11 +10877,14 @@ static void editing_host_page_deactivate_tool (EditingHostPage* self, Command* c
 	_g_object_unref0 (tool_window);
 #line 1478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 10363 "PhotoPage.c"
+#line 10876 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, GdkEventButton* event) {
+static gboolean
+editing_host_page_real_on_double_click (EditingHostPage* self,
+                                        GdkEventButton* event)
+{
 	gboolean result = FALSE;
 #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
@@ -10376,127 +10892,107 @@ static gboolean editing_host_page_real_on_double_click (EditingHostPage* self, G
 	result = FALSE;
 #line 1541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10375 "PhotoPage.c"
+#line 10891 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_on_double_click (EditingHostPage* self, GdkEventButton* event) {
+gboolean
+editing_host_page_on_double_click (EditingHostPage* self,
+                                   GdkEventButton* event)
+{
 #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->on_double_click (self, event);
-#line 10384 "PhotoPage.c"
+#line 10903 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton* event) {
+static gboolean
+editing_host_page_real_on_left_click (Page* base,
+                                      GdkEventButton* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_;
-	GdkEventType _tmp1_;
+	GdkEventType _tmp0_;
 	gint x = 0;
-	GdkEventButton* _tmp6_;
-	gdouble _tmp7_;
+	gdouble _tmp3_;
 	gint y = 0;
-	GdkEventButton* _tmp8_;
-	gdouble _tmp9_;
-	gboolean _tmp10_ = FALSE;
-	EditingToolsEditingTool* _tmp11_;
-	EditingToolsEditingTool* _tmp18_;
-	gint _tmp19_;
-	gint _tmp20_;
-	gboolean _tmp21_;
-	EditingToolsEditingTool* _tmp22_;
-	gint _tmp23_;
-	gint _tmp24_;
+	gdouble _tmp4_;
+	gboolean _tmp5_ = FALSE;
+	EditingToolsEditingTool* _tmp6_;
+	EditingToolsEditingTool* _tmp10_;
+	gint _tmp11_;
+	gint _tmp12_;
+	EditingToolsEditingTool* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = event;
+	_tmp0_ = event->type;
 #line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _tmp0_->type;
-#line 1547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp1_ == GDK_2BUTTON_PRESS) {
-#line 10418 "PhotoPage.c"
-		gboolean _tmp2_ = FALSE;
-		EditingToolsEditingTool* _tmp3_;
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = self->priv->current_tool;
+	if (_tmp0_ == GDK_2BUTTON_PRESS) {
+#line 10934 "PhotoPage.c"
+		gboolean _tmp1_ = FALSE;
+		EditingToolsEditingTool* _tmp2_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp3_ == NULL) {
-#line 10425 "PhotoPage.c"
-			GdkEventButton* _tmp4_;
-			gboolean _tmp5_;
+		_tmp2_ = self->priv->current_tool;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp4_ = event;
+		if (_tmp2_ == NULL) {
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp5_ = editing_host_page_on_double_click (self, _tmp4_);
-#line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp2_ = _tmp5_;
-#line 10434 "PhotoPage.c"
+			_tmp1_ = editing_host_page_on_double_click (self, event);
+#line 10943 "PhotoPage.c"
 		} else {
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp2_ = FALSE;
-#line 10438 "PhotoPage.c"
+			_tmp1_ = FALSE;
+#line 10947 "PhotoPage.c"
 		}
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		result = _tmp2_;
+		result = _tmp1_;
 #line 1548 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10444 "PhotoPage.c"
+#line 10953 "PhotoPage.c"
 	}
 #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = event;
-#line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_->x;
+	_tmp3_ = event->x;
 #line 1550 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	x = (gint) _tmp7_;
-#line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = event;
+	x = (gint) _tmp3_;
 #line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_->y;
+	_tmp4_ = event->y;
 #line 1551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = (gint) _tmp9_;
+	y = (gint) _tmp4_;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = self->priv->current_tool;
-#line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp11_ == NULL) {
-#line 10462 "PhotoPage.c"
-		GtkScale* _tmp12_;
-		gdouble _tmp13_;
+	_tmp6_ = self->priv->current_tool;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = self->priv->zoom_slider;
+	if (_tmp6_ == NULL) {
+#line 10967 "PhotoPage.c"
+		GtkScale* _tmp7_;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_range_get_type (), GtkRange));
+		_tmp7_ = self->priv->zoom_slider;
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = _tmp13_ != 0.0;
-#line 10471 "PhotoPage.c"
+		_tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_range_get_type (), GtkRange)) != 0.0;
+#line 10973 "PhotoPage.c"
 	} else {
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = FALSE;
-#line 10475 "PhotoPage.c"
+		_tmp5_ = FALSE;
+#line 10977 "PhotoPage.c"
 	}
 #line 1555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp10_) {
-#line 10479 "PhotoPage.c"
-		GdkEventButton* _tmp14_;
-		gdouble _tmp15_;
-		GdkEventButton* _tmp16_;
-		gdouble _tmp17_;
-#line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = event;
+	if (_tmp5_) {
+#line 10981 "PhotoPage.c"
+		gdouble _tmp8_;
+		gdouble _tmp9_;
 #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = _tmp14_->x;
+		_tmp8_ = event->x;
 #line 1556 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->zoom_pan_start_point.x = (gint) _tmp15_;
+		self->priv->zoom_pan_start_point.x = (gint) _tmp8_;
 #line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = event;
+		_tmp9_ = event->y;
 #line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = _tmp16_->y;
-#line 1557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		self->priv->zoom_pan_start_point.y = (gint) _tmp17_;
+		self->priv->zoom_pan_start_point.y = (gint) _tmp9_;
 #line 1558 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = TRUE;
 #line 1559 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10505,62 +11001,61 @@ static gboolean editing_host_page_real_on_left_click (Page* base, GdkEventButton
 		result = TRUE;
 #line 1561 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10504 "PhotoPage.c"
+#line 11000 "PhotoPage.c"
 	}
 #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = self->priv->current_tool;
+	_tmp10_ = self->priv->current_tool;
 #line 1565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp18_ == NULL) {
+	if (_tmp10_ == NULL) {
 #line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
 #line 1566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10514 "PhotoPage.c"
+#line 11010 "PhotoPage.c"
 	}
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = x;
+	_tmp11_ = x;
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = y;
+	_tmp12_ = y;
 #line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp19_, _tmp20_);
-#line 1571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp21_) {
+	if (!single_photo_page_is_inside_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp11_, _tmp12_)) {
 #line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
 #line 1572 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10528 "PhotoPage.c"
+#line 11022 "PhotoPage.c"
 	}
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = self->priv->current_tool;
+	_tmp13_ = self->priv->current_tool;
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = x;
+	_tmp14_ = x;
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = y;
+	_tmp15_ = y;
 #line 1574 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_on_left_click (_tmp22_, _tmp23_, _tmp24_);
+	editing_tools_editing_tool_on_left_click (_tmp13_, _tmp14_, _tmp15_);
 #line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
 #line 1577 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10542 "PhotoPage.c"
+#line 11036 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventButton* event) {
+static gboolean
+editing_host_page_real_on_left_released (Page* base,
+                                         GdkEventButton* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-	EditingToolsEditingTool* _tmp21_;
-	EditingToolsEditingTool* _tmp22_;
-	GdkEventButton* _tmp23_;
-	gdouble _tmp24_;
-	GdkEventButton* _tmp25_;
-	gdouble _tmp26_;
-	EditingToolsEditingTool* _tmp27_;
-	EditingToolsEditingToolWindow* _tmp28_;
-	EditingToolsEditingToolWindow* _tmp29_;
-	gboolean _tmp30_;
+	EditingToolsEditingTool* _tmp19_;
+	EditingToolsEditingTool* _tmp20_;
+	gdouble _tmp21_;
+	gdouble _tmp22_;
+	EditingToolsEditingTool* _tmp23_;
+	EditingToolsEditingToolWindow* _tmp24_;
+	EditingToolsEditingToolWindow* _tmp25_;
+	gboolean _tmp26_;
 #line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10569,31 +11064,29 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 	_tmp0_ = self->priv->is_pan_in_progress;
 #line 1581 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 10568 "PhotoPage.c"
+#line 11063 "PhotoPage.c"
 		GdkPoint viewport_center = {0};
 		ZoomState _tmp1_ = {0};
 		GdkPoint _tmp2_ = {0};
 		gint delta_x = 0;
-		GdkEventButton* _tmp3_;
-		gdouble _tmp4_;
-		GdkPoint _tmp5_;
-		gint _tmp6_;
+		gdouble _tmp3_;
+		GdkPoint _tmp4_;
+		gint _tmp5_;
 		gint delta_y = 0;
-		GdkEventButton* _tmp7_;
-		gdouble _tmp8_;
-		GdkPoint _tmp9_;
+		gdouble _tmp6_;
+		GdkPoint _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		gint _tmp10_;
 		gint _tmp11_;
 		gint _tmp12_;
-		gint _tmp13_;
-		gint _tmp14_;
 		ZoomState zoom_state = {0};
-		ZoomState _tmp15_ = {0};
-		GdkPoint _tmp16_;
-		ZoomState _tmp17_;
-		ZoomBuffer* _tmp18_;
-		ZoomBuffer* _tmp19_;
-		ZoomState _tmp20_;
+		ZoomState _tmp13_ = {0};
+		GdkPoint _tmp14_;
+		ZoomState _tmp15_;
+		ZoomBuffer* _tmp16_;
+		ZoomBuffer* _tmp17_;
+		ZoomState _tmp18_;
 #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
 #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10601,286 +11094,266 @@ static gboolean editing_host_page_real_on_left_released (Page* base, GdkEventBut
 #line 1582 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		viewport_center = _tmp2_;
 #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = event;
-#line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_->x;
+		_tmp3_ = event->x;
 #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = self->priv->zoom_pan_start_point;
+		_tmp4_ = self->priv->zoom_pan_start_point;
 #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp5_.x;
+		_tmp5_ = _tmp4_.x;
 #line 1583 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		delta_x = ((gint) _tmp4_) - _tmp6_;
+		delta_x = ((gint) _tmp3_) - _tmp5_;
 #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = event;
+		_tmp6_ = event->y;
 #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = _tmp7_->y;
+		_tmp7_ = self->priv->zoom_pan_start_point;
 #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = self->priv->zoom_pan_start_point;
+		_tmp8_ = _tmp7_.y;
 #line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = _tmp9_.y;
-#line 1584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		delta_y = ((gint) _tmp8_) - _tmp10_;
+		delta_y = ((gint) _tmp6_) - _tmp8_;
 #line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = viewport_center.x;
+		_tmp9_ = viewport_center.x;
 #line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = delta_x;
+		_tmp10_ = delta_x;
 #line 1585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		viewport_center.x = _tmp11_ - _tmp12_;
+		viewport_center.x = _tmp9_ - _tmp10_;
 #line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = viewport_center.y;
+		_tmp11_ = viewport_center.y;
 #line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = delta_y;
+		_tmp12_ = delta_y;
 #line 1586 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		viewport_center.y = _tmp13_ - _tmp14_;
+		viewport_center.y = _tmp11_ - _tmp12_;
 #line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
+		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_);
 #line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = viewport_center;
+		_tmp14_ = viewport_center;
 #line 1588 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_);
+		zoom_state_init_pan (&zoom_state, &_tmp13_, &_tmp14_);
 #line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = zoom_state;
+		_tmp15_ = zoom_state;
 #line 1589 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_);
+		single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
 #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+		_tmp16_ = single_photo_page_get_zoom_buffer (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp17_ = _tmp16_;
 #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = zoom_state;
+		_tmp18_ = zoom_state;
 #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		zoom_buffer_flush_demand_cache (_tmp19_, &_tmp20_);
+		zoom_buffer_flush_demand_cache (_tmp17_, &_tmp18_);
 #line 1590 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp19_);
+		_g_object_unref0 (_tmp17_);
 #line 1592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->is_pan_in_progress = FALSE;
 #line 1593 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 10655 "PhotoPage.c"
+#line 11144 "PhotoPage.c"
 	}
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = self->priv->current_tool;
+	_tmp19_ = self->priv->current_tool;
 #line 1598 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp21_ == NULL) {
+	if (_tmp19_ == NULL) {
 #line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
 #line 1599 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 10665 "PhotoPage.c"
+#line 11154 "PhotoPage.c"
 	}
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = self->priv->current_tool;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = event;
+	_tmp20_ = self->priv->current_tool;
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = _tmp23_->x;
+	_tmp21_ = event->x;
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = event;
+	_tmp22_ = event->y;
 #line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = _tmp25_->y;
-#line 1601 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_tools_editing_tool_on_left_released (_tmp22_, (gint) _tmp24_, (gint) _tmp26_);
+	editing_tools_editing_tool_on_left_released (_tmp20_, (gint) _tmp21_, (gint) _tmp22_);
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = self->priv->current_tool;
+	_tmp23_ = self->priv->current_tool;
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_);
+	_tmp24_ = editing_tools_editing_tool_get_tool_window (_tmp23_);
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp29_ = _tmp28_;
+	_tmp25_ = _tmp24_;
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp30_ = _tmp29_ != NULL;
+	_tmp26_ = _tmp25_ != NULL;
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp29_);
+	_g_object_unref0 (_tmp25_);
 #line 1603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp30_) {
-#line 10691 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp31_;
-		EditingToolsEditingToolWindow* _tmp32_;
-		EditingToolsEditingToolWindow* _tmp33_;
+	if (_tmp26_) {
+#line 11176 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp27_;
+		EditingToolsEditingToolWindow* _tmp28_;
+		EditingToolsEditingToolWindow* _tmp29_;
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = self->priv->current_tool;
+		_tmp27_ = self->priv->current_tool;
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = editing_tools_editing_tool_get_tool_window (_tmp31_);
+		_tmp28_ = editing_tools_editing_tool_get_tool_window (_tmp27_);
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = _tmp32_;
+		_tmp29_ = _tmp28_;
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow));
+		gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_window_get_type (), GtkWindow));
 #line 1604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp33_);
-#line 10705 "PhotoPage.c"
+		_g_object_unref0 (_tmp29_);
+#line 11190 "PhotoPage.c"
 	}
 #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1606 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10711 "PhotoPage.c"
+#line 11196 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_right_click (Page* base, GdkEventButton* event) {
+static gboolean
+editing_host_page_real_on_right_click (Page* base,
+                                       GdkEventButton* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_;
-	gboolean _tmp1_;
 #line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1609 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = event;
-#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp0_);
-#line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp1_;
+	result = page_on_context_buttonpress (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), event);
 #line 1610 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10732 "PhotoPage.c"
+#line 11214 "PhotoPage.c"
 }
 
 
-static gboolean _editing_host_page_on_fetch_original_gsource_func (gpointer self) {
+static gboolean
+_editing_host_page_on_fetch_original_gsource_func (gpointer self)
+{
 	gboolean result;
 	result = editing_host_page_on_fetch_original ((EditingHostPage*) self);
 #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10741 "PhotoPage.c"
+#line 11225 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_photos_altered (EditingHostPage* self, GeeMap* map) {
-	GeeMap* _tmp0_;
+static void
+editing_host_page_on_photos_altered (EditingHostPage* self,
+                                     GeeMap* map)
+{
+	Photo* _tmp0_;
 	Photo* _tmp1_;
-	Photo* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
-	Photo* _tmp5_;
-	Photo* _tmp6_;
-	gboolean _tmp7_;
-	gboolean _tmp8_;
+	gboolean _tmp2_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	gboolean _tmp5_;
+	ViewCollection* _tmp6_;
+	ViewCollection* _tmp7_;
+	ViewCollection* _tmp8_;
 	ViewCollection* _tmp9_;
-	ViewCollection* _tmp10_;
-	gint _tmp11_;
-	ViewCollection* _tmp12_;
-	ViewCollection* _tmp13_;
-	gint _tmp14_;
 #line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1613 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = map;
-#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_get_photo (self);
-#line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp0_ = editing_host_page_get_photo (self);
 #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
+	_tmp1_ = _tmp0_;
 #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = !_tmp3_;
+	_tmp2_ = !gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_OBJECT, DataObject));
 #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 1614 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_) {
+	if (_tmp2_) {
 #line 1615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 10781 "PhotoPage.c"
+#line 11259 "PhotoPage.c"
 	}
 #line 1617 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->pixbuf_dirty = TRUE;
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = editing_host_page_get_photo (self);
-#line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = editing_host_page_get_photo (self);
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = photo_has_transformations (_tmp6_);
+	_tmp4_ = _tmp3_;
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp5_ = photo_has_transformations (_tmp4_);
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp4_);
 #line 1621 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp8_) {
+	if (_tmp5_) {
 #line 1622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		g_idle_add_full (G_PRIORITY_DEFAULT_IDLE, _editing_host_page_on_fetch_original_gsource_func, g_object_ref (self), g_object_unref);
-#line 10799 "PhotoPage.c"
+#line 11275 "PhotoPage.c"
 	}
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
-#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
-#line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = view_collection_get_selected_count (_tmp10_);
+	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp7_ = _tmp6_;
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_DATA_COLLECTION, DataCollection));
+	_tmp9_ = _tmp8_;
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp11_, _tmp14_);
+	page_update_actions (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), view_collection_get_selected_count (_tmp7_), data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_COLLECTION, DataCollection)));
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp13_);
+	_data_collection_unref0 (_tmp9_);
 #line 1624 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp10_);
-#line 10819 "PhotoPage.c"
+	_data_collection_unref0 (_tmp7_);
+#line 11291 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self) {
+static void
+editing_host_page_on_view_contents_ordering_altered (EditingHostPage* self)
+{
 #line 1627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_refresh_caches (self, "on_view_contents_ordering_altered");
-#line 10828 "PhotoPage.c"
+#line 11302 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_on_fetch_original (EditingHostPage* self) {
+static gboolean
+editing_host_page_on_fetch_original (EditingHostPage* self)
+{
 	gboolean result = FALSE;
-	gboolean _tmp0_;
 #line 1631 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (self);
-#line 1632 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
-#line 10841 "PhotoPage.c"
-		PixbufCache* _tmp1_;
+	if (editing_host_page_has_photo (self)) {
+#line 11314 "PhotoPage.c"
+		PixbufCache* _tmp0_;
+		Photo* _tmp1_;
 		Photo* _tmp2_;
-		Photo* _tmp3_;
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = self->priv->master_cache;
+		_tmp0_ = self->priv->master_cache;
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = editing_host_page_get_photo (self);
+		_tmp1_ = editing_host_page_get_photo (self);
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		pixbuf_cache_prefetch (_tmp1_, _tmp3_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
+		pixbuf_cache_prefetch (_tmp0_, _tmp2_, BACKGROUND_JOB_JOB_PRIORITY_LOW, FALSE);
 #line 1633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
-#line 10855 "PhotoPage.c"
+		_g_object_unref0 (_tmp2_);
+#line 11328 "PhotoPage.c"
 	}
 #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = FALSE;
 #line 1635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10861 "PhotoPage.c"
+#line 11334 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
+static gboolean
+editing_host_page_is_panning_possible (EditingHostPage* self)
+{
 	gboolean result = FALSE;
 	Dimensions content_dim = {0};
 	Dimensions _tmp0_ = {0};
 	ZoomState _tmp1_ = {0};
-	gint _tmp2_;
-	ZoomState _tmp3_ = {0};
-	gint _tmp4_;
+	ZoomState _tmp2_ = {0};
 	Dimensions canvas_dim = {0};
-	Dimensions _tmp5_ = {0};
-	gboolean _tmp6_ = FALSE;
+	Dimensions _tmp3_ = {0};
+	gboolean _tmp4_ = FALSE;
+	Dimensions _tmp5_;
+	gint _tmp6_;
 	Dimensions _tmp7_;
 	gint _tmp8_;
-	Dimensions _tmp9_;
-	gint _tmp10_;
 #line 1638 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10890,87 +11363,83 @@ static gboolean editing_host_page_is_panning_possible (EditingHostPage* self) {
 #line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
 #line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = zoom_state_get_zoomed_width (&_tmp1_);
-#line 1642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	content_dim.width = _tmp2_;
-#line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
+	content_dim.width = zoom_state_get_zoomed_width (&_tmp1_);
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = zoom_state_get_zoomed_height (&_tmp3_);
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp2_);
 #line 1643 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	content_dim.height = _tmp4_;
+	content_dim.height = zoom_state_get_zoomed_height (&_tmp2_);
 #line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
+	single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
 #line 1644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	canvas_dim = _tmp5_;
+	canvas_dim = _tmp3_;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = canvas_dim;
+	_tmp5_ = canvas_dim;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_.width;
+	_tmp6_ = _tmp5_.width;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = content_dim;
+	_tmp7_ = content_dim;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_.width;
+	_tmp8_ = _tmp7_.width;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp8_ >= _tmp10_) {
-#line 10912 "PhotoPage.c"
+	if (_tmp6_ >= _tmp8_) {
+#line 11381 "PhotoPage.c"
+		Dimensions _tmp9_;
+		gint _tmp10_;
 		Dimensions _tmp11_;
 		gint _tmp12_;
-		Dimensions _tmp13_;
-		gint _tmp14_;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = canvas_dim;
+		_tmp9_ = canvas_dim;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_.height;
+		_tmp10_ = _tmp9_.height;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = content_dim;
+		_tmp11_ = content_dim;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _tmp13_.height;
+		_tmp12_ = _tmp11_.height;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp12_ >= _tmp14_;
-#line 10927 "PhotoPage.c"
+		_tmp4_ = _tmp10_ >= _tmp12_;
+#line 11396 "PhotoPage.c"
 	} else {
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = FALSE;
-#line 10931 "PhotoPage.c"
+		_tmp4_ = FALSE;
+#line 11400 "PhotoPage.c"
 	}
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = !_tmp6_;
+	result = !_tmp4_;
 #line 1646 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 10937 "PhotoPage.c"
+#line 11406 "PhotoPage.c"
 }
 
 
-static void editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self) {
-	gboolean _tmp0_;
+static void
+editing_host_page_update_cursor_for_zoom_context (EditingHostPage* self)
+{
 #line 1649 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_is_panning_possible (self);
-#line 1650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
+	if (editing_host_page_is_panning_possible (self)) {
 #line 1651 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_FLEUR);
-#line 10951 "PhotoPage.c"
+#line 11419 "PhotoPage.c"
 	} else {
 #line 1653 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_set_page_cursor (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), GDK_LEFT_PTR);
-#line 10955 "PhotoPage.c"
+#line 11423 "PhotoPage.c"
 	}
 }
 
 
-static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* event, gint x, gint y, GdkModifierType mask) {
+static gboolean
+editing_host_page_real_on_motion (Page* base,
+                                  GdkEventMotion* event,
+                                  gint x,
+                                  gint y,
+                                  GdkModifierType mask)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_;
-	gboolean _tmp6_;
-	GdkEventMotion* _tmp24_;
-	gint _tmp25_;
-	gint _tmp26_;
-	GdkModifierType _tmp27_;
-	gboolean _tmp28_;
+	gboolean _tmp2_;
 #line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -10979,167 +11448,137 @@ static gboolean editing_host_page_real_on_motion (Page* base, GdkEventMotion* ev
 	_tmp0_ = self->priv->current_tool;
 #line 1658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 10978 "PhotoPage.c"
+#line 11447 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
-		gint _tmp2_;
-		gint _tmp3_;
-		GdkModifierType _tmp4_;
-		GdkEventMotion* _tmp5_;
 #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = x;
-#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = y;
-#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = mask;
-#line 1659 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_editing_tool_on_motion (_tmp1_, _tmp2_, _tmp3_, _tmp4_);
-#line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = event;
+		editing_tools_editing_tool_on_motion (_tmp1_, x, y, mask);
 #line 1662 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_event_request_motions (_tmp5_);
+		gdk_event_request_motions (event);
 #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
 #line 1664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11002 "PhotoPage.c"
+#line 11459 "PhotoPage.c"
 	}
 #line 1667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_update_cursor_for_zoom_context (self);
 #line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = self->priv->is_pan_in_progress;
+	_tmp2_ = self->priv->is_pan_in_progress;
 #line 1669 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp6_) {
-#line 11010 "PhotoPage.c"
+	if (_tmp2_) {
+#line 11467 "PhotoPage.c"
 		gint delta_x = 0;
-		GdkEventMotion* _tmp7_;
-		gdouble _tmp8_;
-		GdkPoint _tmp9_;
-		gint _tmp10_;
+		gdouble _tmp3_;
+		GdkPoint _tmp4_;
+		gint _tmp5_;
 		gint delta_y = 0;
-		GdkEventMotion* _tmp11_;
-		gdouble _tmp12_;
-		GdkPoint _tmp13_;
-		gint _tmp14_;
+		gdouble _tmp6_;
+		GdkPoint _tmp7_;
+		gint _tmp8_;
 		GdkPoint viewport_center = {0};
-		ZoomState _tmp15_ = {0};
-		GdkPoint _tmp16_ = {0};
-		gint _tmp17_;
-		gint _tmp18_;
-		gint _tmp19_;
-		gint _tmp20_;
+		ZoomState _tmp9_ = {0};
+		GdkPoint _tmp10_ = {0};
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
 		ZoomState zoom_state = {0};
-		ZoomState _tmp21_ = {0};
-		GdkPoint _tmp22_;
-		ZoomState _tmp23_;
-#line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = event;
+		ZoomState _tmp15_ = {0};
+		GdkPoint _tmp16_;
+		ZoomState _tmp17_;
 #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = _tmp7_->x;
+		_tmp3_ = event->x;
 #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = self->priv->zoom_pan_start_point;
+		_tmp4_ = self->priv->zoom_pan_start_point;
 #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = _tmp9_.x;
+		_tmp5_ = _tmp4_.x;
 #line 1670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		delta_x = ((gint) _tmp8_) - _tmp10_;
-#line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = event;
+		delta_x = ((gint) _tmp3_) - _tmp5_;
 #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_->y;
+		_tmp6_ = event->y;
 #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = self->priv->zoom_pan_start_point;
+		_tmp7_ = self->priv->zoom_pan_start_point;
 #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _tmp13_.y;
+		_tmp8_ = _tmp7_.y;
 #line 1671 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		delta_y = ((gint) _tmp12_) - _tmp14_;
+		delta_y = ((gint) _tmp6_) - _tmp8_;
 #line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
+		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp9_);
 #line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		zoom_state_get_viewport_center (&_tmp15_, &_tmp16_);
+		zoom_state_get_viewport_center (&_tmp9_, &_tmp10_);
 #line 1673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		viewport_center = _tmp16_;
+		viewport_center = _tmp10_;
 #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = viewport_center.x;
+		_tmp11_ = viewport_center.x;
 #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = delta_x;
+		_tmp12_ = delta_x;
 #line 1674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		viewport_center.x = _tmp17_ - _tmp18_;
+		viewport_center.x = _tmp11_ - _tmp12_;
 #line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = viewport_center.y;
+		_tmp13_ = viewport_center.y;
 #line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = delta_y;
+		_tmp14_ = delta_y;
 #line 1675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		viewport_center.y = _tmp19_ - _tmp20_;
+		viewport_center.y = _tmp13_ - _tmp14_;
 #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp21_);
+		single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp15_);
 #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = viewport_center;
+		_tmp16_ = viewport_center;
 #line 1677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		zoom_state_init_pan (&zoom_state, &_tmp21_, &_tmp22_);
+		zoom_state_init_pan (&zoom_state, &_tmp15_, &_tmp16_);
 #line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = zoom_state;
+		_tmp17_ = zoom_state;
 #line 1679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp23_);
+		single_photo_page_on_interactive_pan (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_);
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
 #line 1680 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11084 "PhotoPage.c"
+#line 11535 "PhotoPage.c"
 	}
 #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = event;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = x;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = y;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = mask;
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp24_, _tmp25_, _tmp26_, _tmp27_);
-#line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp28_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_motion (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event, x, y, mask);
 #line 1683 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11100 "PhotoPage.c"
+#line 11541 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_leave_notify_event (Page* base) {
+static gboolean
+editing_host_page_real_on_leave_notify_event (Page* base)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_;
-	gboolean _tmp3_;
 #line 1686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
 #line 1687 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11115 "PhotoPage.c"
+#line 11557 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
-		gboolean _tmp2_;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = editing_tools_editing_tool_on_leave_notify_event (_tmp1_);
-#line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		result = _tmp2_;
+		result = editing_tools_editing_tool_on_leave_notify_event (_tmp1_);
 #line 1688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11126 "PhotoPage.c"
+#line 11565 "PhotoPage.c"
 	}
 #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
-#line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp3_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_leave_notify_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page));
 #line 1690 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11134 "PhotoPage.c"
+#line 11571 "PhotoPage.c"
 }
 
 
-static void editing_host_page_track_tool_window (EditingHostPage* self) {
+static void
+editing_host_page_track_tool_window (EditingHostPage* self)
+{
 	EditingToolsEditingTool* _tmp0_;
 #line 1693 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -11147,7 +11586,7 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 	_tmp0_ = self->priv->current_tool;
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11146 "PhotoPage.c"
+#line 11585 "PhotoPage.c"
 		EditingToolsEditingToolWindow* tool_window = NULL;
 		EditingToolsEditingTool* _tmp1_;
 		EditingToolsEditingToolWindow* _tmp2_;
@@ -11163,35 +11602,35 @@ static void editing_host_page_track_tool_window (EditingHostPage* self) {
 		_tmp4_ = tool_window;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp4_ != NULL) {
-#line 11162 "PhotoPage.c"
+#line 11601 "PhotoPage.c"
 			EditingToolsEditingToolWindow* _tmp5_;
-			gboolean _tmp6_;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp5_ = tool_window;
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = editing_tools_editing_tool_window_has_user_moved (_tmp5_);
-#line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp3_ = !_tmp6_;
-#line 11171 "PhotoPage.c"
+			_tmp3_ = !editing_tools_editing_tool_window_has_user_moved (_tmp5_);
+#line 11607 "PhotoPage.c"
 		} else {
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_tmp3_ = FALSE;
-#line 11175 "PhotoPage.c"
+#line 11611 "PhotoPage.c"
 		}
 #line 1697 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (_tmp3_) {
 #line 1698 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			editing_host_page_place_tool_window (self);
-#line 11181 "PhotoPage.c"
+#line 11617 "PhotoPage.c"
 		}
 #line 1695 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (tool_window);
-#line 11185 "PhotoPage.c"
+#line 11621 "PhotoPage.c"
 	}
 }
 
 
-static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
+static void
+editing_host_page_real_on_move (Page* base,
+                                GdkRectangle* rect)
+{
 	EditingHostPage * self;
 	GdkRectangle _tmp0_;
 #line 1702 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11204,11 +11643,14 @@ static void editing_host_page_real_on_move (Page* base, GdkRectangle* rect) {
 	_tmp0_ = *rect;
 #line 1705 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp0_);
-#line 11203 "PhotoPage.c"
+#line 11642 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* rect) {
+static void
+editing_host_page_real_on_move_finished (Page* base,
+                                         GdkRectangle* rect)
+{
 	EditingHostPage * self;
 	GeeHashMap* _tmp0_;
 	GdkRectangle _tmp1_;
@@ -11224,50 +11666,52 @@ static void editing_host_page_real_on_move_finished (Page* base, GdkRectangle* r
 	_tmp1_ = *rect;
 #line 1711 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (editing_host_page_parent_class)->on_move_finished (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), &_tmp1_);
-#line 11223 "PhotoPage.c"
+#line 11665 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self, GdkEventKey* event) {
+static gboolean
+editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
+                                         GdkEventKey* event)
+{
 	gboolean result = FALSE;
 	ZoomState current_zoom_state = {0};
 	ZoomState _tmp0_ = {0};
 	GdkPoint viewport_center = {0};
 	GdkPoint _tmp1_ = {0};
-	GdkEventKey* _tmp2_;
-	guint _tmp3_;
+	guint _tmp2_;
+	const gchar* _tmp3_;
 	const gchar* _tmp4_;
-	const gchar* _tmp5_;
-	GQuark _tmp7_ = 0U;
+	GQuark _tmp6_ = 0U;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label0 = 0;
+	static GQuark _tmp5_label0 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label1 = 0;
+	static GQuark _tmp5_label1 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label2 = 0;
+	static GQuark _tmp5_label2 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label3 = 0;
+	static GQuark _tmp5_label3 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label4 = 0;
+	static GQuark _tmp5_label4 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label5 = 0;
+	static GQuark _tmp5_label5 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label6 = 0;
+	static GQuark _tmp5_label6 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label7 = 0;
+	static GQuark _tmp5_label7 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label8 = 0;
+	static GQuark _tmp5_label8 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label9 = 0;
+	static GQuark _tmp5_label9 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label10 = 0;
+	static GQuark _tmp5_label10 = 0;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp6_label11 = 0;
-#line 11262 "PhotoPage.c"
+	static GQuark _tmp5_label11 = 0;
+#line 11706 "PhotoPage.c"
 	ZoomState new_zoom_state = {0};
-	ZoomState _tmp12_;
-	GdkPoint _tmp13_;
-	ZoomState _tmp14_;
+	ZoomState _tmp11_;
+	GdkPoint _tmp12_;
+	ZoomState _tmp13_;
 #line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), FALSE);
 #line 1714 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11281,146 +11725,143 @@ static gboolean editing_host_page_on_keyboard_pan_event (EditingHostPage* self,
 #line 1716 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	viewport_center = _tmp1_;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = event;
+	_tmp2_ = event->keyval;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_->keyval;
+	_tmp3_ = gdk_keyval_name (_tmp2_);
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = (NULL == _tmp5_) ? 0 : g_quark_from_string (_tmp5_);
+	_tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_);
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (((_tmp7_ == ((0 != _tmp6_label0) ? _tmp6_label0 : (_tmp6_label0 = g_quark_from_static_string ("Left")))) || (_tmp7_ == ((0 != _tmp6_label1) ? _tmp6_label1 : (_tmp6_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp7_ == ((0 != _tmp6_label2) ? _tmp6_label2 : (_tmp6_label2 = g_quark_from_static_string ("KP_4"))))) {
+	if (((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("Left")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("KP_Left"))))) || (_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("KP_4"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11293 "PhotoPage.c"
+#line 11735 "PhotoPage.c"
 			default:
 			{
-				gint _tmp8_;
+				gint _tmp7_;
 #line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp8_ = viewport_center.x;
+				_tmp7_ = viewport_center.x;
 #line 1722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				viewport_center.x = _tmp8_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
+				viewport_center.x = _tmp7_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1723 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11303 "PhotoPage.c"
+#line 11745 "PhotoPage.c"
 			}
 		}
-	} else if (((_tmp7_ == ((0 != _tmp6_label3) ? _tmp6_label3 : (_tmp6_label3 = g_quark_from_static_string ("Right")))) || (_tmp7_ == ((0 != _tmp6_label4) ? _tmp6_label4 : (_tmp6_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp7_ == ((0 != _tmp6_label5) ? _tmp6_label5 : (_tmp6_label5 = g_quark_from_static_string ("KP_6"))))) {
+	} else if (((_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("Right")))) || (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("KP_Right"))))) || (_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("KP_6"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11309 "PhotoPage.c"
+#line 11751 "PhotoPage.c"
 			default:
 			{
-				gint _tmp9_;
+				gint _tmp8_;
 #line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp9_ = viewport_center.x;
+				_tmp8_ = viewport_center.x;
 #line 1728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				viewport_center.x = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
+				viewport_center.x = _tmp8_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11319 "PhotoPage.c"
+#line 11761 "PhotoPage.c"
 			}
 		}
-	} else if (((_tmp7_ == ((0 != _tmp6_label6) ? _tmp6_label6 : (_tmp6_label6 = g_quark_from_static_string ("Down")))) || (_tmp7_ == ((0 != _tmp6_label7) ? _tmp6_label7 : (_tmp6_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp7_ == ((0 != _tmp6_label8) ? _tmp6_label8 : (_tmp6_label8 = g_quark_from_static_string ("KP_2"))))) {
+	} else if (((_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("Down")))) || (_tmp6_ == ((0 != _tmp5_label7) ? _tmp5_label7 : (_tmp5_label7 = g_quark_from_static_string ("KP_Down"))))) || (_tmp6_ == ((0 != _tmp5_label8) ? _tmp5_label8 : (_tmp5_label8 = g_quark_from_static_string ("KP_2"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11325 "PhotoPage.c"
+#line 11767 "PhotoPage.c"
 			default:
 			{
-				gint _tmp10_;
+				gint _tmp9_;
 #line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp10_ = viewport_center.y;
+				_tmp9_ = viewport_center.y;
 #line 1734 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				viewport_center.y = _tmp10_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
+				viewport_center.y = _tmp9_ + EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1735 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11335 "PhotoPage.c"
+#line 11777 "PhotoPage.c"
 			}
 		}
-	} else if (((_tmp7_ == ((0 != _tmp6_label9) ? _tmp6_label9 : (_tmp6_label9 = g_quark_from_static_string ("Up")))) || (_tmp7_ == ((0 != _tmp6_label10) ? _tmp6_label10 : (_tmp6_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp7_ == ((0 != _tmp6_label11) ? _tmp6_label11 : (_tmp6_label11 = g_quark_from_static_string ("KP_8"))))) {
+	} else if (((_tmp6_ == ((0 != _tmp5_label9) ? _tmp5_label9 : (_tmp5_label9 = g_quark_from_static_string ("Up")))) || (_tmp6_ == ((0 != _tmp5_label10) ? _tmp5_label10 : (_tmp5_label10 = g_quark_from_static_string ("KP_Up"))))) || (_tmp6_ == ((0 != _tmp5_label11) ? _tmp5_label11 : (_tmp5_label11 = g_quark_from_static_string ("KP_8"))))) {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11341 "PhotoPage.c"
+#line 11783 "PhotoPage.c"
 			default:
 			{
-				gint _tmp11_;
+				gint _tmp10_;
 #line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp11_ = viewport_center.y;
+				_tmp10_ = viewport_center.y;
 #line 1740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				viewport_center.y = _tmp11_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
+				viewport_center.y = _tmp10_ - EDITING_HOST_PAGE_PAN_INCREMENT_SIZE;
 #line 1741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11351 "PhotoPage.c"
+#line 11793 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1718 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11357 "PhotoPage.c"
+#line 11799 "PhotoPage.c"
 			default:
 			{
 #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				result = FALSE;
 #line 1744 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				return result;
-#line 11364 "PhotoPage.c"
+#line 11806 "PhotoPage.c"
 			}
 		}
 	}
 #line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = current_zoom_state;
+	_tmp11_ = current_zoom_state;
 #line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = viewport_center;
+	_tmp12_ = viewport_center;
 #line 1747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	zoom_state_init_pan (&new_zoom_state, &_tmp12_, &_tmp13_);
+	zoom_state_init_pan (&new_zoom_state, &_tmp11_, &_tmp12_);
 #line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = new_zoom_state;
+	_tmp13_ = new_zoom_state;
 #line 1748 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp14_);
+	single_photo_page_set_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_);
 #line 1749 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
 #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
 #line 1751 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11384 "PhotoPage.c"
+#line 11826 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_key_press_event (GtkWidget* base,
+                                        GdkEventKey* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_;
-	gboolean _tmp4_;
-	GdkEventKey* _tmp7_;
-	gboolean _tmp8_;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp9_;
-	guint _tmp10_;
-	const gchar* _tmp11_;
-	const gchar* _tmp12_;
-	GQuark _tmp14_ = 0U;
+	guint _tmp2_;
+	const gchar* _tmp3_;
+	const gchar* _tmp4_;
+	GQuark _tmp6_ = 0U;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label0 = 0;
+	static GQuark _tmp5_label0 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label1 = 0;
+	static GQuark _tmp5_label1 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label2 = 0;
+	static GQuark _tmp5_label2 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label3 = 0;
+	static GQuark _tmp5_label3 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label4 = 0;
+	static GQuark _tmp5_label4 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label5 = 0;
+	static GQuark _tmp5_label5 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label6 = 0;
+	static GQuark _tmp5_label6 = 0;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp13_label7 = 0;
-#line 11417 "PhotoPage.c"
-	gboolean _tmp15_;
-	gboolean _tmp16_ = FALSE;
+	static GQuark _tmp5_label7 = 0;
+#line 11858 "PhotoPage.c"
+	gboolean _tmp7_;
+	gboolean _tmp8_ = FALSE;
 #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11429,157 +11870,133 @@ static gboolean editing_host_page_real_key_press_event (GtkWidget* base, GdkEven
 	_tmp0_ = self->priv->current_tool;
 #line 1756 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11428 "PhotoPage.c"
+#line 11869 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
-		GdkEventKey* _tmp2_;
-		gboolean _tmp3_;
 #line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = event;
-#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_tools_editing_tool_on_keypress (_tmp1_, _tmp2_);
-#line 1757 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp3_) {
+		if (editing_tools_editing_tool_on_keypress (_tmp1_, event)) {
 #line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
 #line 1758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11444 "PhotoPage.c"
+#line 11879 "PhotoPage.c"
 		}
 	}
 #line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = editing_host_page_is_panning_possible (self);
-#line 1762 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_) {
-#line 11451 "PhotoPage.c"
-		GdkEventKey* _tmp5_;
-		gboolean _tmp6_;
-#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = event;
+	if (editing_host_page_is_panning_possible (self)) {
 #line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = editing_host_page_on_keyboard_pan_event (self, _tmp5_);
-#line 1763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp6_) {
+		if (editing_host_page_on_keyboard_pan_event (self, event)) {
 #line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			result = TRUE;
 #line 1764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return result;
-#line 11464 "PhotoPage.c"
+#line 11890 "PhotoPage.c"
 		}
 	}
 #line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = event;
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = editing_host_page_on_zoom_slider_key_press (self, _tmp7_);
-#line 1770 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp8_) {
+	if (editing_host_page_on_zoom_slider_key_press (self, event)) {
 #line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
 #line 1771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11477 "PhotoPage.c"
+#line 11899 "PhotoPage.c"
 	}
 #line 1773 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = event;
-#line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_->keyval;
+	_tmp2_ = event->keyval;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = gdk_keyval_name (_tmp10_);
+	_tmp3_ = gdk_keyval_name (_tmp2_);
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp4_ = _tmp3_;
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = (NULL == _tmp12_) ? 0 : g_quark_from_string (_tmp12_);
+	_tmp6_ = (NULL == _tmp4_) ? 0 : g_quark_from_string (_tmp4_);
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if ((_tmp14_ == ((0 != _tmp13_label0) ? _tmp13_label0 : (_tmp13_label0 = g_quark_from_static_string ("Down")))) || (_tmp14_ == ((0 != _tmp13_label1) ? _tmp13_label1 : (_tmp13_label1 = g_quark_from_static_string ("KP_Down"))))) {
+	if ((_tmp6_ == ((0 != _tmp5_label0) ? _tmp5_label0 : (_tmp5_label0 = g_quark_from_static_string ("Down")))) || (_tmp6_ == ((0 != _tmp5_label1) ? _tmp5_label1 : (_tmp5_label1 = g_quark_from_static_string ("KP_Down"))))) {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11495 "PhotoPage.c"
+#line 11915 "PhotoPage.c"
 			default:
 			{
 #line 1780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11500 "PhotoPage.c"
+#line 11920 "PhotoPage.c"
 			}
 		}
-	} else if (((_tmp14_ == ((0 != _tmp13_label2) ? _tmp13_label2 : (_tmp13_label2 = g_quark_from_static_string ("equal")))) || (_tmp14_ == ((0 != _tmp13_label3) ? _tmp13_label3 : (_tmp13_label3 = g_quark_from_static_string ("plus"))))) || (_tmp14_ == ((0 != _tmp13_label4) ? _tmp13_label4 : (_tmp13_label4 = g_quark_from_static_string ("KP_Add"))))) {
+	} else if (((_tmp6_ == ((0 != _tmp5_label2) ? _tmp5_label2 : (_tmp5_label2 = g_quark_from_static_string ("equal")))) || (_tmp6_ == ((0 != _tmp5_label3) ? _tmp5_label3 : (_tmp5_label3 = g_quark_from_static_string ("plus"))))) || (_tmp6_ == ((0 != _tmp5_label4) ? _tmp5_label4 : (_tmp5_label4 = g_quark_from_static_string ("KP_Add"))))) {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11506 "PhotoPage.c"
+#line 11926 "PhotoPage.c"
 			default:
 			{
 #line 1785 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize");
 #line 1786 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11513 "PhotoPage.c"
+#line 11933 "PhotoPage.c"
 			}
 		}
-	} else if (((_tmp14_ == ((0 != _tmp13_label5) ? _tmp13_label5 : (_tmp13_label5 = g_quark_from_static_string ("minus")))) || (_tmp14_ == ((0 != _tmp13_label6) ? _tmp13_label6 : (_tmp13_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp14_ == ((0 != _tmp13_label7) ? _tmp13_label7 : (_tmp13_label7 = g_quark_from_static_string ("KP_Subtract"))))) {
+	} else if (((_tmp6_ == ((0 != _tmp5_label5) ? _tmp5_label5 : (_tmp5_label5 = g_quark_from_static_string ("minus")))) || (_tmp6_ == ((0 != _tmp5_label6) ? _tmp5_label6 : (_tmp5_label6 = g_quark_from_static_string ("underscore"))))) || (_tmp6_ == ((0 != _tmp5_label7) ? _tmp5_label7 : (_tmp5_label7 = g_quark_from_static_string ("KP_Subtract"))))) {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11519 "PhotoPage.c"
+#line 11939 "PhotoPage.c"
 			default:
 			{
 #line 1792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize");
 #line 1793 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11526 "PhotoPage.c"
+#line 11946 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 1775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 11532 "PhotoPage.c"
+#line 11952 "PhotoPage.c"
 			default:
 			{
 #line 1796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 1797 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 11539 "PhotoPage.c"
+#line 11959 "PhotoPage.c"
 			}
 		}
 	}
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = handled;
+	_tmp7_ = handled;
 #line 1800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp15_) {
+	if (_tmp7_) {
 #line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
 #line 1801 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 11551 "PhotoPage.c"
+#line 11971 "PhotoPage.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event != NULL) {
-#line 11555 "PhotoPage.c"
-		GdkEventKey* _tmp17_;
-		gboolean _tmp18_;
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = event;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), _tmp17_);
-#line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp18_;
-#line 11564 "PhotoPage.c"
+		_tmp8_ = GTK_WIDGET_CLASS (editing_host_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), gtk_widget_get_type (), GtkWidget), event);
+#line 11977 "PhotoPage.c"
 	} else {
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = TRUE;
-#line 11568 "PhotoPage.c"
+		_tmp8_ = TRUE;
+#line 11981 "PhotoPage.c"
 	}
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp16_;
+	result = _tmp8_;
 #line 1803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11574 "PhotoPage.c"
+#line 11987 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t* default_ctx, Dimensions* dim) {
+static void
+editing_host_page_real_new_surface (SinglePhotoPage* base,
+                                    cairo_t* default_ctx,
+                                    Dimensions* dim)
+{
 	EditingHostPage * self;
 	EditingToolsEditingTool* _tmp0_;
 #line 1806 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11592,27 +12009,29 @@ static void editing_host_page_real_new_surface (SinglePhotoPage* base, cairo_t*
 	_tmp0_ = self->priv->current_tool;
 #line 1808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11591 "PhotoPage.c"
+#line 12008 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
 		EditingToolsPhotoCanvas* _tmp2_;
-		cairo_t* _tmp3_;
-		Dimensions _tmp4_;
+		Dimensions _tmp3_;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp2_ = _tmp1_->canvas;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = default_ctx;
+		_tmp3_ = *dim;
 #line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = *dim;
-#line 1809 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_photo_canvas_set_surface (_tmp2_, _tmp3_, &_tmp4_);
-#line 11606 "PhotoPage.c"
+		editing_tools_photo_canvas_set_surface (_tmp2_, default_ctx, &_tmp3_);
+#line 12020 "PhotoPage.c"
 	}
 }
 
 
-static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPixbuf* pixbuf, SinglePhotoPageUpdateReason reason, Dimensions* old_dim) {
+static void
+editing_host_page_real_updated_pixbuf (SinglePhotoPage* base,
+                                       GdkPixbuf* pixbuf,
+                                       SinglePhotoPageUpdateReason reason,
+                                       Dimensions* old_dim)
+{
 	EditingHostPage * self;
 	gboolean _tmp0_ = FALSE;
 	EditingToolsEditingTool* _tmp1_;
@@ -11626,143 +12045,162 @@ static void editing_host_page_real_updated_pixbuf (SinglePhotoPage* base, GdkPix
 	_tmp1_ = self->priv->current_tool;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_ != NULL) {
-#line 11625 "PhotoPage.c"
-		SinglePhotoPageUpdateReason _tmp2_;
-#line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = reason;
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp2_ != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
-#line 11631 "PhotoPage.c"
+		_tmp0_ = reason != SINGLE_PHOTO_PAGE_UPDATE_REASON_QUALITY_IMPROVEMENT;
+#line 12046 "PhotoPage.c"
 	} else {
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 11635 "PhotoPage.c"
+#line 12050 "PhotoPage.c"
 	}
 #line 1816 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
-#line 11639 "PhotoPage.c"
-		EditingToolsEditingTool* _tmp3_;
-		EditingToolsPhotoCanvas* _tmp4_;
-		Dimensions _tmp5_;
-		GdkPixbuf* _tmp6_;
-		GdkRectangle _tmp7_ = {0};
-#line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = self->priv->current_tool;
+#line 12054 "PhotoPage.c"
+		EditingToolsEditingTool* _tmp2_;
+		EditingToolsPhotoCanvas* _tmp3_;
+		Dimensions _tmp4_;
+		GdkRectangle _tmp5_ = {0};
 #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_->canvas;
+		_tmp2_ = self->priv->current_tool;
 #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = *old_dim;
+		_tmp3_ = _tmp2_->canvas;
 #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = pixbuf;
+		_tmp4_ = *old_dim;
 #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp7_);
+		single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
 #line 1817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_photo_canvas_resized_pixbuf (_tmp4_, &_tmp5_, _tmp6_, &_tmp7_);
+		editing_tools_photo_canvas_resized_pixbuf (_tmp3_, &_tmp4_, pixbuf, &_tmp5_);
 #line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (self->priv->cancel_editing_pixbuf);
 #line 1818 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->cancel_editing_pixbuf = NULL;
-#line 11661 "PhotoPage.c"
+#line 12073 "PhotoPage.c"
 	}
 }
 
 
-static GdkPixbuf* editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
+static GdkPixbuf*
+editing_host_page_real_get_bottom_left_trinket (EditingHostPage* self,
+                                                gint scale)
+{
 	GdkPixbuf* result = NULL;
 #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
 #line 1823 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11672 "PhotoPage.c"
+#line 12087 "PhotoPage.c"
 }
 
 
-GdkPixbuf* editing_host_page_get_bottom_left_trinket (EditingHostPage* self, gint scale) {
+GdkPixbuf*
+editing_host_page_get_bottom_left_trinket (EditingHostPage* self,
+                                           gint scale)
+{
 #line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1822 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_left_trinket (self, scale);
-#line 11681 "PhotoPage.c"
+#line 12099 "PhotoPage.c"
 }
 
 
-static GdkPixbuf* editing_host_page_real_get_top_left_trinket (EditingHostPage* self, gint scale) {
+static GdkPixbuf*
+editing_host_page_real_get_top_left_trinket (EditingHostPage* self,
+                                             gint scale)
+{
 	GdkPixbuf* result = NULL;
 #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
 #line 1827 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11691 "PhotoPage.c"
+#line 12112 "PhotoPage.c"
 }
 
 
-GdkPixbuf* editing_host_page_get_top_left_trinket (EditingHostPage* self, gint scale) {
+GdkPixbuf*
+editing_host_page_get_top_left_trinket (EditingHostPage* self,
+                                        gint scale)
+{
 #line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1826 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_left_trinket (self, scale);
-#line 11700 "PhotoPage.c"
+#line 12124 "PhotoPage.c"
 }
 
 
-static GdkPixbuf* editing_host_page_real_get_top_right_trinket (EditingHostPage* self, gint scale) {
+static GdkPixbuf*
+editing_host_page_real_get_top_right_trinket (EditingHostPage* self,
+                                              gint scale)
+{
 	GdkPixbuf* result = NULL;
 #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
 #line 1831 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11710 "PhotoPage.c"
+#line 12137 "PhotoPage.c"
 }
 
 
-GdkPixbuf* editing_host_page_get_top_right_trinket (EditingHostPage* self, gint scale) {
+GdkPixbuf*
+editing_host_page_get_top_right_trinket (EditingHostPage* self,
+                                         gint scale)
+{
 #line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1830 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_top_right_trinket (self, scale);
-#line 11719 "PhotoPage.c"
+#line 12149 "PhotoPage.c"
 }
 
 
-static GdkPixbuf* editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
+static GdkPixbuf*
+editing_host_page_real_get_bottom_right_trinket (EditingHostPage* self,
+                                                 gint scale)
+{
 	GdkPixbuf* result = NULL;
 #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = NULL;
 #line 1835 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 11729 "PhotoPage.c"
+#line 12162 "PhotoPage.c"
 }
 
 
-GdkPixbuf* editing_host_page_get_bottom_right_trinket (EditingHostPage* self, gint scale) {
+GdkPixbuf*
+editing_host_page_get_bottom_right_trinket (EditingHostPage* self,
+                                            gint scale)
+{
 #line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (self), NULL);
 #line 1834 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return EDITING_HOST_PAGE_GET_CLASS (self)->get_bottom_right_trinket (self, scale);
-#line 11738 "PhotoPage.c"
+#line 12174 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, Dimensions* ctx_dim) {
+static void
+editing_host_page_real_paint (SinglePhotoPage* base,
+                              cairo_t* ctx,
+                              Dimensions* ctx_dim)
+{
 	EditingHostPage * self;
 	EditingToolsEditingTool* _tmp0_;
-	gboolean _tmp3_ = FALSE;
-	gboolean _tmp4_;
-	cairo_t* _tmp22_;
-	Dimensions _tmp23_;
-	ZoomState _tmp24_ = {0};
-	gboolean _tmp25_;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_;
+	Dimensions _tmp16_;
+	ZoomState _tmp17_ = {0};
 	GdkRectangle scaled_rect = {0};
-	GdkRectangle _tmp26_ = {0};
+	GdkRectangle _tmp18_ = {0};
 	GdkPixbuf* trinket = NULL;
-	GdkPixbuf* _tmp27_;
-	GdkPixbuf* _tmp28_;
-	GdkPixbuf* _tmp52_;
-	GdkPixbuf* _tmp53_;
-	GdkPixbuf* _tmp72_;
-	GdkPixbuf* _tmp73_;
-	GdkPixbuf* _tmp97_;
-	GdkPixbuf* _tmp98_;
+	GdkPixbuf* _tmp19_;
+	GdkPixbuf* _tmp20_;
+	GdkPixbuf* _tmp41_;
+	GdkPixbuf* _tmp42_;
+	GdkPixbuf* _tmp58_;
+	GdkPixbuf* _tmp59_;
+	GdkPixbuf* _tmp80_;
+	GdkPixbuf* _tmp81_;
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -11773,509 +12211,453 @@ static void editing_host_page_real_paint (SinglePhotoPage* base, cairo_t* ctx, D
 	_tmp0_ = self->priv->current_tool;
 #line 1839 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ != NULL) {
-#line 11772 "PhotoPage.c"
+#line 12210 "PhotoPage.c"
 		EditingToolsEditingTool* _tmp1_;
-		cairo_t* _tmp2_;
 #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = self->priv->current_tool;
 #line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = ctx;
-#line 1840 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_editing_tool_paint (_tmp1_, _tmp2_);
+		editing_tools_editing_tool_paint (_tmp1_, ctx);
 #line 1842 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11783 "PhotoPage.c"
+#line 12218 "PhotoPage.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = self->priv->photo_missing;
-#line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_) {
-#line 11789 "PhotoPage.c"
-		gboolean _tmp5_;
+	_tmp3_ = self->priv->photo_missing;
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = editing_host_page_has_photo (self);
+	if (_tmp3_) {
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp5_;
-#line 11795 "PhotoPage.c"
+		_tmp2_ = editing_host_page_has_photo (self);
+#line 12226 "PhotoPage.c"
 	} else {
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = FALSE;
-#line 11799 "PhotoPage.c"
+		_tmp2_ = FALSE;
+#line 12230 "PhotoPage.c"
 	}
 #line 1845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_) {
-#line 11803 "PhotoPage.c"
-		cairo_t* _tmp6_;
-		cairo_t* _tmp7_;
-		Dimensions _tmp8_ = {0};
-		gint _tmp9_;
-		Dimensions _tmp10_ = {0};
-		gint _tmp11_;
-		cairo_t* _tmp12_;
-		cairo_t* _tmp13_;
-		Photo* _tmp14_;
-		Photo* _tmp15_;
-		GFile* _tmp16_;
-		GFile* _tmp17_;
-		gchar* _tmp18_;
-		gchar* _tmp19_;
-		gchar* _tmp20_;
-		gchar* _tmp21_;
-#line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = ctx;
+	if (_tmp2_) {
+#line 12234 "PhotoPage.c"
+		Dimensions _tmp4_ = {0};
+		gint _tmp5_;
+		Dimensions _tmp6_ = {0};
+		gint _tmp7_;
+		Photo* _tmp8_;
+		Photo* _tmp9_;
+		GFile* _tmp10_;
+		GFile* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
+		gchar* _tmp14_;
+		gchar* _tmp15_;
 #line 1846 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		set_source_color_from_string (_tmp6_, "#000");
-#line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = ctx;
+		set_source_color_from_string (ctx, "#000");
 #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
+		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp4_);
 #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = _tmp8_.width;
+		_tmp5_ = _tmp4_.width;
 #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp10_);
+		single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp6_);
 #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = _tmp10_.height;
+		_tmp7_ = _tmp6_.height;
 #line 1847 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp7_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp9_, (gdouble) _tmp11_);
+		cairo_rectangle (ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp7_);
 #line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = ctx;
-#line 1848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp12_);
-#line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = ctx;
+		cairo_fill (ctx);
 #line 1849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_paint (_tmp13_);
+		cairo_paint (ctx);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = editing_host_page_get_photo (self);
+		_tmp8_ = editing_host_page_get_photo (self);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = _tmp14_;
+		_tmp9_ = _tmp8_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource));
+		_tmp10_ = media_source_get_file (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = _tmp16_;
+		_tmp11_ = _tmp10_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = g_file_get_path (_tmp17_);
+		_tmp12_ = g_file_get_path (_tmp11_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp13_ = _tmp12_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = g_strdup_printf (_ ("Photo source file missing: %s"), _tmp19_);
+		_tmp14_ = g_strdup_printf (_ ("Photo source file missing: %s"), _tmp13_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = _tmp20_;
+		_tmp15_ = _tmp14_;
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_host_page_draw_message (self, _tmp21_);
+		editing_host_page_draw_message (self, _tmp15_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp21_);
+		_g_free0 (_tmp15_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp19_);
+		_g_free0 (_tmp13_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp17_);
+		_g_object_unref0 (_tmp11_);
 #line 1850 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp15_);
+		_g_object_unref0 (_tmp9_);
 #line 1851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11872 "PhotoPage.c"
+#line 12291 "PhotoPage.c"
 	}
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = ctx;
+	_tmp16_ = *ctx_dim;
 #line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = *ctx_dim;
-#line 1854 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), _tmp22_, &_tmp23_);
-#line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp24_);
+	SINGLE_PHOTO_PAGE_CLASS (editing_host_page_parent_class)->paint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), ctx, &_tmp16_);
 #line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = zoom_state_is_default (&_tmp24_);
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp17_);
 #line 1856 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp25_) {
+	if (!zoom_state_is_default (&_tmp17_)) {
 #line 1857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 11888 "PhotoPage.c"
+#line 12303 "PhotoPage.c"
 	}
 #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp26_);
+	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp18_);
 #line 1860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaled_rect = _tmp26_;
+	scaled_rect = _tmp18_;
 #line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp19_ = editing_host_page_get_bottom_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp27_;
+	trinket = _tmp19_;
 #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = trinket;
+	_tmp20_ = trinket;
 #line 1863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp28_ != NULL) {
-#line 11902 "PhotoPage.c"
+	if (_tmp20_ != NULL) {
+#line 12317 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp29_;
-		gint _tmp30_;
+		GdkRectangle _tmp21_;
+		gint _tmp22_;
 		gint y = 0;
-		GdkRectangle _tmp31_;
+		GdkRectangle _tmp23_;
+		gint _tmp24_;
+		GdkRectangle _tmp25_;
+		gint _tmp26_;
+		GdkPixbuf* _tmp27_;
+		gint _tmp28_;
+		gint _tmp29_;
+		GdkPixbuf* _tmp30_;
+		gint _tmp31_;
 		gint _tmp32_;
-		GdkRectangle _tmp33_;
+		gint _tmp33_;
 		gint _tmp34_;
 		GdkPixbuf* _tmp35_;
 		gint _tmp36_;
 		gint _tmp37_;
-		cairo_t* _tmp38_;
-		GdkPixbuf* _tmp39_;
+		GdkPixbuf* _tmp38_;
+		gint _tmp39_;
 		gint _tmp40_;
-		gint _tmp41_;
-		cairo_t* _tmp42_;
-		gint _tmp43_;
-		gint _tmp44_;
-		GdkPixbuf* _tmp45_;
-		gint _tmp46_;
-		gint _tmp47_;
-		GdkPixbuf* _tmp48_;
-		gint _tmp49_;
-		gint _tmp50_;
-		cairo_t* _tmp51_;
 #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = scaled_rect;
+		_tmp21_ = scaled_rect;
 #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = _tmp29_.x;
+		_tmp22_ = _tmp21_.x;
 #line 1864 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = _tmp30_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = _tmp22_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = scaled_rect;
+		_tmp23_ = scaled_rect;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = _tmp31_.y;
+		_tmp24_ = _tmp23_.y;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = scaled_rect;
+		_tmp25_ = scaled_rect;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = _tmp33_.height;
+		_tmp26_ = _tmp25_.height;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp35_ = trinket;
+		_tmp27_ = trinket;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = gdk_pixbuf_get_height (_tmp35_);
+		_tmp28_ = gdk_pixbuf_get_height (_tmp27_);
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = _tmp36_;
+		_tmp29_ = _tmp28_;
 #line 1865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = ((_tmp32_ + _tmp34_) - _tmp37_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp38_ = ctx;
+		y = ((_tmp24_ + _tmp26_) - _tmp29_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp39_ = trinket;
+		_tmp30_ = trinket;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp40_ = x;
+		_tmp31_ = x;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp41_ = y;
+		_tmp32_ = y;
 #line 1866 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp38_, _tmp39_, (gdouble) _tmp40_, (gdouble) _tmp41_);
-#line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp42_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp30_, (gdouble) _tmp31_, (gdouble) _tmp32_);
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp43_ = x;
+		_tmp33_ = x;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp44_ = y;
+		_tmp34_ = y;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp45_ = trinket;
+		_tmp35_ = trinket;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp46_ = gdk_pixbuf_get_width (_tmp45_);
+		_tmp36_ = gdk_pixbuf_get_width (_tmp35_);
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp47_ = _tmp46_;
+		_tmp37_ = _tmp36_;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp48_ = trinket;
+		_tmp38_ = trinket;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp49_ = gdk_pixbuf_get_height (_tmp48_);
+		_tmp39_ = gdk_pixbuf_get_height (_tmp38_);
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp50_ = _tmp49_;
+		_tmp40_ = _tmp39_;
 #line 1867 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp42_, (gdouble) _tmp43_, (gdouble) _tmp44_, (gdouble) _tmp47_, (gdouble) _tmp50_);
-#line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp51_ = ctx;
+		cairo_rectangle (ctx, (gdouble) _tmp33_, (gdouble) _tmp34_, (gdouble) _tmp37_, (gdouble) _tmp40_);
 #line 1868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp51_);
-#line 11984 "PhotoPage.c"
+		cairo_fill (ctx);
+#line 12390 "PhotoPage.c"
 	}
 #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp52_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp41_ = editing_host_page_get_top_left_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
 #line 1871 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp52_;
+	trinket = _tmp41_;
 #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp53_ = trinket;
+	_tmp42_ = trinket;
 #line 1872 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp53_ != NULL) {
-#line 11996 "PhotoPage.c"
+	if (_tmp42_ != NULL) {
+#line 12402 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp54_;
-		gint _tmp55_;
+		GdkRectangle _tmp43_;
+		gint _tmp44_;
 		gint y = 0;
-		GdkRectangle _tmp56_;
+		GdkRectangle _tmp45_;
+		gint _tmp46_;
+		GdkPixbuf* _tmp47_;
+		gint _tmp48_;
+		gint _tmp49_;
+		gint _tmp50_;
+		gint _tmp51_;
+		GdkPixbuf* _tmp52_;
+		gint _tmp53_;
+		gint _tmp54_;
+		GdkPixbuf* _tmp55_;
+		gint _tmp56_;
 		gint _tmp57_;
-		cairo_t* _tmp58_;
-		GdkPixbuf* _tmp59_;
-		gint _tmp60_;
-		gint _tmp61_;
-		cairo_t* _tmp62_;
-		gint _tmp63_;
-		gint _tmp64_;
-		GdkPixbuf* _tmp65_;
-		gint _tmp66_;
-		gint _tmp67_;
-		GdkPixbuf* _tmp68_;
-		gint _tmp69_;
-		gint _tmp70_;
-		cairo_t* _tmp71_;
 #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp54_ = scaled_rect;
+		_tmp43_ = scaled_rect;
 #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp55_ = _tmp54_.x;
+		_tmp44_ = _tmp43_.x;
 #line 1873 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = _tmp55_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = _tmp44_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp56_ = scaled_rect;
+		_tmp45_ = scaled_rect;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp57_ = _tmp56_.y;
+		_tmp46_ = _tmp45_.y;
 #line 1874 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = _tmp57_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		y = _tmp46_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp58_ = ctx;
+		_tmp47_ = trinket;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp59_ = trinket;
+		_tmp48_ = x;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp60_ = x;
+		_tmp49_ = y;
 #line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp61_ = y;
-#line 1875 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp58_, _tmp59_, (gdouble) _tmp60_, (gdouble) _tmp61_);
-#line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp62_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp47_, (gdouble) _tmp48_, (gdouble) _tmp49_);
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp63_ = x;
+		_tmp50_ = x;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp64_ = y;
+		_tmp51_ = y;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp65_ = trinket;
+		_tmp52_ = trinket;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp66_ = gdk_pixbuf_get_width (_tmp65_);
+		_tmp53_ = gdk_pixbuf_get_width (_tmp52_);
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp67_ = _tmp66_;
+		_tmp54_ = _tmp53_;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp68_ = trinket;
+		_tmp55_ = trinket;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp69_ = gdk_pixbuf_get_height (_tmp68_);
+		_tmp56_ = gdk_pixbuf_get_height (_tmp55_);
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp70_ = _tmp69_;
+		_tmp57_ = _tmp56_;
 #line 1876 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp62_, (gdouble) _tmp63_, (gdouble) _tmp64_, (gdouble) _tmp67_, (gdouble) _tmp70_);
-#line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp71_ = ctx;
+		cairo_rectangle (ctx, (gdouble) _tmp50_, (gdouble) _tmp51_, (gdouble) _tmp54_, (gdouble) _tmp57_);
 #line 1877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp71_);
-#line 12063 "PhotoPage.c"
+		cairo_fill (ctx);
+#line 12460 "PhotoPage.c"
 	}
 #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp72_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp58_ = editing_host_page_get_top_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
 #line 1880 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp72_;
+	trinket = _tmp58_;
 #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp73_ = trinket;
+	_tmp59_ = trinket;
 #line 1881 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp73_ != NULL) {
-#line 12075 "PhotoPage.c"
+	if (_tmp59_ != NULL) {
+#line 12472 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp74_;
+		GdkRectangle _tmp60_;
+		gint _tmp61_;
+		GdkRectangle _tmp62_;
+		gint _tmp63_;
+		GdkPixbuf* _tmp64_;
+		gint _tmp65_;
+		gint _tmp66_;
+		gint y = 0;
+		GdkRectangle _tmp67_;
+		gint _tmp68_;
+		GdkPixbuf* _tmp69_;
+		gint _tmp70_;
+		gint _tmp71_;
+		gint _tmp72_;
+		gint _tmp73_;
+		GdkPixbuf* _tmp74_;
 		gint _tmp75_;
-		GdkRectangle _tmp76_;
-		gint _tmp77_;
-		GdkPixbuf* _tmp78_;
+		gint _tmp76_;
+		GdkPixbuf* _tmp77_;
+		gint _tmp78_;
 		gint _tmp79_;
-		gint _tmp80_;
-		gint y = 0;
-		GdkRectangle _tmp81_;
-		gint _tmp82_;
-		cairo_t* _tmp83_;
-		GdkPixbuf* _tmp84_;
-		gint _tmp85_;
-		gint _tmp86_;
-		cairo_t* _tmp87_;
-		gint _tmp88_;
-		gint _tmp89_;
-		GdkPixbuf* _tmp90_;
-		gint _tmp91_;
-		gint _tmp92_;
-		GdkPixbuf* _tmp93_;
-		gint _tmp94_;
-		gint _tmp95_;
-		cairo_t* _tmp96_;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp74_ = scaled_rect;
+		_tmp60_ = scaled_rect;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp75_ = _tmp74_.x;
+		_tmp61_ = _tmp60_.x;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp76_ = scaled_rect;
+		_tmp62_ = scaled_rect;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp77_ = _tmp76_.width;
+		_tmp63_ = _tmp62_.width;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp78_ = trinket;
+		_tmp64_ = trinket;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp79_ = gdk_pixbuf_get_width (_tmp78_);
+		_tmp65_ = gdk_pixbuf_get_width (_tmp64_);
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp80_ = _tmp79_;
+		_tmp66_ = _tmp65_;
 #line 1882 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = ((_tmp75_ + _tmp77_) - _tmp80_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = ((_tmp61_ + _tmp63_) - _tmp66_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp81_ = scaled_rect;
+		_tmp67_ = scaled_rect;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp82_ = _tmp81_.y;
+		_tmp68_ = _tmp67_.y;
 #line 1883 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = _tmp82_ + EDITING_HOST_PAGE_TRINKET_PADDING;
+		y = _tmp68_ + EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp83_ = ctx;
+		_tmp69_ = trinket;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp84_ = trinket;
+		_tmp70_ = x;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp85_ = x;
+		_tmp71_ = y;
 #line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp86_ = y;
-#line 1884 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp83_, _tmp84_, (gdouble) _tmp85_, (gdouble) _tmp86_);
-#line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp87_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp69_, (gdouble) _tmp70_, (gdouble) _tmp71_);
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp88_ = x;
+		_tmp72_ = x;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp89_ = y;
+		_tmp73_ = y;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp90_ = trinket;
+		_tmp74_ = trinket;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp91_ = gdk_pixbuf_get_width (_tmp90_);
+		_tmp75_ = gdk_pixbuf_get_width (_tmp74_);
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp92_ = _tmp91_;
+		_tmp76_ = _tmp75_;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp93_ = trinket;
+		_tmp77_ = trinket;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp94_ = gdk_pixbuf_get_height (_tmp93_);
+		_tmp78_ = gdk_pixbuf_get_height (_tmp77_);
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp95_ = _tmp94_;
+		_tmp79_ = _tmp78_;
 #line 1885 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp92_, (gdouble) _tmp95_);
-#line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp96_ = ctx;
+		cairo_rectangle (ctx, (gdouble) _tmp72_, (gdouble) _tmp73_, (gdouble) _tmp76_, (gdouble) _tmp79_);
 #line 1886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp96_);
-#line 12157 "PhotoPage.c"
+		cairo_fill (ctx);
+#line 12545 "PhotoPage.c"
 	}
 #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp97_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
+	_tmp80_ = editing_host_page_get_bottom_right_trinket (self, EDITING_HOST_PAGE_TRINKET_SCALE);
 #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
 #line 1889 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	trinket = _tmp97_;
+	trinket = _tmp80_;
 #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_ = trinket;
+	_tmp81_ = trinket;
 #line 1890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp98_ != NULL) {
-#line 12169 "PhotoPage.c"
+	if (_tmp81_ != NULL) {
+#line 12557 "PhotoPage.c"
 		gint x = 0;
-		GdkRectangle _tmp99_;
+		GdkRectangle _tmp82_;
+		gint _tmp83_;
+		GdkRectangle _tmp84_;
+		gint _tmp85_;
+		GdkPixbuf* _tmp86_;
+		gint _tmp87_;
+		gint _tmp88_;
+		gint y = 0;
+		GdkRectangle _tmp89_;
+		gint _tmp90_;
+		GdkRectangle _tmp91_;
+		gint _tmp92_;
+		GdkPixbuf* _tmp93_;
+		gint _tmp94_;
+		gint _tmp95_;
+		GdkPixbuf* _tmp96_;
+		gint _tmp97_;
+		gint _tmp98_;
+		gint _tmp99_;
 		gint _tmp100_;
-		GdkRectangle _tmp101_;
+		GdkPixbuf* _tmp101_;
 		gint _tmp102_;
-		GdkPixbuf* _tmp103_;
-		gint _tmp104_;
+		gint _tmp103_;
+		GdkPixbuf* _tmp104_;
 		gint _tmp105_;
-		gint y = 0;
-		GdkRectangle _tmp106_;
-		gint _tmp107_;
-		GdkRectangle _tmp108_;
-		gint _tmp109_;
-		GdkPixbuf* _tmp110_;
-		gint _tmp111_;
-		gint _tmp112_;
-		cairo_t* _tmp113_;
-		GdkPixbuf* _tmp114_;
-		gint _tmp115_;
-		gint _tmp116_;
-		cairo_t* _tmp117_;
-		gint _tmp118_;
-		gint _tmp119_;
-		GdkPixbuf* _tmp120_;
-		gint _tmp121_;
-		gint _tmp122_;
-		GdkPixbuf* _tmp123_;
-		gint _tmp124_;
-		gint _tmp125_;
-		cairo_t* _tmp126_;
+		gint _tmp106_;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp99_ = scaled_rect;
+		_tmp82_ = scaled_rect;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp100_ = _tmp99_.x;
+		_tmp83_ = _tmp82_.x;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp101_ = scaled_rect;
+		_tmp84_ = scaled_rect;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp102_ = _tmp101_.width;
+		_tmp85_ = _tmp84_.width;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp103_ = trinket;
+		_tmp86_ = trinket;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp104_ = gdk_pixbuf_get_width (_tmp103_);
+		_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp105_ = _tmp104_;
+		_tmp88_ = _tmp87_;
 #line 1891 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = ((_tmp100_ + _tmp102_) - _tmp105_) - EDITING_HOST_PAGE_TRINKET_PADDING;
+		x = ((_tmp83_ + _tmp85_) - _tmp88_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp106_ = scaled_rect;
+		_tmp89_ = scaled_rect;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp107_ = _tmp106_.y;
+		_tmp90_ = _tmp89_.y;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp108_ = scaled_rect;
+		_tmp91_ = scaled_rect;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp109_ = _tmp108_.height;
+		_tmp92_ = _tmp91_.height;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp110_ = trinket;
+		_tmp93_ = trinket;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
+		_tmp94_ = gdk_pixbuf_get_height (_tmp93_);
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp112_ = _tmp111_;
+		_tmp95_ = _tmp94_;
 #line 1892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = ((_tmp107_ + _tmp109_) - _tmp112_) - EDITING_HOST_PAGE_TRINKET_PADDING;
-#line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp113_ = ctx;
+		y = ((_tmp90_ + _tmp92_) - _tmp95_) - EDITING_HOST_PAGE_TRINKET_PADDING;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp114_ = trinket;
+		_tmp96_ = trinket;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp115_ = x;
+		_tmp97_ = x;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp116_ = y;
+		_tmp98_ = y;
 #line 1893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gdk_cairo_set_source_pixbuf (_tmp113_, _tmp114_, (gdouble) _tmp115_, (gdouble) _tmp116_);
-#line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp117_ = ctx;
+		gdk_cairo_set_source_pixbuf (ctx, _tmp96_, (gdouble) _tmp97_, (gdouble) _tmp98_);
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp118_ = x;
+		_tmp99_ = x;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp119_ = y;
+		_tmp100_ = y;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp120_ = trinket;
+		_tmp101_ = trinket;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp121_ = gdk_pixbuf_get_width (_tmp120_);
+		_tmp102_ = gdk_pixbuf_get_width (_tmp101_);
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp122_ = _tmp121_;
+		_tmp103_ = _tmp102_;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp123_ = trinket;
+		_tmp104_ = trinket;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp124_ = gdk_pixbuf_get_height (_tmp123_);
+		_tmp105_ = gdk_pixbuf_get_height (_tmp104_);
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp125_ = _tmp124_;
+		_tmp106_ = _tmp105_;
 #line 1894 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_rectangle (_tmp117_, (gdouble) _tmp118_, (gdouble) _tmp119_, (gdouble) _tmp122_, (gdouble) _tmp125_);
+		cairo_rectangle (ctx, (gdouble) _tmp99_, (gdouble) _tmp100_, (gdouble) _tmp103_, (gdouble) _tmp106_);
 #line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp126_ = ctx;
-#line 1895 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		cairo_fill (_tmp126_);
-#line 12266 "PhotoPage.c"
+		cairo_fill (ctx);
+#line 12645 "PhotoPage.c"
 	}
 #line 1838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (trinket);
-#line 12270 "PhotoPage.c"
+#line 12649 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* photo) {
+gboolean
+editing_host_page_is_rotate_available (EditingHostPage* self,
+                                       Photo* photo)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 1899 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12288,24 +12670,25 @@ gboolean editing_host_page_is_rotate_available (EditingHostPage* self, Photo* ph
 	result = !_tmp0_;
 #line 1900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 12287 "PhotoPage.c"
+#line 12669 "PhotoPage.c"
 }
 
 
-static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation, const gchar* name, const gchar* description) {
+static void
+editing_host_page_rotate (EditingHostPage* self,
+                          Rotation rotation,
+                          const gchar* name,
+                          const gchar* description)
+{
 	Dimensions _tmp0_ = {0};
-	gboolean _tmp1_;
 	RotateSingleCommand* command = NULL;
+	Photo* _tmp1_;
 	Photo* _tmp2_;
-	Photo* _tmp3_;
-	Rotation _tmp4_;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
+	RotateSingleCommand* _tmp3_;
+	RotateSingleCommand* _tmp4_;
+	CommandManager* _tmp5_;
+	CommandManager* _tmp6_;
 	RotateSingleCommand* _tmp7_;
-	RotateSingleCommand* _tmp8_;
-	CommandManager* _tmp9_;
-	CommandManager* _tmp10_;
-	RotateSingleCommand* _tmp11_;
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12319,99 +12702,99 @@ static void editing_host_page_rotate (EditingHostPage* self, Rotation rotation,
 #line 1906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (self);
-#line 1908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 1909 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12323 "PhotoPage.c"
+#line 12704 "PhotoPage.c"
 	}
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_get_photo (self);
-#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
-#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = rotation;
-#line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = name;
+	_tmp1_ = editing_host_page_get_photo (self);
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = description;
+	_tmp2_ = _tmp1_;
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = rotate_single_command_new (_tmp3_, _tmp4_, _tmp5_, _tmp6_);
+	_tmp3_ = rotate_single_command_new (_tmp2_, rotation, name, description);
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 1911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp8_;
+	command = _tmp4_;
 #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp6_ = _tmp5_;
 #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = command;
+	_tmp7_ = command;
 #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command));
 #line 1913 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp10_);
+	_command_manager_unref0 (_tmp6_);
 #line 1903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12355 "PhotoPage.c"
+#line 12730 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_rotate_clockwise (EditingHostPage* self) {
+void
+editing_host_page_on_rotate_clockwise (EditingHostPage* self)
+{
 #line 1916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_CLOCKWISE, RESOURCES_ROTATE_CW_FULL_LABEL, RESOURCES_ROTATE_CW_TOOLTIP);
-#line 12364 "PhotoPage.c"
+#line 12741 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_rotate_counterclockwise (EditingHostPage* self) {
+void
+editing_host_page_on_rotate_counterclockwise (EditingHostPage* self)
+{
 #line 1920 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1921 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_COUNTERCLOCKWISE, RESOURCES_ROTATE_CCW_FULL_LABEL, RESOURCES_ROTATE_CCW_TOOLTIP);
-#line 12373 "PhotoPage.c"
+#line 12752 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_flip_horizontally (EditingHostPage* self) {
+void
+editing_host_page_on_flip_horizontally (EditingHostPage* self)
+{
 #line 1924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_MIRROR, RESOURCES_HFLIP_LABEL, "");
-#line 12382 "PhotoPage.c"
+#line 12763 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_flip_vertically (EditingHostPage* self) {
+void
+editing_host_page_on_flip_vertically (EditingHostPage* self)
+{
 #line 1928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1929 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_rotate (self, ROTATION_UPSIDE_DOWN, RESOURCES_VFLIP_LABEL, "");
-#line 12391 "PhotoPage.c"
+#line 12774 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_revert (EditingHostPage* self) {
+void
+editing_host_page_on_revert (EditingHostPage* self)
+{
 	gboolean _tmp0_;
 	Dimensions _tmp1_ = {0};
-	gboolean _tmp2_;
+	Photo* _tmp2_;
 	Photo* _tmp3_;
-	Photo* _tmp4_;
-	gboolean _tmp5_;
-	gboolean _tmp6_;
+	gboolean _tmp4_;
 	RevertSingleCommand* command = NULL;
-	Photo* _tmp17_;
-	Photo* _tmp18_;
-	RevertSingleCommand* _tmp19_;
+	Photo* _tmp14_;
+	Photo* _tmp15_;
+	RevertSingleCommand* _tmp16_;
+	RevertSingleCommand* _tmp17_;
+	CommandManager* _tmp18_;
+	CommandManager* _tmp19_;
 	RevertSingleCommand* _tmp20_;
-	CommandManager* _tmp21_;
-	CommandManager* _tmp22_;
-	RevertSingleCommand* _tmp23_;
 #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1933 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12420,114 +12803,109 @@ void editing_host_page_on_revert (EditingHostPage* self) {
 	if (_tmp0_) {
 #line 1934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12419 "PhotoPage.c"
+#line 12802 "PhotoPage.c"
 	}
 #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	dimensions_init (&_tmp1_, 0, 0);
 #line 1936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_has_photo (self);
-#line 1938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp2_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 1939 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12431 "PhotoPage.c"
+#line 12812 "PhotoPage.c"
 	}
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_get_photo (self);
-#line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = editing_host_page_get_photo (self);
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = photo_has_editable (_tmp4_);
+	_tmp3_ = _tmp2_;
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = photo_has_editable (_tmp3_);
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 1941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp6_) {
-#line 12445 "PhotoPage.c"
-		AppWindow* _tmp7_;
-		AppWindow* _tmp8_;
-		ViewCollection* _tmp9_;
-		ViewCollection* _tmp10_;
-		GeeCollection* _tmp11_;
-		GeeCollection* _tmp12_;
-		gboolean _tmp13_;
-		gboolean _tmp14_;
-		Photo* _tmp15_;
-		Photo* _tmp16_;
-#line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = app_window_get_instance ();
+	if (_tmp4_) {
+#line 12824 "PhotoPage.c"
+		AppWindow* _tmp5_;
+		AppWindow* _tmp6_;
+		ViewCollection* _tmp7_;
+		ViewCollection* _tmp8_;
+		GeeCollection* _tmp9_;
+		GeeCollection* _tmp10_;
+		gboolean _tmp11_;
+		Photo* _tmp12_;
+		Photo* _tmp13_;
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp5_ = app_window_get_instance ();
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp6_ = _tmp5_;
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp7_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = view_collection_get_sources (_tmp10_);
+		_tmp8_ = _tmp7_;
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_COLLECTION, GeeCollection);
+		_tmp9_ = view_collection_get_sources (_tmp8_);
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_window_get_type (), GtkWindow), _tmp12_);
+		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = !_tmp13_;
+		_tmp11_ = !revert_editable_dialog (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_window_get_type (), GtkWindow), _tmp10_);
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp12_);
+		_g_object_unref0 (_tmp10_);
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp10_);
+		_data_collection_unref0 (_tmp8_);
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp6_);
 #line 1942 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp14_) {
+		if (_tmp11_) {
 #line 1944 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			return;
-#line 12482 "PhotoPage.c"
+#line 12858 "PhotoPage.c"
 		}
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = editing_host_page_get_photo (self);
+		_tmp12_ = editing_host_page_get_photo (self);
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp13_ = _tmp12_;
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		photo_revert_to_master (_tmp16_, TRUE);
+		photo_revert_to_master (_tmp13_, TRUE);
 #line 1947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp16_);
-#line 12492 "PhotoPage.c"
+		_g_object_unref0 (_tmp13_);
+#line 12868 "PhotoPage.c"
 	}
 #line 1950 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 1952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, FALSE);
 #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = editing_host_page_get_photo (self);
+	_tmp14_ = editing_host_page_get_photo (self);
 #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _tmp17_;
+	_tmp15_ = _tmp14_;
 #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = revert_single_command_new (_tmp18_);
+	_tmp16_ = revert_single_command_new (_tmp15_);
 #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = _tmp19_;
+	_tmp17_ = _tmp16_;
 #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp18_);
+	_g_object_unref0 (_tmp15_);
 #line 1954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp20_;
+	command = _tmp17_;
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp18_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = _tmp21_;
+	_tmp19_ = _tmp18_;
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = command;
+	_tmp20_ = command;
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp22_, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_COMMAND, Command));
 #line 1955 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp22_);
+	_command_manager_unref0 (_tmp19_);
 #line 1932 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 12522 "PhotoPage.c"
+#line 12898 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_edit_title (EditingHostPage* self) {
+void
+editing_host_page_on_edit_title (EditingHostPage* self)
+{
 	LibraryPhoto* item = NULL;
 	Photo* _tmp0_;
 	Photo* _tmp1_;
@@ -12561,7 +12939,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1960 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12560 "PhotoPage.c"
+#line 12938 "PhotoPage.c"
 		Photo* _tmp3_;
 		LibraryPhoto* _tmp4_;
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12572,19 +12950,19 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12571 "PhotoPage.c"
+#line 12949 "PhotoPage.c"
 		}
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12577 "PhotoPage.c"
+#line 12955 "PhotoPage.c"
 	} else {
 #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12583 "PhotoPage.c"
+#line 12961 "PhotoPage.c"
 	}
 #line 1965 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12618,7 +12996,7 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1968 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12617 "PhotoPage.c"
+#line 12995 "PhotoPage.c"
 	}
 #line 1970 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12646,11 +13024,13 @@ void editing_host_page_on_edit_title (EditingHostPage* self) {
 	_text_entry_dialog_mediator_unref0 (edit_title_dialog);
 #line 1958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12645 "PhotoPage.c"
+#line 13023 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_edit_comment (EditingHostPage* self) {
+void
+editing_host_page_on_edit_comment (EditingHostPage* self)
+{
 	LibraryPhoto* item = NULL;
 	Photo* _tmp0_;
 	Photo* _tmp1_;
@@ -12684,7 +13064,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_g_object_unref0 (_tmp1_);
 #line 1976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_) {
-#line 12683 "PhotoPage.c"
+#line 13063 "PhotoPage.c"
 		Photo* _tmp3_;
 		LibraryPhoto* _tmp4_;
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -12695,19 +13075,19 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		if (_tmp4_ == NULL) {
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (_tmp3_);
-#line 12694 "PhotoPage.c"
+#line 13074 "PhotoPage.c"
 		}
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		item = _tmp4_;
-#line 12700 "PhotoPage.c"
+#line 13080 "PhotoPage.c"
 	} else {
 #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (item);
 #line 1979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12706 "PhotoPage.c"
+#line 13086 "PhotoPage.c"
 	}
 #line 1981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp5_ = item;
@@ -12741,7 +13121,7 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 		_g_object_unref0 (item);
 #line 1984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12740 "PhotoPage.c"
+#line 13120 "PhotoPage.c"
 	}
 #line 1986 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp13_ = item;
@@ -12769,211 +13149,215 @@ void editing_host_page_on_edit_comment (EditingHostPage* self) {
 	_multi_text_entry_dialog_mediator_unref0 (edit_comment_dialog);
 #line 1974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (item);
-#line 12768 "PhotoPage.c"
+#line 13148 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_adjust_date_time (EditingHostPage* self) {
-	gboolean _tmp0_;
+void
+editing_host_page_on_adjust_date_time (EditingHostPage* self)
+{
 	AdjustDateTimeDialog* dialog = NULL;
+	Photo* _tmp0_;
 	Photo* _tmp1_;
-	Photo* _tmp2_;
+	AdjustDateTimeDialog* _tmp2_;
 	AdjustDateTimeDialog* _tmp3_;
-	AdjustDateTimeDialog* _tmp4_;
 	gint64 time_shift = 0LL;
 	gboolean keep_relativity = FALSE;
 	gboolean modify_originals = FALSE;
-	AdjustDateTimeDialog* _tmp5_;
-	gint64 _tmp6_ = 0LL;
+	AdjustDateTimeDialog* _tmp4_;
+	gint64 _tmp5_ = 0LL;
+	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
-	gboolean _tmp8_ = FALSE;
-	gboolean _tmp9_;
+	gboolean _tmp8_;
 #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (self);
-#line 1991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp0_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 1992 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 12795 "PhotoPage.c"
+#line 13174 "PhotoPage.c"
 	}
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_get_photo (self);
+	_tmp0_ = editing_host_page_get_photo (self);
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE);
+	_tmp2_ = adjust_date_time_dialog_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATEABLE, Dateable), 1, !G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE), FALSE, FALSE);
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp2_);
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 1994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dialog = _tmp4_;
+	dialog = _tmp3_;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = dialog;
+	_tmp4_ = dialog;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = adjust_date_time_dialog_execute (_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
+	_tmp8_ = adjust_date_time_dialog_execute (_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	time_shift = _tmp6_;
+	time_shift = _tmp5_;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	keep_relativity = _tmp7_;
+	keep_relativity = _tmp6_;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	modify_originals = _tmp8_;
+	modify_originals = _tmp7_;
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp9_) {
-#line 12823 "PhotoPage.c"
+	if (_tmp8_) {
+#line 13202 "PhotoPage.c"
+		ViewCollection* _tmp9_;
 		ViewCollection* _tmp10_;
-		ViewCollection* _tmp11_;
+		GeeList* _tmp11_;
 		GeeList* _tmp12_;
-		GeeList* _tmp13_;
 		AdjustDateTimePhotoCommand* command = NULL;
+		Photo* _tmp13_;
 		Photo* _tmp14_;
-		Photo* _tmp15_;
-		gint64 _tmp16_;
-		gboolean _tmp17_;
+		gint64 _tmp15_;
+		gboolean _tmp16_;
+		AdjustDateTimePhotoCommand* _tmp17_;
 		AdjustDateTimePhotoCommand* _tmp18_;
-		AdjustDateTimePhotoCommand* _tmp19_;
+		CommandManager* _tmp19_;
 		CommandManager* _tmp20_;
-		CommandManager* _tmp21_;
-		AdjustDateTimePhotoCommand* _tmp22_;
+		AdjustDateTimePhotoCommand* _tmp21_;
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp9_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = view_collection_get_selected (_tmp11_);
+		_tmp11_ = view_collection_get_selected (_tmp10_);
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = _tmp12_;
+		_tmp12_ = _tmp11_;
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp13_);
+		_g_object_unref0 (_tmp12_);
 #line 1999 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp11_);
+		_data_collection_unref0 (_tmp10_);
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = editing_host_page_get_photo (self);
+		_tmp13_ = editing_host_page_get_photo (self);
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = _tmp14_;
+		_tmp14_ = _tmp13_;
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = time_shift;
+		_tmp15_ = time_shift;
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = modify_originals;
+		_tmp16_ = modify_originals;
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATEABLE, Dateable), _tmp16_, _tmp17_);
+		_tmp17_ = adjust_date_time_photo_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_DATEABLE, Dateable), _tmp15_, _tmp16_);
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp15_);
+		_g_object_unref0 (_tmp14_);
 #line 2001 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		command = _tmp19_;
+		command = _tmp18_;
 #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp19_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = _tmp20_;
+		_tmp20_ = _tmp19_;
 #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = command;
+		_tmp21_ = command;
 #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp20_, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, TYPE_COMMAND, Command));
 #line 2003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_command_manager_unref0 (_tmp21_);
+		_command_manager_unref0 (_tmp20_);
 #line 1998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 12878 "PhotoPage.c"
+#line 13257 "PhotoPage.c"
 	}
 #line 1990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (dialog);
-#line 12882 "PhotoPage.c"
+#line 13261 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_set_background (EditingHostPage* self) {
-	gboolean _tmp0_;
+void
+editing_host_page_on_set_background (EditingHostPage* self)
+{
 #line 2007 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (self);
-#line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
-#line 12894 "PhotoPage.c"
+	if (editing_host_page_has_photo (self)) {
+#line 13272 "PhotoPage.c"
 		SetBackgroundPhotoDialog* dialog = NULL;
-		SetBackgroundPhotoDialog* _tmp1_;
+		SetBackgroundPhotoDialog* _tmp0_;
 		gboolean desktop = FALSE;
 		gboolean screensaver = FALSE;
-		SetBackgroundPhotoDialog* _tmp2_;
+		SetBackgroundPhotoDialog* _tmp1_;
+		gboolean _tmp2_ = FALSE;
 		gboolean _tmp3_ = FALSE;
-		gboolean _tmp4_ = FALSE;
-		gboolean _tmp5_;
+		gboolean _tmp4_;
 #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = set_background_photo_dialog_new ();
+		_tmp0_ = set_background_photo_dialog_new ();
 #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_object_ref_sink (_tmp1_);
+		g_object_ref_sink (_tmp0_);
 #line 2009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		dialog = _tmp1_;
+		dialog = _tmp0_;
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = dialog;
+		_tmp1_ = dialog;
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = set_background_photo_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_);
+		_tmp4_ = set_background_photo_dialog_execute (_tmp1_, &_tmp2_, &_tmp3_);
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		desktop = _tmp3_;
+		desktop = _tmp2_;
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		screensaver = _tmp4_;
+		screensaver = _tmp3_;
 #line 2011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp5_) {
-#line 12919 "PhotoPage.c"
+		if (_tmp4_) {
+#line 13297 "PhotoPage.c"
+			AppWindow* _tmp5_;
 			AppWindow* _tmp6_;
-			AppWindow* _tmp7_;
+			Photo* _tmp7_;
 			Photo* _tmp8_;
-			Photo* _tmp9_;
+			gboolean _tmp9_;
 			gboolean _tmp10_;
-			gboolean _tmp11_;
+			AppWindow* _tmp11_;
 			AppWindow* _tmp12_;
-			AppWindow* _tmp13_;
 #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp6_ = app_window_get_instance ();
+			_tmp5_ = app_window_get_instance ();
 #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp7_ = _tmp6_;
+			_tmp6_ = _tmp5_;
 #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2012 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp7_);
+			_g_object_unref0 (_tmp6_);
 #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp8_ = editing_host_page_get_photo (self);
+			_tmp7_ = editing_host_page_get_photo (self);
 #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = _tmp8_;
+			_tmp8_ = _tmp7_;
 #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp10_ = desktop;
+			_tmp9_ = desktop;
 #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp11_ = screensaver;
+			_tmp10_ = screensaver;
 #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			desktop_integration_set_background (_tmp9_, _tmp10_, _tmp11_);
+			desktop_integration_set_background (_tmp8_, _tmp9_, _tmp10_);
 #line 2013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp9_);
+			_g_object_unref0 (_tmp8_);
 #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp12_ = app_window_get_instance ();
+			_tmp11_ = app_window_get_instance ();
 #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp13_ = _tmp12_;
+			_tmp12_ = _tmp11_;
 #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_PAGE_WINDOW, PageWindow));
+			page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp13_);
-#line 12956 "PhotoPage.c"
+			_g_object_unref0 (_tmp12_);
+#line 13334 "PhotoPage.c"
 		}
 #line 2008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (dialog);
-#line 12960 "PhotoPage.c"
+#line 13338 "PhotoPage.c"
 	}
 }
 
 
-static void _editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender, gpointer self) {
+static void
+_editing_host_page_on_rotate_counterclockwise_gtk_tool_button_clicked (GtkToolButton* _sender,
+                                                                       gpointer self)
+{
 #line 2024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 12968 "PhotoPage.c"
+#line 13349 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_on_ctrl_pressed (Page* base,
+                                        GdkEventKey* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	GtkToolButton* _tmp0_;
@@ -12983,8 +13367,6 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	guint _tmp4_;
 	GtkToolButton* _tmp5_;
 	EditingToolsEditingTool* _tmp6_;
-	GdkEventKey* _tmp7_;
-	gboolean _tmp8_;
 #line 2019 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2020 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13015,21 +13397,20 @@ static gboolean editing_host_page_real_on_ctrl_pressed (Page* base, GdkEventKey*
 	if (_tmp6_ == NULL) {
 #line 2027 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_out_original (self);
-#line 13014 "PhotoPage.c"
+#line 13396 "PhotoPage.c"
 	}
 #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = event;
-#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp7_);
-#line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp8_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_pressed (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event);
 #line 2029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13024 "PhotoPage.c"
+#line 13402 "PhotoPage.c"
 }
 
 
-static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey* event) {
+static gboolean
+editing_host_page_real_on_ctrl_released (Page* base,
+                                         GdkEventKey* event)
+{
 	EditingHostPage * self;
 	gboolean result = FALSE;
 	GtkToolButton* _tmp0_;
@@ -13041,8 +13422,6 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	gboolean _tmp6_ = FALSE;
 	gboolean _tmp7_ = FALSE;
 	EditingToolsEditingTool* _tmp8_;
-	GdkEventKey* _tmp11_;
-	gboolean _tmp12_;
 #line 2032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13071,159 +13450,141 @@ static gboolean editing_host_page_real_on_ctrl_released (Page* base, GdkEventKey
 	_tmp8_ = self->priv->current_tool;
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp8_ == NULL) {
-#line 13070 "PhotoPage.c"
-		gboolean _tmp9_;
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = _tmp9_;
-#line 13076 "PhotoPage.c"
+		_tmp7_ = page_get_shift_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 13451 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp7_ = FALSE;
-#line 13080 "PhotoPage.c"
+#line 13455 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp7_) {
-#line 13084 "PhotoPage.c"
-		gboolean _tmp10_;
-#line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = !_tmp10_;
-#line 13090 "PhotoPage.c"
+		_tmp6_ = !page_get_alt_pressed (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+#line 13461 "PhotoPage.c"
 	} else {
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp6_ = FALSE;
-#line 13094 "PhotoPage.c"
+#line 13465 "PhotoPage.c"
 	}
 #line 2039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp6_) {
 #line 2040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		editing_host_page_swap_in_original (self);
-#line 13100 "PhotoPage.c"
+#line 13471 "PhotoPage.c"
 	}
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = event;
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), _tmp11_);
-#line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp12_;
+	result = PAGE_CLASS (editing_host_page_parent_class)->on_ctrl_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), TYPE_PAGE, Page), event);
 #line 2042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13110 "PhotoPage.c"
+#line 13477 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_tool_button_toggled (EditingHostPage* self, GtkToggleToolButton* toggle, EditingToolsEditingToolFactory factory) {
+void
+editing_host_page_on_tool_button_toggled (EditingHostPage* self,
+                                          GtkToggleToolButton* toggle,
+                                          EditingToolsEditingToolFactory factory)
+{
 	gboolean _tmp0_ = FALSE;
-	GtkToggleToolButton* _tmp1_;
+	gboolean _tmp1_;
 	gboolean _tmp2_;
-	gboolean _tmp3_;
 	gboolean deactivating_only = FALSE;
-	Dimensions _tmp6_ = {0};
-	gboolean _tmp7_;
-	GtkToggleToolButton* _tmp8_;
-	GtkToggleToolButton* _tmp9_;
+	Dimensions _tmp4_ = {0};
+	gboolean _tmp5_;
+	GtkToggleToolButton* _tmp6_;
 	EditingToolsEditingTool* tool = NULL;
-	EditingToolsEditingToolFactory _tmp10_;
+	EditingToolsEditingTool* _tmp7_;
+	EditingToolsEditingTool* _tmp8_;
+	EditingToolsEditingTool* _tmp9_;
+	EditingToolsEditingTool* _tmp10_;
 	EditingToolsEditingTool* _tmp11_;
 	EditingToolsEditingTool* _tmp12_;
 	EditingToolsEditingTool* _tmp13_;
-	EditingToolsEditingTool* _tmp14_;
-	EditingToolsEditingTool* _tmp15_;
-	EditingToolsEditingTool* _tmp16_;
-	EditingToolsEditingTool* _tmp17_;
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GTK_IS_TOGGLE_TOOL_BUTTON (toggle));
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = toggle;
+	_tmp1_ = gtk_toggle_tool_button_get_active (toggle);
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
-#line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp3_) {
-#line 13145 "PhotoPage.c"
-		GtkToggleToolButton* _tmp4_;
-		GtkToggleToolButton* _tmp5_;
+	_tmp2_ = _tmp1_;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = self->priv->current_editing_toggle;
+	if (!_tmp2_) {
+#line 13511 "PhotoPage.c"
+		GtkToggleToolButton* _tmp3_;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = toggle;
+		_tmp3_ = self->priv->current_editing_toggle;
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp4_ == _tmp5_;
-#line 13154 "PhotoPage.c"
+		_tmp0_ = _tmp3_ == toggle;
+#line 13517 "PhotoPage.c"
 	} else {
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 13158 "PhotoPage.c"
+#line 13521 "PhotoPage.c"
 	}
 #line 2048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	deactivating_only = _tmp0_;
 #line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	dimensions_init (&_tmp6_, 0, 0);
+	dimensions_init (&_tmp4_, 0, 0);
 #line 2049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp6_, FALSE);
+	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp4_, FALSE);
 #line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = deactivating_only;
+	_tmp5_ = deactivating_only;
 #line 2051 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp7_) {
+	if (_tmp5_) {
 #line 2052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		page_restore_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13174 "PhotoPage.c"
+#line 13537 "PhotoPage.c"
 	}
 #line 2056 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_suspend_cursor_hiding (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = toggle;
-#line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _g_object_ref0 (_tmp8_);
+	_tmp6_ = _g_object_ref0 (toggle);
 #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->current_editing_toggle);
 #line 2058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->current_editing_toggle = _tmp9_;
-#line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = factory;
+	self->priv->current_editing_toggle = _tmp6_;
 #line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = _tmp10_ ();
+	_tmp7_ = factory ();
 #line 2061 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	tool = _tmp11_;
+	tool = _tmp7_;
 #line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = tool;
+	_tmp8_ = tool;
 #line 2062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp12_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0);
+	g_signal_connect_object (_tmp8_, "activated", (GCallback) _editing_host_page_on_tool_activated_editing_tools_editing_tool_activated, self, 0);
 #line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = tool;
+	_tmp9_ = tool;
 #line 2063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp13_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0);
+	g_signal_connect_object (_tmp9_, "deactivated", (GCallback) _editing_host_page_on_tool_deactivated_editing_tools_editing_tool_deactivated, self, 0);
 #line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = tool;
+	_tmp10_ = tool;
 #line 2064 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp14_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0);
+	g_signal_connect_object (_tmp10_, "applied", (GCallback) _editing_host_page_on_tool_applied_editing_tools_editing_tool_applied, self, 0);
 #line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = tool;
+	_tmp11_ = tool;
 #line 2065 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp15_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0);
+	g_signal_connect_object (_tmp11_, "cancelled", (GCallback) _editing_host_page_on_tool_cancelled_editing_tools_editing_tool_cancelled, self, 0);
 #line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = tool;
+	_tmp12_ = tool;
 #line 2066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (_tmp16_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0);
+	g_signal_connect_object (_tmp12_, "aborted", (GCallback) _editing_host_page_on_tool_aborted_editing_tools_editing_tool_aborted, self, 0);
 #line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = tool;
+	_tmp13_ = tool;
 #line 2068 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_activate_tool (self, _tmp17_);
+	editing_host_page_activate_tool (self, _tmp13_);
 #line 2045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (tool);
-#line 13218 "PhotoPage.c"
+#line 13577 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_tool_activated (EditingHostPage* self) {
+static void
+editing_host_page_on_tool_activated (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 	GtkScale* _tmp1_;
 	GtkToggleToolButton* _tmp2_;
@@ -13241,11 +13602,13 @@ static void editing_host_page_on_tool_activated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, TRUE);
-#line 13240 "PhotoPage.c"
+#line 13601 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
+static void
+editing_host_page_on_tool_deactivated (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 	GtkScale* _tmp1_;
 	GtkToggleToolButton* _tmp2_;
@@ -13263,15 +13626,18 @@ static void editing_host_page_on_tool_deactivated (EditingHostPage* self) {
 	_tmp2_ = self->priv->current_editing_toggle;
 #line 2080 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	gtk_toggle_tool_button_set_active (_tmp2_, FALSE);
-#line 13262 "PhotoPage.c"
+#line 13625 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* command, GdkPixbuf* new_pixbuf, Dimensions* new_max_dim, gboolean needs_improvement) {
-	Command* _tmp0_;
-	GdkPixbuf* _tmp1_;
-	Dimensions _tmp2_;
-	gboolean _tmp3_;
+static void
+editing_host_page_on_tool_applied (EditingHostPage* self,
+                                   Command* command,
+                                   GdkPixbuf* new_pixbuf,
+                                   Dimensions* new_max_dim,
+                                   gboolean needs_improvement)
+{
+	Dimensions _tmp0_;
 #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13281,20 +13647,16 @@ static void editing_host_page_on_tool_applied (EditingHostPage* self, Command* c
 #line 2083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (new_max_dim != NULL);
 #line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = command;
+	_tmp0_ = *new_max_dim;
 #line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = new_pixbuf;
-#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = *new_max_dim;
-#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = needs_improvement;
-#line 2085 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_deactivate_tool (self, _tmp0_, _tmp1_, &_tmp2_, _tmp3_);
-#line 13289 "PhotoPage.c"
+	editing_host_page_deactivate_tool (self, command, new_pixbuf, &_tmp0_, needs_improvement);
+#line 13649 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
+static void
+editing_host_page_on_tool_cancelled (EditingHostPage* self)
+{
 	Dimensions _tmp0_ = {0};
 #line 2088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -13306,11 +13668,13 @@ static void editing_host_page_on_tool_cancelled (EditingHostPage* self) {
 	single_photo_page_restore_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 2092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 13305 "PhotoPage.c"
+#line 13667 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
+static void
+editing_host_page_on_tool_aborted (EditingHostPage* self)
+{
 	Dimensions _tmp0_ = {0};
 #line 2095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -13320,14 +13684,15 @@ static void editing_host_page_on_tool_aborted (EditingHostPage* self) {
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2097 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_set_photo_missing (self, TRUE);
-#line 13319 "PhotoPage.c"
+#line 13683 "PhotoPage.c"
 }
 
 
-void editing_host_page_toggle_crop (EditingHostPage* self) {
+void
+editing_host_page_toggle_crop (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 	GtkToggleToolButton* _tmp1_;
-	gboolean _tmp2_;
 #line 2100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13335,17 +13700,16 @@ void editing_host_page_toggle_crop (EditingHostPage* self) {
 #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->crop_button;
 #line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2101 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13337 "PhotoPage.c"
+	gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_));
+#line 13700 "PhotoPage.c"
 }
 
 
-void editing_host_page_toggle_straighten (EditingHostPage* self) {
+void
+editing_host_page_toggle_straighten (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 	GtkToggleToolButton* _tmp1_;
-	gboolean _tmp2_;
 #line 2104 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13353,17 +13717,16 @@ void editing_host_page_toggle_straighten (EditingHostPage* self) {
 #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->straighten_button;
 #line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13355 "PhotoPage.c"
+	gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_));
+#line 13717 "PhotoPage.c"
 }
 
 
-void editing_host_page_toggle_redeye (EditingHostPage* self) {
+void
+editing_host_page_toggle_redeye (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 	GtkToggleToolButton* _tmp1_;
-	gboolean _tmp2_;
 #line 2108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13371,17 +13734,16 @@ void editing_host_page_toggle_redeye (EditingHostPage* self) {
 #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->redeye_button;
 #line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2109 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13373 "PhotoPage.c"
+	gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_));
+#line 13734 "PhotoPage.c"
 }
 
 
-void editing_host_page_toggle_adjust (EditingHostPage* self) {
+void
+editing_host_page_toggle_adjust (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 	GtkToggleToolButton* _tmp1_;
-	gboolean _tmp2_;
 #line 2112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13389,23 +13751,25 @@ void editing_host_page_toggle_adjust (EditingHostPage* self) {
 #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->adjust_button;
 #line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = gtk_toggle_tool_button_get_active (_tmp1_);
-#line 2113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_toggle_tool_button_set_active (_tmp0_, !_tmp2_);
-#line 13391 "PhotoPage.c"
+	gtk_toggle_tool_button_set_active (_tmp0_, !gtk_toggle_tool_button_get_active (_tmp1_));
+#line 13751 "PhotoPage.c"
 }
 
 
-static EditingToolsEditingTool* _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void) {
+static EditingToolsEditingTool*
+_editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory (void)
+{
 	EditingToolsEditingTool* result;
 	result = editing_tools_straighten_tool_factory ();
 #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13400 "PhotoPage.c"
+#line 13762 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
+static void
+editing_host_page_on_straighten_toggled (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 #line 2116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -13413,20 +13777,24 @@ static void editing_host_page_on_straighten_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->straighten_button;
 #line 2117 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_straighten_tool_factory_editing_tools_editing_tool_factory);
-#line 13412 "PhotoPage.c"
+#line 13776 "PhotoPage.c"
 }
 
 
-static EditingToolsEditingTool* _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void) {
+static EditingToolsEditingTool*
+_editing_tools_crop_tool_factory_editing_tools_editing_tool_factory (void)
+{
 	EditingToolsEditingTool* result;
 	result = editing_tools_crop_tool_factory ();
 #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13421 "PhotoPage.c"
+#line 13787 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
+static void
+editing_host_page_on_crop_toggled (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 #line 2120 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -13434,20 +13802,24 @@ static void editing_host_page_on_crop_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->crop_button;
 #line 2121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_crop_tool_factory_editing_tools_editing_tool_factory);
-#line 13433 "PhotoPage.c"
+#line 13801 "PhotoPage.c"
 }
 
 
-static EditingToolsEditingTool* _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void) {
+static EditingToolsEditingTool*
+_editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory (void)
+{
 	EditingToolsEditingTool* result;
 	result = editing_tools_redeye_tool_factory ();
 #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13442 "PhotoPage.c"
+#line 13812 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
+static void
+editing_host_page_on_redeye_toggled (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 #line 2124 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -13455,20 +13827,24 @@ static void editing_host_page_on_redeye_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->redeye_button;
 #line 2125 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_redeye_tool_factory_editing_tools_editing_tool_factory);
-#line 13454 "PhotoPage.c"
+#line 13826 "PhotoPage.c"
 }
 
 
-static EditingToolsEditingTool* _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void) {
+static EditingToolsEditingTool*
+_editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory (void)
+{
 	EditingToolsEditingTool* result;
 	result = editing_tools_adjust_tool_factory ();
 #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13463 "PhotoPage.c"
+#line 13837 "PhotoPage.c"
 }
 
 
-static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
+static void
+editing_host_page_on_adjust_toggled (EditingHostPage* self)
+{
 	GtkToggleToolButton* _tmp0_;
 #line 2128 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
@@ -13476,11 +13852,14 @@ static void editing_host_page_on_adjust_toggled (EditingHostPage* self) {
 	_tmp0_ = self->priv->adjust_button;
 #line 2129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_tool_button_toggled (self, _tmp0_, _editing_tools_adjust_tool_factory_editing_tools_editing_tool_factory);
-#line 13475 "PhotoPage.c"
+#line 13851 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* photo) {
+gboolean
+editing_host_page_is_enhance_available (EditingHostPage* self,
+                                        Photo* photo)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 2132 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13493,32 +13872,33 @@ gboolean editing_host_page_is_enhance_available (EditingHostPage* self, Photo* p
 	result = !_tmp0_;
 #line 2133 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 13492 "PhotoPage.c"
+#line 13871 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_enhance (EditingHostPage* self) {
+void
+editing_host_page_on_enhance (EditingHostPage* self)
+{
 	EditingToolsEditingTool* _tmp0_;
-	gboolean _tmp2_;
 	EditingToolsAdjustTool* adjust_tool = NULL;
-	EditingToolsEditingTool* _tmp3_;
+	EditingToolsEditingTool* _tmp2_;
+	EditingToolsAdjustTool* _tmp3_;
 	EditingToolsAdjustTool* _tmp4_;
-	EditingToolsAdjustTool* _tmp5_;
 	EnhanceSingleCommand* command = NULL;
+	Photo* _tmp6_;
 	Photo* _tmp7_;
-	Photo* _tmp8_;
+	EnhanceSingleCommand* _tmp8_;
 	EnhanceSingleCommand* _tmp9_;
-	EnhanceSingleCommand* _tmp10_;
+	CommandManager* _tmp10_;
 	CommandManager* _tmp11_;
-	CommandManager* _tmp12_;
-	EnhanceSingleCommand* _tmp13_;
+	EnhanceSingleCommand* _tmp12_;
 #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = self->priv->current_tool;
 #line 2140 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (!G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 13517 "PhotoPage.c"
+#line 13897 "PhotoPage.c"
 		Dimensions _tmp1_ = {0};
 #line 2141 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		dimensions_init (&_tmp1_, 0, 0);
@@ -13526,118 +13906,116 @@ void editing_host_page_on_enhance (EditingHostPage* self) {
 		editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp1_, FALSE);
 #line 2143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_cancel_zoom (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
-#line 13525 "PhotoPage.c"
+#line 13905 "PhotoPage.c"
 	}
 #line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_has_photo (self);
-#line 2146 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp2_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 2147 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13533 "PhotoPage.c"
+#line 13911 "PhotoPage.c"
 	}
 #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = self->priv->current_tool;
+	_tmp2_ = self->priv->current_tool;
 #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp3_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp3_) : NULL);
+	_tmp3_ = _editing_tools_editing_tool_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, EDITING_TOOLS_TYPE_ADJUST_TOOL) ? ((EditingToolsAdjustTool*) _tmp2_) : NULL);
 #line 2149 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	adjust_tool = _tmp4_;
+	adjust_tool = _tmp3_;
 #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = adjust_tool;
+	_tmp4_ = adjust_tool;
 #line 2150 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp5_ != NULL) {
-#line 13545 "PhotoPage.c"
-		EditingToolsAdjustTool* _tmp6_;
+	if (_tmp4_ != NULL) {
+#line 13923 "PhotoPage.c"
+		EditingToolsAdjustTool* _tmp5_;
 #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = adjust_tool;
+		_tmp5_ = adjust_tool;
 #line 2151 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		editing_tools_adjust_tool_enhance (_tmp6_);
+		editing_tools_adjust_tool_enhance (_tmp5_);
 #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_editing_tools_editing_tool_unref0 (adjust_tool);
 #line 2153 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13555 "PhotoPage.c"
+#line 13933 "PhotoPage.c"
 	}
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = editing_host_page_get_photo (self);
+	_tmp6_ = editing_host_page_get_photo (self);
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = enhance_single_command_new (_tmp8_);
+	_tmp8_ = enhance_single_command_new (_tmp7_);
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 2156 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp10_;
+	command = _tmp9_;
 #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp10_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = command;
+	_tmp12_ = command;
 #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
 #line 2157 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp12_);
+	_command_manager_unref0 (_tmp11_);
 #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
 #line 2136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_editing_tools_editing_tool_unref0 (adjust_tool);
-#line 13583 "PhotoPage.c"
+#line 13961 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_copy_adjustments (EditingHostPage* self) {
-	gboolean _tmp0_;
+void
+editing_host_page_on_copy_adjustments (EditingHostPage* self)
+{
+	Photo* _tmp0_;
 	Photo* _tmp1_;
-	Photo* _tmp2_;
+	PixelTransformationBundle* _tmp2_;
 	PixelTransformationBundle* _tmp3_;
-	PixelTransformationBundle* _tmp4_;
 #line 2160 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (self);
-#line 2161 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp0_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 2162 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13601 "PhotoPage.c"
+#line 13978 "PhotoPage.c"
 	}
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_get_photo (self);
+	_tmp0_ = editing_host_page_get_photo (self);
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = photo_get_color_adjustments (_tmp2_);
+	_tmp2_ = photo_get_color_adjustments (_tmp1_);
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	pixel_transformation_bundle_set_copied_color_adjustments (_tmp4_);
+	pixel_transformation_bundle_set_copied_color_adjustments (_tmp3_);
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_pixel_transformation_bundle_unref0 (_tmp4_);
+	_pixel_transformation_bundle_unref0 (_tmp3_);
 #line 2163 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 2164 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", TRUE);
-#line 13619 "PhotoPage.c"
+#line 13996 "PhotoPage.c"
 }
 
 
-void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
+void
+editing_host_page_on_paste_adjustments (EditingHostPage* self)
+{
 	PixelTransformationBundle* copied_adjustments = NULL;
 	PixelTransformationBundle* _tmp0_;
 	gboolean _tmp1_ = FALSE;
-	gboolean _tmp2_;
 	AdjustColorsSingleCommand* command = NULL;
+	Photo* _tmp3_;
 	Photo* _tmp4_;
-	Photo* _tmp5_;
-	PixelTransformationBundle* _tmp6_;
+	PixelTransformationBundle* _tmp5_;
+	AdjustColorsSingleCommand* _tmp6_;
 	AdjustColorsSingleCommand* _tmp7_;
-	AdjustColorsSingleCommand* _tmp8_;
+	CommandManager* _tmp8_;
 	CommandManager* _tmp9_;
-	CommandManager* _tmp10_;
-	AdjustColorsSingleCommand* _tmp11_;
+	AdjustColorsSingleCommand* _tmp10_;
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13645,19 +14023,17 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 #line 2168 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	copied_adjustments = _tmp0_;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_has_photo (self);
-#line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp2_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp1_ = TRUE;
-#line 13649 "PhotoPage.c"
+#line 14025 "PhotoPage.c"
 	} else {
-		PixelTransformationBundle* _tmp3_;
+		PixelTransformationBundle* _tmp2_;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = copied_adjustments;
+		_tmp2_ = copied_adjustments;
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = _tmp3_ == NULL;
-#line 13656 "PhotoPage.c"
+		_tmp1_ = _tmp2_ == NULL;
+#line 14032 "PhotoPage.c"
 	}
 #line 2169 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp1_) {
@@ -13665,41 +14041,43 @@ void editing_host_page_on_paste_adjustments (EditingHostPage* self) {
 		_pixel_transformation_bundle_unref0 (copied_adjustments);
 #line 2170 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13664 "PhotoPage.c"
+#line 14040 "PhotoPage.c"
 	}
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = editing_host_page_get_photo (self);
+	_tmp3_ = editing_host_page_get_photo (self);
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = copied_adjustments;
+	_tmp5_ = copied_adjustments;
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = adjust_colors_single_command_new (_tmp5_, _tmp6_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
+	_tmp6_ = adjust_colors_single_command_new (_tmp4_, _tmp5_, RESOURCES_PASTE_ADJUSTMENTS_LABEL, RESOURCES_PASTE_ADJUSTMENTS_TOOLTIP);
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp5_);
+	_g_object_unref0 (_tmp4_);
 #line 2172 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp8_;
+	command = _tmp7_;
 #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp9_ = _tmp8_;
 #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = command;
+	_tmp10_ = command;
 #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp10_, G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
 #line 2174 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp10_);
+	_command_manager_unref0 (_tmp9_);
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
 #line 2167 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_pixel_transformation_bundle_unref0 (copied_adjustments);
-#line 13694 "PhotoPage.c"
+#line 14070 "PhotoPage.c"
 }
 
 
-static void editing_host_page_place_tool_window (EditingHostPage* self) {
+static void
+editing_host_page_place_tool_window (EditingHostPage* self)
+{
 	EditingToolsEditingTool* _tmp0_;
 	EditingToolsEditingToolWindow* tool_window = NULL;
 	EditingToolsEditingTool* _tmp1_;
@@ -13721,30 +14099,25 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	gchar* _tmp14_;
 	gchar* _tmp15_;
 	gboolean _tmp16_;
-	gboolean _tmp17_;
 	GdkScreen* screen = NULL;
-	GtkWindow* _tmp87_;
-	GtkWindow* _tmp88_;
-	GdkScreen* _tmp89_;
+	GtkWindow* _tmp84_;
+	GtkWindow* _tmp85_;
+	GdkScreen* _tmp86_;
+	GdkScreen* _tmp87_;
+	GdkScreen* _tmp88_;
+	gint _tmp89_;
 	GdkScreen* _tmp90_;
-	GdkScreen* _tmp91_;
+	GtkAllocation _tmp91_;
 	gint _tmp92_;
-	GdkScreen* _tmp93_;
-	gint _tmp94_;
+	gint _tmp93_;
+	GdkScreen* _tmp94_;
 	GtkAllocation _tmp95_;
 	gint _tmp96_;
-	gint _tmp97_;
+	EditingToolsEditingToolWindow* _tmp97_;
 	gint _tmp98_;
-	GdkScreen* _tmp99_;
-	gint _tmp100_;
-	GtkAllocation _tmp101_;
-	gint _tmp102_;
-	gint _tmp103_;
-	EditingToolsEditingToolWindow* _tmp104_;
-	gint _tmp105_;
-	gint _tmp106_;
-	EditingToolsEditingToolWindow* _tmp107_;
-	EditingToolsEditingToolWindow* _tmp108_;
+	gint _tmp99_;
+	EditingToolsEditingToolWindow* _tmp100_;
+	EditingToolsEditingToolWindow* _tmp101_;
 #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2178 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -13753,7 +14126,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 	if (_tmp0_ == NULL) {
 #line 2179 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13752 "PhotoPage.c"
+#line 14125 "PhotoPage.c"
 	}
 #line 2181 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = self->priv->current_tool;
@@ -13769,7 +14142,7 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 		_g_object_unref0 (tool_window);
 #line 2183 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 13768 "PhotoPage.c"
+#line 14141 "PhotoPage.c"
 	}
 #line 2186 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp4_ = tool_window;
@@ -13808,390 +14181,375 @@ static void editing_host_page_place_tool_window (EditingHostPage* self) {
 #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp16_ = gee_abstract_map_has_key (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp15_);
 #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = _tmp16_;
-#line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_free0 (_tmp15_);
 #line 2195 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp17_) {
-#line 13812 "PhotoPage.c"
-		GeeHashMap* _tmp18_;
-		EditingToolsEditingTool* _tmp19_;
-		const gchar* _tmp20_;
+	if (_tmp16_) {
+#line 14183 "PhotoPage.c"
+		GeeHashMap* _tmp17_;
+		EditingToolsEditingTool* _tmp18_;
+		const gchar* _tmp19_;
+		gchar* _tmp20_;
 		gchar* _tmp21_;
-		gchar* _tmp22_;
-		gpointer _tmp23_;
-		GeeHashMap* _tmp24_;
-		EditingToolsEditingTool* _tmp25_;
-		const gchar* _tmp26_;
+		gpointer _tmp22_;
+		GeeHashMap* _tmp23_;
+		EditingToolsEditingTool* _tmp24_;
+		const gchar* _tmp25_;
+		gchar* _tmp26_;
 		gchar* _tmp27_;
-		gchar* _tmp28_;
-		gpointer _tmp29_;
+		gpointer _tmp28_;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = self->priv->last_locations;
+		_tmp17_ = self->priv->last_locations;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = self->priv->current_tool;
+		_tmp18_ = self->priv->current_tool;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp19_->name;
+		_tmp19_ = _tmp18_->name;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = g_strconcat (_tmp20_, "_x", NULL);
+		_tmp20_ = g_strconcat (_tmp19_, "_x", NULL);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = _tmp21_;
+		_tmp21_ = _tmp20_;
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp22_);
+		_tmp22_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp21_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		x = (gint) ((gintptr) _tmp23_);
+		x = (gint) ((gintptr) _tmp22_);
 #line 2196 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp22_);
+		_g_free0 (_tmp21_);
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = self->priv->last_locations;
+		_tmp23_ = self->priv->last_locations;
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = self->priv->current_tool;
+		_tmp24_ = self->priv->current_tool;
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = _tmp25_->name;
+		_tmp25_ = _tmp24_->name;
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = g_strconcat (_tmp26_, "_y", NULL);
+		_tmp26_ = g_strconcat (_tmp25_, "_y", NULL);
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = _tmp27_;
+		_tmp27_ = _tmp26_;
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp28_);
+		_tmp28_ = gee_abstract_map_get (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, GEE_TYPE_ABSTRACT_MAP, GeeAbstractMap), _tmp27_);
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		y = (gint) ((gintptr) _tmp29_);
+		y = (gint) ((gintptr) _tmp28_);
 #line 2197 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp28_);
-#line 13857 "PhotoPage.c"
+		_g_free0 (_tmp27_);
+#line 14228 "PhotoPage.c"
 	} else {
+		GtkWindow* _tmp29_;
 		GtkWindow* _tmp30_;
-		GtkWindow* _tmp31_;
+		AppWindow* _tmp31_;
 		AppWindow* _tmp32_;
-		AppWindow* _tmp33_;
-		gboolean _tmp34_;
+		gboolean _tmp33_;
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp29_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = _tmp30_;
+		_tmp30_ = _tmp29_;
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = app_window_get_instance ();
+		_tmp31_ = app_window_get_instance ();
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = _tmp32_;
+		_tmp32_ = _tmp31_;
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = _tmp31_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_window_get_type (), GtkWindow);
+		_tmp33_ = _tmp30_ == G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_window_get_type (), GtkWindow);
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp33_);
+		_g_object_unref0 (_tmp32_);
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp31_);
+		_g_object_unref0 (_tmp30_);
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp34_) {
-#line 13880 "PhotoPage.c"
+		if (_tmp33_) {
+#line 14251 "PhotoPage.c"
 			gint rx = 0;
 			gint ry = 0;
+			GtkWindow* _tmp34_;
 			GtkWindow* _tmp35_;
-			GtkWindow* _tmp36_;
-			GdkWindow* _tmp37_;
+			GdkWindow* _tmp36_;
+			gint _tmp37_ = 0;
 			gint _tmp38_ = 0;
-			gint _tmp39_ = 0;
 			GtkAllocation viewport_allocation = {0};
-			GtkViewport* _tmp40_;
-			GtkAllocation _tmp41_ = {0};
+			GtkViewport* _tmp39_;
+			GtkAllocation _tmp40_ = {0};
 			gint cx = 0;
 			gint cy = 0;
 			gint cwidth = 0;
 			gint cheight = 0;
-			GtkAllocation _tmp42_;
-			gint _tmp43_;
-			GtkAllocation _tmp44_;
-			gint _tmp45_;
-			GtkAllocation _tmp46_;
-			gint _tmp47_;
-			GtkAllocation _tmp48_;
-			gint _tmp49_;
-			gint _tmp50_ = 0;
+			GtkAllocation _tmp41_;
+			gint _tmp42_;
+			GtkAllocation _tmp43_;
+			gint _tmp44_;
+			GtkAllocation _tmp45_;
+			gint _tmp46_;
+			GtkAllocation _tmp47_;
+			gint _tmp48_;
+			gint _tmp49_ = 0;
+			gint _tmp58_;
 			gint _tmp59_;
 			gint _tmp60_;
-			gint _tmp61_;
-			GtkAllocation _tmp62_;
-			gint _tmp63_;
+			GtkAllocation _tmp61_;
+			gint _tmp62_;
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp35_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp34_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp36_ = _tmp35_;
+			_tmp35_ = _tmp34_;
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp37_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget));
+			_tmp36_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget));
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gdk_window_get_root_origin (_tmp37_, &_tmp38_, &_tmp39_);
+			gdk_window_get_root_origin (_tmp36_, &_tmp37_, &_tmp38_);
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			rx = _tmp38_;
+			rx = _tmp37_;
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			ry = _tmp39_;
+			ry = _tmp38_;
 #line 2205 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp36_);
+			_g_object_unref0 (_tmp35_);
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
+			_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->viewport;
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), &_tmp41_);
+			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), &_tmp40_);
 #line 2208 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			viewport_allocation = _tmp41_;
+			viewport_allocation = _tmp40_;
 #line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp42_ = viewport_allocation;
+			_tmp41_ = viewport_allocation;
 #line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp43_ = _tmp42_.x;
+			_tmp42_ = _tmp41_.x;
 #line 2211 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cx = _tmp43_;
+			cx = _tmp42_;
 #line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp44_ = viewport_allocation;
+			_tmp43_ = viewport_allocation;
 #line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp45_ = _tmp44_.y;
+			_tmp44_ = _tmp43_.y;
 #line 2212 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cy = _tmp45_;
+			cy = _tmp44_;
 #line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp46_ = viewport_allocation;
+			_tmp45_ = viewport_allocation;
 #line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp47_ = _tmp46_.width;
+			_tmp46_ = _tmp45_.width;
 #line 2213 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cwidth = _tmp47_;
+			cwidth = _tmp46_;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp48_ = viewport_allocation;
+			_tmp47_ = viewport_allocation;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp49_ = _tmp48_.height;
+			_tmp48_ = _tmp47_.height;
 #line 2214 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			cheight = _tmp49_;
+			cheight = _tmp48_;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			if (G_TYPE_CHECK_INSTANCE_TYPE (self, TYPE_DIRECT_PHOTO_PAGE)) {
-#line 13955 "PhotoPage.c"
+#line 14326 "PhotoPage.c"
+				gint _tmp50_;
 				gint _tmp51_;
 				gint _tmp52_;
-				gint _tmp53_;
-				GtkAllocation _tmp54_;
-				gint _tmp55_;
+				GtkAllocation _tmp53_;
+				gint _tmp54_;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp51_ = rx;
+				_tmp50_ = rx;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp52_ = cx;
+				_tmp51_ = cx;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp53_ = cwidth;
+				_tmp52_ = cwidth;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp54_ = tool_alloc;
+				_tmp53_ = tool_alloc;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp55_ = _tmp54_.width;
+				_tmp54_ = _tmp53_.width;
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp50_ = ((_tmp51_ + _tmp52_) + (_tmp53_ / 2)) - (_tmp55_ / 2);
-#line 13973 "PhotoPage.c"
+				_tmp49_ = ((_tmp50_ + _tmp51_) + (_tmp52_ / 2)) - (_tmp54_ / 2);
+#line 14344 "PhotoPage.c"
 			} else {
+				gint _tmp55_;
 				gint _tmp56_;
 				gint _tmp57_;
-				gint _tmp58_;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp56_ = rx;
+				_tmp55_ = rx;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp57_ = cx;
+				_tmp56_ = cx;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp58_ = cwidth;
+				_tmp57_ = cwidth;
 #line 2219 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp50_ = (_tmp56_ + _tmp57_) + (_tmp58_ / 2);
-#line 13986 "PhotoPage.c"
+				_tmp49_ = (_tmp55_ + _tmp56_) + (_tmp57_ / 2);
+#line 14357 "PhotoPage.c"
 			}
 #line 2218 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			x = _tmp50_;
+			x = _tmp49_;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp59_ = ry;
+			_tmp58_ = ry;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp60_ = cy;
+			_tmp59_ = cy;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp61_ = cheight;
+			_tmp60_ = cheight;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp62_ = tool_alloc;
+			_tmp61_ = tool_alloc;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp63_ = _tmp62_.height;
+			_tmp62_ = _tmp61_.height;
 #line 2220 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			y = ((_tmp59_ + _tmp60_) + _tmp61_) - ((_tmp63_ / 4) * 3);
-#line 14002 "PhotoPage.c"
+			y = ((_tmp58_ + _tmp59_) + _tmp60_) - ((_tmp62_ / 4) * 3);
+#line 14373 "PhotoPage.c"
 		} else {
+			GtkWindow* _tmp63_;
 			GtkWindow* _tmp64_;
-			GtkWindow* _tmp65_;
 			GtkAllocation toolbar_alloc = {0};
+			GtkToolbar* _tmp65_;
 			GtkToolbar* _tmp66_;
-			GtkToolbar* _tmp67_;
-			GtkAllocation _tmp68_ = {0};
+			GtkAllocation _tmp67_ = {0};
 			GdkScreen* screen = NULL;
+			GtkWindow* _tmp68_;
 			GtkWindow* _tmp69_;
-			GtkWindow* _tmp70_;
+			GdkScreen* _tmp70_;
 			GdkScreen* _tmp71_;
 			GdkScreen* _tmp72_;
 			GdkScreen* _tmp73_;
 			GdkScreen* _tmp74_;
-			gint _tmp75_;
-			GdkScreen* _tmp76_;
-			gint _tmp77_;
-			GtkAllocation _tmp78_;
-			gint _tmp79_;
-			GtkAllocation _tmp80_;
-			gint _tmp81_;
-			EditingToolsEditingTool* _tmp82_;
+			GtkAllocation _tmp75_;
+			gint _tmp76_;
+			GtkAllocation _tmp77_;
+			gint _tmp78_;
+			EditingToolsEditingTool* _tmp79_;
 #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp64_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp63_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp65_ = _tmp64_;
+			_tmp64_ = _tmp63_;
 #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp65_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow");
+			_vala_assert (G_TYPE_CHECK_INSTANCE_TYPE (_tmp64_, TYPE_FULLSCREEN_WINDOW), "get_container() is FullscreenWindow");
 #line 2222 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp65_);
+			_g_object_unref0 (_tmp64_);
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp66_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp65_ = page_get_toolbar (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp67_ = _tmp66_;
+			_tmp66_ = _tmp65_;
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp67_, gtk_widget_get_type (), GtkWidget), &_tmp68_);
+			gtk_widget_get_allocation (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_widget_get_type (), GtkWidget), &_tmp67_);
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			toolbar_alloc = _tmp68_;
+			toolbar_alloc = _tmp67_;
 #line 2227 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp67_);
+			_g_object_unref0 (_tmp66_);
 #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp69_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp68_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp70_ = _tmp69_;
+			_tmp69_ = _tmp68_;
 #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp71_ = gtk_window_get_screen (_tmp70_);
+			_tmp70_ = gtk_window_get_screen (_tmp69_);
 #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp72_ = _g_object_ref0 (_tmp71_);
+			_tmp71_ = _g_object_ref0 (_tmp70_);
 #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp73_ = _tmp72_;
+			_tmp72_ = _tmp71_;
 #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp70_);
+			_g_object_unref0 (_tmp69_);
 #line 2229 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			screen = _tmp73_;
+			screen = _tmp72_;
 #line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp74_ = screen;
-#line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp75_ = gdk_screen_get_width (_tmp74_);
+			_tmp73_ = screen;
 #line 2230 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			x = _tmp75_;
-#line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp76_ = screen;
+			x = gdk_screen_get_width (_tmp73_);
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp77_ = gdk_screen_get_height (_tmp76_);
+			_tmp74_ = screen;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp78_ = toolbar_alloc;
+			_tmp75_ = toolbar_alloc;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp79_ = _tmp78_.height;
+			_tmp76_ = _tmp75_.height;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp80_ = tool_alloc;
+			_tmp77_ = tool_alloc;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp81_ = _tmp80_.height;
+			_tmp78_ = _tmp77_.height;
 #line 2231 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			y = ((_tmp77_ - _tmp79_) - _tmp81_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR;
+			y = ((gdk_screen_get_height (_tmp74_) - _tmp76_) - _tmp78_) - EDITING_HOST_PAGE_TOOL_WINDOW_SEPARATOR;
 #line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp82_ = self->priv->current_tool;
+			_tmp79_ = self->priv->current_tool;
 #line 2235 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp82_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
-#line 14081 "PhotoPage.c"
-				gint _tmp83_;
+			if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp79_, EDITING_TOOLS_TYPE_ADJUST_TOOL)) {
+#line 14446 "PhotoPage.c"
+				gint _tmp80_;
 #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp83_ = x;
+				_tmp80_ = x;
 #line 2236 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				x = (_tmp83_ * 3) / 4;
-#line 14087 "PhotoPage.c"
+				x = (_tmp80_ * 3) / 4;
+#line 14452 "PhotoPage.c"
 			} else {
-				gint _tmp84_;
-				GtkAllocation _tmp85_;
-				gint _tmp86_;
+				gint _tmp81_;
+				GtkAllocation _tmp82_;
+				gint _tmp83_;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp84_ = x;
+				_tmp81_ = x;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp85_ = tool_alloc;
+				_tmp82_ = tool_alloc;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp86_ = _tmp85_.width;
+				_tmp83_ = _tmp82_.width;
 #line 2238 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				x = (_tmp84_ - _tmp86_) / 2;
-#line 14100 "PhotoPage.c"
+				x = (_tmp81_ - _tmp83_) / 2;
+#line 14465 "PhotoPage.c"
 			}
 #line 2200 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (screen);
-#line 14104 "PhotoPage.c"
+#line 14469 "PhotoPage.c"
 		}
 	}
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp87_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp84_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp88_ = _tmp87_;
+	_tmp85_ = _tmp84_;
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp89_ = gtk_window_get_screen (_tmp88_);
+	_tmp86_ = gtk_window_get_screen (_tmp85_);
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp90_ = _g_object_ref0 (_tmp89_);
+	_tmp87_ = _g_object_ref0 (_tmp86_);
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp91_ = _tmp90_;
+	_tmp88_ = _tmp87_;
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp88_);
+	_g_object_unref0 (_tmp85_);
 #line 2244 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	screen = _tmp91_;
+	screen = _tmp88_;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp92_ = x;
+	_tmp89_ = x;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp93_ = screen;
+	_tmp90_ = screen;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp94_ = gdk_screen_get_width (_tmp93_);
+	_tmp91_ = tool_alloc;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp95_ = tool_alloc;
-#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp96_ = _tmp95_.width;
-#line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp97_ = CLAMP (_tmp92_, 0, _tmp94_ - _tmp96_);
+	_tmp92_ = _tmp91_.width;
 #line 2245 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	x = _tmp97_;
+	x = CLAMP (_tmp89_, 0, gdk_screen_get_width (_tmp90_) - _tmp92_);
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp98_ = y;
+	_tmp93_ = y;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp99_ = screen;
+	_tmp94_ = screen;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp100_ = gdk_screen_get_height (_tmp99_);
-#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp101_ = tool_alloc;
-#line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp102_ = _tmp101_.height;
+	_tmp95_ = tool_alloc;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp103_ = CLAMP (_tmp98_, 0, _tmp100_ - _tmp102_);
+	_tmp96_ = _tmp95_.height;
 #line 2246 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	y = _tmp103_;
+	y = CLAMP (_tmp93_, 0, gdk_screen_get_height (_tmp94_) - _tmp96_);
 #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp104_ = tool_window;
+	_tmp97_ = tool_window;
 #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp105_ = x;
+	_tmp98_ = x;
 #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp106_ = y;
+	_tmp99_ = y;
 #line 2248 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp104_, gtk_window_get_type (), GtkWindow), _tmp105_, _tmp106_);
+	gtk_window_move (G_TYPE_CHECK_INSTANCE_CAST (_tmp97_, gtk_window_get_type (), GtkWindow), _tmp98_, _tmp99_);
 #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp107_ = tool_window;
+	_tmp100_ = tool_window;
 #line 2249 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp107_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
 #line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp108_ = tool_window;
+	_tmp101_ = tool_window;
 #line 2250 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp108_, gtk_window_get_type (), GtkWindow));
+	gtk_window_present (G_TYPE_CHECK_INSTANCE_CAST (_tmp101_, gtk_window_get_type (), GtkWindow));
 #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (screen);
 #line 2177 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (tool_window);
-#line 14169 "PhotoPage.c"
+#line 14526 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
+static void
+editing_host_page_real_on_next_photo (SinglePhotoPage* base)
+{
 	EditingHostPage * self;
 	Dimensions _tmp0_ = {0};
-	gboolean _tmp1_;
 	Photo* current_photo = NULL;
+	Photo* _tmp1_;
 	Photo* _tmp2_;
-	Photo* _tmp3_;
 	DataView* current = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	Photo* _tmp5_;
 	Photo* _tmp6_;
-	Photo* _tmp7_;
+	DataView* _tmp7_;
 	DataView* _tmp8_;
 	DataView* _tmp9_;
-	DataView* _tmp10_;
 	DataView* next = NULL;
+	DataView* _tmp10_;
 	DataView* _tmp11_;
-	DataView* _tmp12_;
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14199,151 +14557,149 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 #line 2254 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (self);
-#line 2256 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 2257 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14203 "PhotoPage.c"
+#line 14559 "PhotoPage.c"
 	}
 #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_get_photo (self);
+	_tmp1_ = editing_host_page_get_photo (self);
 #line 2259 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	current_photo = _tmp2_;
+	current_photo = _tmp1_;
 #line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = current_photo;
+	_tmp2_ = current_photo;
 #line 2260 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp3_ != NULL, "current_photo != null");
+	_vala_assert (_tmp2_ != NULL, "current_photo != null");
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = editing_host_page_get_photo (self);
+	_tmp5_ = editing_host_page_get_photo (self);
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
+	_tmp7_ = view_collection_get_view_for_source (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource));
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 2262 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	current = _tmp9_;
+	current = _tmp8_;
 #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = current;
+	_tmp9_ = current;
 #line 2263 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp10_ == NULL) {
+	if (_tmp9_ == NULL) {
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
 #line 2264 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14241 "PhotoPage.c"
+#line 14597 "PhotoPage.c"
 	}
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = current;
+	_tmp10_ = current;
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _g_object_ref0 (_tmp11_);
+	_tmp11_ = _g_object_ref0 (_tmp10_);
 #line 2267 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	next = _tmp12_;
-#line 14249 "PhotoPage.c"
+	next = _tmp11_;
+#line 14605 "PhotoPage.c"
 	{
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp12_ = FALSE;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = TRUE;
+		_tmp12_ = TRUE;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14256 "PhotoPage.c"
+#line 14612 "PhotoPage.c"
+			ViewCollection* _tmp13_;
 			ViewCollection* _tmp14_;
-			ViewCollection* _tmp15_;
+			DataView* _tmp15_;
 			DataView* _tmp16_;
 			DataView* _tmp17_;
-			DataView* _tmp18_;
 			Photo* next_photo = NULL;
-			DataView* _tmp19_;
-			DataSource* _tmp20_;
+			DataView* _tmp18_;
+			DataSource* _tmp19_;
+			Photo* _tmp20_;
 			Photo* _tmp21_;
 			Photo* _tmp22_;
 			Photo* _tmp23_;
 			Photo* _tmp24_;
-			Photo* _tmp25_;
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (!_tmp13_) {
-#line 14272 "PhotoPage.c"
+			if (!_tmp12_) {
+#line 14628 "PhotoPage.c"
 			}
 #line 2268 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp13_ = FALSE;
+			_tmp12_ = FALSE;
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp15_ = _tmp14_;
+			_tmp14_ = _tmp13_;
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp16_ = next;
+			_tmp15_ = next;
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp17_ = view_collection_get_next (_tmp15_, _tmp16_);
+			_tmp16_ = view_collection_get_next (_tmp14_, _tmp15_);
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next);
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			next = _tmp17_;
+			next = _tmp16_;
 #line 2269 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_data_collection_unref0 (_tmp15_);
+			_data_collection_unref0 (_tmp14_);
 #line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp18_ = next;
+			_tmp17_ = next;
 #line 2270 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp18_ == NULL) {
+			if (_tmp17_ == NULL) {
 #line 2271 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14296 "PhotoPage.c"
+#line 14652 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp19_ = next;
+			_tmp18_ = next;
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp20_ = data_view_get_source (_tmp19_);
+			_tmp19_ = data_view_get_source (_tmp18_);
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
+			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL;
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp21_ == NULL) {
+			if (_tmp20_ == NULL) {
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_object_unref0 (_tmp20_);
-#line 14308 "PhotoPage.c"
+				_g_object_unref0 (_tmp19_);
+#line 14664 "PhotoPage.c"
 			}
 #line 2273 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			next_photo = _tmp21_;
+			next_photo = _tmp20_;
 #line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp22_ = next_photo;
+			_tmp21_ = next_photo;
 #line 2274 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp22_ == NULL) {
+			if (_tmp21_ == NULL) {
 #line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
 #line 2275 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14320 "PhotoPage.c"
+#line 14676 "PhotoPage.c"
 			}
 #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp23_ = next_photo;
+			_tmp22_ = next_photo;
 #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp24_ = current_photo;
+			_tmp23_ = current_photo;
 #line 2277 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp23_ == _tmp24_) {
+			if (_tmp22_ == _tmp23_) {
 #line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (next_photo);
 #line 2278 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14332 "PhotoPage.c"
+#line 14688 "PhotoPage.c"
 			}
 #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp25_ = next_photo;
+			_tmp24_ = next_photo;
 #line 2280 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_replace_photo (self, _tmp25_);
+			editing_host_page_replace_photo (self, _tmp24_);
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (next_photo);
 #line 2282 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14342 "PhotoPage.c"
+#line 14698 "PhotoPage.c"
 		}
 	}
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14352,28 +14708,29 @@ static void editing_host_page_real_on_next_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2253 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14351 "PhotoPage.c"
+#line 14707 "PhotoPage.c"
 }
 
 
-static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
+static void
+editing_host_page_real_on_previous_photo (SinglePhotoPage* base)
+{
 	EditingHostPage * self;
 	Dimensions _tmp0_ = {0};
-	gboolean _tmp1_;
 	Photo* current_photo = NULL;
+	Photo* _tmp1_;
 	Photo* _tmp2_;
-	Photo* _tmp3_;
 	DataView* current = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	Photo* _tmp5_;
 	Photo* _tmp6_;
-	Photo* _tmp7_;
+	DataView* _tmp7_;
 	DataView* _tmp8_;
 	DataView* _tmp9_;
-	DataView* _tmp10_;
 	DataView* previous = NULL;
+	DataView* _tmp10_;
 	DataView* _tmp11_;
-	DataView* _tmp12_;
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_EDITING_HOST_PAGE, EditingHostPage);
 #line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14381,151 +14738,149 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 #line 2287 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_deactivate_tool (self, NULL, NULL, &_tmp0_, FALSE);
 #line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (self);
-#line 2289 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (self)) {
 #line 2290 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14385 "PhotoPage.c"
+#line 14740 "PhotoPage.c"
 	}
 #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_get_photo (self);
+	_tmp1_ = editing_host_page_get_photo (self);
 #line 2292 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	current_photo = _tmp2_;
+	current_photo = _tmp1_;
 #line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = current_photo;
+	_tmp2_ = current_photo;
 #line 2293 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_vala_assert (_tmp3_ != NULL, "current_photo != null");
+	_vala_assert (_tmp2_ != NULL, "current_photo != null");
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = editing_host_page_get_photo (self);
+	_tmp5_ = editing_host_page_get_photo (self);
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = view_collection_get_view_for_source (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource));
+	_tmp7_ = view_collection_get_view_for_source (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_DATA_SOURCE, DataSource));
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 2295 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	current = _tmp9_;
+	current = _tmp8_;
 #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = current;
+	_tmp9_ = current;
 #line 2296 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp10_ == NULL) {
+	if (_tmp9_ == NULL) {
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current);
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (current_photo);
 #line 2297 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 14423 "PhotoPage.c"
+#line 14778 "PhotoPage.c"
 	}
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = current;
+	_tmp10_ = current;
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _g_object_ref0 (_tmp11_);
+	_tmp11_ = _g_object_ref0 (_tmp10_);
 #line 2300 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	previous = _tmp12_;
-#line 14431 "PhotoPage.c"
+	previous = _tmp11_;
+#line 14786 "PhotoPage.c"
 	{
-		gboolean _tmp13_ = FALSE;
+		gboolean _tmp12_ = FALSE;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = TRUE;
+		_tmp12_ = TRUE;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		while (TRUE) {
-#line 14438 "PhotoPage.c"
+#line 14793 "PhotoPage.c"
+			ViewCollection* _tmp13_;
 			ViewCollection* _tmp14_;
-			ViewCollection* _tmp15_;
+			DataView* _tmp15_;
 			DataView* _tmp16_;
 			DataView* _tmp17_;
-			DataView* _tmp18_;
 			Photo* previous_photo = NULL;
-			DataView* _tmp19_;
-			DataSource* _tmp20_;
+			DataView* _tmp18_;
+			DataSource* _tmp19_;
+			Photo* _tmp20_;
 			Photo* _tmp21_;
 			Photo* _tmp22_;
 			Photo* _tmp23_;
 			Photo* _tmp24_;
-			Photo* _tmp25_;
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (!_tmp13_) {
-#line 14454 "PhotoPage.c"
+			if (!_tmp12_) {
+#line 14809 "PhotoPage.c"
 			}
 #line 2301 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp13_ = FALSE;
+			_tmp12_ = FALSE;
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp14_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp13_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp15_ = _tmp14_;
+			_tmp14_ = _tmp13_;
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp16_ = previous;
+			_tmp15_ = previous;
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp17_ = view_collection_get_previous (_tmp15_, _tmp16_);
+			_tmp16_ = view_collection_get_previous (_tmp14_, _tmp15_);
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous);
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			previous = _tmp17_;
+			previous = _tmp16_;
 #line 2302 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_data_collection_unref0 (_tmp15_);
+			_data_collection_unref0 (_tmp14_);
 #line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp18_ = previous;
+			_tmp17_ = previous;
 #line 2303 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp18_ == NULL) {
+			if (_tmp17_ == NULL) {
 #line 2304 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14478 "PhotoPage.c"
+#line 14833 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp19_ = previous;
+			_tmp18_ = previous;
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp20_ = data_view_get_source (_tmp19_);
+			_tmp19_ = data_view_get_source (_tmp18_);
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp21_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp20_, TYPE_PHOTO) ? ((Photo*) _tmp20_) : NULL;
+			_tmp20_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp19_, TYPE_PHOTO) ? ((Photo*) _tmp19_) : NULL;
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp21_ == NULL) {
+			if (_tmp20_ == NULL) {
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_object_unref0 (_tmp20_);
-#line 14490 "PhotoPage.c"
+				_g_object_unref0 (_tmp19_);
+#line 14845 "PhotoPage.c"
 			}
 #line 2306 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			previous_photo = _tmp21_;
+			previous_photo = _tmp20_;
 #line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp22_ = previous_photo;
+			_tmp21_ = previous_photo;
 #line 2307 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp22_ == NULL) {
+			if (_tmp21_ == NULL) {
 #line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
 #line 2308 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				continue;
-#line 14502 "PhotoPage.c"
+#line 14857 "PhotoPage.c"
 			}
 #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp23_ = previous_photo;
+			_tmp22_ = previous_photo;
 #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp24_ = current_photo;
+			_tmp23_ = current_photo;
 #line 2310 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			if (_tmp23_ == _tmp24_) {
+			if (_tmp22_ == _tmp23_) {
 #line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (previous_photo);
 #line 2311 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 14514 "PhotoPage.c"
+#line 14869 "PhotoPage.c"
 			}
 #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp25_ = previous_photo;
+			_tmp24_ = previous_photo;
 #line 2313 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			editing_host_page_replace_photo (self, _tmp25_);
+			editing_host_page_replace_photo (self, _tmp24_);
 #line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			_g_object_unref0 (previous_photo);
 #line 2315 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			break;
-#line 14524 "PhotoPage.c"
+#line 14879 "PhotoPage.c"
 		}
 	}
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14534,11 +14889,13 @@ static void editing_host_page_real_on_previous_photo (SinglePhotoPage* base) {
 	_g_object_unref0 (current);
 #line 2286 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (current_photo);
-#line 14533 "PhotoPage.c"
+#line 14888 "PhotoPage.c"
 }
 
 
-gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
+gboolean
+editing_host_page_has_current_tool (EditingHostPage* self)
+{
 	gboolean result = FALSE;
 	EditingToolsEditingTool* _tmp0_;
 #line 2319 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14549,116 +14906,101 @@ gboolean editing_host_page_has_current_tool (EditingHostPage* self) {
 	result = _tmp0_ != NULL;
 #line 2320 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 14548 "PhotoPage.c"
+#line 14905 "PhotoPage.c"
 }
 
 
-void editing_host_page_unset_view_collection (EditingHostPage* self) {
+void
+editing_host_page_unset_view_collection (EditingHostPage* self)
+{
 #line 2323 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_EDITING_HOST_PAGE (self));
 #line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (self->priv->parent_view);
 #line 2324 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->parent_view = NULL;
-#line 14559 "PhotoPage.c"
+#line 14918 "PhotoPage.c"
 }
 
 
-static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_construct (GType object_type, EditingHostPage* host_page) {
+static EditingHostPageEditingHostCanvas*
+editing_host_page_editing_host_canvas_construct (GType object_type,
+                                                 EditingHostPage* host_page)
+{
 	EditingHostPageEditingHostCanvas* self = NULL;
-	EditingHostPage* _tmp0_;
+	GtkWindow* _tmp0_;
 	GtkWindow* _tmp1_;
-	GtkWindow* _tmp2_;
-	EditingHostPage* _tmp3_;
-	GtkDrawingArea* _tmp4_;
-	GdkWindow* _tmp5_;
-	EditingHostPage* _tmp6_;
-	Photo* _tmp7_;
-	Photo* _tmp8_;
-	EditingHostPage* _tmp9_;
-	cairo_t* _tmp10_;
-	cairo_t* _tmp11_;
+	GtkDrawingArea* _tmp2_;
+	GdkWindow* _tmp3_;
+	Photo* _tmp4_;
+	Photo* _tmp5_;
+	cairo_t* _tmp6_;
+	cairo_t* _tmp7_;
+	Dimensions _tmp8_ = {0};
+	GdkPixbuf* _tmp9_;
+	GdkPixbuf* _tmp10_;
+	GdkRectangle _tmp11_ = {0};
 	EditingHostPage* _tmp12_;
-	Dimensions _tmp13_ = {0};
-	EditingHostPage* _tmp14_;
-	GdkPixbuf* _tmp15_;
-	GdkPixbuf* _tmp16_;
-	EditingHostPage* _tmp17_;
-	GdkRectangle _tmp18_ = {0};
-	EditingHostPage* _tmp19_;
-	EditingHostPage* _tmp20_;
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_EDITING_HOST_PAGE (host_page), NULL);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = host_page;
+	_tmp0_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_PAGE, Page));
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_PAGE, Page));
-#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
-#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = host_page;
-#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
-#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
-#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = host_page;
-#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = editing_host_page_get_photo (_tmp6_);
-#line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp1_ = _tmp0_;
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = host_page;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage)->canvas;
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = single_photo_page_get_cairo_context (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+	_tmp3_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget));
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp4_ = editing_host_page_get_photo (host_page);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = host_page;
+	_tmp5_ = _tmp4_;
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp13_);
+	_tmp6_ = single_photo_page_get_cairo_context (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = host_page;
+	_tmp7_ = _tmp6_;
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = single_photo_page_get_scaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
+	single_photo_page_get_surface_dim (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp8_);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = _tmp15_;
+	_tmp9_ = single_photo_page_get_scaled_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = host_page;
+	_tmp10_ = _tmp9_;
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp18_);
+	single_photo_page_get_scaled_pixbuf_position (G_TYPE_CHECK_INSTANCE_CAST (host_page, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp11_);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self = (EditingHostPageEditingHostCanvas*) editing_tools_photo_canvas_construct (object_type, _tmp2_, _tmp5_, _tmp8_, _tmp11_, &_tmp13_, _tmp16_, &_tmp18_);
+	self = (EditingHostPageEditingHostCanvas*) editing_tools_photo_canvas_construct (object_type, _tmp1_, _tmp3_, _tmp5_, _tmp7_, &_tmp8_, _tmp10_, &_tmp11_);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp16_);
+	_g_object_unref0 (_tmp10_);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_cairo_destroy0 (_tmp11_);
+	_cairo_destroy0 (_tmp7_);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp5_);
 #line 378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
-#line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = host_page;
+	_g_object_unref0 (_tmp1_);
 #line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = _g_object_ref0 (_tmp19_);
+	_tmp12_ = _g_object_ref0 (host_page);
 #line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->host_page);
 #line 382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->host_page = _tmp20_;
+	self->priv->host_page = _tmp12_;
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 14646 "PhotoPage.c"
+#line 14984 "PhotoPage.c"
 }
 
 
-static EditingHostPageEditingHostCanvas* editing_host_page_editing_host_canvas_new (EditingHostPage* host_page) {
+static EditingHostPageEditingHostCanvas*
+editing_host_page_editing_host_canvas_new (EditingHostPage* host_page)
+{
 #line 377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return editing_host_page_editing_host_canvas_construct (EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, host_page);
-#line 14653 "PhotoPage.c"
+#line 14993 "PhotoPage.c"
 }
 
 
-static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base) {
+static void
+editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhotoCanvas* base)
+{
 	EditingHostPageEditingHostCanvas * self;
 	EditingHostPage* _tmp0_;
 #line 385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14667,11 +15009,13 @@ static void editing_host_page_editing_host_canvas_real_repaint (EditingToolsPhot
 	_tmp0_ = self->priv->host_page;
 #line 386 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 14666 "PhotoPage.c"
+#line 15008 "PhotoPage.c"
 }
 
 
-static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEditingHostCanvasClass * klass) {
+static void
+editing_host_page_editing_host_canvas_class_init (EditingHostPageEditingHostCanvasClass * klass)
+{
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_editing_host_canvas_parent_class = g_type_class_peek_parent (klass);
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14680,18 +15024,22 @@ static void editing_host_page_editing_host_canvas_class_init (EditingHostPageEdi
 	g_type_class_add_private (klass, sizeof (EditingHostPageEditingHostCanvasPrivate));
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((EditingToolsPhotoCanvasClass *) klass)->repaint = (void (*) (EditingToolsPhotoCanvas *)) editing_host_page_editing_host_canvas_real_repaint;
-#line 14679 "PhotoPage.c"
+#line 15023 "PhotoPage.c"
 }
 
 
-static void editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self) {
+static void
+editing_host_page_editing_host_canvas_instance_init (EditingHostPageEditingHostCanvas * self)
+{
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = EDITING_HOST_PAGE_EDITING_HOST_CANVAS_GET_PRIVATE (self);
-#line 14686 "PhotoPage.c"
+#line 15032 "PhotoPage.c"
 }
 
 
-static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj) {
+static void
+editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCanvas * obj)
+{
 	EditingHostPageEditingHostCanvas * self;
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_HOST_PAGE_TYPE_EDITING_HOST_CANVAS, EditingHostPageEditingHostCanvas);
@@ -14699,11 +15047,13 @@ static void editing_host_page_editing_host_canvas_finalize (EditingToolsPhotoCan
 	_g_object_unref0 (self->priv->host_page);
 #line 374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_CLASS (editing_host_page_editing_host_canvas_parent_class)->finalize (obj);
-#line 14698 "PhotoPage.c"
+#line 15046 "PhotoPage.c"
 }
 
 
-static GType editing_host_page_editing_host_canvas_get_type (void) {
+static GType
+editing_host_page_editing_host_canvas_get_type (void)
+{
 	static volatile gsize editing_host_page_editing_host_canvas_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_host_page_editing_host_canvas_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingHostPageEditingHostCanvasClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_host_page_editing_host_canvas_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingHostPageEditingHostCanvas), 0, (GInstanceInitFunc) editing_host_page_editing_host_canvas_instance_init, NULL };
@@ -14715,7 +15065,9 @@ static GType editing_host_page_editing_host_canvas_get_type (void) {
 }
 
 
-static void editing_host_page_class_init (EditingHostPageClass * klass) {
+static void
+editing_host_page_class_init (EditingHostPageClass * klass)
+{
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_parent_class = g_type_class_peek_parent (klass);
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -14818,11 +15170,13 @@ static void editing_host_page_class_init (EditingHostPageClass * klass) {
 	((SinglePhotoPageClass *) klass)->on_previous_photo = (void (*) (SinglePhotoPage *)) editing_host_page_real_on_previous_photo;
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_host_page_finalize;
-#line 14817 "PhotoPage.c"
+#line 15169 "PhotoPage.c"
 }
 
 
-static void editing_host_page_instance_init (EditingHostPage * self) {
+static void
+editing_host_page_instance_init (EditingHostPage * self)
+{
 	GtkToolButton* _tmp0_;
 	GtkToolButton* _tmp1_;
 	GeeHashMap* _tmp2_;
@@ -14886,11 +15240,13 @@ static void editing_host_page_instance_init (EditingHostPage * self) {
 	_tmp2_ = gee_hash_map_new (G_TYPE_STRING, (GBoxedCopyFunc) g_strdup, (GDestroyNotify) g_free, G_TYPE_INT, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL);
 #line 415 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->last_locations = _tmp2_;
-#line 14885 "PhotoPage.c"
+#line 15239 "PhotoPage.c"
 }
 
 
-static void editing_host_page_finalize (GObject * obj) {
+static void
+editing_host_page_finalize (GObject * obj)
+{
 	EditingHostPage * self;
 	SourceCollection* _tmp0_;
 	guint _tmp1_;
@@ -14970,11 +15326,13 @@ static void editing_host_page_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->last_locations);
 #line 364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (editing_host_page_parent_class)->finalize (obj);
-#line 14969 "PhotoPage.c"
+#line 15325 "PhotoPage.c"
 }
 
 
-GType editing_host_page_get_type (void) {
+GType
+editing_host_page_get_type (void)
+{
 	static volatile gsize editing_host_page_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_host_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingHostPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_host_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingHostPage), 0, (GInstanceInitFunc) editing_host_page_instance_init, NULL };
@@ -14986,371 +15344,580 @@ GType editing_host_page_get_type (void) {
 }
 
 
-static void _library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender, DataSource* source, gpointer self) {
+static void
+_library_photo_page_on_photo_destroyed_source_collection_item_destroyed (SourceCollection* _sender,
+                                                                         DataSource* source,
+                                                                         gpointer self)
+{
 #line 2364 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_destroyed ((LibraryPhotoPage*) self, source);
-#line 14988 "PhotoPage.c"
+#line 15350 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_library_photo_page_on_metadata_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                       GeeMap* items,
+                                                                       gpointer self)
+{
 #line 2365 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_metadata_altered ((LibraryPhotoPage*) self, items);
-#line 14995 "PhotoPage.c"
+#line 15361 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender, gpointer self) {
+static void
+_library_photo_page_on_external_app_changed_configuration_facade_external_app_changed (ConfigurationFacade* _sender,
+                                                                                       gpointer self)
+{
 #line 2366 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_app_changed ((LibraryPhotoPage*) self);
-#line 15002 "PhotoPage.c"
+#line 15371 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_export_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                GVariant* parameter,
+                                                                gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_export ((LibraryPhotoPage*) self);
-#line 15009 "PhotoPage.c"
+#line 15382 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_print_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_print ((LibraryPhotoPage*) self);
-#line 15016 "PhotoPage.c"
+#line 15393 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_publish_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_publish ((LibraryPhotoPage*) self);
-#line 15023 "PhotoPage.c"
+#line 15404 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_remove_from_library_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                             GVariant* parameter,
+                                                                             gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_remove_from_library ((LibraryPhotoPage*) self);
-#line 15030 "PhotoPage.c"
+#line 15415 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_move_to_trash_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_move_to_trash ((LibraryPhotoPage*) self);
-#line 15037 "PhotoPage.c"
+#line 15426 "PhotoPage.c"
 }
 
 
-static void _single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_single_photo_page_on_previous_photo_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_previous_photo ((SinglePhotoPage*) self);
-#line 15044 "PhotoPage.c"
+#line 15437 "PhotoPage.c"
 }
 
 
-static void _single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_single_photo_page_on_next_photo_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo ((SinglePhotoPage*) self);
-#line 15051 "PhotoPage.c"
+#line 15448 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_rotate_clockwise_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                         GVariant* parameter,
+                                                                         gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_clockwise ((EditingHostPage*) self);
-#line 15058 "PhotoPage.c"
+#line 15459 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_rotate_counterclockwise_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                                GVariant* parameter,
+                                                                                gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_rotate_counterclockwise ((EditingHostPage*) self);
-#line 15065 "PhotoPage.c"
+#line 15470 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_flip_horizontally_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                          GVariant* parameter,
+                                                                          gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_horizontally ((EditingHostPage*) self);
-#line 15072 "PhotoPage.c"
+#line 15481 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_flip_vertically_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                        GVariant* parameter,
+                                                                        gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_flip_vertically ((EditingHostPage*) self);
-#line 15079 "PhotoPage.c"
+#line 15492 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_enhance_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                GVariant* parameter,
+                                                                gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_enhance ((EditingHostPage*) self);
-#line 15086 "PhotoPage.c"
+#line 15503 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_copy_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                         GVariant* parameter,
+                                                                         gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_copy_adjustments ((EditingHostPage*) self);
-#line 15093 "PhotoPage.c"
+#line 15514 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_paste_adjustments_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                          GVariant* parameter,
+                                                                          gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_paste_adjustments ((EditingHostPage*) self);
-#line 15100 "PhotoPage.c"
+#line 15525 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_crop_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_crop ((EditingHostPage*) self);
-#line 15107 "PhotoPage.c"
+#line 15536 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_straighten_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_straighten ((EditingHostPage*) self);
-#line 15114 "PhotoPage.c"
+#line 15547 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_redeye_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_redeye ((EditingHostPage*) self);
-#line 15121 "PhotoPage.c"
+#line 15558 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_toggle_adjust_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_toggle_adjust ((EditingHostPage*) self);
-#line 15128 "PhotoPage.c"
+#line 15569 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_revert_gsimple_action_activate_callback (GSimpleAction* action,
+                                                               GVariant* parameter,
+                                                               gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_revert ((EditingHostPage*) self);
-#line 15135 "PhotoPage.c"
+#line 15580 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_edit_title_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_title ((EditingHostPage*) self);
-#line 15142 "PhotoPage.c"
+#line 15591 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_edit_comment_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                     GVariant* parameter,
+                                                                     gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_edit_comment ((EditingHostPage*) self);
-#line 15149 "PhotoPage.c"
+#line 15602 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_adjust_date_time_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                         GVariant* parameter,
+                                                                         gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_adjust_date_time ((EditingHostPage*) self);
-#line 15156 "PhotoPage.c"
+#line 15613 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_external_edit_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit ((LibraryPhotoPage*) self);
-#line 15163 "PhotoPage.c"
+#line 15624 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_external_edit_raw_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                           GVariant* parameter,
+                                                                           gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_external_edit_raw ((LibraryPhotoPage*) self);
-#line 15170 "PhotoPage.c"
+#line 15635 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_send_to_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                 GVariant* parameter,
+                                                                 gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_send_to ((LibraryPhotoPage*) self);
-#line 15177 "PhotoPage.c"
+#line 15646 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_set_background_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_set_background ((EditingHostPage*) self);
-#line 15184 "PhotoPage.c"
+#line 15657 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_flag_unflag_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                     GVariant* parameter,
+                                                                     gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_flag_unflag ((LibraryPhotoPage*) self);
-#line 15191 "PhotoPage.c"
+#line 15668 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_increase_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                         GVariant* parameter,
+                                                                         gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_increase_rating ((LibraryPhotoPage*) self);
-#line 15198 "PhotoPage.c"
+#line 15679 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_decrease_rating_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                         GVariant* parameter,
+                                                                         gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_decrease_rating ((LibraryPhotoPage*) self);
-#line 15205 "PhotoPage.c"
+#line 15690 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_rate_rejected_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                       GVariant* parameter,
+                                                                       gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_rejected ((LibraryPhotoPage*) self);
-#line 15212 "PhotoPage.c"
+#line 15701 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_rate_unrated_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_unrated ((LibraryPhotoPage*) self);
-#line 15219 "PhotoPage.c"
+#line 15712 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_rate_one_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                  GVariant* parameter,
+                                                                  gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_one ((LibraryPhotoPage*) self);
-#line 15226 "PhotoPage.c"
+#line 15723 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_rate_two_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                  GVariant* parameter,
+                                                                  gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_two ((LibraryPhotoPage*) self);
-#line 15233 "PhotoPage.c"
+#line 15734 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_rate_three_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                    GVariant* parameter,
+                                                                    gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_three ((LibraryPhotoPage*) self);
-#line 15240 "PhotoPage.c"
+#line 15745 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_rate_four_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_four ((LibraryPhotoPage*) self);
-#line 15247 "PhotoPage.c"
+#line 15756 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_rate_five_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_rate_five ((LibraryPhotoPage*) self);
-#line 15254 "PhotoPage.c"
+#line 15767 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_increase_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_increase_size ((EditingHostPage*) self);
-#line 15261 "PhotoPage.c"
+#line 15778 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_on_decrease_size_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_on_decrease_size ((EditingHostPage*) self);
-#line 15268 "PhotoPage.c"
+#line 15789 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_snap_zoom_to_min_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_min ((EditingHostPage*) self);
-#line 15275 "PhotoPage.c"
+#line 15800 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_snap_zoom_to_isomorphic_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                             GVariant* parameter,
+                                                                             gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_isomorphic ((EditingHostPage*) self);
-#line 15282 "PhotoPage.c"
+#line 15811 "PhotoPage.c"
 }
 
 
-static void _editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_editing_host_page_snap_zoom_to_max_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                      GVariant* parameter,
+                                                                      gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_snap_zoom_to_max ((EditingHostPage*) self);
-#line 15289 "PhotoPage.c"
+#line 15822 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_add_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                  GVariant* parameter,
+                                                                  gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_add_tags ((LibraryPhotoPage*) self);
-#line 15296 "PhotoPage.c"
+#line 15833 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_modify_tags_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                     GVariant* parameter,
+                                                                     gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_modify_tags ((LibraryPhotoPage*) self);
-#line 15303 "PhotoPage.c"
+#line 15844 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_library_photo_page_on_slideshow_gsimple_action_activate_callback (GSimpleAction* action,
+                                                                   GVariant* parameter,
+                                                                   gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_slideshow ((LibraryPhotoPage*) self);
-#line 15310 "PhotoPage.c"
+#line 15855 "PhotoPage.c"
 }
 
 
-static void _page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action, GVariant* parameter, gpointer self) {
+static void
+_page_on_action_toggle_gsimple_action_activate_callback (GSimpleAction* action,
+                                                         GVariant* parameter,
+                                                         gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_on_action_toggle ((Page*) self, action, parameter);
-#line 15317 "PhotoPage.c"
+#line 15866 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action, GVariant* value, gpointer self) {
+static void
+_library_photo_page_on_display_ratings_gsimple_action_change_state_callback (GSimpleAction* action,
+                                                                             GVariant* value,
+                                                                             gpointer self)
+{
 #line 2388 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_display_ratings ((LibraryPhotoPage*) self, action, value);
-#line 15324 "PhotoPage.c"
+#line 15877 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_library_photo_page_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                     GeeMap* items,
+                                                                     gpointer self)
+{
 #line 2348 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photos_altered ((LibraryPhotoPage*) self);
-#line 15331 "PhotoPage.c"
+#line 15888 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender, GeeCollection* unlinking, gpointer self) {
+static void
+_library_photo_page_on_photo_unlinking_source_collection_items_unlinking (SourceCollection* _sender,
+                                                                          GeeCollection* unlinking,
+                                                                          gpointer self)
+{
 #line 2359 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_unlinking ((LibraryPhotoPage*) self, unlinking);
-#line 15338 "PhotoPage.c"
+#line 15899 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender, GeeCollection* relinked, gpointer self) {
+static void
+_library_photo_page_on_photo_relinked_source_collection_items_relinked (SourceCollection* _sender,
+                                                                        GeeCollection* relinked,
+                                                                        gpointer self)
+{
 #line 2360 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_photo_relinked ((LibraryPhotoPage*) self, relinked);
-#line 15345 "PhotoPage.c"
+#line 15910 "PhotoPage.c"
 }
 
 
-LibraryPhotoPage* library_photo_page_construct (GType object_type) {
+LibraryPhotoPage*
+library_photo_page_construct (GType object_type)
+{
 	LibraryPhotoPage * self = NULL;
 	LibraryPhotoSourceCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -15412,49 +15979,51 @@ LibraryPhotoPage* library_photo_page_construct (GType object_type) {
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_SOURCE_COLLECTION, SourceCollection), "items-relinked", (GCallback) _library_photo_page_on_photo_relinked_source_collection_items_relinked, self, 0);
 #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 15411 "PhotoPage.c"
+#line 15978 "PhotoPage.c"
 }
 
 
-LibraryPhotoPage* library_photo_page_new (void) {
+LibraryPhotoPage*
+library_photo_page_new (void)
+{
 #line 2344 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_construct (TYPE_LIBRARY_PHOTO_PAGE);
-#line 15418 "PhotoPage.c"
+#line 15987 "PhotoPage.c"
 }
 
 
-gboolean library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self, DataView* view) {
+gboolean
+library_photo_page_not_trashed_view_filter (LibraryPhotoPage* self,
+                                            DataView* view)
+{
 	gboolean result = FALSE;
-	DataView* _tmp0_;
-	DataSource* _tmp1_;
-	MediaSource* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
+	DataSource* _tmp0_;
+	MediaSource* _tmp1_;
+	gboolean _tmp2_;
 #line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_LIBRARY_PHOTO_PAGE (self), FALSE);
 #line 2369 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = view;
-#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = data_view_get_source (_tmp0_);
+	_tmp0_ = data_view_get_source (view);
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = media_source_is_trashed (_tmp2_);
+	_tmp2_ = !media_source_is_trashed (_tmp1_);
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = !_tmp3_;
-#line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp4_;
+	result = _tmp2_;
 #line 2370 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15449 "PhotoPage.c"
+#line 16015 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCollection* unlinking) {
+static void
+library_photo_page_on_photo_unlinking (LibraryPhotoPage* self,
+                                       GeeCollection* unlinking)
+{
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
 #line 2373 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -15464,11 +16033,14 @@ static void library_photo_page_on_photo_unlinking (LibraryPhotoPage* self, GeeCo
 	_tmp0_ = self->priv->filter;
 #line 2374 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15463 "PhotoPage.c"
+#line 16032 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCollection* relinked) {
+static void
+library_photo_page_on_photo_relinked (LibraryPhotoPage* self,
+                                      GeeCollection* relinked)
+{
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
 #line 2377 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -15478,182 +16050,172 @@ static void library_photo_page_on_photo_relinked (LibraryPhotoPage* self, GeeCol
 	_tmp0_ = self->priv->filter;
 #line 2378 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_VIEW_FILTER, ViewFilter), "refresh");
-#line 15477 "PhotoPage.c"
+#line 16049 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_init_collect_ui_filenames (Page* base, GeeList* ui_filenames) {
+static void
+library_photo_page_real_init_collect_ui_filenames (Page* base,
+                                                   GeeList* ui_filenames)
+{
 	LibraryPhotoPage * self;
-	GeeList* _tmp0_;
-	GeeList* _tmp1_;
-	GeeList* _tmp2_;
 #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2381 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_LIST (ui_filenames));
 #line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = ui_filenames;
-#line 2382 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = ui_filenames;
+	PAGE_CLASS (library_photo_page_parent_class)->init_collect_ui_filenames (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), ui_filenames);
 #line 2384 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo_context.ui");
 #line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = ui_filenames;
-#line 2385 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
-#line 15502 "PhotoPage.c"
+	gee_collection_add (G_TYPE_CHECK_INSTANCE_CAST (ui_filenames, GEE_TYPE_COLLECTION, GeeCollection), "photo.ui");
+#line 16068 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new16 (gboolean value) {
+static GVariant*
+_variant_new16 (gboolean value)
+{
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_boolean (value));
-#line 15509 "PhotoPage.c"
+#line 16077 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new17 (const gchar* value) {
+static GVariant*
+_variant_new17 (const gchar* value)
+{
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 15516 "PhotoPage.c"
+#line 16086 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender, GVariant* value, gpointer self) {
+static void
+_library_photo_page_on_raw_developer_changed_g_simple_action_change_state (GSimpleAction* _sender,
+                                                                           GVariant* value,
+                                                                           gpointer self)
+{
 #line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_raw_developer_changed ((LibraryPhotoPage*) self, _sender, value);
-#line 15523 "PhotoPage.c"
+#line 16097 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_add_actions (Page* base, GActionMap* map) {
+static void
+library_photo_page_real_add_actions (Page* base,
+                                     GActionMap* map)
+{
 	LibraryPhotoPage * self;
-	GActionMap* _tmp0_;
-	GActionMap* _tmp1_;
-	GAction* _tmp2_;
-	GSimpleAction* _tmp3_;
-	GSimpleAction* _tmp4_;
-	ConfigFacade* _tmp5_;
-	ConfigFacade* _tmp6_;
-	gboolean _tmp7_;
-	GVariant* _tmp8_;
+	GAction* _tmp0_;
+	GSimpleAction* _tmp1_;
+	GSimpleAction* _tmp2_;
+	ConfigFacade* _tmp3_;
+	ConfigFacade* _tmp4_;
+	GVariant* _tmp5_;
 	RawDeveloper d = 0;
-	ConfigFacade* _tmp9_;
-	ConfigFacade* _tmp10_;
-	RawDeveloper _tmp11_;
-	RawDeveloper _tmp12_;
-	const gchar* _tmp13_ = NULL;
-	RawDeveloper _tmp14_;
+	ConfigFacade* _tmp6_;
+	ConfigFacade* _tmp7_;
+	RawDeveloper _tmp8_;
+	const gchar* _tmp9_ = NULL;
+	RawDeveloper _tmp10_;
 	GSimpleAction* action = NULL;
-	const GVariantType* _tmp15_;
-	GVariant* _tmp16_;
-	GSimpleAction* _tmp17_;
-	GSimpleAction* _tmp18_;
-	GActionMap* _tmp19_;
+	const GVariantType* _tmp11_;
+	GVariant* _tmp12_;
+	GSimpleAction* _tmp13_;
+	GSimpleAction* _tmp14_;
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = map;
-#line 2441 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
+	PAGE_CLASS (library_photo_page_parent_class)->add_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map);
 #line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = map;
-#line 2443 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_action_map_add_action_entries (_tmp1_, LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self);
+	g_action_map_add_action_entries (map, LIBRARY_PHOTO_PAGE_entries, G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries), self);
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
+	_tmp0_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ViewRatings");
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp2_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp2_) : NULL;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, g_simple_action_get_type ()) ? ((GSimpleAction*) _tmp0_) : NULL;
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp2_);
-#line 15571 "PhotoPage.c"
+		_g_object_unref0 (_tmp0_);
+#line 16139 "PhotoPage.c"
 	}
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = config_facade_get_instance ();
+	_tmp2_ = _tmp1_;
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = config_facade_get_instance ();
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp4_ = _tmp3_;
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _variant_new16 (_tmp7_);
+	_tmp5_ = _variant_new16 (configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_emit_by_name (_tmp4_, "change-state", _tmp8_);
+	g_signal_emit_by_name (_tmp2_, "change-state", _tmp5_);
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_variant_unref0 (_tmp8_);
-#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_variant_unref0 (_tmp5_);
 #line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp4_);
+#line 2444 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+	_g_object_unref0 (_tmp2_);
 #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = config_facade_get_instance ();
-#line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp6_ = config_facade_get_instance ();
 #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp7_ = _tmp6_;
 #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp8_ = configuration_facade_get_default_raw_developer (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp7_);
 #line 2445 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	d = _tmp12_;
+	d = _tmp8_;
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = d;
+	_tmp10_ = d;
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_ == RAW_DEVELOPER_SHOTWELL) {
+	if (_tmp10_ == RAW_DEVELOPER_SHOTWELL) {
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = "Shotwell";
-#line 15609 "PhotoPage.c"
+		_tmp9_ = "Shotwell";
+#line 16173 "PhotoPage.c"
 	} else {
 #line 2447 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = "Camera";
-#line 15613 "PhotoPage.c"
+		_tmp9_ = "Camera";
+#line 16177 "PhotoPage.c"
 	}
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = G_VARIANT_TYPE_STRING;
+	_tmp11_ = G_VARIANT_TYPE_STRING;
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = _variant_new17 (_tmp13_);
+	_tmp12_ = _variant_new17 (_tmp9_);
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = g_simple_action_new_stateful ("RawDeveloper", _tmp15_, _tmp16_);
+	_tmp13_ = g_simple_action_new_stateful ("RawDeveloper", _tmp11_, _tmp12_);
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = _tmp17_;
+	_tmp14_ = _tmp13_;
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_variant_unref0 (_tmp16_);
+	_g_variant_unref0 (_tmp12_);
 #line 2446 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	action = _tmp18_;
+	action = _tmp14_;
 #line 2448 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_signal_connect_object (action, "change-state", (GCallback) _library_photo_page_on_raw_developer_changed_g_simple_action_change_state, self, 0);
 #line 2449 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_simple_action_set_enabled (action, TRUE);
 #line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = map;
-#line 2450 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_action_map_add_action (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
+	g_action_map_add_action (map, G_TYPE_CHECK_INSTANCE_CAST (action, g_action_get_type (), GAction));
 #line 2440 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15637 "PhotoPage.c"
+#line 16199 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_remove_actions (Page* base, GActionMap* map) {
+static void
+library_photo_page_real_remove_actions (Page* base,
+                                        GActionMap* map)
+{
 	LibraryPhotoPage * self;
-	GActionMap* _tmp0_;
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2453 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_ACTION_MAP (map));
 #line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = map;
-#line 2454 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp0_);
-#line 15652 "PhotoPage.c"
+	PAGE_CLASS (library_photo_page_parent_class)->remove_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), map);
+#line 16214 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -15665,89 +16227,106 @@ static void library_photo_page_real_remove_actions (Page* base, GActionMap* map)
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
 #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 15664 "PhotoPage.c"
+#line 16226 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2455 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 15668 "PhotoPage.c"
+#line 16230 "PhotoPage.c"
 			{
-				GActionMap* _tmp1_;
-				GActionEntry _tmp2_;
-				const gchar* _tmp3_;
+				GActionEntry _tmp0_;
+				const gchar* _tmp1_;
 #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp1_ = map;
+				_tmp0_ = entry;
 #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp2_ = entry;
-#line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp3_ = _tmp2_.name;
+				_tmp1_ = _tmp0_.name;
 #line 2456 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				g_action_map_remove_action (_tmp1_, _tmp3_);
-#line 15681 "PhotoPage.c"
+				g_action_map_remove_action (map, _tmp1_);
+#line 16240 "PhotoPage.c"
 			}
 		}
 	}
 }
 
 
-static gpointer _injection_group_ref0 (gpointer self) {
+static gpointer
+_injection_group_ref0 (gpointer self)
+{
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self ? injection_group_ref (self) : NULL;
-#line 15691 "PhotoPage.c"
+#line 16252 "PhotoPage.c"
 }
 
 
-static void _vala_array_add86 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add86 (InjectionGroup** * array,
+                   int* length,
+                   int* size,
+                   InjectionGroup* value)
+{
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15702 "PhotoPage.c"
+#line 16268 "PhotoPage.c"
 	}
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2466 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15708 "PhotoPage.c"
+#line 16274 "PhotoPage.c"
 }
 
 
-static void _vala_array_add87 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add87 (InjectionGroup** * array,
+                   int* length,
+                   int* size,
+                   InjectionGroup* value)
+{
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15719 "PhotoPage.c"
+#line 16290 "PhotoPage.c"
 	}
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2471 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15725 "PhotoPage.c"
+#line 16296 "PhotoPage.c"
 }
 
 
-static void _vala_array_add88 (InjectionGroup** * array, int* length, int* size, InjectionGroup* value) {
+static void
+_vala_array_add88 (InjectionGroup** * array,
+                   int* length,
+                   int* size,
+                   InjectionGroup* value)
+{
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if ((*length) == (*size)) {
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*array = g_renew (InjectionGroup*, *array, (*size) + 1);
-#line 15736 "PhotoPage.c"
+#line 16312 "PhotoPage.c"
 	}
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[(*length)++] = value;
 #line 2476 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	(*array)[*length] = NULL;
-#line 15742 "PhotoPage.c"
+#line 16318 "PhotoPage.c"
 }
 
 
-static InjectionGroup** library_photo_page_real_init_collect_injection_groups (Page* base, int* result_length1) {
+static InjectionGroup**
+library_photo_page_real_init_collect_injection_groups (Page* base,
+                                                       int* result_length1)
+{
 	LibraryPhotoPage * self;
 	InjectionGroup** result = NULL;
 	InjectionGroup** groups = NULL;
@@ -15832,7 +16411,7 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	if (result_length1) {
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		*result_length1 = _tmp11__length1;
-#line 15831 "PhotoPage.c"
+#line 16410 "PhotoPage.c"
 	}
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = _tmp11_;
@@ -15844,49 +16423,44 @@ static InjectionGroup** library_photo_page_real_init_collect_injection_groups (P
 	_injection_group_unref0 (print_group);
 #line 2478 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 15843 "PhotoPage.c"
+#line 16422 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_display_ratings (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
+static void
+library_photo_page_on_display_ratings (LibraryPhotoPage* self,
+                                       GSimpleAction* action,
+                                       GVariant* value)
+{
 	gboolean display = FALSE;
-	GVariant* _tmp0_;
-	gboolean _tmp1_;
-	ConfigFacade* _tmp2_;
-	ConfigFacade* _tmp3_;
-	GSimpleAction* _tmp4_;
-	GVariant* _tmp5_;
+	ConfigFacade* _tmp0_;
+	ConfigFacade* _tmp1_;
 #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2481 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (G_IS_SIMPLE_ACTION (action));
 #line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = value;
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = g_variant_get_boolean (_tmp0_);
-#line 2482 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	display = _tmp1_;
+	display = g_variant_get_boolean (value);
 #line 2484 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_set_display_ratings (self, display);
 #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = config_facade_get_instance ();
+	_tmp0_ = config_facade_get_instance ();
 #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = _tmp0_;
 #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
+	configuration_facade_set_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), display);
 #line 2486 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = action;
-#line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = value;
+	_g_object_unref0 (_tmp1_);
 #line 2487 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_simple_action_set_state (_tmp4_, _tmp5_);
-#line 15881 "PhotoPage.c"
+	g_simple_action_set_state (action, value);
+#line 16452 "PhotoPage.c"
 }
 
 
-static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboolean display) {
+static void
+library_photo_page_set_display_ratings (LibraryPhotoPage* self,
+                                        gboolean display)
+{
 	GSimpleAction* action = NULL;
 	GAction* _tmp0_;
 	GSimpleAction* _tmp1_;
@@ -15901,7 +16475,7 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	if (_tmp1_ == NULL) {
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 15900 "PhotoPage.c"
+#line 16474 "PhotoPage.c"
 	}
 #line 2492 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	action = _tmp1_;
@@ -15909,57 +16483,46 @@ static void library_photo_page_set_display_ratings (LibraryPhotoPage* self, gboo
 	_tmp2_ = action;
 #line 2493 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp2_ != NULL) {
-#line 15908 "PhotoPage.c"
+#line 16482 "PhotoPage.c"
 		GSimpleAction* _tmp3_;
-		gboolean _tmp4_;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = action;
 #line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = display;
-#line 2494 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		g_simple_action_set_enabled (_tmp3_, _tmp4_);
-#line 15917 "PhotoPage.c"
+		g_simple_action_set_enabled (_tmp3_, display);
+#line 16488 "PhotoPage.c"
 	}
 #line 2491 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (action);
-#line 15921 "PhotoPage.c"
+#line 16492 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_update_actions (Page* base, gint selected_count, gint count) {
+static void
+library_photo_page_real_update_actions (Page* base,
+                                        gint selected_count,
+                                        gint count)
+{
 	LibraryPhotoPage * self;
 	gboolean multiple = FALSE;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_ = FALSE;
-	gboolean _tmp5_;
+	gboolean _tmp2_;
+	gboolean _tmp3_ = FALSE;
 	gboolean rotate_possible = FALSE;
-	gboolean _tmp9_ = FALSE;
-	gboolean _tmp10_;
+	gboolean _tmp6_ = FALSE;
 	gboolean is_raw = FALSE;
+	gboolean _tmp9_ = FALSE;
 	gboolean _tmp14_ = FALSE;
-	gboolean _tmp15_;
-	gboolean _tmp20_ = FALSE;
-	gboolean _tmp21_;
-	gboolean _tmp30_ = FALSE;
-	gboolean _tmp31_;
-	gboolean _tmp33_;
-	gboolean _tmp34_ = FALSE;
-	gboolean _tmp35_;
-	gboolean _tmp39_;
-	gboolean _tmp40_;
-	gboolean _tmp41_;
-	gboolean _tmp42_;
-	gboolean _tmp43_;
-	gboolean _tmp44_;
-	gboolean _tmp45_;
-	gboolean _tmp46_;
-	gboolean _tmp55_ = FALSE;
-	gboolean _tmp56_;
-	gint _tmp61_;
-	gint _tmp62_;
+	gboolean _tmp21_ = FALSE;
+	gboolean _tmp22_ = FALSE;
+	gboolean _tmp25_;
+	gboolean _tmp26_;
+	gboolean _tmp27_;
+	gboolean _tmp28_;
+	gboolean _tmp29_;
+	gboolean _tmp30_;
+	gboolean _tmp37_ = FALSE;
+	gboolean _tmp38_;
 #line 2497 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -15967,387 +16530,332 @@ static void library_photo_page_real_update_actions (Page* base, gint selected_co
 #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_ > 1;
+	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) > 1;
 #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 2498 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	multiple = _tmp3_;
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp5_) {
-#line 15977 "PhotoPage.c"
-		Photo* _tmp6_;
-		Photo* _tmp7_;
-		gboolean _tmp8_;
+	multiple = _tmp2_;
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 16536 "PhotoPage.c"
+		Photo* _tmp4_;
+		Photo* _tmp5_;
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp7_);
+		_tmp5_ = _tmp4_;
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp8_;
+		_tmp3_ = editing_host_page_is_rotate_available (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp5_);
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp7_);
-#line 15991 "PhotoPage.c"
+		_g_object_unref0 (_tmp5_);
+#line 16547 "PhotoPage.c"
 	} else {
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = FALSE;
-#line 15995 "PhotoPage.c"
+		_tmp3_ = FALSE;
+#line 16551 "PhotoPage.c"
 	}
 #line 2499 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	rotate_possible = _tmp4_;
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp10_) {
-#line 16003 "PhotoPage.c"
-		Photo* _tmp11_;
-		Photo* _tmp12_;
-		PhotoFileFormat _tmp13_;
+	rotate_possible = _tmp3_;
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 16557 "PhotoPage.c"
+		Photo* _tmp7_;
+		Photo* _tmp8_;
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = photo_get_master_file_format (_tmp12_);
+		_tmp8_ = _tmp7_;
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = _tmp13_ == PHOTO_FILE_FORMAT_RAW;
+		_tmp6_ = photo_get_master_file_format (_tmp8_) == PHOTO_FILE_FORMAT_RAW;
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp12_);
-#line 16017 "PhotoPage.c"
+		_g_object_unref0 (_tmp8_);
+#line 16568 "PhotoPage.c"
 	} else {
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = FALSE;
-#line 16021 "PhotoPage.c"
+		_tmp6_ = FALSE;
+#line 16572 "PhotoPage.c"
 	}
 #line 2500 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	is_raw = _tmp9_;
-#line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	is_raw = _tmp6_;
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp15_) {
-#line 16029 "PhotoPage.c"
-		ConfigFacade* _tmp16_;
-		ConfigFacade* _tmp17_;
-		gchar* _tmp18_;
-		gchar* _tmp19_;
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 16578 "PhotoPage.c"
+		ConfigFacade* _tmp10_;
+		ConfigFacade* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = config_facade_get_instance ();
+		_tmp10_ = config_facade_get_instance ();
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = _tmp16_;
+		_tmp11_ = _tmp10_;
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp12_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp13_ = _tmp12_;
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = g_strcmp0 (_tmp19_, "") != 0;
+		_tmp9_ = g_strcmp0 (_tmp13_, "") != 0;
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp19_);
+		_g_free0 (_tmp13_);
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp17_);
-#line 16048 "PhotoPage.c"
+		_g_object_unref0 (_tmp11_);
+#line 16597 "PhotoPage.c"
 	} else {
 #line 2503 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = FALSE;
-#line 16052 "PhotoPage.c"
+		_tmp9_ = FALSE;
+#line 16601 "PhotoPage.c"
 	}
 #line 2502 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp14_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp9_);
 #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp21_) {
-#line 16060 "PhotoPage.c"
-		gboolean _tmp22_ = FALSE;
-		Photo* _tmp23_;
-		Photo* _tmp24_;
-		gboolean _tmp25_;
-		gboolean _tmp26_;
-#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 16607 "PhotoPage.c"
+		gboolean _tmp15_ = FALSE;
+		Photo* _tmp16_;
+		Photo* _tmp17_;
+		gboolean _tmp18_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = _tmp23_;
+		_tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = photo_has_transformations (_tmp24_);
+		_tmp17_ = _tmp16_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = _tmp25_;
+		_tmp18_ = photo_has_transformations (_tmp17_);
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp24_);
+		_g_object_unref0 (_tmp17_);
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp26_) {
+		if (_tmp18_) {
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp22_ = TRUE;
-#line 16080 "PhotoPage.c"
+			_tmp15_ = TRUE;
+#line 16624 "PhotoPage.c"
 		} else {
-			Photo* _tmp27_;
-			Photo* _tmp28_;
-			gboolean _tmp29_;
+			Photo* _tmp19_;
+			Photo* _tmp20_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp27_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+			_tmp19_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp28_ = _tmp27_;
-#line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp29_ = photo_has_editable (_tmp28_);
+			_tmp20_ = _tmp19_;
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp22_ = _tmp29_;
+			_tmp15_ = photo_has_editable (_tmp20_);
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp28_);
-#line 16095 "PhotoPage.c"
+			_g_object_unref0 (_tmp20_);
+#line 16636 "PhotoPage.c"
 		}
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = _tmp22_;
-#line 16099 "PhotoPage.c"
+		_tmp14_ = _tmp15_;
+#line 16640 "PhotoPage.c"
 	} else {
 #line 2506 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = FALSE;
-#line 16103 "PhotoPage.c"
+		_tmp14_ = FALSE;
+#line 16644 "PhotoPage.c"
 	}
 #line 2505 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp20_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp14_);
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp31_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp31_) {
-#line 16111 "PhotoPage.c"
-		gboolean _tmp32_;
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = !_tmp32_;
-#line 16117 "PhotoPage.c"
+		_tmp21_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 16652 "PhotoPage.c"
 	} else {
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = FALSE;
-#line 16121 "PhotoPage.c"
+		_tmp21_ = FALSE;
+#line 16656 "PhotoPage.c"
 	}
 #line 2508 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp30_) {
+	if (_tmp21_) {
 #line 2509 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 2510 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
-#line 16129 "PhotoPage.c"
+#line 16664 "PhotoPage.c"
 	}
 #line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp33_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2513 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", _tmp33_);
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp35_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)));
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp35_) {
-#line 16139 "PhotoPage.c"
-		Photo* _tmp36_;
-		Photo* _tmp37_;
-		gboolean _tmp38_;
-#line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 16670 "PhotoPage.c"
+		Photo* _tmp23_;
+		Photo* _tmp24_;
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = _tmp36_;
+		_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp38_ = photo_has_color_adjustments (_tmp37_);
+		_tmp24_ = _tmp23_;
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = _tmp38_;
+		_tmp22_ = photo_has_color_adjustments (_tmp24_);
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp37_);
-#line 16153 "PhotoPage.c"
+		_g_object_unref0 (_tmp24_);
+#line 16681 "PhotoPage.c"
 	} else {
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = FALSE;
-#line 16157 "PhotoPage.c"
+		_tmp22_ = FALSE;
+#line 16685 "PhotoPage.c"
 	}
 #line 2515 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp34_);
-#line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp39_ = pixel_transformation_bundle_has_copied_color_adjustments ();
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "CopyColorAdjustments", _tmp22_);
 #line 2516 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", _tmp39_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PasteColorAdjustments", pixel_transformation_bundle_has_copied_color_adjustments ());
 #line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp40_ = multiple;
+	_tmp25_ = multiple;
 #line 2518 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp40_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "PrevPhoto", _tmp25_);
 #line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp41_ = multiple;
+	_tmp26_ = multiple;
 #line 2519 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp41_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "NextPhoto", _tmp26_);
 #line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp42_ = rotate_possible;
+	_tmp27_ = rotate_possible;
 #line 2520 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp42_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise", _tmp27_);
 #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp43_ = rotate_possible;
+	_tmp28_ = rotate_possible;
 #line 2521 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp43_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise", _tmp28_);
 #line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp44_ = rotate_possible;
+	_tmp29_ = rotate_possible;
 #line 2522 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp44_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipHorizontally", _tmp29_);
 #line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp45_ = rotate_possible;
+	_tmp30_ = rotate_possible;
 #line 2523 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp45_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "FlipVertically", _tmp30_);
 #line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp46_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2525 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp46_) {
-#line 16193 "PhotoPage.c"
-		Photo* _tmp47_;
-		Photo* _tmp48_;
-		Scaling _tmp49_ = {0};
-		gboolean _tmp50_;
-		Photo* _tmp51_;
-		Photo* _tmp52_;
-		Scaling _tmp53_ = {0};
-		gboolean _tmp54_;
-#line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp47_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 16717 "PhotoPage.c"
+		Photo* _tmp31_;
+		Photo* _tmp32_;
+		Scaling _tmp33_ = {0};
+		Photo* _tmp34_;
+		Photo* _tmp35_;
+		Scaling _tmp36_ = {0};
 #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp48_ = _tmp47_;
+		_tmp31_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		scaling_for_original (&_tmp49_);
+		_tmp32_ = _tmp31_;
 #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp50_ = editing_tools_crop_tool_is_available (_tmp48_, &_tmp49_);
+		scaling_for_original (&_tmp33_);
 #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", _tmp50_);
+		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Crop", editing_tools_crop_tool_is_available (_tmp32_, &_tmp33_));
 #line 2526 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp48_);
-#line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp51_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_g_object_unref0 (_tmp32_);
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp52_ = _tmp51_;
+		_tmp34_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		scaling_for_original (&_tmp53_);
+		_tmp35_ = _tmp34_;
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp54_ = editing_tools_redeye_tool_is_available (_tmp52_, &_tmp53_);
+		scaling_for_original (&_tmp36_);
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", _tmp54_);
+		page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RedEye", editing_tools_redeye_tool_is_available (_tmp35_, &_tmp36_));
 #line 2527 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp52_);
-#line 16226 "PhotoPage.c"
+		_g_object_unref0 (_tmp35_);
+#line 16744 "PhotoPage.c"
 	}
 #line 2531 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp56_ = is_raw;
+	_tmp38_ = is_raw;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp56_) {
-#line 16234 "PhotoPage.c"
-		ConfigFacade* _tmp57_;
-		ConfigFacade* _tmp58_;
-		gchar* _tmp59_;
-		gchar* _tmp60_;
+	if (_tmp38_) {
+#line 16752 "PhotoPage.c"
+		ConfigFacade* _tmp39_;
+		ConfigFacade* _tmp40_;
+		gchar* _tmp41_;
+		gchar* _tmp42_;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp57_ = config_facade_get_instance ();
+		_tmp39_ = config_facade_get_instance ();
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp58_ = _tmp57_;
+		_tmp40_ = _tmp39_;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp59_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp41_ = configuration_facade_get_external_raw_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp60_ = _tmp59_;
+		_tmp42_ = _tmp41_;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp55_ = g_strcmp0 (_tmp60_, "") != 0;
+		_tmp37_ = g_strcmp0 (_tmp42_, "") != 0;
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp60_);
+		_g_free0 (_tmp42_);
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp58_);
-#line 16253 "PhotoPage.c"
+		_g_object_unref0 (_tmp40_);
+#line 16771 "PhotoPage.c"
 	} else {
 #line 2534 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp55_ = FALSE;
-#line 16257 "PhotoPage.c"
+		_tmp37_ = FALSE;
+#line 16775 "PhotoPage.c"
 	}
 #line 2533 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp55_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEditRAW", _tmp37_);
 #line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp61_ = selected_count;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp62_ = count;
-#line 2536 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp61_, _tmp62_);
-#line 16267 "PhotoPage.c"
+	PAGE_CLASS (library_photo_page_parent_class)->update_actions (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), selected_count, count);
+#line 16781 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_photos_altered (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_photos_altered (LibraryPhotoPage* self)
+{
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
 #line 2539 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp1_) {
-#line 16280 "PhotoPage.c"
-		gboolean _tmp2_ = FALSE;
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 16793 "PhotoPage.c"
+		gboolean _tmp1_ = FALSE;
+		Photo* _tmp2_;
 		Photo* _tmp3_;
-		Photo* _tmp4_;
-		gboolean _tmp5_;
-		gboolean _tmp6_;
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		gboolean _tmp4_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = photo_has_transformations (_tmp4_);
+		_tmp3_ = _tmp2_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = photo_has_transformations (_tmp3_);
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
+		_g_object_unref0 (_tmp3_);
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp6_) {
+		if (_tmp4_) {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp2_ = TRUE;
-#line 16300 "PhotoPage.c"
+			_tmp1_ = TRUE;
+#line 16810 "PhotoPage.c"
 		} else {
-			Photo* _tmp7_;
-			Photo* _tmp8_;
-			gboolean _tmp9_;
-#line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+			Photo* _tmp5_;
+			Photo* _tmp6_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp8_ = _tmp7_;
+			_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp9_ = photo_has_editable (_tmp8_);
+			_tmp6_ = _tmp5_;
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp2_ = _tmp9_;
+			_tmp1_ = photo_has_editable (_tmp6_);
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp8_);
-#line 16315 "PhotoPage.c"
+			_g_object_unref0 (_tmp6_);
+#line 16822 "PhotoPage.c"
 		}
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp2_;
-#line 16319 "PhotoPage.c"
+		_tmp0_ = _tmp1_;
+#line 16826 "PhotoPage.c"
 	} else {
 #line 2541 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16323 "PhotoPage.c"
+#line 16830 "PhotoPage.c"
 	}
 #line 2540 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Revert", _tmp0_);
 #line 2542 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_flag_action (self);
-#line 16329 "PhotoPage.c"
+#line 16836 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self, GSimpleAction* action, GVariant* value) {
+static void
+library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
+                                             GSimpleAction* action,
+                                             GVariant* value)
+{
 	RawDeveloper developer = 0;
-	GVariant* _tmp0_;
+	const gchar* _tmp0_;
 	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	GQuark _tmp4_ = 0U;
+	GQuark _tmp3_ = 0U;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp3_label0 = 0;
+	static GQuark _tmp2_label0 = 0;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp3_label1 = 0;
-#line 16343 "PhotoPage.c"
-	RawDeveloper _tmp5_;
-	GSimpleAction* _tmp6_;
-	GVariant* _tmp7_;
+	static GQuark _tmp2_label1 = 0;
+#line 16853 "PhotoPage.c"
+	RawDeveloper _tmp4_;
 #line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2545 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16355,274 +16863,256 @@ static void library_photo_page_on_raw_developer_changed (LibraryPhotoPage* self,
 #line 2547 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	developer = RAW_DEVELOPER_SHOTWELL;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = value;
+	_tmp0_ = g_variant_get_string (value, NULL);
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = g_variant_get_string (_tmp0_, NULL);
+	_tmp1_ = _tmp0_;
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp3_ = (NULL == _tmp1_) ? 0 : g_quark_from_string (_tmp1_);
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = (NULL == _tmp2_) ? 0 : g_quark_from_string (_tmp2_);
-#line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_ == ((0 != _tmp3_label0) ? _tmp3_label0 : (_tmp3_label0 = g_quark_from_static_string ("Shotwell")))) {
+	if (_tmp3_ == ((0 != _tmp2_label0) ? _tmp2_label0 : (_tmp2_label0 = g_quark_from_static_string ("Shotwell")))) {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16365 "PhotoPage.c"
+#line 16871 "PhotoPage.c"
 			default:
 			{
 #line 2551 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_SHOTWELL;
 #line 2552 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16372 "PhotoPage.c"
+#line 16878 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp4_ == ((0 != _tmp3_label1) ? _tmp3_label1 : (_tmp3_label1 = g_quark_from_static_string ("Camera")))) {
+	} else if (_tmp3_ == ((0 != _tmp2_label1) ? _tmp2_label1 : (_tmp2_label1 = g_quark_from_static_string ("Camera")))) {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16378 "PhotoPage.c"
+#line 16884 "PhotoPage.c"
 			default:
 			{
 #line 2554 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				developer = RAW_DEVELOPER_CAMERA;
 #line 2555 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16385 "PhotoPage.c"
+#line 16891 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2549 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 16391 "PhotoPage.c"
+#line 16897 "PhotoPage.c"
 			default:
 			{
 #line 2557 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 16396 "PhotoPage.c"
+#line 16902 "PhotoPage.c"
 			}
 		}
 	}
 #line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = developer;
+	_tmp4_ = developer;
 #line 2560 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_developer_changed (self, _tmp5_);
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = action;
+	library_photo_page_developer_changed (self, _tmp4_);
 #line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = value;
-#line 2562 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_simple_action_set_state (_tmp6_, _tmp7_);
-#line 16410 "PhotoPage.c"
+	g_simple_action_set_state (action, value);
+#line 16912 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
+static void
+library_photo_page_real_developer_changed (LibraryPhotoPage* self,
+                                           RawDeveloper rd)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 	Photo* photo = NULL;
+	ViewCollection* _tmp3_;
 	ViewCollection* _tmp4_;
-	ViewCollection* _tmp5_;
+	GeeList* _tmp5_;
 	GeeList* _tmp6_;
-	GeeList* _tmp7_;
-	gpointer _tmp8_;
-	DataView* _tmp9_;
-	DataSource* _tmp10_;
+	gpointer _tmp7_;
+	DataView* _tmp8_;
+	DataSource* _tmp9_;
+	Photo* _tmp10_;
 	Photo* _tmp11_;
-	Photo* _tmp12_;
-	gboolean _tmp13_ = FALSE;
-	Photo* _tmp14_;
-	gboolean _tmp19_ = FALSE;
-	Photo* _tmp20_;
-	gboolean _tmp21_;
+	gboolean _tmp12_ = FALSE;
+	Photo* _tmp13_;
+	gboolean _tmp15_ = FALSE;
+	Photo* _tmp16_;
 #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_ != 1;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) != 1;
 #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 2566 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_) {
+	if (_tmp2_) {
 #line 2567 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16448 "PhotoPage.c"
+#line 16949 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp4_ = _tmp3_;
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = view_collection_get_selected (_tmp5_);
+	_tmp5_ = view_collection_get_selected (_tmp4_);
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp6_ = _tmp5_;
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = gee_list_get (_tmp7_, 0);
+	_tmp7_ = gee_list_get (_tmp6_, 0);
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = (DataView*) _tmp8_;
+	_tmp8_ = (DataView*) _tmp7_;
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = data_view_get_source (_tmp9_);
+	_tmp9_ = data_view_get_source (_tmp8_);
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_PHOTO) ? ((Photo*) _tmp10_) : NULL;
+	_tmp10_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp9_, TYPE_PHOTO) ? ((Photo*) _tmp9_) : NULL;
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp11_ == NULL) {
+	if (_tmp10_ == NULL) {
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp10_);
-#line 16470 "PhotoPage.c"
+		_g_object_unref0 (_tmp9_);
+#line 16971 "PhotoPage.c"
 	}
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp11_ = _tmp10_;
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp5_);
+	_data_collection_unref0 (_tmp4_);
 #line 2569 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo = _tmp12_;
+	photo = _tmp11_;
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = photo;
+	_tmp13_ = photo;
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_ == NULL) {
+	if (_tmp13_ == NULL) {
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = TRUE;
-#line 16488 "PhotoPage.c"
+		_tmp12_ = TRUE;
+#line 16989 "PhotoPage.c"
 	} else {
-		RawDeveloper _tmp15_;
-		Photo* _tmp16_;
-		RawDeveloper _tmp17_;
-		gboolean _tmp18_;
-#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = rd;
-#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = photo;
-#line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = photo_get_raw_developer (_tmp16_);
+		Photo* _tmp14_;
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = raw_developer_is_equivalent (_tmp15_, _tmp17_);
+		_tmp14_ = photo;
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = _tmp18_;
-#line 16504 "PhotoPage.c"
+		_tmp12_ = raw_developer_is_equivalent (rd, photo_get_raw_developer (_tmp14_));
+#line 16996 "PhotoPage.c"
 	}
 #line 2570 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp13_) {
+	if (_tmp12_) {
 #line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo);
 #line 2571 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16512 "PhotoPage.c"
+#line 17004 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = photo;
-#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = photo_has_transformations (_tmp20_);
+	_tmp16_ = photo;
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp21_) {
+	if (!photo_has_transformations (_tmp16_)) {
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = TRUE;
-#line 16522 "PhotoPage.c"
+		_tmp15_ = TRUE;
+#line 17012 "PhotoPage.c"
 	} else {
-		gboolean _tmp22_;
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = dialogs_confirm_warn_developer_changed (1);
-#line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp22_;
-#line 16529 "PhotoPage.c"
+		_tmp15_ = dialogs_confirm_warn_developer_changed (1);
+#line 17016 "PhotoPage.c"
 	}
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp19_) {
-#line 16533 "PhotoPage.c"
+	if (_tmp15_) {
+#line 17020 "PhotoPage.c"
 		SetRawDeveloperCommand* command = NULL;
-		ViewCollection* _tmp23_;
-		ViewCollection* _tmp24_;
-		GeeList* _tmp25_;
-		GeeList* _tmp26_;
-		RawDeveloper _tmp27_;
-		SetRawDeveloperCommand* _tmp28_;
-		SetRawDeveloperCommand* _tmp29_;
-		CommandManager* _tmp30_;
-		CommandManager* _tmp31_;
-		SetRawDeveloperCommand* _tmp32_;
-#line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		ViewCollection* _tmp17_;
+		ViewCollection* _tmp18_;
+		GeeList* _tmp19_;
+		GeeList* _tmp20_;
+		SetRawDeveloperCommand* _tmp21_;
+		SetRawDeveloperCommand* _tmp22_;
+		CommandManager* _tmp23_;
+		CommandManager* _tmp24_;
+		SetRawDeveloperCommand* _tmp25_;
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = _tmp23_;
+		_tmp17_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = view_collection_get_selected (_tmp24_);
+		_tmp18_ = _tmp17_;
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp26_ = _tmp25_;
+		_tmp19_ = view_collection_get_selected (_tmp18_);
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = rd;
+		_tmp20_ = _tmp19_;
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp28_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, GEE_TYPE_ITERABLE, GeeIterable), _tmp27_);
+		_tmp21_ = set_raw_developer_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, GEE_TYPE_ITERABLE, GeeIterable), rd);
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = _tmp28_;
+		_tmp22_ = _tmp21_;
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp26_);
+		_g_object_unref0 (_tmp20_);
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp24_);
+		_data_collection_unref0 (_tmp18_);
 #line 2576 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		command = _tmp29_;
+		command = _tmp22_;
 #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp23_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = _tmp30_;
+		_tmp24_ = _tmp23_;
 #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = command;
+		_tmp25_ = command;
 #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		command_manager_execute (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp24_, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_COMMAND, Command));
 #line 2578 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_command_manager_unref0 (_tmp31_);
+		_command_manager_unref0 (_tmp24_);
 #line 2580 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_update_development_menu_item_sensitivity (self);
 #line 2575 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (command);
-#line 16579 "PhotoPage.c"
+#line 17063 "PhotoPage.c"
 	}
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16583 "PhotoPage.c"
+#line 17067 "PhotoPage.c"
 }
 
 
-void library_photo_page_developer_changed (LibraryPhotoPage* self, RawDeveloper rd) {
+void
+library_photo_page_developer_changed (LibraryPhotoPage* self,
+                                      RawDeveloper rd)
+{
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2565 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	LIBRARY_PHOTO_PAGE_GET_CLASS (self)->developer_changed (self, rd);
-#line 16592 "PhotoPage.c"
+#line 17079 "PhotoPage.c"
 }
 
 
-static void library_photo_page_update_flag_action (LibraryPhotoPage* self) {
-	gboolean _tmp0_;
+static void
+library_photo_page_update_flag_action (LibraryPhotoPage* self)
+{
 #line 2584 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2585 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", _tmp0_);
-#line 16604 "PhotoPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag", editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage)));
+#line 17090 "PhotoPage.c"
 }
 
 
-static void _library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender, gpointer self) {
+static void
+_library_photo_page_on_page_destroyed_gtk_widget_destroy (GtkWidget* _sender,
+                                                          gpointer self)
+{
 #line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_page_destroyed ((LibraryPhotoPage*) self);
-#line 16611 "PhotoPage.c"
+#line 17100 "PhotoPage.c"
 }
 
 
-void library_photo_page_display_for_collection (LibraryPhotoPage* self, CollectionPage* return_page, Photo* photo, ViewCollection* view) {
+void
+library_photo_page_display_for_collection (LibraryPhotoPage* self,
+                                           CollectionPage* return_page,
+                                           Photo* photo,
+                                           ViewCollection* view)
+{
 	CollectionPage* _tmp0_;
-	CollectionPage* _tmp1_;
-	CollectionPage* _tmp2_;
-	ViewCollection* _tmp3_ = NULL;
-	ViewCollection* _tmp4_;
-	Photo* _tmp9_;
+	ViewCollection* _tmp1_ = NULL;
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16632,57 +17122,45 @@ void library_photo_page_display_for_collection (LibraryPhotoPage* self, Collecti
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail ((view == NULL) || IS_VIEW_COLLECTION (view));
 #line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = return_page;
-#line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (return_page);
 #line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (self->priv->return_page);
 #line 2594 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	self->priv->return_page = _tmp1_;
+	self->priv->return_page = _tmp0_;
 #line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = return_page;
-#line 2595 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0);
-#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = view;
-#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_ != NULL) {
-#line 16646 "PhotoPage.c"
-		ViewCollection* _tmp5_;
-		ViewCollection* _tmp6_;
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (return_page, gtk_widget_get_type (), GtkWidget), "destroy", (GCallback) _library_photo_page_on_page_destroyed_gtk_widget_destroy, self, 0);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = view;
+	if (view != NULL) {
+#line 17130 "PhotoPage.c"
+		ViewCollection* _tmp2_;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _data_collection_ref0 (_tmp5_);
+		_tmp2_ = _data_collection_ref0 (view);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp3_);
+		_data_collection_unref0 (_tmp1_);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp6_;
-#line 16657 "PhotoPage.c"
+		_tmp1_ = _tmp2_;
+#line 17138 "PhotoPage.c"
 	} else {
-		CollectionPage* _tmp7_;
-		ViewCollection* _tmp8_;
-#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = return_page;
+		ViewCollection* _tmp3_;
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE, Page));
+		_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (return_page, TYPE_PAGE, Page));
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp3_);
+		_data_collection_unref0 (_tmp1_);
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp8_;
-#line 16669 "PhotoPage.c"
+		_tmp1_ = _tmp3_;
+#line 17147 "PhotoPage.c"
 	}
 #line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = photo;
-#line 2597 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp9_);
+	editing_host_page_display_copy_of (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_, photo);
 #line 2592 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_data_collection_unref0 (_tmp3_);
-#line 16677 "PhotoPage.c"
+	_data_collection_unref0 (_tmp1_);
+#line 17153 "PhotoPage.c"
 }
 
 
-void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
+void
+library_photo_page_on_page_destroyed (LibraryPhotoPage* self)
+{
 #line 2600 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2603 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16691,11 +17169,13 @@ void library_photo_page_on_page_destroyed (LibraryPhotoPage* self) {
 	self->priv->return_page = NULL;
 #line 2604 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	editing_host_page_unset_view_collection (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 16690 "PhotoPage.c"
+#line 17168 "PhotoPage.c"
 }
 
 
-CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self) {
+CollectionPage*
+library_photo_page_get_controller_page (LibraryPhotoPage* self)
+{
 	CollectionPage* result = NULL;
 	CollectionPage* _tmp0_;
 	CollectionPage* _tmp1_;
@@ -16709,17 +17189,18 @@ CollectionPage* library_photo_page_get_controller_page (LibraryPhotoPage* self)
 	result = _tmp1_;
 #line 2608 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16708 "PhotoPage.c"
+#line 17188 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_switched_to (Page* base) {
+static void
+library_photo_page_real_switched_to (Page* base)
+{
 	LibraryPhotoPage * self;
 	Photo* _tmp0_;
 	Photo* _tmp1_;
 	ConfigFacade* _tmp2_;
 	ConfigFacade* _tmp3_;
-	gboolean _tmp4_;
 #line 2611 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2615 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -16741,22 +17222,22 @@ static void library_photo_page_real_switched_to (Page* base) {
 #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp3_ = _tmp2_;
 #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_set_display_ratings (self, _tmp4_);
+	library_photo_page_set_display_ratings (self, configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade)));
 #line 2622 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp3_);
-#line 16745 "PhotoPage.c"
+#line 17224 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_switching_from (Page* base) {
+static void
+library_photo_page_real_switching_from (Page* base)
+{
 	LibraryPhotoPage * self;
 #line 2626 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2627 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	PAGE_CLASS (library_photo_page_parent_class)->switching_from (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page));
-#line 16755 "PhotoPage.c"
+#line 17236 "PhotoPage.c"
 	{
 		GActionEntry* entry_collection = NULL;
 		gint entry_collection_length1 = 0;
@@ -16768,11 +17249,11 @@ static void library_photo_page_real_switching_from (Page* base) {
 		entry_collection_length1 = G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries);
 #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		for (entry_it = 0; entry_it < G_N_ELEMENTS (LIBRARY_PHOTO_PAGE_entries); entry_it = entry_it + 1) {
-#line 16767 "PhotoPage.c"
+#line 17248 "PhotoPage.c"
 			GActionEntry entry = {0};
 #line 2628 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			entry = entry_collection[entry_it];
-#line 16771 "PhotoPage.c"
+#line 17252 "PhotoPage.c"
 			{
 				AppWindow* _tmp0_;
 				AppWindow* _tmp1_;
@@ -16790,48 +17271,43 @@ static void library_photo_page_real_switching_from (Page* base) {
 				g_action_map_remove_action (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, g_action_map_get_type (), GActionMap), _tmp3_);
 #line 2629 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				_g_object_unref0 (_tmp1_);
-#line 16789 "PhotoPage.c"
+#line 17270 "PhotoPage.c"
 			}
 		}
 	}
 }
 
 
-static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base, gint scale) {
+static GdkPixbuf*
+library_photo_page_real_get_bottom_left_trinket (EditingHostPage* base,
+                                                 gint scale)
+{
 	LibraryPhotoPage * self;
 	GdkPixbuf* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
-	Photo* _tmp5_;
-	LibraryPhoto* _tmp6_;
-	Rating _tmp7_;
-	gint _tmp8_;
-	GdkPixbuf* _tmp9_;
-	GdkPixbuf* _tmp10_;
+	Photo* _tmp3_;
+	LibraryPhoto* _tmp4_;
+	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp6_;
 #line 2633 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16815 "PhotoPage.c"
+#line 17294 "PhotoPage.c"
 	} else {
+		ConfigFacade* _tmp1_;
 		ConfigFacade* _tmp2_;
-		ConfigFacade* _tmp3_;
-		gboolean _tmp4_;
-#line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = config_facade_get_instance ();
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp2_;
+		_tmp1_ = config_facade_get_instance ();
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp2_ = _tmp1_;
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp4_;
+		_tmp0_ = !configuration_facade_get_display_photo_ratings (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
-#line 16830 "PhotoPage.c"
+		_g_object_unref0 (_tmp2_);
+#line 17306 "PhotoPage.c"
 	}
 #line 2634 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16839,60 +17315,53 @@ static GdkPixbuf* library_photo_page_real_get_bottom_left_trinket (EditingHostPa
 		result = NULL;
 #line 2635 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16838 "PhotoPage.c"
+#line 17314 "PhotoPage.c"
 	}
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
-#line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = scale;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = resources_get_rating_trinket (_tmp7_, _tmp8_);
+	_tmp5_ = resources_get_rating_trinket (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource)), scale);
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp6_ = _tmp5_;
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp4_);
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp10_;
+	result = _tmp6_;
 #line 2637 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16858 "PhotoPage.c"
+#line 17330 "PhotoPage.c"
 }
 
 
-static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage* base, gint scale) {
+static GdkPixbuf*
+library_photo_page_real_get_top_right_trinket (EditingHostPage* base,
+                                               gint scale)
+{
 	LibraryPhotoPage * self;
 	GdkPixbuf* result = NULL;
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
-	GdkPixbuf* _tmp5_;
+	GdkPixbuf* _tmp3_;
 #line 2640 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 16876 "PhotoPage.c"
+#line 17348 "PhotoPage.c"
 	} else {
-		Photo* _tmp2_;
-		LibraryPhoto* _tmp3_;
-		gboolean _tmp4_;
-#line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		Photo* _tmp1_;
+		LibraryPhoto* _tmp2_;
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
+		_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_FLAGGABLE, Flaggable));
+		_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp4_;
+		_tmp0_ = !flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_FLAGGABLE, Flaggable));
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
-#line 16891 "PhotoPage.c"
+		_g_object_unref0 (_tmp2_);
+#line 17360 "PhotoPage.c"
 	}
 #line 2641 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -16900,19 +17369,21 @@ static GdkPixbuf* library_photo_page_real_get_top_right_trinket (EditingHostPage
 		result = NULL;
 #line 2642 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 16899 "PhotoPage.c"
+#line 17368 "PhotoPage.c"
 	}
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
+	_tmp3_ = resources_get_icon (RESOURCES_ICON_FLAGGED_TRINKET, RESOURCES_DEFAULT_ICON_SCALE);
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp5_;
+	result = _tmp3_;
 #line 2644 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 16907 "PhotoPage.c"
+#line 17376 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_slideshow (LibraryPhotoPage* self)
+{
 	LibraryPhoto* photo = NULL;
 	Photo* _tmp0_;
 	LibraryPhoto* _tmp1_;
@@ -16938,7 +17409,7 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 		_g_object_unref0 (photo);
 #line 2650 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 16937 "PhotoPage.c"
+#line 17408 "PhotoPage.c"
 	}
 #line 2652 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = app_window_get_instance ();
@@ -16968,64 +17439,54 @@ static void library_photo_page_on_slideshow (LibraryPhotoPage* self) {
 	_g_object_unref0 (_tmp3_);
 #line 2647 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 16967 "PhotoPage.c"
+#line 17438 "PhotoPage.c"
 }
 
 
-static void library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self) {
+static void
+library_photo_page_update_zoom_menu_item_sensitivity (LibraryPhotoPage* self)
+{
 	gboolean _tmp0_ = FALSE;
 	ZoomState _tmp1_ = {0};
-	gboolean _tmp2_;
-	gboolean _tmp4_ = FALSE;
-	ZoomState _tmp5_ = {0};
-	gboolean _tmp6_;
+	gboolean _tmp2_ = FALSE;
+	ZoomState _tmp3_ = {0};
 #line 2656 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp1_);
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = zoom_state_is_max (&_tmp1_);
-#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp2_) {
-#line 16986 "PhotoPage.c"
-		gboolean _tmp3_;
-#line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (!zoom_state_is_max (&_tmp1_)) {
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp3_;
-#line 16992 "PhotoPage.c"
+		_tmp0_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 17457 "PhotoPage.c"
 	} else {
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 16996 "PhotoPage.c"
+#line 17461 "PhotoPage.c"
 	}
 #line 2657 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseSize", _tmp0_);
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp5_);
-#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = zoom_state_is_default (&_tmp5_);
-#line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp6_) {
-#line 17006 "PhotoPage.c"
-		gboolean _tmp7_;
+	single_photo_page_get_zoom_state (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), &_tmp3_);
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (!zoom_state_is_default (&_tmp3_)) {
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = !_tmp7_;
-#line 17012 "PhotoPage.c"
+		_tmp2_ = !editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 17471 "PhotoPage.c"
 	} else {
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = FALSE;
-#line 17016 "PhotoPage.c"
+		_tmp2_ = FALSE;
+#line 17475 "PhotoPage.c"
 	}
 #line 2658 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp4_);
-#line 17020 "PhotoPage.c"
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseSize", _tmp2_);
+#line 17479 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
+static void
+library_photo_page_real_on_increase_size (EditingHostPage* base)
+{
 	LibraryPhotoPage * self;
 #line 2661 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
@@ -17033,11 +17494,13 @@ static void library_photo_page_real_on_increase_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_increase_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2664 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17032 "PhotoPage.c"
+#line 17493 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
+static void
+library_photo_page_real_on_decrease_size (EditingHostPage* base)
+{
 	LibraryPhotoPage * self;
 #line 2667 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
@@ -17045,70 +17508,63 @@ static void library_photo_page_real_on_decrease_size (EditingHostPage* base) {
 	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_decrease_size (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2670 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_zoom_menu_item_sensitivity (self);
-#line 17044 "PhotoPage.c"
+#line 17507 "PhotoPage.c"
 }
 
 
-static gboolean library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base, GdkEventKey* event) {
+static gboolean
+library_photo_page_real_on_zoom_slider_key_press (EditingHostPage* base,
+                                                  GdkEventKey* event)
+{
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	gboolean _tmp1_;
-	GdkEventKey* _tmp2_;
-	guint _tmp3_;
-	const gchar* _tmp4_;
+	guint _tmp0_;
+	const gchar* _tmp1_;
 #line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2673 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = event;
-#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp0_);
-#line 2674 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp1_) {
+	if (EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->on_zoom_slider_key_press (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), event)) {
 #line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
 #line 2675 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17070 "PhotoPage.c"
+#line 17529 "PhotoPage.c"
 	}
 #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = event;
+	_tmp0_ = event->keyval;
 #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_->keyval;
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2677 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (g_strcmp0 (_tmp4_, "Escape") == 0) {
+	if (g_strcmp0 (_tmp1_, "Escape") == 0) {
 #line 2678 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		library_photo_page_return_to_collection (self);
 #line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = TRUE;
 #line 2679 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17086 "PhotoPage.c"
+#line 17543 "PhotoPage.c"
 	} else {
 #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		result = FALSE;
 #line 2681 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17092 "PhotoPage.c"
+#line 17549 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean missing) {
+static void
+library_photo_page_real_update_ui (EditingHostPage* base,
+                                   gboolean missing)
+{
 	LibraryPhotoPage * self;
 	gboolean sensitivity = FALSE;
-	gboolean _tmp0_;
-	gboolean _tmp1_;
 #line 2685 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = missing;
-#line 2686 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	sensitivity = !_tmp0_;
+	sensitivity = !missing;
 #line 2688 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SendTo", sensitivity);
 #line 2689 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17170,117 +17626,98 @@ static void library_photo_page_real_update_ui (EditingHostPage* base, gboolean m
 #line 2722 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "SetBackground", sensitivity);
 #line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = missing;
-#line 2724 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp1_);
-#line 17172 "PhotoPage.c"
+	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->update_ui (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), missing);
+#line 17626 "PhotoPage.c"
 }
 
 
-static void library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base, Photo* photo, gboolean missing) {
+static void
+library_photo_page_real_notify_photo_backing_missing (EditingHostPage* base,
+                                                      Photo* photo,
+                                                      gboolean missing)
+{
 	LibraryPhotoPage * self;
-	gboolean _tmp0_;
-	Photo* _tmp3_;
-	gboolean _tmp4_;
 #line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2727 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_PHOTO (photo));
 #line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = missing;
-#line 2728 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
-#line 17189 "PhotoPage.c"
-		Photo* _tmp1_;
-#line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = photo;
+	if (missing) {
 #line 2729 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17195 "PhotoPage.c"
+		media_source_mark_offline (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
+#line 17644 "PhotoPage.c"
 	} else {
-		Photo* _tmp2_;
-#line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = photo;
 #line 2731 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
-#line 17202 "PhotoPage.c"
+		media_source_mark_online (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_LIBRARY_PHOTO, LibraryPhoto), TYPE_MEDIA_SOURCE, MediaSource));
+#line 17648 "PhotoPage.c"
 	}
 #line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = photo;
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = missing;
-#line 2733 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), _tmp3_, _tmp4_);
-#line 17210 "PhotoPage.c"
+	EDITING_HOST_PAGE_CLASS (library_photo_page_parent_class)->notify_photo_backing_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), photo, missing);
+#line 17652 "PhotoPage.c"
 }
 
 
-static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+library_photo_page_real_key_press_event (GtkWidget* base,
+                                         GdkEventKey* event)
+{
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean handled = FALSE;
-	GdkEventKey* _tmp3_;
-	guint _tmp4_;
-	const gchar* _tmp5_;
-	const gchar* _tmp6_;
-	GQuark _tmp8_ = 0U;
+	guint _tmp1_;
+	const gchar* _tmp2_;
+	const gchar* _tmp3_;
+	GQuark _tmp5_ = 0U;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label0 = 0;
+	static GQuark _tmp4_label0 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label1 = 0;
+	static GQuark _tmp4_label1 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label2 = 0;
+	static GQuark _tmp4_label2 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label3 = 0;
+	static GQuark _tmp4_label3 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label4 = 0;
+	static GQuark _tmp4_label4 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label5 = 0;
+	static GQuark _tmp4_label5 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label6 = 0;
+	static GQuark _tmp4_label6 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label7 = 0;
+	static GQuark _tmp4_label7 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label8 = 0;
+	static GQuark _tmp4_label8 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label9 = 0;
+	static GQuark _tmp4_label9 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label10 = 0;
+	static GQuark _tmp4_label10 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label11 = 0;
+	static GQuark _tmp4_label11 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label12 = 0;
+	static GQuark _tmp4_label12 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label13 = 0;
+	static GQuark _tmp4_label13 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label14 = 0;
+	static GQuark _tmp4_label14 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label15 = 0;
+	static GQuark _tmp4_label15 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label16 = 0;
+	static GQuark _tmp4_label16 = 0;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	static GQuark _tmp7_label17 = 0;
+	static GQuark _tmp4_label17 = 0;
 #line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2736 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event != NULL) {
-#line 17266 "PhotoPage.c"
-		GdkEventKey* _tmp1_;
-		gboolean _tmp2_;
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = event;
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), _tmp1_);
-#line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp2_ == TRUE;
-#line 17275 "PhotoPage.c"
+		_tmp0_ = GTK_WIDGET_CLASS (library_photo_page_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), gtk_widget_get_type (), GtkWidget), event) == TRUE;
+#line 17712 "PhotoPage.c"
 	} else {
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 17279 "PhotoPage.c"
+#line 17716 "PhotoPage.c"
 	}
 #line 2737 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
@@ -17288,229 +17725,227 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 		result = TRUE;
 #line 2738 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17287 "PhotoPage.c"
+#line 17724 "PhotoPage.c"
 	}
 #line 2740 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	handled = TRUE;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = event;
-#line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_->keyval;
+	_tmp1_ = event->keyval;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = gdk_keyval_name (_tmp4_);
+	_tmp2_ = gdk_keyval_name (_tmp1_);
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = (NULL == _tmp6_) ? 0 : g_quark_from_string (_tmp6_);
+	_tmp5_ = (NULL == _tmp3_) ? 0 : g_quark_from_string (_tmp3_);
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (((_tmp8_ == ((0 != _tmp7_label0) ? _tmp7_label0 : (_tmp7_label0 = g_quark_from_static_string ("Escape")))) || (_tmp8_ == ((0 != _tmp7_label1) ? _tmp7_label1 : (_tmp7_label1 = g_quark_from_static_string ("Return"))))) || (_tmp8_ == ((0 != _tmp7_label2) ? _tmp7_label2 : (_tmp7_label2 = g_quark_from_static_string ("KP_Enter"))))) {
+	if (((_tmp5_ == ((0 != _tmp4_label0) ? _tmp4_label0 : (_tmp4_label0 = g_quark_from_static_string ("Escape")))) || (_tmp5_ == ((0 != _tmp4_label1) ? _tmp4_label1 : (_tmp4_label1 = g_quark_from_static_string ("Return"))))) || (_tmp5_ == ((0 != _tmp4_label2) ? _tmp4_label2 : (_tmp4_label2 = g_quark_from_static_string ("KP_Enter"))))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17305 "PhotoPage.c"
+#line 17740 "PhotoPage.c"
 			default:
 			{
-				GtkWindow* _tmp9_;
-				GtkWindow* _tmp10_;
-				gboolean _tmp11_;
+				GtkWindow* _tmp6_;
+				GtkWindow* _tmp7_;
+				gboolean _tmp8_;
 #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp9_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+				_tmp6_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp10_ = _tmp9_;
+				_tmp7_ = _tmp6_;
 #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp11_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp10_, TYPE_FULLSCREEN_WINDOW);
+				_tmp8_ = !G_TYPE_CHECK_INSTANCE_TYPE (_tmp7_, TYPE_FULLSCREEN_WINDOW);
 #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_object_unref0 (_tmp10_);
+				_g_object_unref0 (_tmp7_);
 #line 2745 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				if (_tmp11_) {
+				if (_tmp8_) {
 #line 2746 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 					library_photo_page_return_to_collection (self);
-#line 17323 "PhotoPage.c"
+#line 17758 "PhotoPage.c"
 				}
 #line 2747 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17327 "PhotoPage.c"
+#line 17762 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label3) ? _tmp7_label3 : (_tmp7_label3 = g_quark_from_static_string ("Delete")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label3) ? _tmp4_label3 : (_tmp4_label3 = g_quark_from_static_string ("Delete")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17333 "PhotoPage.c"
+#line 17768 "PhotoPage.c"
 			default:
 			{
 #line 2753 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "MoveToTrash");
 #line 2754 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17340 "PhotoPage.c"
+#line 17775 "PhotoPage.c"
 			}
 		}
-	} else if ((_tmp8_ == ((0 != _tmp7_label4) ? _tmp7_label4 : (_tmp7_label4 = g_quark_from_static_string ("period")))) || (_tmp8_ == ((0 != _tmp7_label5) ? _tmp7_label5 : (_tmp7_label5 = g_quark_from_static_string ("greater"))))) {
+	} else if ((_tmp5_ == ((0 != _tmp4_label4) ? _tmp4_label4 : (_tmp4_label4 = g_quark_from_static_string ("period")))) || (_tmp5_ == ((0 != _tmp4_label5) ? _tmp4_label5 : (_tmp4_label5 = g_quark_from_static_string ("greater"))))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17346 "PhotoPage.c"
+#line 17781 "PhotoPage.c"
 			default:
 			{
 #line 2758 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating");
 #line 2759 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17353 "PhotoPage.c"
+#line 17788 "PhotoPage.c"
 			}
 		}
-	} else if ((_tmp8_ == ((0 != _tmp7_label6) ? _tmp7_label6 : (_tmp7_label6 = g_quark_from_static_string ("comma")))) || (_tmp8_ == ((0 != _tmp7_label7) ? _tmp7_label7 : (_tmp7_label7 = g_quark_from_static_string ("less"))))) {
+	} else if ((_tmp5_ == ((0 != _tmp4_label6) ? _tmp4_label6 : (_tmp4_label6 = g_quark_from_static_string ("comma")))) || (_tmp5_ == ((0 != _tmp4_label7) ? _tmp4_label7 : (_tmp4_label7 = g_quark_from_static_string ("less"))))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17359 "PhotoPage.c"
+#line 17794 "PhotoPage.c"
 			default:
 			{
 #line 2763 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating");
 #line 2764 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17366 "PhotoPage.c"
+#line 17801 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label8) ? _tmp7_label8 : (_tmp7_label8 = g_quark_from_static_string ("KP_1")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label8) ? _tmp4_label8 : (_tmp4_label8 = g_quark_from_static_string ("KP_1")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17372 "PhotoPage.c"
+#line 17807 "PhotoPage.c"
 			default:
 			{
 #line 2767 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne");
 #line 2768 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17379 "PhotoPage.c"
+#line 17814 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label9) ? _tmp7_label9 : (_tmp7_label9 = g_quark_from_static_string ("KP_2")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label9) ? _tmp4_label9 : (_tmp4_label9 = g_quark_from_static_string ("KP_2")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17385 "PhotoPage.c"
+#line 17820 "PhotoPage.c"
 			default:
 			{
 #line 2771 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo");
 #line 2772 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17392 "PhotoPage.c"
+#line 17827 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label10) ? _tmp7_label10 : (_tmp7_label10 = g_quark_from_static_string ("KP_3")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label10) ? _tmp4_label10 : (_tmp4_label10 = g_quark_from_static_string ("KP_3")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17398 "PhotoPage.c"
+#line 17833 "PhotoPage.c"
 			default:
 			{
 #line 2775 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree");
 #line 2776 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17405 "PhotoPage.c"
+#line 17840 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label11) ? _tmp7_label11 : (_tmp7_label11 = g_quark_from_static_string ("KP_4")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label11) ? _tmp4_label11 : (_tmp4_label11 = g_quark_from_static_string ("KP_4")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17411 "PhotoPage.c"
+#line 17846 "PhotoPage.c"
 			default:
 			{
 #line 2779 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour");
 #line 2780 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17418 "PhotoPage.c"
+#line 17853 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label12) ? _tmp7_label12 : (_tmp7_label12 = g_quark_from_static_string ("KP_5")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label12) ? _tmp4_label12 : (_tmp4_label12 = g_quark_from_static_string ("KP_5")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17424 "PhotoPage.c"
+#line 17859 "PhotoPage.c"
 			default:
 			{
 #line 2783 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive");
 #line 2784 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17431 "PhotoPage.c"
+#line 17866 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label13) ? _tmp7_label13 : (_tmp7_label13 = g_quark_from_static_string ("KP_0")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label13) ? _tmp4_label13 : (_tmp4_label13 = g_quark_from_static_string ("KP_0")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17437 "PhotoPage.c"
+#line 17872 "PhotoPage.c"
 			default:
 			{
 #line 2787 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated");
 #line 2788 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17444 "PhotoPage.c"
+#line 17879 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label14) ? _tmp7_label14 : (_tmp7_label14 = g_quark_from_static_string ("KP_9")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label14) ? _tmp4_label14 : (_tmp4_label14 = g_quark_from_static_string ("KP_9")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17450 "PhotoPage.c"
+#line 17885 "PhotoPage.c"
 			default:
 			{
 #line 2791 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected");
 #line 2792 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17457 "PhotoPage.c"
+#line 17892 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label15) ? _tmp7_label15 : (_tmp7_label15 = g_quark_from_static_string ("bracketright")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label15) ? _tmp4_label15 : (_tmp4_label15 = g_quark_from_static_string ("bracketright")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17463 "PhotoPage.c"
+#line 17898 "PhotoPage.c"
 			default:
 			{
 #line 2795 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateClockwise");
 #line 2796 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17470 "PhotoPage.c"
+#line 17905 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label16) ? _tmp7_label16 : (_tmp7_label16 = g_quark_from_static_string ("bracketleft")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label16) ? _tmp4_label16 : (_tmp4_label16 = g_quark_from_static_string ("bracketleft")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17476 "PhotoPage.c"
+#line 17911 "PhotoPage.c"
 			default:
 			{
 #line 2799 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RotateCounterclockwise");
 #line 2800 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17483 "PhotoPage.c"
+#line 17918 "PhotoPage.c"
 			}
 		}
-	} else if (_tmp8_ == ((0 != _tmp7_label17) ? _tmp7_label17 : (_tmp7_label17 = g_quark_from_static_string ("slash")))) {
+	} else if (_tmp5_ == ((0 != _tmp4_label17) ? _tmp4_label17 : (_tmp4_label17 = g_quark_from_static_string ("slash")))) {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17489 "PhotoPage.c"
+#line 17924 "PhotoPage.c"
 			default:
 			{
 #line 2803 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				page_activate_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "Flag");
 #line 2804 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17496 "PhotoPage.c"
+#line 17931 "PhotoPage.c"
 			}
 		}
 	} else {
 #line 2741 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		switch (0) {
-#line 17502 "PhotoPage.c"
+#line 17937 "PhotoPage.c"
 			default:
 			{
 #line 2807 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				handled = FALSE;
 #line 2808 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 17509 "PhotoPage.c"
+#line 17944 "PhotoPage.c"
 			}
 		}
 	}
@@ -17518,11 +17953,14 @@ static gboolean library_photo_page_real_key_press_event (GtkWidget* base, GdkEve
 	result = handled;
 #line 2811 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17517 "PhotoPage.c"
+#line 17952 "PhotoPage.c"
 }
 
 
-static gboolean library_photo_page_real_on_double_click (EditingHostPage* base, GdkEventButton* event) {
+static gboolean
+library_photo_page_real_on_double_click (EditingHostPage* base,
+                                         GdkEventButton* event)
+{
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
 	FullscreenWindow* fs = NULL;
@@ -17541,7 +17979,7 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	if (_tmp1_ == NULL) {
 #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp0_);
-#line 17540 "PhotoPage.c"
+#line 17978 "PhotoPage.c"
 	}
 #line 2815 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	fs = _tmp1_;
@@ -17551,14 +17989,14 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	if (_tmp2_ == NULL) {
 #line 2817 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		self->priv->return_to_collection_on_release = TRUE;
-#line 17550 "PhotoPage.c"
+#line 17988 "PhotoPage.c"
 	} else {
 		FullscreenWindow* _tmp3_;
 #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp3_ = fs;
 #line 2819 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		fullscreen_window_close (_tmp3_);
-#line 17557 "PhotoPage.c"
+#line 17995 "PhotoPage.c"
 	}
 #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
@@ -17566,16 +18004,17 @@ static gboolean library_photo_page_real_on_double_click (EditingHostPage* base,
 	_g_object_unref0 (fs);
 #line 2821 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17565 "PhotoPage.c"
+#line 18003 "PhotoPage.c"
 }
 
 
-static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventButton* event) {
+static gboolean
+library_photo_page_real_on_left_released (Page* base,
+                                          GdkEventButton* event)
+{
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_;
-	GdkEventButton* _tmp1_;
-	gboolean _tmp2_;
 #line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2824 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17592,21 +18031,19 @@ static gboolean library_photo_page_real_on_left_released (Page* base, GdkEventBu
 		result = TRUE;
 #line 2829 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return result;
-#line 17591 "PhotoPage.c"
+#line 18030 "PhotoPage.c"
 	}
 #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = event;
-#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), _tmp1_);
-#line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp2_;
+	result = PAGE_CLASS (library_photo_page_parent_class)->on_left_released (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage), TYPE_PAGE, Page), event);
 #line 2832 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17601 "PhotoPage.c"
+#line 18036 "PhotoPage.c"
 }
 
 
-static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
+static GtkMenu*
+library_photo_page_get_context_menu (LibraryPhotoPage* self)
+{
 	GtkMenu* result = NULL;
 	GtkMenu* _tmp0_;
 	GtkMenu* _tmp7_;
@@ -17617,7 +18054,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	_tmp0_ = self->priv->context_menu;
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_ == NULL) {
-#line 17616 "PhotoPage.c"
+#line 18053 "PhotoPage.c"
 		GMenuModel* model = NULL;
 		GtkBuilder* _tmp1_;
 		GObject* _tmp2_;
@@ -17649,7 +18086,7 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 		gtk_menu_attach_to_widget (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), NULL);
 #line 2838 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (model);
-#line 17648 "PhotoPage.c"
+#line 18085 "PhotoPage.c"
 	}
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp7_ = self->priv->context_menu;
@@ -17659,16 +18096,18 @@ static GtkMenu* library_photo_page_get_context_menu (LibraryPhotoPage* self) {
 	result = _tmp8_;
 #line 2845 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17658 "PhotoPage.c"
+#line 18095 "PhotoPage.c"
 }
 
 
-static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkEventButton* event) {
+static gboolean
+library_photo_page_real_on_context_buttonpress (Page* base,
+                                                GdkEventButton* event)
+{
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_;
 	GtkMenu* _tmp1_;
-	GdkEventButton* _tmp2_;
 #line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_LIBRARY_PHOTO_PAGE, LibraryPhotoPage);
 #line 2848 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -17678,20 +18117,20 @@ static gboolean library_photo_page_real_on_context_buttonpress (Page* base, GdkE
 #line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = event;
-#line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, _tmp2_);
+	page_popup_context_menu (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), _tmp1_, event);
 #line 2849 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
 #line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	result = TRUE;
 #line 2851 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17686 "PhotoPage.c"
+#line 18123 "PhotoPage.c"
 }
 
 
-static gboolean library_photo_page_real_on_context_keypress (Page* base) {
+static gboolean
+library_photo_page_real_on_context_keypress (Page* base)
+{
 	LibraryPhotoPage * self;
 	gboolean result = FALSE;
 	GtkMenu* _tmp0_;
@@ -17710,11 +18149,13 @@ static gboolean library_photo_page_real_on_context_keypress (Page* base) {
 	result = TRUE;
 #line 2857 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 17709 "PhotoPage.c"
+#line 18148 "PhotoPage.c"
 }
 
 
-static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
+static void
+library_photo_page_return_to_collection (LibraryPhotoPage* self)
+{
 	CollectionPage* _tmp0_;
 #line 2860 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
@@ -17722,7 +18163,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 	_tmp0_ = self->priv->return_page;
 #line 2862 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (NULL != _tmp0_) {
-#line 17721 "PhotoPage.c"
+#line 18162 "PhotoPage.c"
 		LibraryWindow* _tmp1_;
 		LibraryWindow* _tmp2_;
 		CollectionPage* _tmp3_;
@@ -17736,7 +18177,7 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 		library_window_switch_to_page (_tmp2_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PAGE, Page));
 #line 2863 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp2_);
-#line 17735 "PhotoPage.c"
+#line 18176 "PhotoPage.c"
 	} else {
 		LibraryWindow* _tmp4_;
 		LibraryWindow* _tmp5_;
@@ -17748,12 +18189,14 @@ static void library_photo_page_return_to_collection (LibraryPhotoPage* self) {
 		library_window_switch_to_library_page (_tmp5_);
 #line 2865 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (_tmp5_);
-#line 17747 "PhotoPage.c"
+#line 18188 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_remove_from_library (LibraryPhotoPage* self)
+{
 	LibraryPhoto* photo = NULL;
 	Photo* _tmp0_;
 	GeeCollection* photos = NULL;
@@ -17776,370 +18219,348 @@ static void library_photo_page_on_remove_from_library (LibraryPhotoPage* self) {
 	_g_object_unref0 (photos);
 #line 2868 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17775 "PhotoPage.c"
+#line 18218 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_move_to_trash (LibraryPhotoPage* self) {
-	gboolean _tmp0_;
-	CollectionPage* _tmp1_;
+static void
+library_photo_page_on_move_to_trash (LibraryPhotoPage* self)
+{
+	CollectionPage* _tmp0_;
 	LibraryPhoto* photo = NULL;
-	Photo* _tmp4_;
+	Photo* _tmp3_;
 	GeeCollection* photos = NULL;
-	GeeArrayList* _tmp5_;
-	GeeCollection* _tmp6_;
+	GeeArrayList* _tmp4_;
+	GeeCollection* _tmp5_;
+	LibraryPhoto* _tmp6_;
 	LibraryPhoto* _tmp7_;
-	LibraryPhoto* _tmp8_;
+	Photo* _tmp8_;
 	Photo* _tmp9_;
-	Photo* _tmp10_;
-	gboolean _tmp11_;
-	gboolean _tmp12_;
-	CommandManager* _tmp22_;
-	CommandManager* _tmp23_;
-	GeeCollection* _tmp24_;
-	TrashUntrashPhotosCommand* _tmp25_;
-	TrashUntrashPhotosCommand* _tmp26_;
-	LibraryWindow* _tmp27_;
-	LibraryWindow* _tmp28_;
+	gboolean _tmp10_;
+	CommandManager* _tmp20_;
+	CommandManager* _tmp21_;
+	GeeCollection* _tmp22_;
+	TrashUntrashPhotosCommand* _tmp23_;
+	TrashUntrashPhotosCommand* _tmp24_;
+	LibraryWindow* _tmp25_;
+	LibraryWindow* _tmp26_;
 #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2878 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp0_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 2879 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 17808 "PhotoPage.c"
+#line 18249 "PhotoPage.c"
 	}
 #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = self->priv->return_page;
+	_tmp0_ = self->priv->return_page;
 #line 2886 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp1_, TYPE_EVENT_PAGE)) {
-#line 17814 "PhotoPage.c"
+	if (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_EVENT_PAGE)) {
+#line 18255 "PhotoPage.c"
+		LibraryWindow* _tmp1_;
 		LibraryWindow* _tmp2_;
-		LibraryWindow* _tmp3_;
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = library_window_get_app ();
+		_tmp1_ = library_window_get_app ();
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		library_window_set_page_switching_enabled (_tmp3_, FALSE);
+		library_window_set_page_switching_enabled (_tmp2_, FALSE);
 #line 2887 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
-#line 17825 "PhotoPage.c"
+		_g_object_unref0 (_tmp2_);
+#line 18266 "PhotoPage.c"
 	}
 #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2890 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
+	photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+	_tmp4_ = gee_array_list_new (TYPE_LIBRARY_PHOTO, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2892 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
+	photos = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = photos;
+	_tmp5_ = photos;
 #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = photo;
+	_tmp6_ = photo;
 #line 2893 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	gee_collection_add (_tmp6_, _tmp7_);
+	gee_collection_add (_tmp5_, _tmp6_);
 #line 2896 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = photo;
-#line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp7_ = photo;
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
+	_tmp9_ = _tmp8_;
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp9_);
 #line 2900 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp12_) {
-#line 17857 "PhotoPage.c"
-		LibraryWindow* _tmp13_;
-		LibraryWindow* _tmp14_;
-		GtkWindow* _tmp15_;
-		GtkWindow* _tmp16_;
-		gboolean _tmp17_;
-		LibraryWindow* _tmp20_;
-		LibraryWindow* _tmp21_;
+	if (_tmp10_) {
+#line 18296 "PhotoPage.c"
+		LibraryWindow* _tmp11_;
+		LibraryWindow* _tmp12_;
+		GtkWindow* _tmp13_;
+		GtkWindow* _tmp14_;
+		gboolean _tmp15_;
+		LibraryWindow* _tmp18_;
+		LibraryWindow* _tmp19_;
 #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = library_window_get_app ();
+		_tmp11_ = library_window_get_app ();
 #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = _tmp13_;
+		_tmp12_ = _tmp11_;
 #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		library_window_set_page_switching_enabled (_tmp14_, TRUE);
+		library_window_set_page_switching_enabled (_tmp12_, TRUE);
 #line 2903 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp14_);
+		_g_object_unref0 (_tmp12_);
 #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp13_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp16_ = _tmp15_;
+		_tmp14_ = _tmp13_;
 #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp17_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp16_, TYPE_FULLSCREEN_WINDOW);
+		_tmp15_ = G_TYPE_CHECK_INSTANCE_TYPE (_tmp14_, TYPE_FULLSCREEN_WINDOW);
 #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp16_);
+		_g_object_unref0 (_tmp14_);
 #line 2905 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		if (_tmp17_) {
-#line 17883 "PhotoPage.c"
-			GtkWindow* _tmp18_;
-			FullscreenWindow* _tmp19_;
+		if (_tmp15_) {
+#line 18322 "PhotoPage.c"
+			GtkWindow* _tmp16_;
+			FullscreenWindow* _tmp17_;
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp18_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+			_tmp16_ = page_get_container (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
+			_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_FULLSCREEN_WINDOW, FullscreenWindow);
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			fullscreen_window_close (_tmp19_);
+			fullscreen_window_close (_tmp17_);
 #line 2906 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-			_g_object_unref0 (_tmp19_);
-#line 17894 "PhotoPage.c"
+			_g_object_unref0 (_tmp17_);
+#line 18333 "PhotoPage.c"
 		}
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = library_window_get_app ();
+		_tmp18_ = library_window_get_app ();
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = _tmp20_;
+		_tmp19_ = _tmp18_;
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		library_window_switch_to_library_page (_tmp21_);
+		library_window_switch_to_library_page (_tmp19_);
 #line 2908 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp21_);
-#line 17904 "PhotoPage.c"
+		_g_object_unref0 (_tmp19_);
+#line 18343 "PhotoPage.c"
 	}
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp20_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = _tmp22_;
+	_tmp21_ = _tmp20_;
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = photos;
+	_tmp22_ = photos;
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = trash_untrash_photos_command_new (_tmp24_, TRUE);
+	_tmp23_ = trash_untrash_photos_command_new (_tmp22_, TRUE);
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = _tmp25_;
+	_tmp24_ = _tmp23_;
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp21_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_COMMAND, Command));
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp26_);
+	_g_object_unref0 (_tmp24_);
 #line 2911 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp23_);
+	_command_manager_unref0 (_tmp21_);
 #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = library_window_get_app ();
+	_tmp25_ = library_window_get_app ();
 #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = _tmp27_;
+	_tmp26_ = _tmp25_;
 #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_window_set_page_switching_enabled (_tmp28_, TRUE);
+	library_window_set_page_switching_enabled (_tmp26_, TRUE);
 #line 2912 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp28_);
+	_g_object_unref0 (_tmp26_);
 #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photos);
 #line 2877 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 17934 "PhotoPage.c"
+#line 18373 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_flag_unflag (LibraryPhotoPage* self) {
-	gboolean _tmp0_;
+static void
+library_photo_page_on_flag_unflag (LibraryPhotoPage* self)
+{
 #line 2915 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
-#line 17946 "PhotoPage.c"
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 18384 "PhotoPage.c"
 		GeeArrayList* photo_list = NULL;
+		GeeArrayList* _tmp0_;
 		GeeArrayList* _tmp1_;
-		GeeArrayList* _tmp2_;
+		Photo* _tmp2_;
 		Photo* _tmp3_;
-		Photo* _tmp4_;
+		CommandManager* _tmp4_;
 		CommandManager* _tmp5_;
-		CommandManager* _tmp6_;
-		GeeArrayList* _tmp7_;
-		Photo* _tmp8_;
-		LibraryPhoto* _tmp9_;
-		gboolean _tmp10_;
-		FlagUnflagCommand* _tmp11_;
-		FlagUnflagCommand* _tmp12_;
+		GeeArrayList* _tmp6_;
+		Photo* _tmp7_;
+		LibraryPhoto* _tmp8_;
+		FlagUnflagCommand* _tmp9_;
+		FlagUnflagCommand* _tmp10_;
 #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
+		_tmp0_ = gee_array_list_new (TYPE_MEDIA_SOURCE, (GBoxedCopyFunc) g_object_ref, (GDestroyNotify) g_object_unref, NULL, NULL, NULL);
 #line 2917 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		photo_list = _tmp1_;
+		photo_list = _tmp0_;
 #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = photo_list;
+		_tmp1_ = photo_list;
 #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
+		gee_abstract_collection_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, GEE_TYPE_ABSTRACT_COLLECTION, GeeAbstractCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource));
 #line 2918 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
-#line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_g_object_unref0 (_tmp3_);
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = photo_list;
+		_tmp5_ = _tmp4_;
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp6_ = photo_list;
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
+		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_FLAGGABLE, Flaggable));
+		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_LIBRARY_PHOTO, LibraryPhoto);
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection), !_tmp10_);
+		_tmp9_ = flag_unflag_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection), !flaggable_is_flagged (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_FLAGGABLE, Flaggable)));
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp10_ = _tmp9_;
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_COMMAND, Command));
+		command_manager_execute (_tmp5_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp12_);
+		_g_object_unref0 (_tmp10_);
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp9_);
+		_g_object_unref0 (_tmp8_);
 #line 2919 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_command_manager_unref0 (_tmp6_);
+		_command_manager_unref0 (_tmp5_);
 #line 2916 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (photo_list);
-#line 18000 "PhotoPage.c"
+#line 18435 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_photo_destroyed (LibraryPhotoPage* self, DataSource* source) {
-	DataSource* _tmp0_;
+static void
+library_photo_page_on_photo_destroyed (LibraryPhotoPage* self,
+                                       DataSource* source)
+{
 #line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2924 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_DATA_SOURCE (source));
 #line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = source;
-#line 2925 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_LIBRARY_PHOTO, LibraryPhoto));
-#line 18015 "PhotoPage.c"
+	library_photo_page_on_photo_removed (self, G_TYPE_CHECK_INSTANCE_CAST (source, TYPE_LIBRARY_PHOTO, LibraryPhoto));
+#line 18450 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_photo_removed (LibraryPhotoPage* self, LibraryPhoto* photo) {
+static void
+library_photo_page_on_photo_removed (LibraryPhotoPage* self,
+                                     LibraryPhoto* photo)
+{
 	gboolean _tmp0_ = FALSE;
-	LibraryPhoto* _tmp1_;
 	ViewCollection* view = NULL;
+	ViewCollection* _tmp3_;
+	ViewCollection* _tmp4_;
+	ViewCollection* _tmp5_;
 	ViewCollection* _tmp6_;
-	ViewCollection* _tmp7_;
-	ViewCollection* _tmp8_;
-	ViewCollection* _tmp9_;
-	LibraryPhoto* _tmp10_;
-	DataView* _tmp11_;
-	DataView* _tmp12_;
-	Marker* _tmp13_;
-	Marker* _tmp14_;
-	LibraryPhoto* _tmp15_;
-	Photo* _tmp16_;
-	Photo* _tmp17_;
-	gboolean _tmp18_;
-	gboolean _tmp19_;
+	DataView* _tmp7_;
+	DataView* _tmp8_;
+	Marker* _tmp9_;
+	Marker* _tmp10_;
+	Photo* _tmp11_;
+	Photo* _tmp12_;
+	gboolean _tmp13_;
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO (photo));
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = photo;
-#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp1_ == NULL) {
+	if (photo == NULL) {
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18047 "PhotoPage.c"
+#line 18479 "PhotoPage.c"
 	} else {
-		LibraryPhoto* _tmp2_;
-		Photo* _tmp3_;
-		Photo* _tmp4_;
-		gboolean _tmp5_;
-#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = photo;
-#line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		Photo* _tmp1_;
+		Photo* _tmp2_;
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource));
+		_tmp2_ = _tmp1_;
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = !_tmp5_;
+		_tmp0_ = !data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource));
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
-#line 18065 "PhotoPage.c"
+		_g_object_unref0 (_tmp2_);
+#line 18491 "PhotoPage.c"
 	}
 #line 2930 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 2931 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18071 "PhotoPage.c"
+#line 18497 "PhotoPage.c"
 	}
 #line 2934 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	single_photo_page_on_next_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage));
 #line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2936 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	view = _tmp6_;
-#line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = view;
+	view = _tmp3_;
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = view;
+	_tmp4_ = view;
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = view;
+	_tmp5_ = view;
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = photo;
+	_tmp6_ = view;
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = view_collection_get_view_for_source (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_DATA_SOURCE, DataSource));
+	_tmp7_ = view_collection_get_view_for_source (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource));
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = _tmp11_;
+	_tmp8_ = _tmp7_;
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_OBJECT, DataObject));
+	_tmp9_ = data_collection_mark (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_COLLECTION, DataCollection), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = _tmp13_;
+	_tmp10_ = _tmp9_;
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_DATA_COLLECTION, DataCollection), _tmp14_);
+	data_collection_remove_marked (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_COLLECTION, DataCollection), _tmp10_);
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp10_);
 #line 2937 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp12_);
-#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = photo;
-#line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_g_object_unref0 (_tmp8_);
 #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = _tmp16_;
+	_tmp11_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_DATA_SOURCE, DataSource));
+	_tmp12_ = _tmp11_;
 #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = _tmp18_;
+	_tmp13_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_DATA_SOURCE, DataSource));
 #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp17_);
+	_g_object_unref0 (_tmp12_);
 #line 2938 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp19_) {
-#line 18115 "PhotoPage.c"
-		LibraryWindow* _tmp20_;
-		LibraryWindow* _tmp21_;
+	if (_tmp13_) {
+#line 18535 "PhotoPage.c"
+		LibraryWindow* _tmp14_;
+		LibraryWindow* _tmp15_;
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = library_window_get_app ();
+		_tmp14_ = library_window_get_app ();
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = _tmp20_;
+		_tmp15_ = _tmp14_;
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		library_window_switch_to_library_page (_tmp21_);
+		library_window_switch_to_library_page (_tmp15_);
 #line 2941 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp21_);
-#line 18126 "PhotoPage.c"
+		_g_object_unref0 (_tmp15_);
+#line 18546 "PhotoPage.c"
 	}
 #line 2928 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (view);
-#line 18130 "PhotoPage.c"
+#line 18550 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_print (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_print (LibraryPhotoPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 #line 2945 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18147,170 +18568,166 @@ static void library_photo_page_on_print (LibraryPhotoPage* self) {
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = view_collection_get_selected_count (_tmp1_);
-#line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_ > 0;
+	_tmp2_ = view_collection_get_selected_count (_tmp1_) > 0;
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 2946 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_) {
-#line 18153 "PhotoPage.c"
+	if (_tmp2_) {
+#line 18572 "PhotoPage.c"
+		PrintManager* _tmp3_;
 		PrintManager* _tmp4_;
-		PrintManager* _tmp5_;
+		ViewCollection* _tmp5_;
 		ViewCollection* _tmp6_;
-		ViewCollection* _tmp7_;
-		GeeList* _tmp8_;
-		GeeCollection* _tmp9_;
+		GeeList* _tmp7_;
+		GeeCollection* _tmp8_;
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = print_manager_get_instance ();
+		_tmp3_ = print_manager_get_instance ();
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp5_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp6_ = _tmp5_;
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = view_collection_get_selected_sources_of_type (_tmp7_, TYPE_PHOTO);
+		_tmp7_ = view_collection_get_selected_sources_of_type (_tmp6_, TYPE_PHOTO);
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GEE_TYPE_COLLECTION, GeeCollection);
+		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		print_manager_spool_photo (_tmp5_, _tmp9_);
+		print_manager_spool_photo (_tmp4_, _tmp8_);
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp9_);
+		_g_object_unref0 (_tmp8_);
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp7_);
+		_data_collection_unref0 (_tmp6_);
 #line 2947 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_print_manager_unref0 (_tmp5_);
-#line 18180 "PhotoPage.c"
+		_print_manager_unref0 (_tmp4_);
+#line 18599 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_external_app_changed (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_external_app_changed (LibraryPhotoPage* self)
+{
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
 #line 2952 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp1_) {
-#line 18194 "PhotoPage.c"
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 18612 "PhotoPage.c"
+		ConfigFacade* _tmp1_;
 		ConfigFacade* _tmp2_;
-		ConfigFacade* _tmp3_;
+		gchar* _tmp3_;
 		gchar* _tmp4_;
-		gchar* _tmp5_;
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = config_facade_get_instance ();
+		_tmp1_ = config_facade_get_instance ();
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = _tmp2_;
+		_tmp2_ = _tmp1_;
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+		_tmp3_ = configuration_facade_get_external_photo_app (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = g_strcmp0 (_tmp5_, "") != 0;
+		_tmp0_ = g_strcmp0 (_tmp4_, "") != 0;
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp5_);
+		_g_free0 (_tmp4_);
 #line 2954 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp3_);
-#line 18213 "PhotoPage.c"
+		_g_object_unref0 (_tmp2_);
+#line 18631 "PhotoPage.c"
 	} else {
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 18217 "PhotoPage.c"
+#line 18635 "PhotoPage.c"
 	}
 #line 2953 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "ExternalEdit", _tmp0_);
-#line 18221 "PhotoPage.c"
+#line 18639 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
-	gboolean _tmp0_;
+static void
+library_photo_page_on_external_edit (LibraryPhotoPage* self)
+{
 	GError * _inner_error_ = NULL;
 #line 2957 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2958 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp0_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 2959 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18236 "PhotoPage.c"
+#line 18653 "PhotoPage.c"
 	}
 	{
+		AppWindow* _tmp0_;
 		AppWindow* _tmp1_;
-		AppWindow* _tmp2_;
+		Photo* _tmp2_;
 		Photo* _tmp3_;
-		Photo* _tmp4_;
+		AppWindow* _tmp4_;
 		AppWindow* _tmp5_;
-		AppWindow* _tmp6_;
 #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = app_window_get_instance ();
+		_tmp0_ = app_window_get_instance ();
 #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = _tmp1_;
+		_tmp1_ = _tmp0_;
 #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_PAGE_WINDOW, PageWindow));
+		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2962 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_object_unref0 (_tmp1_);
 #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		photo_open_with_external_editor (_tmp4_, &_inner_error_);
+		photo_open_with_external_editor (_tmp3_, &_inner_error_);
 #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
+		_g_object_unref0 (_tmp3_);
 #line 2963 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18263 "PhotoPage.c"
+#line 18680 "PhotoPage.c"
 			goto __catch263_g_error;
 		}
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = app_window_get_instance ();
+		_tmp4_ = app_window_get_instance ();
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp5_ = _tmp4_;
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
+		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2964 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp6_);
-#line 18274 "PhotoPage.c"
+		_g_object_unref0 (_tmp5_);
+#line 18691 "PhotoPage.c"
 	}
 	goto __finally263;
 	__catch263_g_error:
 	{
 		GError* err = NULL;
+		AppWindow* _tmp6_;
 		AppWindow* _tmp7_;
-		AppWindow* _tmp8_;
-		GError* _tmp9_;
+		GError* _tmp8_;
+		Photo* _tmp9_;
 		Photo* _tmp10_;
-		Photo* _tmp11_;
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
 #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = app_window_get_instance ();
+		_tmp6_ = app_window_get_instance ();
 #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp7_ = _tmp6_;
 #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
+		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2966 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp7_);
 #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = err;
+		_tmp8_ = err;
 #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = _tmp10_;
+		_tmp10_ = _tmp9_;
 #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		open_external_editor_error_dialog (_tmp9_, _tmp11_);
+		open_external_editor_error_dialog (_tmp8_, _tmp10_);
 #line 2967 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp11_);
+		_g_object_unref0 (_tmp10_);
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18309 "PhotoPage.c"
+#line 18726 "PhotoPage.c"
 	}
 	__finally263:
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18321,116 +18738,112 @@ static void library_photo_page_on_external_edit (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 2961 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18320 "PhotoPage.c"
+#line 18737 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
-	gboolean _tmp0_;
+static void
+library_photo_page_on_external_edit_raw (LibraryPhotoPage* self)
+{
+	Photo* _tmp0_;
 	Photo* _tmp1_;
-	Photo* _tmp2_;
-	PhotoFileFormat _tmp3_;
-	gboolean _tmp4_;
+	gboolean _tmp2_;
 	GError * _inner_error_ = NULL;
 #line 2972 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2973 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp0_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 2974 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18340 "PhotoPage.c"
+#line 18755 "PhotoPage.c"
 	}
 #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = _tmp1_;
+	_tmp0_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = photo_get_master_file_format (_tmp2_);
+	_tmp1_ = _tmp0_;
 #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_ != PHOTO_FILE_FORMAT_RAW;
+	_tmp2_ = photo_get_master_file_format (_tmp1_) != PHOTO_FILE_FORMAT_RAW;
 #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 2976 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp4_) {
+	if (_tmp2_) {
 #line 2977 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18356 "PhotoPage.c"
+#line 18769 "PhotoPage.c"
 	}
 	{
-		AppWindow* _tmp5_;
-		AppWindow* _tmp6_;
-		Photo* _tmp7_;
-		Photo* _tmp8_;
-		AppWindow* _tmp9_;
-		AppWindow* _tmp10_;
+		AppWindow* _tmp3_;
+		AppWindow* _tmp4_;
+		Photo* _tmp5_;
+		Photo* _tmp6_;
+		AppWindow* _tmp7_;
+		AppWindow* _tmp8_;
 #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = app_window_get_instance ();
+		_tmp3_ = app_window_get_instance ();
 #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = _tmp5_;
+		_tmp4_ = _tmp3_;
 #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_PAGE_WINDOW, PageWindow));
+		page_window_set_busy_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2980 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp6_);
+		_g_object_unref0 (_tmp4_);
 #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp6_ = _tmp5_;
 #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		photo_open_with_raw_external_editor (_tmp8_, &_inner_error_);
+		photo_open_with_raw_external_editor (_tmp6_, &_inner_error_);
 #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp8_);
+		_g_object_unref0 (_tmp6_);
 #line 2981 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18383 "PhotoPage.c"
+#line 18796 "PhotoPage.c"
 			goto __catch264_g_error;
 		}
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = app_window_get_instance ();
+		_tmp7_ = app_window_get_instance ();
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = _tmp9_;
+		_tmp8_ = _tmp7_;
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
+		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2982 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp10_);
-#line 18394 "PhotoPage.c"
+		_g_object_unref0 (_tmp8_);
+#line 18807 "PhotoPage.c"
 	}
 	goto __finally264;
 	__catch264_g_error:
 	{
 		GError* err = NULL;
-		AppWindow* _tmp11_;
-		AppWindow* _tmp12_;
-		GError* _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
+		AppWindow* _tmp9_;
+		AppWindow* _tmp10_;
+		GError* _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
 #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = app_window_get_instance ();
+		_tmp9_ = app_window_get_instance ();
 #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp12_ = _tmp11_;
+		_tmp10_ = _tmp9_;
 #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_PAGE_WINDOW, PageWindow));
+		page_window_set_normal_cursor (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_PAGE_WINDOW, PageWindow));
 #line 2984 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp12_);
+		_g_object_unref0 (_tmp10_);
 #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp13_ = err;
+		_tmp11_ = err;
 #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp14_ = resources_launch_editor_failed (_tmp13_);
+		_tmp12_ = resources_launch_editor_failed (_tmp11_);
 #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp15_ = _tmp14_;
+		_tmp13_ = _tmp12_;
 #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		app_window_error_message (_tmp15_, NULL);
+		app_window_error_message (_tmp13_, NULL);
 #line 2985 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp15_);
+		_g_free0 (_tmp13_);
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18429 "PhotoPage.c"
+#line 18842 "PhotoPage.c"
 	}
 	__finally264:
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18441,198 +18854,193 @@ static void library_photo_page_on_external_edit_raw (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 2979 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18440 "PhotoPage.c"
+#line 18853 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_send_to (LibraryPhotoPage* self) {
-	gboolean _tmp0_;
+static void
+library_photo_page_on_send_to (LibraryPhotoPage* self)
+{
 #line 2989 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2990 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp0_) {
-#line 18453 "PhotoPage.c"
+	if (editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
+#line 18865 "PhotoPage.c"
+		ViewCollection* _tmp0_;
 		ViewCollection* _tmp1_;
-		ViewCollection* _tmp2_;
-		GeeList* _tmp3_;
-		GeeCollection* _tmp4_;
+		GeeList* _tmp2_;
+		GeeCollection* _tmp3_;
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp1_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp0_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = _tmp1_;
+		_tmp1_ = _tmp0_;
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp3_ = view_collection_get_selected_sources (_tmp2_);
+		_tmp2_ = view_collection_get_selected_sources (_tmp1_);
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, GEE_TYPE_COLLECTION, GeeCollection);
+		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		desktop_integration_send_to (_tmp4_);
+		desktop_integration_send_to (_tmp3_);
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp4_);
+		_g_object_unref0 (_tmp3_);
 #line 2991 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp2_);
-#line 18472 "PhotoPage.c"
+		_data_collection_unref0 (_tmp1_);
+#line 18884 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_export (LibraryPhotoPage* self) {
-	gboolean _tmp0_;
+static void
+library_photo_page_on_export (LibraryPhotoPage* self)
+{
 	ExportDialog* export_dialog = NULL;
-	ExportDialog* _tmp1_;
+	ExportDialog* _tmp0_;
 	gint scale = 0;
 	ScaleConstraint constraint = 0;
 	ExportFormatParameters export_params = {0};
-	ExportFormatParameters _tmp2_ = {0};
-	ExportDialog* _tmp3_;
-	gint _tmp4_ = 0;
-	ScaleConstraint _tmp5_ = 0;
-	gboolean _tmp6_;
+	ExportFormatParameters _tmp1_ = {0};
+	ExportDialog* _tmp2_;
+	gint _tmp3_ = 0;
+	ScaleConstraint _tmp4_ = 0;
+	gboolean _tmp5_;
 	GFile* save_as = NULL;
+	Photo* _tmp6_;
 	Photo* _tmp7_;
-	Photo* _tmp8_;
-	ExportFormatParameters _tmp9_;
+	ExportFormatParameters _tmp8_;
+	gchar* _tmp9_;
 	gchar* _tmp10_;
-	gchar* _tmp11_;
+	GFile* _tmp11_;
 	GFile* _tmp12_;
 	GFile* _tmp13_;
-	GFile* _tmp14_;
 	Scaling scaling = {0};
-	ScaleConstraint _tmp15_;
-	gint _tmp16_;
-	Scaling _tmp17_ = {0};
+	ScaleConstraint _tmp14_;
+	gint _tmp15_;
+	Scaling _tmp16_ = {0};
 	GError * _inner_error_ = NULL;
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 2995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 2995 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp0_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 2996 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18511 "PhotoPage.c"
+#line 18922 "PhotoPage.c"
 	}
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = export_dialog_new (_ ("Export Photo"));
+	_tmp0_ = export_dialog_new (_ ("Export Photo"));
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 2998 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_dialog = _tmp1_;
+	export_dialog = _tmp0_;
 #line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_format_parameters_last (&_tmp2_);
+	export_format_parameters_last (&_tmp1_);
 #line 3002 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	export_params = _tmp2_;
+	export_params = _tmp1_;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = export_dialog;
+	_tmp2_ = export_dialog;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = export_dialog_execute (_tmp3_, &_tmp4_, &_tmp5_, &export_params);
+	_tmp5_ = export_dialog_execute (_tmp2_, &_tmp3_, &_tmp4_, &export_params);
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scale = _tmp4_;
+	scale = _tmp3_;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	constraint = _tmp5_;
+	constraint = _tmp4_;
 #line 3003 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp6_) {
+	if (!_tmp5_) {
 #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
 #line 3004 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18537 "PhotoPage.c"
+#line 18948 "PhotoPage.c"
 	}
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp7_ = _tmp6_;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = export_params;
+	_tmp8_ = export_params;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = photo_get_export_basename_for_parameters (_tmp8_, &_tmp9_);
+	_tmp9_ = photo_get_export_basename_for_parameters (_tmp7_, &_tmp8_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = _tmp10_;
+	_tmp10_ = _tmp9_;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = export_ui_choose_file (_tmp11_);
+	_tmp11_ = export_ui_choose_file (_tmp10_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp12_ = _tmp11_;
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_free0 (_tmp11_);
+	_g_free0 (_tmp10_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp7_);
 #line 3006 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	save_as = _tmp13_;
+	save_as = _tmp12_;
 #line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = save_as;
+	_tmp13_ = save_as;
 #line 3008 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp14_ == NULL) {
+	if (_tmp13_ == NULL) {
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (save_as);
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_object_unref0 (export_dialog);
 #line 3009 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18569 "PhotoPage.c"
+#line 18980 "PhotoPage.c"
 	}
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = constraint;
+	_tmp14_ = constraint;
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = scale;
+	_tmp15_ = scale;
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling_for_constraint (_tmp15_, _tmp16_, FALSE, &_tmp17_);
+	scaling_for_constraint (_tmp14_, _tmp15_, FALSE, &_tmp16_);
 #line 3011 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	scaling = _tmp17_;
-#line 18579 "PhotoPage.c"
+	scaling = _tmp16_;
+#line 18990 "PhotoPage.c"
 	{
+		Photo* _tmp17_;
 		Photo* _tmp18_;
-		Photo* _tmp19_;
-		GFile* _tmp20_;
-		Scaling _tmp21_;
-		ExportFormatParameters _tmp22_;
-		JpegQuality _tmp23_;
+		GFile* _tmp19_;
+		Scaling _tmp20_;
+		ExportFormatParameters _tmp21_;
+		JpegQuality _tmp22_;
+		Photo* _tmp23_;
 		Photo* _tmp24_;
-		Photo* _tmp25_;
+		ExportFormatParameters _tmp25_;
 		ExportFormatParameters _tmp26_;
-		PhotoFileFormat _tmp27_;
+		ExportFormatMode _tmp27_;
 		ExportFormatParameters _tmp28_;
-		ExportFormatMode _tmp29_;
-		ExportFormatParameters _tmp30_;
-		gboolean _tmp31_;
+		gboolean _tmp29_;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp17_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp19_ = _tmp18_;
+		_tmp18_ = _tmp17_;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp20_ = save_as;
+		_tmp19_ = save_as;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp21_ = scaling;
+		_tmp20_ = scaling;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp22_ = export_params;
+		_tmp21_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp23_ = _tmp22_.quality;
+		_tmp22_ = _tmp21_.quality;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp24_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		_tmp23_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp25_ = _tmp24_;
+		_tmp24_ = _tmp23_;
+#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
+		_tmp25_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp26_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp27_ = photo_get_export_format_for_parameters (_tmp25_, &_tmp26_);
+		_tmp27_ = _tmp26_.mode;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp28_ = export_params;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp29_ = _tmp28_.mode;
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp30_ = export_params;
+		_tmp29_ = _tmp28_.export_metadata;
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp31_ = _tmp30_.export_metadata;
+		photo_export (_tmp18_, _tmp19_, &_tmp20_, _tmp22_, photo_get_export_format_for_parameters (_tmp24_, &_tmp25_), _tmp27_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp29_, &_inner_error_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		photo_export (_tmp19_, _tmp20_, &_tmp21_, _tmp23_, _tmp27_, _tmp29_ == EXPORT_FORMAT_MODE_UNMODIFIED, _tmp31_, &_inner_error_);
-#line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp25_);
+		_g_object_unref0 (_tmp24_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp19_);
+		_g_object_unref0 (_tmp18_);
 #line 3014 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 18631 "PhotoPage.c"
+#line 19039 "PhotoPage.c"
 			goto __catch265_g_error;
 		}
 	}
@@ -18640,40 +19048,40 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 	__catch265_g_error:
 	{
 		GError* err = NULL;
-		GFile* _tmp32_;
-		gchar* _tmp33_;
-		gchar* _tmp34_;
-		GError* _tmp35_;
-		const gchar* _tmp36_;
-		gchar* _tmp37_;
-		gchar* _tmp38_;
+		GFile* _tmp30_;
+		gchar* _tmp31_;
+		gchar* _tmp32_;
+		GError* _tmp33_;
+		const gchar* _tmp34_;
+		gchar* _tmp35_;
+		gchar* _tmp36_;
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		err = _inner_error_;
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_inner_error_ = NULL;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp32_ = save_as;
+		_tmp30_ = save_as;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp33_ = g_file_get_path (_tmp32_);
+		_tmp31_ = g_file_get_path (_tmp30_);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp34_ = _tmp33_;
+		_tmp32_ = _tmp31_;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp35_ = err;
+		_tmp33_ = err;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp36_ = _tmp35_->message;
+		_tmp34_ = _tmp33_->message;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp37_ = g_strdup_printf (_ ("Unable to export %s: %s"), _tmp34_, _tmp36_);
+		_tmp35_ = g_strdup_printf (_ ("Unable to export %s: %s"), _tmp32_, _tmp34_);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp38_ = _tmp37_;
+		_tmp36_ = _tmp35_;
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		app_window_error_message (_tmp38_, NULL);
+		app_window_error_message (_tmp36_, NULL);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp38_);
+		_g_free0 (_tmp36_);
 #line 3018 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_free0 (_tmp34_);
+		_g_free0 (_tmp32_);
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_g_error_free0 (err);
-#line 18672 "PhotoPage.c"
+#line 19080 "PhotoPage.c"
 	}
 	__finally265:
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18688,21 +19096,22 @@ static void library_photo_page_on_export (LibraryPhotoPage* self) {
 		g_clear_error (&_inner_error_);
 #line 3013 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18687 "PhotoPage.c"
+#line 19095 "PhotoPage.c"
 	}
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (save_as);
 #line 2994 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (export_dialog);
-#line 18693 "PhotoPage.c"
+#line 19101 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_publish (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_publish (LibraryPhotoPage* self)
+{
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
+	gboolean _tmp2_;
 #line 3022 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -18710,325 +19119,314 @@ static void library_photo_page_on_publish (LibraryPhotoPage* self) {
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection));
-#line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_ > 0;
+	_tmp2_ = data_collection_get_count (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_DATA_COLLECTION, DataCollection)) > 0;
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_data_collection_unref0 (_tmp1_);
 #line 3023 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp3_) {
-#line 18716 "PhotoPage.c"
+	if (_tmp2_) {
+#line 19123 "PhotoPage.c"
+		ViewCollection* _tmp3_;
 		ViewCollection* _tmp4_;
-		ViewCollection* _tmp5_;
-		GeeList* _tmp6_;
-		GeeCollection* _tmp7_;
+		GeeList* _tmp5_;
+		GeeCollection* _tmp6_;
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp4_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+		_tmp3_ = page_get_view (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp5_ = _tmp4_;
+		_tmp4_ = _tmp3_;
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = view_collection_get_selected_sources (_tmp5_);
+		_tmp5_ = view_collection_get_selected_sources (_tmp4_);
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, GEE_TYPE_COLLECTION, GeeCollection);
+		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, GEE_TYPE_COLLECTION, GeeCollection);
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		publishing_ui_publishing_dialog_go (_tmp7_);
+		publishing_ui_publishing_dialog_go (_tmp6_);
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp7_);
+		_g_object_unref0 (_tmp6_);
 #line 3024 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_data_collection_unref0 (_tmp5_);
-#line 18735 "PhotoPage.c"
+		_data_collection_unref0 (_tmp4_);
+#line 19142 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_increase_rating (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_increase_rating (LibraryPhotoPage* self)
+{
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
 	SetRatingSingleCommand* command = NULL;
-	Photo* _tmp3_;
-	Photo* _tmp4_;
-	SetRatingSingleCommand* _tmp5_;
-	SetRatingSingleCommand* _tmp6_;
-	CommandManager* _tmp7_;
-	CommandManager* _tmp8_;
-	SetRatingSingleCommand* _tmp9_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	SetRatingSingleCommand* _tmp3_;
+	SetRatingSingleCommand* _tmp4_;
+	CommandManager* _tmp5_;
+	CommandManager* _tmp6_;
+	SetRatingSingleCommand* _tmp7_;
 #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18759 "PhotoPage.c"
+#line 19165 "PhotoPage.c"
 	} else {
-		gboolean _tmp2_;
-#line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp2_;
-#line 18766 "PhotoPage.c"
+		_tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 19169 "PhotoPage.c"
 	}
 #line 3029 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3030 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18772 "PhotoPage.c"
+#line 19175 "PhotoPage.c"
 	}
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = _tmp1_;
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), TRUE);
+	_tmp3_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), TRUE);
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = _tmp3_;
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp2_);
 #line 3032 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp6_;
+	command = _tmp4_;
 #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp6_ = _tmp5_;
 #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = command;
+	_tmp7_ = command;
 #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command));
 #line 3033 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp8_);
+	_command_manager_unref0 (_tmp6_);
 #line 3035 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3028 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18800 "PhotoPage.c"
+#line 19203 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_decrease_rating (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_decrease_rating (LibraryPhotoPage* self)
+{
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
 	SetRatingSingleCommand* command = NULL;
-	Photo* _tmp3_;
-	Photo* _tmp4_;
-	SetRatingSingleCommand* _tmp5_;
-	SetRatingSingleCommand* _tmp6_;
-	CommandManager* _tmp7_;
-	CommandManager* _tmp8_;
-	SetRatingSingleCommand* _tmp9_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	SetRatingSingleCommand* _tmp3_;
+	SetRatingSingleCommand* _tmp4_;
+	CommandManager* _tmp5_;
+	CommandManager* _tmp6_;
+	SetRatingSingleCommand* _tmp7_;
 #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18823 "PhotoPage.c"
+#line 19225 "PhotoPage.c"
 	} else {
-		gboolean _tmp2_;
-#line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp2_;
-#line 18830 "PhotoPage.c"
+		_tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 19229 "PhotoPage.c"
 	}
 #line 3039 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3040 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18836 "PhotoPage.c"
+#line 19235 "PhotoPage.c"
 	}
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = _tmp1_;
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), FALSE);
+	_tmp3_ = set_rating_single_command_new_inc_dec (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), FALSE);
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = _tmp5_;
+	_tmp4_ = _tmp3_;
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp2_);
 #line 3042 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp6_;
+	command = _tmp4_;
 #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = _tmp7_;
+	_tmp6_ = _tmp5_;
 #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = command;
+	_tmp7_ = command;
 #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command));
 #line 3043 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp8_);
+	_command_manager_unref0 (_tmp6_);
 #line 3045 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3038 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18864 "PhotoPage.c"
+#line 19263 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_set_rating (LibraryPhotoPage* self, Rating rating) {
+static void
+library_photo_page_on_set_rating (LibraryPhotoPage* self,
+                                  Rating rating)
+{
 	gboolean _tmp0_ = FALSE;
-	gboolean _tmp1_;
 	SetRatingSingleCommand* command = NULL;
-	Photo* _tmp3_;
-	Photo* _tmp4_;
-	Rating _tmp5_;
-	SetRatingSingleCommand* _tmp6_;
+	Photo* _tmp1_;
+	Photo* _tmp2_;
+	SetRatingSingleCommand* _tmp3_;
+	SetRatingSingleCommand* _tmp4_;
+	CommandManager* _tmp5_;
+	CommandManager* _tmp6_;
 	SetRatingSingleCommand* _tmp7_;
-	CommandManager* _tmp8_;
-	CommandManager* _tmp9_;
-	SetRatingSingleCommand* _tmp10_;
 #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (!_tmp1_) {
+	if (!editing_host_page_has_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage))) {
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = TRUE;
-#line 18888 "PhotoPage.c"
+#line 19286 "PhotoPage.c"
 	} else {
-		gboolean _tmp2_;
-#line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp2_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp2_;
-#line 18895 "PhotoPage.c"
+		_tmp0_ = editing_host_page_get_photo_missing (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+#line 19290 "PhotoPage.c"
 	}
 #line 3049 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3050 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 18901 "PhotoPage.c"
+#line 19296 "PhotoPage.c"
 	}
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = rating;
+	_tmp2_ = _tmp1_;
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), _tmp5_);
+	_tmp3_ = set_rating_single_command_new (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_SOURCE, DataSource), rating);
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = _tmp3_;
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp2_);
 #line 3052 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command = _tmp7_;
+	command = _tmp4_;
 #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
+	_tmp5_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
 #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = _tmp8_;
+	_tmp6_ = _tmp5_;
 #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = command;
+	_tmp7_ = command;
 #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	command_manager_execute (_tmp9_, G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_COMMAND, Command));
 #line 3053 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_command_manager_unref0 (_tmp9_);
+	_command_manager_unref0 (_tmp6_);
 #line 3055 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_update_rating_menu_item_sensitivity (self);
 #line 3048 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (command);
-#line 18931 "PhotoPage.c"
+#line 19324 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_rate_rejected (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_rate_rejected (LibraryPhotoPage* self)
+{
 #line 3058 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3059 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_REJECTED);
-#line 18940 "PhotoPage.c"
+#line 19335 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_rate_unrated (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_rate_unrated (LibraryPhotoPage* self)
+{
 #line 3062 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3063 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_UNRATED);
-#line 18949 "PhotoPage.c"
+#line 19346 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_rate_one (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_rate_one (LibraryPhotoPage* self)
+{
 #line 3066 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3067 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_ONE);
-#line 18958 "PhotoPage.c"
+#line 19357 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_rate_two (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_rate_two (LibraryPhotoPage* self)
+{
 #line 3070 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3071 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_TWO);
-#line 18967 "PhotoPage.c"
+#line 19368 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_rate_three (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_rate_three (LibraryPhotoPage* self)
+{
 #line 3074 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3075 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_THREE);
-#line 18976 "PhotoPage.c"
+#line 19379 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_rate_four (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_rate_four (LibraryPhotoPage* self)
+{
 #line 3078 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3079 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FOUR);
-#line 18985 "PhotoPage.c"
+#line 19390 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_rate_five (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_rate_five (LibraryPhotoPage* self)
+{
 #line 3082 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3083 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_on_set_rating (self, RATING_FIVE);
-#line 18994 "PhotoPage.c"
+#line 19401 "PhotoPage.c"
 }
 
 
-static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self) {
+static void
+library_photo_page_update_rating_menu_item_sensitivity (LibraryPhotoPage* self)
+{
 	Photo* _tmp0_;
 	Photo* _tmp1_;
-	Rating _tmp2_;
+	Photo* _tmp2_;
 	Photo* _tmp3_;
 	Photo* _tmp4_;
-	Rating _tmp5_;
+	Photo* _tmp5_;
 	Photo* _tmp6_;
 	Photo* _tmp7_;
-	Rating _tmp8_;
+	Photo* _tmp8_;
 	Photo* _tmp9_;
 	Photo* _tmp10_;
-	Rating _tmp11_;
+	Photo* _tmp11_;
 	Photo* _tmp12_;
 	Photo* _tmp13_;
-	Rating _tmp14_;
+	Photo* _tmp14_;
 	Photo* _tmp15_;
 	Photo* _tmp16_;
-	Rating _tmp17_;
-	Photo* _tmp18_;
-	Photo* _tmp19_;
-	Rating _tmp20_;
-	Photo* _tmp21_;
-	Photo* _tmp22_;
-	Rating _tmp23_;
-	gboolean _tmp24_;
-	Photo* _tmp25_;
-	Photo* _tmp26_;
-	Rating _tmp27_;
-	gboolean _tmp28_;
+	Photo* _tmp17_;
 #line 3086 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19036,121 +19434,104 @@ static void library_photo_page_update_rating_menu_item_sensitivity (LibraryPhoto
 #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp1_ = _tmp0_;
 #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource));
-#line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", _tmp2_ != RATING_REJECTED);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateRejected", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_REJECTED);
 #line 3087 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
 #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = _tmp3_;
+	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp3_ = _tmp2_;
 #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", _tmp5_ != RATING_UNRATED);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateUnrated", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_UNRATED);
 #line 3088 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp4_);
-#line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_g_object_unref0 (_tmp3_);
 #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp7_ = _tmp6_;
+	_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp8_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp5_ = _tmp4_;
 #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", _tmp8_ != RATING_ONE);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateOne", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_ONE);
 #line 3089 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp7_);
-#line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp9_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_g_object_unref0 (_tmp5_);
 #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp10_ = _tmp9_;
+	_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp11_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp7_ = _tmp6_;
 #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", _tmp11_ != RATING_TWO);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateTwo", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_TWO);
 #line 3090 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp10_);
-#line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_g_object_unref0 (_tmp7_);
 #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp13_ = _tmp12_;
+	_tmp8_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp14_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp9_ = _tmp8_;
 #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", _tmp14_ != RATING_THREE);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateThree", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_THREE);
 #line 3091 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp13_);
-#line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp15_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_g_object_unref0 (_tmp9_);
 #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp16_ = _tmp15_;
+	_tmp10_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp17_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp11_ = _tmp10_;
 #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", _tmp17_ != RATING_FOUR);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFour", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_FOUR);
 #line 3092 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp16_);
-#line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp18_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	_g_object_unref0 (_tmp11_);
 #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp19_ = _tmp18_;
+	_tmp12_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp20_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp13_ = _tmp12_;
 #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", _tmp20_ != RATING_FIVE);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RateFive", media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, TYPE_MEDIA_SOURCE, MediaSource)) != RATING_FIVE);
 #line 3093 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp19_);
-#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp21_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp22_ = _tmp21_;
+	_g_object_unref0 (_tmp13_);
 #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp23_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp14_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp24_ = rating_can_increase (_tmp23_);
+	_tmp15_ = _tmp14_;
 #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", _tmp24_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "IncreaseRating", rating_can_increase (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource))));
 #line 3094 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp22_);
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp25_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp26_ = _tmp25_;
+	_g_object_unref0 (_tmp15_);
 #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp27_ = media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, TYPE_MEDIA_SOURCE, MediaSource));
+	_tmp16_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp28_ = rating_can_decrease (_tmp27_);
+	_tmp17_ = _tmp16_;
 #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", _tmp28_);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "DecreaseRating", rating_can_decrease (media_source_get_rating (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, TYPE_MEDIA_SOURCE, MediaSource))));
 #line 3095 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp26_);
-#line 19124 "PhotoPage.c"
+	_g_object_unref0 (_tmp17_);
+#line 19500 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new18 (const gchar* value) {
+static GVariant*
+_variant_new18 (const gchar* value)
+{
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19131 "PhotoPage.c"
+#line 19509 "PhotoPage.c"
 }
 
 
-static GVariant* _variant_new19 (const gchar* value) {
+static GVariant*
+_variant_new19 (const gchar* value)
+{
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return g_variant_ref_sink (g_variant_new_string (value));
-#line 19138 "PhotoPage.c"
+#line 19518 "PhotoPage.c"
 }
 
 
-static void library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self) {
+static void
+library_photo_page_update_development_menu_item_sensitivity (LibraryPhotoPage* self)
+{
 	PhotoFileFormat format = 0;
 	Photo* _tmp0_;
 	Photo* _tmp1_;
 	PhotoFileFormat _tmp2_;
 	PhotoFileFormat _tmp3_;
 	PhotoFileFormat _tmp4_;
-	PhotoFileFormat _tmp5_;
 #line 3098 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19160,161 +19541,149 @@ static void library_photo_page_update_development_menu_item_sensitivity (Library
 #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp2_ = photo_get_master_file_format (_tmp1_);
 #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
-#line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (_tmp1_);
 #line 3099 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	format = _tmp3_;
+	format = _tmp2_;
 #line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = format;
+	_tmp3_ = format;
 #line 3100 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp4_ == PHOTO_FILE_FORMAT_RAW);
+	page_set_action_sensitive (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper", _tmp3_ == PHOTO_FILE_FORMAT_RAW);
 #line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = format;
+	_tmp4_ = format;
 #line 3102 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp5_ == PHOTO_FILE_FORMAT_RAW) {
-#line 19172 "PhotoPage.c"
+	if (_tmp4_ == PHOTO_FILE_FORMAT_RAW) {
+#line 19551 "PhotoPage.c"
+		Photo* _tmp5_;
 		Photo* _tmp6_;
-		Photo* _tmp7_;
-		RawDeveloper _tmp8_;
-		RawDeveloper _tmp9_;
-#line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+		RawDeveloper _tmp7_;
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = _tmp6_;
+		_tmp5_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = photo_get_raw_developer (_tmp7_);
+		_tmp6_ = _tmp5_;
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = _tmp8_;
+		_tmp7_ = photo_get_raw_developer (_tmp6_);
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp7_);
+		_g_object_unref0 (_tmp6_);
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		switch (_tmp9_) {
+		switch (_tmp7_) {
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_SHOTWELL:
-#line 19191 "PhotoPage.c"
+#line 19567 "PhotoPage.c"
 			{
-				GAction* _tmp10_;
-				GAction* _tmp11_;
-				GVariant* _tmp12_;
+				GAction* _tmp8_;
+				GAction* _tmp9_;
+				GVariant* _tmp10_;
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp10_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
+				_tmp8_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp11_ = _tmp10_;
+				_tmp9_ = _tmp8_;
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp12_ = _variant_new18 ("Shotwell");
+				_tmp10_ = _variant_new18 ("Shotwell");
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				g_action_change_state (_tmp11_, _tmp12_);
+				g_action_change_state (_tmp9_, _tmp10_);
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_variant_unref0 (_tmp12_);
+				_g_variant_unref0 (_tmp10_);
 #line 3107 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_object_unref0 (_tmp11_);
+				_g_object_unref0 (_tmp9_);
 #line 3108 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19210 "PhotoPage.c"
+#line 19586 "PhotoPage.c"
 			}
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_CAMERA:
 #line 3105 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 			case RAW_DEVELOPER_EMBEDDED:
-#line 19216 "PhotoPage.c"
+#line 19592 "PhotoPage.c"
 			{
-				GAction* _tmp13_;
-				GAction* _tmp14_;
-				GVariant* _tmp15_;
+				GAction* _tmp11_;
+				GAction* _tmp12_;
+				GVariant* _tmp13_;
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp13_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
+				_tmp11_ = page_get_action (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page), "RawDeveloper");
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp14_ = _tmp13_;
+				_tmp12_ = _tmp11_;
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_tmp15_ = _variant_new19 ("Camera");
+				_tmp13_ = _variant_new19 ("Camera");
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				g_action_change_state (_tmp14_, _tmp15_);
+				g_action_change_state (_tmp12_, _tmp13_);
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_variant_unref0 (_tmp15_);
+				_g_variant_unref0 (_tmp13_);
 #line 3112 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-				_g_object_unref0 (_tmp14_);
+				_g_object_unref0 (_tmp12_);
 #line 3113 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				break;
-#line 19235 "PhotoPage.c"
+#line 19611 "PhotoPage.c"
 			}
 			default:
 			{
 #line 3116 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 				g_assert_not_reached ();
-#line 19241 "PhotoPage.c"
+#line 19617 "PhotoPage.c"
 			}
 		}
 	}
 }
 
 
-static void library_photo_page_on_metadata_altered (LibraryPhotoPage* self, GeeMap* map) {
+static void
+library_photo_page_on_metadata_altered (LibraryPhotoPage* self,
+                                        GeeMap* map)
+{
 	gboolean _tmp0_ = FALSE;
-	GeeMap* _tmp1_;
+	Photo* _tmp1_;
 	Photo* _tmp2_;
-	Photo* _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
+	gboolean _tmp3_;
 #line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (IS_LIBRARY_PHOTO_PAGE (self));
 #line 3121 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = map;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = _tmp2_;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = gee_map_has_key (_tmp1_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
+	_tmp1_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp5_ = _tmp4_;
+	_tmp2_ = _tmp1_;
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp3_);
+	_tmp3_ = gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	if (_tmp5_) {
-#line 19273 "PhotoPage.c"
-		GeeMap* _tmp6_;
-		Photo* _tmp7_;
-		Photo* _tmp8_;
-		gpointer _tmp9_;
-		Alteration* _tmp10_;
-		gboolean _tmp11_;
-#line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp6_ = map;
+	_g_object_unref0 (_tmp2_);
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp7_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
+	if (_tmp3_) {
+#line 19646 "PhotoPage.c"
+		Photo* _tmp4_;
+		Photo* _tmp5_;
+		gpointer _tmp6_;
+		Alteration* _tmp7_;
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp8_ = _tmp7_;
+		_tmp4_ = editing_host_page_get_photo (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_EDITING_HOST_PAGE, EditingHostPage));
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp9_ = gee_map_get (_tmp6_, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_OBJECT, DataObject));
+		_tmp5_ = _tmp4_;
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp10_ = (Alteration*) _tmp9_;
+		_tmp6_ = gee_map_get (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_OBJECT, DataObject));
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp11_ = alteration_has_subject (_tmp10_, "metadata");
+		_tmp7_ = (Alteration*) _tmp6_;
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_tmp0_ = _tmp11_;
+		_tmp0_ = alteration_has_subject (_tmp7_, "metadata");
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_alteration_unref0 (_tmp10_);
+		_alteration_unref0 (_tmp7_);
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-		_g_object_unref0 (_tmp8_);
-#line 19298 "PhotoPage.c"
+		_g_object_unref0 (_tmp5_);
+#line 19665 "PhotoPage.c"
 	} else {
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_tmp0_ = FALSE;
-#line 19302 "PhotoPage.c"
+#line 19669 "PhotoPage.c"
 	}
 #line 3122 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp0_) {
 #line 3123 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		single_photo_page_repaint (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_SINGLE_PHOTO_PAGE, SinglePhotoPage), NULL);
-#line 19308 "PhotoPage.c"
+#line 19675 "PhotoPage.c"
 	}
 }
 
 
-static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_add_tags (LibraryPhotoPage* self)
+{
 	AddTagsDialog* dialog = NULL;
 	AddTagsDialog* _tmp0_;
 	gchar** names = NULL;
@@ -19347,7 +19716,7 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 	_tmp4__length1 = names_length1;
 #line 3129 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	if (_tmp4_ != NULL) {
-#line 19346 "PhotoPage.c"
+#line 19715 "PhotoPage.c"
 		CommandManager* _tmp5_;
 		CommandManager* _tmp6_;
 		HierarchicalTagIndex* _tmp7_;
@@ -19408,17 +19777,19 @@ static void library_photo_page_on_add_tags (LibraryPhotoPage* self) {
 		_hierarchical_tag_index_unref0 (_tmp8_);
 #line 3130 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		_command_manager_unref0 (_tmp6_);
-#line 19407 "PhotoPage.c"
+#line 19776 "PhotoPage.c"
 	}
 #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	names = (_vala_array_free (names, names_length1, (GDestroyNotify) g_free), NULL);
 #line 3126 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_text_entry_dialog_mediator_unref0 (dialog);
-#line 19413 "PhotoPage.c"
+#line 19782 "PhotoPage.c"
 }
 
 
-static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
+static void
+library_photo_page_on_modify_tags (LibraryPhotoPage* self)
+{
 	LibraryPhoto* photo = NULL;
 	ViewCollection* _tmp0_;
 	ViewCollection* _tmp1_;
@@ -19483,7 +19854,7 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 		_g_object_unref0 (photo);
 #line 3143 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 		return;
-#line 19482 "PhotoPage.c"
+#line 19853 "PhotoPage.c"
 	}
 #line 3145 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_tmp11_ = page_get_command_manager (G_TYPE_CHECK_INSTANCE_CAST (self, TYPE_PAGE, Page));
@@ -19509,73 +19880,80 @@ static void library_photo_page_on_modify_tags (LibraryPhotoPage* self) {
 	_text_entry_dialog_mediator_unref0 (dialog);
 #line 3136 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	_g_object_unref0 (photo);
-#line 19508 "PhotoPage.c"
+#line 19879 "PhotoPage.c"
 }
 
 
-static gboolean library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base, DataView* view) {
+static gboolean
+library_photo_page_library_photo_page_view_filter_real_predicate (ViewFilter* base,
+                                                                  DataView* view)
+{
 	LibraryPhotoPageLibraryPhotoPageViewFilter * self;
 	gboolean result = FALSE;
-	DataView* _tmp0_;
-	DataSource* _tmp1_;
-	MediaSource* _tmp2_;
-	gboolean _tmp3_;
-	gboolean _tmp4_;
+	DataSource* _tmp0_;
+	MediaSource* _tmp1_;
+	gboolean _tmp2_;
 #line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER, LibraryPhotoPageLibraryPhotoPageViewFilter);
 #line 2335 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	g_return_val_if_fail (IS_DATA_VIEW (view), FALSE);
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp0_ = view;
+	_tmp0_ = data_view_get_source (view);
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp1_ = data_view_get_source (_tmp0_);
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource);
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_MEDIA_SOURCE, MediaSource);
+	_tmp2_ = !media_source_is_trashed (_tmp1_);
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp3_ = media_source_is_trashed (_tmp2_);
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_tmp4_ = !_tmp3_;
-#line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
-	result = _tmp4_;
+	result = _tmp2_;
 #line 2336 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return result;
-#line 19540 "PhotoPage.c"
+#line 19908 "PhotoPage.c"
 }
 
 
-static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_construct (GType object_type) {
+static LibraryPhotoPageLibraryPhotoPageViewFilter*
+library_photo_page_library_photo_page_view_filter_construct (GType object_type)
+{
 	LibraryPhotoPageLibraryPhotoPageViewFilter* self = NULL;
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self = (LibraryPhotoPageLibraryPhotoPageViewFilter*) view_filter_construct (object_type);
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return self;
-#line 19550 "PhotoPage.c"
+#line 19920 "PhotoPage.c"
 }
 
 
-static LibraryPhotoPageLibraryPhotoPageViewFilter* library_photo_page_library_photo_page_view_filter_new (void) {
+static LibraryPhotoPageLibraryPhotoPageViewFilter*
+library_photo_page_library_photo_page_view_filter_new (void)
+{
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	return library_photo_page_library_photo_page_view_filter_construct (LIBRARY_PHOTO_PAGE_TYPE_LIBRARY_PHOTO_PAGE_VIEW_FILTER);
-#line 19557 "PhotoPage.c"
+#line 19929 "PhotoPage.c"
 }
 
 
-static void library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass) {
+static void
+library_photo_page_library_photo_page_view_filter_class_init (LibraryPhotoPageLibraryPhotoPageViewFilterClass * klass)
+{
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_library_photo_page_view_filter_parent_class = g_type_class_peek_parent (klass);
 #line 2334 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	((ViewFilterClass *) klass)->predicate = (gboolean (*) (ViewFilter *, DataView*)) library_photo_page_library_photo_page_view_filter_real_predicate;
-#line 19566 "PhotoPage.c"
+#line 19940 "PhotoPage.c"
 }
 
 
-static void library_photo_page_library_photo_page_view_filter_instance_init (LibraryPhotoPageLibraryPhotoPageViewFilter * self) {
+static void
+library_photo_page_library_photo_page_view_filter_instance_init (LibraryPhotoPageLibraryPhotoPageViewFilter * self)
+{
 }
 
 
-static GType library_photo_page_library_photo_page_view_filter_get_type (void) {
+static GType
+library_photo_page_library_photo_page_view_filter_get_type (void)
+{
 	static volatile gsize library_photo_page_library_photo_page_view_filter_type_id__volatile = 0;
 	if (g_once_init_enter (&library_photo_page_library_photo_page_view_filter_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoPageLibraryPhotoPageViewFilterClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_page_library_photo_page_view_filter_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoPageLibraryPhotoPageViewFilter), 0, (GInstanceInitFunc) library_photo_page_library_photo_page_view_filter_instance_init, NULL };
@@ -19587,7 +19965,9 @@ static GType library_photo_page_library_photo_page_view_filter_get_type (void) {
 }
 
 
-static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
+static void
+library_photo_page_class_init (LibraryPhotoPageClass * klass)
+{
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	library_photo_page_parent_class = g_type_class_peek_parent (klass);
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
@@ -19634,11 +20014,13 @@ static void library_photo_page_class_init (LibraryPhotoPageClass * klass) {
 	((PageClass *) klass)->on_context_keypress = (gboolean (*) (Page *)) library_photo_page_real_on_context_keypress;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (klass)->finalize = library_photo_page_finalize;
-#line 19633 "PhotoPage.c"
+#line 20013 "PhotoPage.c"
 }
 
 
-static void library_photo_page_instance_init (LibraryPhotoPage * self) {
+static void
+library_photo_page_instance_init (LibraryPhotoPage * self)
+{
 	LibraryPhotoPageLibraryPhotoPageViewFilter* _tmp0_;
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv = LIBRARY_PHOTO_PAGE_GET_PRIVATE (self);
@@ -19650,11 +20032,13 @@ static void library_photo_page_instance_init (LibraryPhotoPage * self) {
 	_tmp0_ = library_photo_page_library_photo_page_view_filter_new ();
 #line 2342 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	self->priv->filter = _tmp0_;
-#line 19649 "PhotoPage.c"
+#line 20031 "PhotoPage.c"
 }
 
 
-static void library_photo_page_finalize (GObject * obj) {
+static void
+library_photo_page_finalize (GObject * obj)
+{
 	LibraryPhotoPage * self;
 	LibraryPhotoSourceCollection* _tmp0_;
 	guint _tmp1_;
@@ -19695,11 +20079,13 @@ static void library_photo_page_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->context_menu);
 #line 2332 "/home/jens/Source/shotwell/src/PhotoPage.vala"
 	G_OBJECT_CLASS (library_photo_page_parent_class)->finalize (obj);
-#line 19694 "PhotoPage.c"
+#line 20078 "PhotoPage.c"
 }
 
 
-GType library_photo_page_get_type (void) {
+GType
+library_photo_page_get_type (void)
+{
 	static volatile gsize library_photo_page_type_id__volatile = 0;
 	if (g_once_init_enter (&library_photo_page_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (LibraryPhotoPageClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) library_photo_page_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (LibraryPhotoPage), 0, (GInstanceInitFunc) library_photo_page_instance_init, NULL };
@@ -19711,7 +20097,11 @@ GType library_photo_page_get_type (void) {
 }
 
 
-static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_destroy (gpointer array,
+                     gint array_length,
+                     GDestroyNotify destroy_func)
+{
 	if ((array != NULL) && (destroy_func != NULL)) {
 		int i;
 		for (i = 0; i < array_length; i = i + 1) {
@@ -19723,7 +20113,11 @@ static void _vala_array_destroy (gpointer array, gint array_length, GDestroyNoti
 }
 
 
-static void _vala_array_free (gpointer array, gint array_length, GDestroyNotify destroy_func) {
+static void
+_vala_array_free (gpointer array,
+                  gint array_length,
+                  GDestroyNotify destroy_func)
+{
 	_vala_array_destroy (array, array_length, destroy_func);
 	g_free (array);
 }