Update upstream source from tag 'upstream/0.28.3'

Update to upstream version '0.28.3'
with Debian dir 828a38627ed9287d7cf2466fb15ebdea073742b7

3 files changed, 8443 insertions, 8170 deletions

diff --git a/src/editing_tools/EditingTools.c b/src/editing_tools/EditingTools.c
index 06abe20..629c926 100644
--- a/src/editing_tools/EditingTools.c
+++ b/src/editing_tools/EditingTools.c
@@ -1,4 +1,4 @@
-/* EditingTools.c generated by valac 0.36.6, the Vala compiler
+/* EditingTools.c generated by valac 0.40.4, the Vala compiler
  * generated from EditingTools.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -15,6 +15,7 @@
  * the preconfigure() method, implement it, and ensure in init() that it's been called.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -41,6 +42,11 @@
 typedef struct _EditingToolsEditingToolWindow EditingToolsEditingToolWindow;
 typedef struct _EditingToolsEditingToolWindowClass EditingToolsEditingToolWindowClass;
 typedef struct _EditingToolsEditingToolWindowPrivate EditingToolsEditingToolWindowPrivate;
+enum  {
+	EDITING_TOOLS_EDITING_TOOL_WINDOW_0_PROPERTY,
+	EDITING_TOOLS_EDITING_TOOL_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_editing_tool_window_properties[EDITING_TOOLS_EDITING_TOOL_WINDOW_NUM_PROPERTIES];
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 
 #define TYPE_PAGE_WINDOW (page_window_get_type ())
@@ -152,9 +158,9 @@ typedef struct _EditingToolsParamSpecPhotoCanvas EditingToolsParamSpecPhotoCanva
 enum  {
 	EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL,
 	EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL,
-	EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL
+	EDITING_TOOLS_PHOTO_CANVAS_NUM_SIGNALS
 };
-static guint editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_LAST_SIGNAL] = {0};
+static guint editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NUM_SIGNALS] = {0};
 
 #define EDITING_TOOLS_TYPE_EDITING_TOOL (editing_tools_editing_tool_get_type ())
 #define EDITING_TOOLS_EDITING_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool))
@@ -185,9 +191,9 @@ enum  {
 	EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL,
 	EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL,
 	EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL,
-	EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL
+	EDITING_TOOLS_EDITING_TOOL_NUM_SIGNALS
 };
-static guint editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_LAST_SIGNAL] = {0};
+static guint editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_NUM_SIGNALS] = {0};
 
 #define EDITING_TOOLS_TYPE_CROP_TOOL (editing_tools_crop_tool_get_type ())
 #define EDITING_TOOLS_CROP_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool))
@@ -293,6 +299,11 @@ typedef struct _CropCommandClass CropCommandClass;
 
 #define TYPE_BOX_COMPLEMENTS (box_complements_get_type ())
 typedef struct _EditingToolsCropToolParamSpecConstraintDescription EditingToolsCropToolParamSpecConstraintDescription;
+enum  {
+	EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_0_PROPERTY,
+	EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_crop_tool_crop_tool_window_properties[EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_NUM_PROPERTIES];
 
 #define EDITING_TOOLS_TYPE_REDEYE_INSTANCE (editing_tools_redeye_instance_get_type ())
 typedef struct _EditingToolsRedeyeInstance EditingToolsRedeyeInstance;
@@ -361,6 +372,11 @@ typedef struct _AlterationClass AlterationClass;
 typedef struct _DataCollection DataCollection;
 typedef struct _DataCollectionClass DataCollectionClass;
 #define _data_collection_unref0(var) ((var == NULL) ? NULL : (var = (data_collection_unref (var), NULL)))
+enum  {
+	EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_0_PROPERTY,
+	EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_redeye_tool_redeye_tool_window_properties[EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_NUM_PROPERTIES];
 
 #define EDITING_TOOLS_TYPE_ADJUST_TOOL (editing_tools_adjust_tool_get_type ())
 #define EDITING_TOOLS_ADJUST_TOOL(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool))
@@ -457,6 +473,11 @@ typedef struct _EditingToolsAdjustToolSliderAdjustmentCommandClass EditingToolsA
 
 typedef struct _EditingToolsAdjustToolAdjustEnhanceCommand EditingToolsAdjustToolAdjustEnhanceCommand;
 typedef struct _EditingToolsAdjustToolAdjustEnhanceCommandClass EditingToolsAdjustToolAdjustEnhanceCommandClass;
+enum  {
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_0_PROPERTY,
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_adjust_tool_adjust_tool_window_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_NUM_PROPERTIES];
 
 #define TYPE_COMMAND_DESCRIPTION (command_description_get_type ())
 #define COMMAND_DESCRIPTION(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_COMMAND_DESCRIPTION, CommandDescription))
@@ -467,9 +488,29 @@ typedef struct _CommandDescription CommandDescription;
 typedef struct _CommandDescriptionIface CommandDescriptionIface;
 typedef struct _CommandPrivate CommandPrivate;
 typedef struct _EditingToolsAdjustToolAdjustToolCommandPrivate EditingToolsAdjustToolAdjustToolCommandPrivate;
+enum  {
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_0_PROPERTY,
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_adjust_tool_adjust_tool_command_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_NUM_PROPERTIES];
 typedef struct _EditingToolsAdjustToolAdjustResetCommandPrivate EditingToolsAdjustToolAdjustResetCommandPrivate;
+enum  {
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_0_PROPERTY,
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_adjust_tool_adjust_reset_command_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_NUM_PROPERTIES];
 typedef struct _EditingToolsAdjustToolSliderAdjustmentCommandPrivate EditingToolsAdjustToolSliderAdjustmentCommandPrivate;
+enum  {
+	EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_0_PROPERTY,
+	EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_adjust_tool_slider_adjustment_command_properties[EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_NUM_PROPERTIES];
 typedef struct _EditingToolsAdjustToolAdjustEnhanceCommandPrivate EditingToolsAdjustToolAdjustEnhanceCommandPrivate;
+enum  {
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_0_PROPERTY,
+	EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_adjust_tool_adjust_enhance_command_properties[EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_NUM_PROPERTIES];
 
 #define TYPE_ENHANCE_SINGLE_COMMAND (enhance_single_command_get_type ())
 #define ENHANCE_SINGLE_COMMAND(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_ENHANCE_SINGLE_COMMAND, EnhanceSingleCommand))
@@ -903,28 +944,41 @@ void editing_tools_init (GError** error);
 void editing_tools_terminate (void);
 GType editing_tools_editing_tool_window_get_type (void) G_GNUC_CONST;
 #define EDITING_TOOLS_EDITING_TOOL_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindowPrivate))
-enum  {
-	EDITING_TOOLS_EDITING_TOOL_WINDOW_DUMMY_PROPERTY
-};
 #define EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER 6
-EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container);
-static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message);
-static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self);
-static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkWidget* widget);
+EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type,
+                                                                            GtkWindow* container);
+static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self,
+                                                          const gchar* log_domain,
+                                                          GLogLevelFlags log_levels,
+                                                          const gchar* message);
+static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain,
+                                                                     GLogLevelFlags log_levels,
+                                                                     const gchar* message,
+                                                                     gpointer self);
+static void editing_tools_editing_tool_window_real_add (GtkContainer* base,
+                                                 GtkWidget* widget);
 gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self);
-static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, GdkEventKey* event);
+static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base,
+                                                                 GdkEventKey* event);
 GType page_window_get_type (void) G_GNUC_CONST;
 GType app_window_get_type (void) G_GNUC_CONST;
 AppWindow* app_window_get_instance (void);
-static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event);
+static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base,
+                                                                    GdkEventButton* event);
 static void editing_tools_editing_tool_window_real_realize (GtkWidget* base);
 #define RESOURCES_TRANSIENT_WINDOW_OPACITY 0.90
 static void editing_tools_editing_tool_window_finalize (GObject * obj);
 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;
 GType data_object_get_type (void) G_GNUC_CONST;
@@ -937,120 +991,246 @@ GType dimensions_get_type (void) G_GNUC_CONST;
 Dimensions* dimensions_dup (const Dimensions* self);
 void dimensions_free (Dimensions* self);
 #define EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvasPrivate))
-enum  {
-	EDITING_TOOLS_PHOTO_CANVAS_DUMMY_PROPERTY
-};
-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 cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, GdkPixbuf* pixbuf, GdkRectangle* pos);
-void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, GdkRectangle* rectangle, GdkRectangle* result);
-void photo_unscaled_to_raw_rect (Photo* self, GdkRectangle* unscaled_rect, GdkRectangle* result);
-void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self, GdkPoint* active_point, GdkPoint* result);
-void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result);
+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 cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self,
+                                                               cairo_t* default_ctx,
+                                                               GdkPixbuf* pixbuf,
+                                                               GdkRectangle* pos);
+void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self,
+                                                      GdkRectangle* rectangle,
+                                                      GdkRectangle* result);
+void photo_unscaled_to_raw_rect (Photo* self,
+                                 GdkRectangle* unscaled_rect,
+                                 GdkRectangle* result);
+void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self,
+                                                          GdkPoint* active_point,
+                                                          GdkPoint* result);
+void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self,
+                                                            GdkRectangle* result);
 GType photo_exception_get_type (void) G_GNUC_CONST;
-void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result);
-void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self, GdkRectangle* active_rect, GdkRectangle* result);
-void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self, GdkPoint* user_point, GdkPoint* result);
-void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self, GdkRectangle* user_rect, GdkRectangle* result);
+void media_source_get_dimensions (MediaSource* self,
+                                  PhotoException disallowed_steps,
+                                  Dimensions* result);
+void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self,
+                                                         GdkRectangle* active_rect,
+                                                         GdkRectangle* result);
+void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self,
+                                                      GdkPoint* user_point,
+                                                      GdkPoint* result);
+void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self,
+                                                     GdkRectangle* user_rect,
+                                                     GdkRectangle* result);
 Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self);
 GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self);
 GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self);
 cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self);
-void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result);
+void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
+                                                 Dimensions* result);
 GType scaling_get_type (void) G_GNUC_CONST;
 GType scale_constraint_get_type (void) G_GNUC_CONST;
 Scaling* scaling_dup (const Scaling* self);
 void scaling_free (Scaling* self);
-void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result);
-void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result);
-void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim);
+void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self,
+                                             Scaling* result);
+void scaling_for_viewport (Dimensions* viewport,
+                           gboolean scale_up,
+                           Scaling* result);
+void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self,
+                                             cairo_t* default_ctx,
+                                             Dimensions* surface_dim);
 cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self);
 GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self);
-void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position);
+void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self,
+                                                Dimensions* old_dim,
+                                                GdkPixbuf* scaled,
+                                                GdkRectangle* scaled_position);
 void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self);
 static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self);
-void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf);
-void set_source_color_from_string (cairo_t* ctx, const gchar* spec);
-void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
-void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over);
+void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self,
+                                              GdkPixbuf* pixbuf);
+void set_source_color_from_string (cairo_t* ctx,
+                                   const gchar* spec);
+void paint_pixmap_with_background (cairo_t* ctx,
+                                   GdkPixbuf* pixbuf,
+                                   gint x,
+                                   gint y);
+void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self,
+                                               cairo_surface_t* surface,
+                                               gboolean over);
 GType box_get_type (void) G_GNUC_CONST;
 Box* box_dup (const Box* self);
 void box_free (Box* self);
-void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over);
+void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self,
+                                                    cairo_surface_t* surface,
+                                                    Box* source_area,
+                                                    gboolean over);
 gint box_get_width (Box *self);
 gint box_get_height (Box *self);
-void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box);
-void box_get_rectangle (Box *self, GdkRectangle* result);
-void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos);
+void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self,
+                                          cairo_t* ctx,
+                                          Box* box);
+void box_get_rectangle (Box *self,
+                        GdkRectangle* result);
+void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self,
+                                           cairo_t* ctx,
+                                           const gchar* text,
+                                           gint x,
+                                           gint y,
+                                           gboolean use_scaled_pos);
 #define RESOURCES_ONIMAGE_FONT_BACKGROUND "rgba(255,255,255,0.5)"
 #define RESOURCES_ONIMAGE_FONT_COLOR "#000000"
-void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos);
-void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos);
-void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint width);
-void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint active_center_x, gint active_center_y, gint radius);
-void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint height);
-void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* box);
-void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area);
-static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
-static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self,
+                                                      cairo_t* ctx,
+                                                      gint x,
+                                                      gint y,
+                                                      gint width,
+                                                      gboolean use_scaled_pos);
+void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self,
+                                                    cairo_t* ctx,
+                                                    gint x,
+                                                    gint y,
+                                                    gint height,
+                                                    gboolean use_scaled_pos);
+void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self,
+                                                       gint x,
+                                                       gint y,
+                                                       gint width);
+void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self,
+                                             cairo_t* ctx,
+                                             gint active_center_x,
+                                             gint active_center_y,
+                                             gint radius);
+void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self,
+                                                     gint x,
+                                                     gint y,
+                                                     gint height);
+void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self,
+                                           Box* box);
+void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
+                                                 Box* area);
+static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure,
+                                                  GValue * return_value,
+                                                  guint n_param_values,
+                                                  const GValue * param_values,
+                                                  gpointer invocation_hint,
+                                                  gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure,
+                                                       GValue * return_value,
+                                                       guint n_param_values,
+                                                       const GValue * param_values,
+                                                       gpointer invocation_hint,
+                                                       gpointer marshal_data);
 static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj);
 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;
 #define EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingToolPrivate))
-enum  {
-	EDITING_TOOLS_EDITING_TOOL_DUMMY_PROPERTY
-};
-EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name);
-void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas);
-static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas);
+EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type,
+                                                               const gchar* name);
+void editing_tools_editing_tool_activate (EditingToolsEditingTool* self,
+                                          EditingToolsPhotoCanvas* canvas);
+static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self,
+                                               EditingToolsPhotoCanvas* canvas);
 EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self);
-gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event);
-static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
+gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
+                                                 GdkEventKey* event);
+static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender,
+                                                                             GdkEventKey* event,
+                                                                             gpointer self);
 void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self);
 static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self);
 gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self);
 static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self);
-GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error);
-static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error);
-void dimensions_init (Dimensions *self, gint width, gint height);
-void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y);
-static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self, gint x, gint y);
-void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y);
-static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self, gint x, gint y);
-void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask);
-static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask);
+GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self,
+                                                          Scaling* scaling,
+                                                          Photo* photo,
+                                                          Dimensions* max_dim,
+                                                          GError** error);
+static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self,
+                                                               Scaling* scaling,
+                                                               Photo* photo,
+                                                               Dimensions* max_dim,
+                                                               GError** error);
+void dimensions_init (Dimensions *self,
+                      gint width,
+                      gint height);
+void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self,
+                                               gint x,
+                                               gint y);
+static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self,
+                                                    gint x,
+                                                    gint y);
+void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self,
+                                                  gint x,
+                                                  gint y);
+static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self,
+                                                       gint x,
+                                                       gint y);
+void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self,
+                                           gint x,
+                                           gint y,
+                                           GdkModifierType mask);
+static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self,
+                                                gint x,
+                                                gint y,
+                                                GdkModifierType mask);
 gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self);
 static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self);
-static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event);
+static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self,
+                                                      GdkEventKey* event);
 void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self);
-void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx);
-static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx);
+void editing_tools_editing_tool_paint (EditingToolsEditingTool* self,
+                                       cairo_t* ctx);
+static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self,
+                                            cairo_t* ctx);
 GType command_get_type (void) G_GNUC_CONST;
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data);
+static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure,
+                                                                GValue * return_value,
+                                                                guint n_param_values,
+                                                                const GValue * param_values,
+                                                                gpointer invocation_hint,
+                                                                gpointer marshal_data);
 static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_crop_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_crop_tool_crop_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 GType box_location_get_type (void) G_GNUC_CONST;
 static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance);
 static void editing_tools_crop_tool_constraint_description_unref (gpointer instance);
-static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name,
+                                                                       const gchar* nick,
+                                                                       const gchar* blurb,
+                                                                       GType object_type,
+                                                                       GParamFlags flags) G_GNUC_UNUSED;
+static void editing_tools_crop_tool_value_set_constraint_description (GValue* value,
+                                                               gpointer v_object) G_GNUC_UNUSED;
+static void editing_tools_crop_tool_value_take_constraint_description (GValue* value,
+                                                                gpointer v_object) G_GNUC_UNUSED;
 static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) G_GNUC_UNUSED;
 static GType editing_tools_crop_tool_constraint_description_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static GType editing_tools_crop_tool_reticle_orientation_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static GType editing_tools_crop_tool_constraint_mode_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define EDITING_TOOLS_CROP_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropToolPrivate))
-enum  {
-	EDITING_TOOLS_CROP_TOOL_DUMMY_PROPERTY
-};
 static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self);
 static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_create_constraints (int* result_length1);
-static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, int constraint_data_length1);
+static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data,
+                                                              int constraint_data_length1);
 #define EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO (-1.0f)
 #define EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT 0.15
 #define EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT 0.15
@@ -1070,52 +1250,170 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 static EditingToolsCropTool* editing_tools_crop_tool_new (void);
 static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type);
 EditingToolsCropTool* editing_tools_crop_tool_factory (void);
-gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling);
-void scaling_get_scaled_dimensions (Scaling *self, Dimensions* original, Dimensions* result);
-void photo_get_original_dimensions (Photo* self, Dimensions* result);
-static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
-static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio);
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
-static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value);
+gboolean editing_tools_crop_tool_is_available (Photo* photo,
+                                               Scaling* scaling);
+void scaling_get_scaled_dimensions (Scaling *self,
+                                    Dimensions* original,
+                                    Dimensions* result);
+void photo_get_original_dimensions (Photo* self,
+                                    Dimensions* result);
+static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name,
+                                                                                               gint new_basis_width,
+                                                                                               gint new_basis_height,
+                                                                                               gboolean new_pivotable,
+                                                                                               gfloat new_aspect_ratio);
+static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type,
+                                                                                                     const gchar* new_name,
+                                                                                                     gint new_basis_width,
+                                                                                                     gint new_basis_height,
+                                                                                                     gboolean new_pivotable,
+                                                                                                     gfloat new_aspect_ratio);
+static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array,
+                       int* length,
+                       int* size,
+                       EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array,
+                       int* length,
+                       int* size,
+                       EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array,
+                       int* length,
+                       int* size,
+                       EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
+static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array,
+                        int* length,
+                        int* size,
+                        EditingToolsCropToolConstraintDescription* value);
 static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self);
 static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self);
-static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event);
-static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event);
-static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event);
-static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, Box* crop, Box* result);
-static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Box* new_crop);
-static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position);
-static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, GtkEntry* sender, const gchar* text, gint length, gint* position);
-static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position);
+static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self,
+                                                           GdkEventFocus* event);
+static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self,
+                                                            GdkEventFocus* event);
+static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self,
+                                                            GdkEventFocus* event);
+static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
+                                             Box* crop,
+                                             Box* result);
+static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self,
+                                           Box* new_crop);
+static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self,
+                                                   const gchar* text,
+                                                   gint length,
+                                                   gint* position);
+static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self,
+                                                   GtkEntry* sender,
+                                                   const gchar* text,
+                                                   gint length,
+                                                   gint* position);
+static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self,
+                                                    const gchar* text,
+                                                    gint length,
+                                                    gint* position);
 static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self);
-static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, EditingToolsCropToolConstraintDescription* constraint, Photo* photo);
+static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self,
+                                                                           EditingToolsCropToolConstraintDescription* constraint,
+                                                                           Photo* photo);
 static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self);
 static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self);
 static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self);
@@ -1124,87 +1422,192 @@ GType config_facade_get_type (void) G_GNUC_CONST;
 ConfigFacade* config_facade_get_instance (void);
 gint configuration_facade_get_last_crop_width (ConfigurationFacade* self);
 gint configuration_facade_get_last_crop_height (ConfigurationFacade* self);
-void box_adjust_height (Box *self, gint height);
-void box_adjust_width (Box *self, gint width);
-static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, Dimensions* result);
-gboolean photo_get_straighten (Photo* self, gdouble* theta);
-void clamp_inside_rotated_image (Box* src, gint img_w, gint img_h, gdouble angle_deg, gboolean preserve_geom, Box* result);
-static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, gint* index);
+void box_adjust_height (Box *self,
+                        gint height);
+void box_adjust_width (Box *self,
+                       gint width);
+static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self,
+                                                   Dimensions* result);
+gboolean photo_get_straighten (Photo* self,
+                               gdouble* theta);
+void clamp_inside_rotated_image (Box* src,
+                                 gint img_w,
+                                 gint img_h,
+                                 gdouble angle_deg,
+                                 gboolean preserve_geom,
+                                 Box* result);
+static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self,
+                                                                                        gint* index);
 gint configuration_facade_get_last_crop_menu_choice (ConfigurationFacade* self);
-static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas);
-static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas);
-static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cairo_t* ctx, Dimensions* dim);
+static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base,
+                                            EditingToolsPhotoCanvas* canvas);
+static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self,
+                                                   EditingToolsPhotoCanvas* canvas);
+static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self,
+                                          cairo_t* ctx,
+                                          Dimensions* dim);
 static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container);
-static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type, GtkWindow* container);
+static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type,
+                                                                                        GtkWindow* container);
 gboolean photo_has_crop (Photo* self);
 static gboolean editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self);
 static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self);
-gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions);
-void box_init (Box *self, gint left, gint top, gint right, gint bottom);
-void box_get_scaled_similar (Box *self, Dimensions* original, Dimensions* scaled, Box* result);
-void dimensions_for_rectangle (GdkRectangle* rect, Dimensions* result);
-static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self);
-static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position);
-static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self);
-static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas);
+gboolean photo_get_crop (Photo* self,
+                         Box* crop,
+                         PhotoException exceptions);
+void box_init (Box *self,
+               gint left,
+               gint top,
+               gint right,
+               gint bottom);
+void box_get_scaled_similar (Box *self,
+                             Dimensions* original,
+                             Dimensions* scaled,
+                             Box* result);
+void dimensions_for_rectangle (GdkRectangle* rect,
+                               Dimensions* result);
+static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender,
+                                                                                  cairo_t* ctx,
+                                                                                  Dimensions* dim,
+                                                                                  gpointer self);
+static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self,
+                                                Dimensions* old_dim,
+                                                GdkPixbuf* scaled,
+                                                GdkRectangle* scaled_position);
+static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                                  Dimensions* old_dim,
+                                                                                                  GdkPixbuf* scaled,
+                                                                                                  GdkRectangle* scaled_position,
+                                                                                                  gpointer self);
+static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self,
+                                                     EditingToolsPhotoCanvas* canvas);
 static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self);
-static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self);
+static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender,
+                                                             gpointer self);
+static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender,
+                                                                   gpointer self);
+static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                        gpointer self);
 static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self);
-static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self);
-static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self);
-static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self);
-static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self);
+static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                          gpointer self);
+static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender,
+                                                                                       GdkEventFocus* event,
+                                                                                       gpointer self);
+static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender,
+                                                                                        GdkEventFocus* event,
+                                                                                        gpointer self);
+static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender,
+                                                                             const gchar* new_text,
+                                                                             gint new_text_length,
+                                                                             gint* position,
+                                                                             gpointer self);
+static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender,
+                                                                              const gchar* new_text,
+                                                                              gint new_text_length,
+                                                                              gint* position,
+                                                                              gpointer self);
 static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self);
-static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event);
+static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                                   GdkEventKey* event);
 static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base);
 static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base);
-static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error);
+static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base,
+                                                            Scaling* scaling,
+                                                            Photo* photo,
+                                                            Dimensions* max_dim,
+                                                            GError** error);
 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);
-void dimensions_for_pixbuf (GdkPixbuf* pixbuf, Dimensions* result);
-static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y);
-void box_get_offset (Box *self, gint xofs, gint yofs, Box* result);
-BoxLocation box_approx_location (Box *self, gint x, gint y);
-static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y);
-static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, gint x, gint y);
-static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask);
-static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, gint x, gint y);
-static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, cairo_t* default_ctx);
-static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, Box* crop);
-void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self, gint choice);
-void configuration_facade_set_last_crop_width (ConfigurationFacade* self, gint choice);
-void configuration_facade_set_last_crop_height (ConfigurationFacade* self, gint choice);
+GdkPixbuf* photo_get_pixbuf_with_options (Photo* self,
+                                          Scaling* scaling,
+                                          PhotoException exceptions,
+                                          BackingFetchMode fetch_mode,
+                                          GError** error);
+void dimensions_for_pixbuf (GdkPixbuf* pixbuf,
+                            Dimensions* result);
+static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base,
+                                                 gint x,
+                                                 gint y);
+void box_get_offset (Box *self,
+                     gint xofs,
+                     gint yofs,
+                     Box* result);
+BoxLocation box_approx_location (Box *self,
+                                 gint x,
+                                 gint y);
+static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base,
+                                                    gint x,
+                                                    gint y);
+static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self,
+                                            gint x,
+                                            gint y);
+static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base,
+                                             gint x,
+                                             gint y,
+                                             GdkModifierType mask);
+static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self,
+                                                         gint x,
+                                                         gint y);
+static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base,
+                                         cairo_t* default_ctx);
+static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
+                                              Box* crop);
+void configuration_facade_set_last_crop_menu_choice (ConfigurationFacade* self,
+                                                     gint choice);
+void configuration_facade_set_last_crop_width (ConfigurationFacade* self,
+                                               gint choice);
+void configuration_facade_set_last_crop_height (ConfigurationFacade* self,
+                                                gint choice);
 #define RESOURCES_CROP_LABEL _ ("Crop")
 #define RESOURCES_CROP_TOOLTIP _ ("Crop the photo’s size")
-CropCommand* crop_command_new (Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
-CropCommand* crop_command_construct (GType object_type, Photo* photo, Box* crop, const gchar* name, const gchar* explanation);
+CropCommand* crop_command_new (Photo* photo,
+                               Box* crop,
+                               const gchar* name,
+                               const gchar* explanation);
+CropCommand* crop_command_construct (GType object_type,
+                                     Photo* photo,
+                                     Box* crop,
+                                     const gchar* name,
+                                     const gchar* explanation);
 GType page_command_get_type (void) G_GNUC_CONST;
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
 GType generic_photo_transformation_command_get_type (void) G_GNUC_CONST;
 GType crop_command_get_type (void) G_GNUC_CONST;
-void box_get_dimensions (Box *self, Dimensions* result);
-static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x);
-static gboolean _box_equal (const Box * s1, const Box * s2);
-static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop);
-gboolean box_equals (Box *self, Box* box);
+void box_get_dimensions (Box *self,
+                         Dimensions* result);
+static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self,
+                                               gdouble center_x,
+                                               gdouble center_y,
+                                               gdouble bounds_x,
+                                               gdouble bounds_y,
+                                               gdouble user_x);
+static gboolean _box_equal (const Box * s1,
+                     const Box * s2);
+static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self,
+                                         Box* new_crop);
+gboolean box_equals (Box *self,
+                     Box* box);
 GType box_complements_get_type (void) G_GNUC_CONST;
-BoxComplements box_resized_complements (Box *self, Box* resized, Box* horizontal, gboolean* horizontal_enlarged, Box* vertical, gboolean* vertical_enlarged);
-static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, Box* area, gdouble alpha);
-void box_get_reduced (Box *self, gint amount, Box* result);
-enum  {
-	EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_DUMMY_PROPERTY
-};
+BoxComplements box_resized_complements (Box *self,
+                                        Box* resized,
+                                        Box* horizontal,
+                                        gboolean* horizontal_enlarged,
+                                        Box* vertical,
+                                        gboolean* vertical_enlarged);
+static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
+                                             Box* area,
+                                             gdouble alpha);
+void box_get_reduced (Box *self,
+                      gint amount,
+                      Box* result);
 static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj);
-enum  {
-	EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_DUMMY_PROPERTY
-};
 #define RESOURCES_CANCEL_LABEL _ ("_Cancel")
 #define EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING 8
-static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter);
-static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self);
+static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model,
+                                                                                   GtkTreeIter* iter);
+static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model,
+                                                                                                                     GtkTreeIter* iter,
+                                                                                                                     gpointer self);
 static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj);
 static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj);
 GType editing_tools_redeye_instance_get_type (void) G_GNUC_CONST;
@@ -1214,82 +1617,147 @@ void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self);
 #define EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS 32
 #define EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS 10
 static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self);
-void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, GdkRectangle* result);
-void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, EditingToolsRedeyeInstance* result);
+void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst,
+                                                   GdkRectangle* result);
+void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect,
+                                                     EditingToolsRedeyeInstance* result);
 GType editing_tools_redeye_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeToolPrivate))
-enum  {
-	EDITING_TOOLS_REDEYE_TOOL_DUMMY_PROPERTY
-};
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void);
 static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type);
 EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void);
-gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling);
-static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas, EditingToolsRedeyeInstance* result);
-static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, cairo_t* ctx, Dimensions* dim);
-static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, EditingToolsRedeyeInstance* inst);
-static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, GtkScrollType type);
+gboolean editing_tools_redeye_tool_is_available (Photo* photo,
+                                                 Scaling* scaling);
+static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self,
+                                                         EditingToolsPhotoCanvas* canvas,
+                                                         EditingToolsRedeyeInstance* result);
+static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
+                                            cairo_t* ctx,
+                                            Dimensions* dim);
+static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self,
+                                                     EditingToolsRedeyeInstance* inst);
+static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self,
+                                                          GtkScrollType type);
 static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self);
-void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result);
+void derotate_point_arb (GdkPoint* source_point,
+                         gint img_w,
+                         gint img_h,
+                         gdouble angle,
+                         GdkPoint* result);
 GType redeye_command_get_type (void) G_GNUC_CONST;
 #define RESOURCES_RED_EYE_LABEL _ ("Red-eye")
 #define RESOURCES_RED_EYE_TOOLTIP _ ("Reduce or eliminate any red-eye effects in the photo")
-RedeyeCommand* redeye_command_new (Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation);
-RedeyeCommand* redeye_command_construct (GType object_type, Photo* photo, EditingToolsRedeyeInstance* redeye_instance, const gchar* name, const gchar* explanation);
+RedeyeCommand* redeye_command_new (Photo* photo,
+                                   EditingToolsRedeyeInstance* redeye_instance,
+                                   const gchar* name,
+                                   const gchar* explanation);
+RedeyeCommand* redeye_command_construct (GType object_type,
+                                         Photo* photo,
+                                         EditingToolsRedeyeInstance* redeye_instance,
+                                         const gchar* name,
+                                         const gchar* explanation);
 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* app_window_get_command_manager (void);
-void command_manager_execute (CommandManager* self, Command* command);
+void command_manager_execute (CommandManager* self,
+                              Command* command);
 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_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, GeeMap* map);
-GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self, Scaling* scaling, GError** error);
+static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self,
+                                                  GeeMap* map);
+GdkPixbuf* photo_source_get_pixbuf (PhotoSource* self,
+                                    Scaling* scaling,
+                                    GError** error);
 static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self);
 static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self);
-static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas);
-static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas);
+static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base,
+                                              EditingToolsPhotoCanvas* canvas);
+static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self,
+                                                     EditingToolsPhotoCanvas* canvas);
 static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container);
-static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, GtkWindow* container);
+static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type,
+                                                                                                GtkWindow* container);
 static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self);
 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;
 DataCollection* data_object_get_membership (DataObject* self);
-static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                                 GeeMap* items,
+                                                                                 gpointer self);
 static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base);
-static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas);
+static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self,
+                                                       EditingToolsPhotoCanvas* canvas);
 static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self);
-static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self);
-static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self);
-static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self);
+static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender,
+                                                                                    cairo_t* ctx,
+                                                                                    Dimensions* dim,
+                                                                                    gpointer self);
+static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                                   Dimensions* old_dim,
+                                                                                                   GdkPixbuf* scaled,
+                                                                                                   GdkRectangle* scaled_position,
+                                                                                                   gpointer self);
+static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender,
+                                                             gpointer self);
+static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender,
+                                                             gpointer self);
+static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender,
+                                                                                  GtkScrollType scroll,
+                                                                                  gdouble new_value,
+                                                                                  gpointer self);
 static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base);
-static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx);
-static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y);
-gboolean coord_in_rectangle (gint x, gint y, GdkRectangle* rect);
-static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y);
-static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask);
-static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event);
+static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
+                                           cairo_t* ctx);
+static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base,
+                                                   gint x,
+                                                   gint y);
+gboolean coord_in_rectangle (gint x,
+                             gint y,
+                             GdkRectangle* rect);
+static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base,
+                                                      gint x,
+                                                      gint y);
+static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base,
+                                               gint x,
+                                               gint y,
+                                               GdkModifierType mask);
+static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                                     GdkEventKey* event);
 #define EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindowPrivate))
-enum  {
-	EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_DUMMY_PROPERTY
-};
 #define RESOURCES_APPLY_LABEL _ ("_Apply")
 #define EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING 8
 static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj);
@@ -1298,64 +1766,112 @@ GType editing_tools_adjust_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 gpointer one_shot_scheduler_ref (gpointer instance);
 void one_shot_scheduler_unref (gpointer instance);
-GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_one_shot_scheduler (GValue* value, gpointer v_object);
-void value_take_one_shot_scheduler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_one_shot_scheduler (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_one_shot_scheduler (GValue* value,
+                                   gpointer v_object);
+void value_take_one_shot_scheduler (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_one_shot_scheduler (const GValue* value);
 GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
 #define EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustToolPrivate))
-enum  {
-	EDITING_TOOLS_ADJUST_TOOL_DUMMY_PROPERTY
-};
 #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH 200
 #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC ((guint) 100)
 static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void);
 static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type);
 EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void);
-gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling);
-static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas);
+gboolean editing_tools_adjust_tool_is_available (Photo* photo,
+                                                 Scaling* scaling);
+static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base,
+                                              EditingToolsPhotoCanvas* canvas);
 static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container);
-static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container);
+static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type,
+                                                                                                GtkWindow* container);
 PixelTransformationBundle* photo_get_color_adjustments (Photo* self);
 GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
-void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas);
+void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self,
+                                                      gint user_nub_pos);
+void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self,
+                                                       gint user_nub_pos);
+static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self,
+                                                     EditingToolsPhotoCanvas* canvas);
 static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self);
-static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source);
-static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, GeeMap* map);
-static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self);
+static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self,
+                                                    GdkPixbuf* source);
+static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self,
+                                                  GeeMap* map);
+static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                                 GeeMap* items,
+                                                                                 gpointer self);
 static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base);
 static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base);
-static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas);
+static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self,
+                                                       EditingToolsPhotoCanvas* canvas);
 static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self);
-static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx);
-void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf);
-static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error);
+static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
+                                           cairo_t* ctx);
+void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self,
+                                                 GdkPixbuf* source_pixbuf);
+static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base,
+                                                              Scaling* scaling,
+                                                              Photo* photo,
+                                                              Dimensions* max_dim,
+                                                              GError** error);
 gboolean photo_has_color_adjustments (Photo* self);
 static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self);
 static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current);
-static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformationBundle* current);
+static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner,
+                                                                                              PixelTransformationBundle* current);
+static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type,
+                                                                                                    EditingToolsAdjustTool* owner,
+                                                                                                    PixelTransformationBundle* current);
 static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self);
 #define RESOURCES_ADJUST_LABEL _ ("Adjust")
 #define RESOURCES_ADJUST_TOOLTIP _ ("Adjust the photo’s color and tone")
-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);
 GType adjust_colors_single_command_get_type (void) G_GNUC_CONST;
-static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations);
-static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation);
-static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name);
+static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self,
+                                                       PixelTransformationBundle* new_transformations);
+static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self,
+                                                      PixelTransformation* new_transformation);
+static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self,
+                                               PixelTransformation* new_transformation,
+                                               const gchar* name);
 static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name);
-static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name);
+static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner,
+                                                                                                        PixelTransformation* old_transformation,
+                                                                                                        PixelTransformation* new_transformation,
+                                                                                                        const gchar* name);
+static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type,
+                                                                                                              EditingToolsAdjustTool* owner,
+                                                                                                              PixelTransformation* old_transformation,
+                                                                                                              PixelTransformation* new_transformation,
+                                                                                                              const gchar* name);
 static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self);
-OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
-OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
-void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
+OneShotScheduler* one_shot_scheduler_new (const gchar* name,
+                                          OneShotCallback callback,
+                                          void* callback_target);
+OneShotScheduler* one_shot_scheduler_construct (GType object_type,
+                                                const gchar* name,
+                                                OneShotCallback callback,
+                                                void* callback_target);
+void one_shot_scheduler_after_timeout (OneShotScheduler* self,
+                                       guint msec,
+                                       gboolean reschedule);
 static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self);
 static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self);
 static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self);
@@ -1378,108 +1894,145 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self);
 gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
 static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self);
-static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event);
-gboolean has_only_key_modifier (GdkModifierType field, GdkModifierType mask);
-static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self);
-static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self);
-static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self);
-static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
+static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self,
+                                                    GtkWidget* widget,
+                                                    GdkEventButton* event);
+gboolean has_only_key_modifier (GdkModifierType field,
+                                GdkModifierType mask);
+static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                                   Dimensions* old_dim,
+                                                                                                   GdkPixbuf* scaled,
+                                                                                                   GdkRectangle* scaled_position,
+                                                                                                   gpointer self);
+static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender,
+                                                          gpointer self);
+static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender,
+                                                             gpointer self);
+static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                                gpointer self);
+static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                                gpointer self);
+static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                                  gpointer self);
+static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                            gpointer self);
+static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                                   gpointer self);
+static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                               gpointer self);
+static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                                  gpointer self);
+static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender,
+                                                                                                        gpointer self);
+static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                                   GdkEventButton* event,
+                                                                                   gpointer self);
 gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self);
 static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
-static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo);
-static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, EditingToolsAdjustTool* owner, Photo* photo);
-static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments);
-static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation);
-static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event);
-enum  {
-	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_WINDOW_DUMMY_PROPERTY
-};
+static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner,
+                                                                                                  Photo* photo);
+static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type,
+                                                                                                        EditingToolsAdjustTool* owner,
+                                                                                                        Photo* photo);
+static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self,
+                                                PixelTransformationBundle* new_adjustments);
+static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self,
+                                              PixelTransformation* transformation);
+static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                                     GdkEventKey* event);
 #define RESOURCES_OK_LABEL _ ("_OK")
 RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
 RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
 static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj);
 GType command_description_get_type (void) G_GNUC_CONST;
-enum  {
-	EDITING_TOOLS_ADJUST_TOOL_ADJUST_TOOL_COMMAND_DUMMY_PROPERTY
-};
 static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self);
-static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self);
-static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation);
-Command* command_construct (GType object_type, const gchar* name, const gchar* explanation);
+static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender,
+                                                                                                                 gpointer self);
+static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type,
+                                                                                                  EditingToolsAdjustTool* owner,
+                                                                                                  const gchar* name,
+                                                                                                  const gchar* explanation);
+Command* command_construct (GType object_type,
+                            const gchar* name,
+                            const gchar* explanation);
 void command_manager_reset (CommandManager* self);
 static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommandPrivate))
-enum  {
-	EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_DUMMY_PROPERTY
-};
 static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base);
 static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base);
-static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command);
+static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base,
+                                                                       Command* command);
 static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommandPrivate))
-enum  {
-	EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_DUMMY_PROPERTY
-};
 static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base);
 static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base);
 static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base);
-static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, Command* command);
+static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base,
+                                                                            Command* command);
 void command_execute (Command* self);
 static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj);
 #define EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommandPrivate))
-enum  {
-	EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_DUMMY_PROPERTY
-};
 #define RESOURCES_ENHANCE_LABEL _ ("Enhance")
 #define RESOURCES_ENHANCE_TOOLTIP _ ("Automatically improve the photo’s appearance")
 static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base);
 PixelTransformationBundle* photo_get_enhance_transformations (Photo* self);
 static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base);
-static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base, Command* command);
+static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base,
+                                                                         Command* command);
 GType enhance_single_command_get_type (void) G_GNUC_CONST;
 DataSource* single_data_source_command_get_source (SingleDataSourceCommand* self);
-gboolean data_source_equals (DataSource* self, DataSource* source);
+gboolean data_source_equals (DataSource* self,
+                             DataSource* source);
 static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj);
 static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * 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);
 
 
-void editing_tools_preconfigure (void) {
+void
+editing_tools_preconfigure (void)
+{
 }
 
 
-void editing_tools_init (GError** error) {
+void
+editing_tools_init (GError** error)
+{
 }
 
 
-void editing_tools_terminate (void) {
+void
+editing_tools_terminate (void)
+{
 }
 
 
-static void _editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message, gpointer self) {
+static void
+_editing_tools_editing_tool_window_suppress_warnings_glog_func (const gchar* log_domain,
+                                                                GLogLevelFlags log_levels,
+                                                                const gchar* message,
+                                                                gpointer self)
+{
 #line 56 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_window_suppress_warnings ((EditingToolsEditingToolWindow*) self, log_domain, log_levels, message);
-#line 1472 "EditingTools.c"
+#line 2023 "EditingTools.c"
 }
 
 
-EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container) {
+EditingToolsEditingToolWindow*
+editing_tools_editing_tool_window_construct (GType object_type,
+                                             GtkWindow* container)
+{
 	EditingToolsEditingToolWindow * self = NULL;
-	GtkWindow* _tmp0_;
 	GtkFrame* outer_frame = NULL;
+	GtkFrame* _tmp0_;
 	GtkFrame* _tmp1_;
 	GtkFrame* _tmp2_;
 	GtkFrame* _tmp3_;
-	GtkFrame* _tmp4_;
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1487,31 +2040,29 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 #line 35 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_window_set_decorated (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), FALSE);
 #line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = container;
-#line 36 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), _tmp0_);
+	gtk_window_set_transient_for (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), container);
 #line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = (GtkFrame*) gtk_frame_new (NULL);
+	_tmp0_ = (GtkFrame*) gtk_frame_new (NULL);
 #line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 38 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	outer_frame = _tmp1_;
+	outer_frame = _tmp0_;
 #line 39 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), (guint) 0);
 #line 40 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_frame_set_shadow_type (outer_frame, GTK_SHADOW_OUT);
 #line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = self->priv->layout_frame;
+	_tmp1_ = self->priv->layout_frame;
 #line 42 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_container_get_type (), GtkContainer), (guint) EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER);
+	gtk_container_set_border_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_container_get_type (), GtkContainer), (guint) EDITING_TOOLS_EDITING_TOOL_WINDOW_FRAME_BORDER);
 #line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->priv->layout_frame;
+	_tmp2_ = self->priv->layout_frame;
 #line 43 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_frame_set_shadow_type (_tmp3_, GTK_SHADOW_NONE);
+	gtk_frame_set_shadow_type (_tmp2_, GTK_SHADOW_NONE);
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->layout_frame;
+	_tmp3_ = self->priv->layout_frame;
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget));
 #line 46 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_CONTAINER_CLASS (editing_tools_editing_tool_window_parent_class)->add (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (outer_frame, gtk_widget_get_type (), GtkWidget));
 #line 48 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1528,14 +2079,16 @@ EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GTyp
 	_g_object_unref0 (outer_frame);
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 1532 "EditingTools.c"
+#line 2083 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkWidget* widget) {
+static void
+editing_tools_editing_tool_window_real_add (GtkContainer* base,
+                                            GtkWidget* widget)
+{
 	EditingToolsEditingToolWindow * self;
 	GtkFrame* _tmp0_;
-	GtkWidget* _tmp1_;
 #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 63 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1543,14 +2096,14 @@ static void editing_tools_editing_tool_window_real_add (GtkContainer* base, GtkW
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->layout_frame;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = widget;
-#line 64 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), _tmp1_);
-#line 1550 "EditingTools.c"
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_container_get_type (), GtkContainer), widget);
+#line 2101 "EditingTools.c"
 }
 
 
-gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self) {
+gboolean
+editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingToolWindow* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1561,133 +2114,110 @@ gboolean editing_tools_editing_tool_window_has_user_moved (EditingToolsEditingTo
 	result = _tmp0_;
 #line 68 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1565 "EditingTools.c"
+#line 2118 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+editing_tools_editing_tool_window_real_key_press_event (GtkWidget* base,
+                                                        GdkEventKey* event)
+{
 	EditingToolsEditingToolWindow * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	gboolean _tmp1_;
-	AppWindow* _tmp2_;
-	AppWindow* _tmp3_;
-	GdkEventKey* _tmp4_;
-	gboolean _tmp5_ = FALSE;
-	gboolean _tmp6_;
+	AppWindow* _tmp0_;
+	AppWindow* _tmp1_;
+	gboolean _tmp2_ = FALSE;
+	gboolean _tmp3_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = event;
-#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 72 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_) {
+	if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), event)) {
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1593 "EditingTools.c"
+#line 2142 "EditingTools.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = app_window_get_instance ();
-#line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_;
+	_tmp0_ = app_window_get_instance ();
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = event;
+	_tmp1_ = _tmp0_;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), "key-press-event", _tmp4_, &_tmp5_);
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), "key-press-event", event, &_tmp2_);
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp1_);
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp6_;
+	result = _tmp3_;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1611 "EditingTools.c"
+#line 2158 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
+static gboolean
+editing_tools_editing_tool_window_real_button_press_event (GtkWidget* base,
+                                                           GdkEventButton* event)
+{
 	EditingToolsEditingToolWindow * self;
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_;
-	guint _tmp1_;
-	GdkEventButton* _tmp5_;
-	guint _tmp6_;
-	GdkEventButton* _tmp7_;
-	gdouble _tmp8_;
-	GdkEventButton* _tmp9_;
-	gdouble _tmp10_;
-	GdkEventButton* _tmp11_;
-	guint32 _tmp12_;
+	guint _tmp0_;
+	guint _tmp2_;
+	gdouble _tmp3_;
+	gdouble _tmp4_;
+	guint32 _tmp5_;
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = event;
+	_tmp0_ = event->button;
 #line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _tmp0_->button;
-#line 80 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_ != ((guint) 1)) {
-#line 1638 "EditingTools.c"
-		gboolean _tmp2_ = FALSE;
+	if (_tmp0_ != ((guint) 1)) {
+#line 2181 "EditingTools.c"
+		gboolean _tmp1_ = FALSE;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event != NULL) {
-#line 1642 "EditingTools.c"
-			GdkEventButton* _tmp3_;
-			gboolean _tmp4_;
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp3_ = event;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp4_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), _tmp3_);
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp2_ = _tmp4_;
-#line 1651 "EditingTools.c"
+			_tmp1_ = GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->button_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget), event);
+#line 2187 "EditingTools.c"
 		} else {
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp2_ = TRUE;
-#line 1655 "EditingTools.c"
+			_tmp1_ = TRUE;
+#line 2191 "EditingTools.c"
 		}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		result = _tmp2_;
+		result = _tmp1_;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 1661 "EditingTools.c"
+#line 2197 "EditingTools.c"
 	}
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = event;
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_->button;
+	_tmp2_ = event->button;
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = event;
+	_tmp3_ = event->x_root;
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _tmp7_->x_root;
+	_tmp4_ = event->y_root;
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = event;
+	_tmp5_ = event->time;
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = _tmp9_->y_root;
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = event;
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = _tmp11_->time;
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp6_, (gint) _tmp8_, (gint) _tmp10_, _tmp12_);
+	gtk_window_begin_move_drag (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), (gint) _tmp2_, (gint) _tmp3_, (gint) _tmp4_, _tmp5_);
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = TRUE;
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 1687 "EditingTools.c"
+#line 2215 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
+static void
+editing_tools_editing_tool_window_real_realize (GtkWidget* base)
+{
 	EditingToolsEditingToolWindow * self;
 #line 89 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_EDITING_TOOL_WINDOW, EditingToolsEditingToolWindow);
@@ -1695,20 +2225,27 @@ static void editing_tools_editing_tool_window_real_realize (GtkWidget* base) {
 	gtk_widget_set_opacity (G_TYPE_CHECK_INSTANCE_TYPE (self, gtk_widget_get_type ()) ? ((GtkWidget*) self) : NULL, RESOURCES_TRANSIENT_WINDOW_OPACITY);
 #line 92 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	GTK_WIDGET_CLASS (editing_tools_editing_tool_window_parent_class)->realize (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), gtk_widget_get_type (), GtkWidget));
-#line 1699 "EditingTools.c"
+#line 2229 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self, const gchar* log_domain, GLogLevelFlags log_levels, const gchar* message) {
+static void
+editing_tools_editing_tool_window_suppress_warnings (EditingToolsEditingToolWindow* self,
+                                                     const gchar* log_domain,
+                                                     GLogLevelFlags log_levels,
+                                                     const gchar* message)
+{
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL_WINDOW (self));
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (message != NULL);
-#line 1708 "EditingTools.c"
+#line 2243 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToolWindowClass * klass) {
+static void
+editing_tools_editing_tool_window_class_init (EditingToolsEditingToolWindowClass * klass)
+{
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1723,11 +2260,13 @@ static void editing_tools_editing_tool_window_class_init (EditingToolsEditingToo
 	((GtkWidgetClass *) klass)->realize = (void (*) (GtkWidget *)) editing_tools_editing_tool_window_real_realize;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_editing_tool_window_finalize;
-#line 1727 "EditingTools.c"
+#line 2264 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_instance_init (EditingToolsEditingToolWindow * self) {
+static void
+editing_tools_editing_tool_window_instance_init (EditingToolsEditingToolWindow * self)
+{
 	GtkFrame* _tmp0_;
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_EDITING_TOOL_WINDOW_GET_PRIVATE (self);
@@ -1739,11 +2278,13 @@ static void editing_tools_editing_tool_window_instance_init (EditingToolsEditing
 	self->priv->layout_frame = _tmp0_;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->user_moved = FALSE;
-#line 1743 "EditingTools.c"
+#line 2282 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_window_finalize (GObject * obj) {
+static void
+editing_tools_editing_tool_window_finalize (GObject * obj)
+{
 	EditingToolsEditingToolWindow * self;
 	GLogFunc _tmp0_;
 	void* _tmp0__target;
@@ -1759,11 +2300,13 @@ static void editing_tools_editing_tool_window_finalize (GObject * obj) {
 	_g_object_unref0 (self->priv->layout_frame);
 #line 28 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_editing_tool_window_parent_class)->finalize (obj);
-#line 1763 "EditingTools.c"
+#line 2304 "EditingTools.c"
 }
 
 
-GType editing_tools_editing_tool_window_get_type (void) {
+GType
+editing_tools_editing_tool_window_get_type (void)
+{
 	static volatile gsize editing_tools_editing_tool_window_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_editing_tool_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsEditingToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_editing_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsEditingToolWindow), 0, (GInstanceInitFunc) editing_tools_editing_tool_window_instance_init, NULL };
@@ -1775,38 +2318,44 @@ GType editing_tools_editing_tool_window_get_type (void) {
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1782 "EditingTools.c"
+#line 2327 "EditingTools.c"
 }
 
 
-static gpointer _cairo_reference0 (gpointer self) {
+static gpointer
+_cairo_reference0 (gpointer self)
+{
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_reference (self) : NULL;
-#line 1789 "EditingTools.c"
+#line 2336 "EditingTools.c"
 }
 
 
-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)
+{
 	EditingToolsPhotoCanvas* self = NULL;
 	GtkWindow* _tmp0_;
-	GtkWindow* _tmp1_;
-	GdkWindow* _tmp2_;
-	GdkWindow* _tmp3_;
-	Photo* _tmp4_;
-	Photo* _tmp5_;
-	cairo_t* _tmp6_;
-	cairo_t* _tmp7_;
-	Dimensions _tmp8_;
-	GdkRectangle _tmp9_;
-	GdkPixbuf* _tmp10_;
-	GdkPixbuf* _tmp11_;
-	cairo_t* _tmp12_;
-	GdkPixbuf* _tmp13_;
-	GdkRectangle _tmp14_;
-	cairo_surface_t* _tmp15_;
+	GdkWindow* _tmp1_;
+	Photo* _tmp2_;
+	cairo_t* _tmp3_;
+	Dimensions _tmp4_;
+	GdkRectangle _tmp5_;
+	GdkPixbuf* _tmp6_;
+	GdkRectangle _tmp7_;
+	cairo_surface_t* _tmp8_;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -1824,72 +2373,62 @@ EditingToolsPhotoCanvas* editing_tools_photo_canvas_construct (GType object_type
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsPhotoCanvas*) g_type_create_instance (object_type);
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = container;
-#line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _g_object_ref0 (_tmp0_);
+	_tmp0_ = _g_object_ref0 (container);
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->container);
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->container = _tmp1_;
+	self->priv->container = _tmp0_;
 #line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = drawing_window;
-#line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _g_object_ref0 (_tmp2_);
+	_tmp1_ = _g_object_ref0 (drawing_window);
 #line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->drawing_window);
 #line 116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->drawing_window = _tmp3_;
+	self->priv->drawing_window = _tmp1_;
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = photo;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp2_ = _g_object_ref0 (photo);
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->photo = _tmp5_;
-#line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = default_ctx;
+	self->priv->photo = _tmp2_;
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _cairo_reference0 (_tmp6_);
+	_tmp3_ = _cairo_reference0 (default_ctx);
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->default_ctx = _tmp7_;
+	self->priv->default_ctx = _tmp3_;
 #line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = *surface_dim;
+	_tmp4_ = *surface_dim;
 #line 119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->surface_dim = _tmp8_;
+	self->priv->surface_dim = _tmp4_;
 #line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = *scaled_position;
+	_tmp5_ = *scaled_position;
 #line 120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_position = _tmp9_;
+	self->priv->scaled_position = _tmp5_;
 #line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = scaled;
-#line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _g_object_ref0 (_tmp10_);
+	_tmp6_ = _g_object_ref0 (scaled);
 #line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
 #line 121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_pixbuf = _tmp11_;
-#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = default_ctx;
+	self->priv->scaled_pixbuf = _tmp6_;
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = scaled;
+	_tmp7_ = *scaled_position;
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = *scaled_position;
-#line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp12_, _tmp13_, &_tmp14_);
+	_tmp8_ = editing_tools_photo_canvas_pixbuf_to_surface (self, default_ctx, scaled, &_tmp7_);
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled = _tmp15_;
+	self->priv->scaled = _tmp8_;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 1889 "EditingTools.c"
+#line 2424 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self, GdkRectangle* rectangle, GdkRectangle* result) {
+void
+editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* self,
+                                                 GdkRectangle* rectangle,
+                                                 GdkRectangle* result)
+{
 	Photo* _tmp0_;
 	GdkRectangle _tmp1_;
 	GdkRectangle _tmp2_ = {0};
@@ -1907,11 +2446,15 @@ void editing_tools_photo_canvas_unscaled_to_raw_rect (EditingToolsPhotoCanvas* s
 	*result = _tmp2_;
 #line 131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 1911 "EditingTools.c"
+#line 2450 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self, GdkPoint* active_point, GdkPoint* result) {
+void
+editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanvas* self,
+                                                     GdkPoint* active_point,
+                                                     GdkPoint* result)
+{
 	GdkRectangle scaled_position = {0};
 	GdkRectangle _tmp0_ = {0};
 	Dimensions unscaled_dims = {0};
@@ -1987,11 +2530,15 @@ void editing_tools_photo_canvas_active_to_unscaled_point (EditingToolsPhotoCanva
 	*result = _result_;
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 1991 "EditingTools.c"
+#line 2534 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self, GdkRectangle* active_rect, GdkRectangle* result) {
+void
+editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas* self,
+                                                    GdkRectangle* active_rect,
+                                                    GdkRectangle* result)
+{
 	GdkPoint upper_left = {0};
 	GdkPoint _tmp0_ = {0};
 	GdkPoint lower_right = {0};
@@ -2119,11 +2666,15 @@ void editing_tools_photo_canvas_active_to_unscaled_rect (EditingToolsPhotoCanvas
 	*result = unscaled_rect;
 #line 167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2123 "EditingTools.c"
+#line 2670 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self, GdkPoint* user_point, GdkPoint* result) {
+void
+editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* self,
+                                                 GdkPoint* user_point,
+                                                 GdkPoint* result)
+{
 	GdkRectangle active_offsets = {0};
 	GdkRectangle _tmp0_ = {0};
 	GdkPoint _result_ = {0};
@@ -2172,11 +2723,15 @@ void editing_tools_photo_canvas_user_to_active_point (EditingToolsPhotoCanvas* s
 	*result = _result_;
 #line 177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2176 "EditingTools.c"
+#line 2727 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self, GdkRectangle* user_rect, GdkRectangle* result) {
+void
+editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* self,
+                                                GdkRectangle* user_rect,
+                                                GdkRectangle* result)
+{
 	GdkPoint upper_left = {0};
 	GdkPoint _tmp0_ = {0};
 	GdkPoint lower_right = {0};
@@ -2304,11 +2859,13 @@ void editing_tools_photo_canvas_user_to_active_rect (EditingToolsPhotoCanvas* se
 	*result = active_rect;
 #line 197 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2308 "EditingTools.c"
+#line 2863 "EditingTools.c"
 }
 
 
-Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
+Photo*
+editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self)
+{
 	Photo* result = NULL;
 	Photo* _tmp0_;
 	Photo* _tmp1_;
@@ -2322,11 +2879,13 @@ Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self) {
 	result = _tmp1_;
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2326 "EditingTools.c"
+#line 2883 "EditingTools.c"
 }
 
 
-GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self) {
+GtkWindow*
+editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self)
+{
 	GtkWindow* result = NULL;
 	GtkWindow* _tmp0_;
 	GtkWindow* _tmp1_;
@@ -2340,11 +2899,13 @@ GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2344 "EditingTools.c"
+#line 2903 "EditingTools.c"
 }
 
 
-GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self) {
+GdkWindow*
+editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self)
+{
 	GdkWindow* result = NULL;
 	GdkWindow* _tmp0_;
 	GdkWindow* _tmp1_;
@@ -2358,11 +2919,13 @@ GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanva
 	result = _tmp1_;
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2362 "EditingTools.c"
+#line 2923 "EditingTools.c"
 }
 
 
-cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self) {
+cairo_t*
+editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self)
+{
 	cairo_t* result = NULL;
 	cairo_t* _tmp0_;
 	cairo_t* _tmp1_;
@@ -2376,11 +2939,14 @@ cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* se
 	result = _tmp1_;
 #line 213 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2380 "EditingTools.c"
+#line 2943 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result) {
+void
+editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
+                                            Dimensions* result)
+{
 	Dimensions _tmp0_;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
@@ -2390,11 +2956,14 @@ void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
 	*result = _tmp0_;
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2394 "EditingTools.c"
+#line 2960 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scaling* result) {
+void
+editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self,
+                                        Scaling* result)
+{
 	Dimensions _tmp0_;
 	Scaling _tmp1_ = {0};
 #line 220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2407,16 +2976,18 @@ void editing_tools_photo_canvas_get_scaling (EditingToolsPhotoCanvas* self, Scal
 	*result = _tmp1_;
 #line 221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2411 "EditingTools.c"
+#line 2980 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, Dimensions* surface_dim) {
+void
+editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self,
+                                        cairo_t* default_ctx,
+                                        Dimensions* surface_dim)
+{
 	cairo_t* _tmp0_;
-	cairo_t* _tmp1_;
+	Dimensions _tmp1_;
 	Dimensions _tmp2_;
-	cairo_t* _tmp3_;
-	Dimensions _tmp4_;
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2424,35 +2995,35 @@ void editing_tools_photo_canvas_set_surface (EditingToolsPhotoCanvas* self, cair
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (surface_dim != NULL);
 #line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = default_ctx;
-#line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _cairo_reference0 (_tmp0_);
+	_tmp0_ = _cairo_reference0 (default_ctx);
 #line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->default_ctx);
 #line 225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->default_ctx = _tmp1_;
+	self->priv->default_ctx = _tmp0_;
 #line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = *surface_dim;
+	_tmp1_ = *surface_dim;
 #line 226 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->surface_dim = _tmp2_;
-#line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = default_ctx;
+	self->priv->surface_dim = _tmp1_;
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = *surface_dim;
+	_tmp2_ = *surface_dim;
 #line 228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, _tmp3_, &_tmp4_);
-#line 2445 "EditingTools.c"
+	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL], 0, default_ctx, &_tmp2_);
+#line 3012 "EditingTools.c"
 }
 
 
-static gpointer _cairo_surface_reference0 (gpointer self) {
+static gpointer
+_cairo_surface_reference0 (gpointer self)
+{
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? cairo_surface_reference (self) : NULL;
-#line 2452 "EditingTools.c"
+#line 3021 "EditingTools.c"
 }
 
 
-cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self) {
+cairo_surface_t*
+editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhotoCanvas* self)
+{
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* _tmp0_;
 	cairo_surface_t* _tmp1_;
@@ -2466,11 +3037,13 @@ cairo_surface_t* editing_tools_photo_canvas_get_scaled_surface (EditingToolsPhot
 	result = _tmp1_;
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2470 "EditingTools.c"
+#line 3041 "EditingTools.c"
 }
 
 
-GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self) {
+GdkPixbuf*
+editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas* self)
+{
 	GdkPixbuf* result = NULL;
 	GdkPixbuf* _tmp0_;
 	GdkPixbuf* _tmp1_;
@@ -2484,11 +3057,14 @@ GdkPixbuf* editing_tools_photo_canvas_get_scaled_pixbuf (EditingToolsPhotoCanvas
 	result = _tmp1_;
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 2488 "EditingTools.c"
+#line 3061 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self, GdkRectangle* result) {
+void
+editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCanvas* self,
+                                                       GdkRectangle* result)
+{
 	GdkRectangle _tmp0_;
 #line 239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
@@ -2498,21 +3074,23 @@ void editing_tools_photo_canvas_get_scaled_pixbuf_position (EditingToolsPhotoCan
 	*result = _tmp0_;
 #line 240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2502 "EditingTools.c"
+#line 3078 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
+void
+editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self,
+                                           Dimensions* old_dim,
+                                           GdkPixbuf* scaled,
+                                           GdkRectangle* scaled_position)
+{
 	cairo_t* _tmp0_;
-	GdkPixbuf* _tmp1_;
-	GdkRectangle _tmp2_;
-	cairo_surface_t* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	GdkPixbuf* _tmp5_;
+	GdkRectangle _tmp1_;
+	cairo_surface_t* _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkRectangle _tmp4_;
+	Dimensions _tmp5_;
 	GdkRectangle _tmp6_;
-	Dimensions _tmp7_;
-	GdkPixbuf* _tmp8_;
-	GdkRectangle _tmp9_;
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2524,58 +3102,59 @@ void editing_tools_photo_canvas_resized_pixbuf (EditingToolsPhotoCanvas* self, D
 #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->default_ctx;
 #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = scaled;
-#line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = *scaled_position;
+	_tmp1_ = *scaled_position;
 #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp0_, _tmp1_, &_tmp2_);
+	_tmp2_ = editing_tools_photo_canvas_pixbuf_to_surface (self, _tmp0_, scaled, &_tmp1_);
 #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->scaled);
 #line 244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled = _tmp3_;
+	self->priv->scaled = _tmp2_;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = scaled;
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _g_object_ref0 (_tmp4_);
+	_tmp3_ = _g_object_ref0 (scaled);
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_pixbuf = _tmp5_;
+	self->priv->scaled_pixbuf = _tmp3_;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = *scaled_position;
+	_tmp4_ = *scaled_position;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_position = _tmp6_;
-#line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = *old_dim;
+	self->priv->scaled_position = _tmp4_;
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = scaled;
+	_tmp5_ = *old_dim;
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = *scaled_position;
+	_tmp6_ = *scaled_position;
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp7_, _tmp8_, &_tmp9_);
-#line 2557 "EditingTools.c"
+	g_signal_emit (self, editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL], 0, &_tmp5_, scaled, &_tmp6_);
+#line 3129 "EditingTools.c"
 }
 
 
-static void editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self) {
+static void
+editing_tools_photo_canvas_real_repaint (EditingToolsPhotoCanvas* self)
+{
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_critical ("Type `%s' does not implement abstract method `editing_tools_photo_canvas_repaint'", g_type_name (G_TYPE_FROM_INSTANCE (self)));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 2566 "EditingTools.c"
+#line 3140 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self) {
+void
+editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self)
+{
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->repaint (self);
-#line 2575 "EditingTools.c"
+#line 3151 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, GdkPixbuf* pixbuf) {
+void
+editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self,
+                                         GdkPixbuf* pixbuf)
+{
 	cairo_t* _tmp0_;
 	cairo_t* _tmp1_;
 	cairo_t* _tmp2_;
@@ -2585,12 +3164,11 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 	gint _tmp6_;
 	cairo_t* _tmp7_;
 	cairo_t* _tmp8_;
-	GdkPixbuf* _tmp9_;
-	GdkRectangle _tmp10_;
-	gint _tmp11_;
-	GdkRectangle _tmp12_;
-	gint _tmp13_;
-	cairo_t* _tmp14_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	cairo_t* _tmp13_;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2622,43 +3200,43 @@ void editing_tools_photo_canvas_paint_pixbuf (EditingToolsPhotoCanvas* self, Gdk
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp8_ = self->priv->default_ctx;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = pixbuf;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->priv->scaled_position;
+	_tmp9_ = self->priv->scaled_position;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _tmp10_.x;
+	_tmp10_ = _tmp9_.x;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->priv->scaled_position;
+	_tmp11_ = self->priv->scaled_position;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_.y;
+	_tmp12_ = _tmp11_.y;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	paint_pixmap_with_background (_tmp8_, _tmp9_, _tmp11_, _tmp13_);
+	paint_pixmap_with_background (_tmp8_, pixbuf, _tmp10_, _tmp12_);
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->priv->default_ctx;
+	_tmp13_ = self->priv->default_ctx;
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_restore (_tmp14_);
-#line 2641 "EditingTools.c"
+	cairo_restore (_tmp13_);
+#line 3217 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, gboolean over) {
+void
+editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self,
+                                          cairo_surface_t* surface,
+                                          gboolean over)
+{
 	cairo_t* _tmp0_;
-	gboolean _tmp1_;
-	cairo_t* _tmp4_;
-	cairo_surface_t* _tmp5_;
-	GdkRectangle _tmp6_;
-	gint _tmp7_;
-	GdkRectangle _tmp8_;
-	gint _tmp9_;
+	cairo_t* _tmp3_;
+	cairo_surface_t* _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	cairo_t* _tmp9_;
 	cairo_t* _tmp10_;
-	cairo_t* _tmp11_;
-	cairo_surface_t* _tmp12_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
 	GdkRectangle _tmp13_;
 	gint _tmp14_;
-	GdkRectangle _tmp15_;
-	gint _tmp16_;
-	cairo_t* _tmp17_;
-	cairo_t* _tmp18_;
+	cairo_t* _tmp15_;
+	cairo_t* _tmp16_;
 #line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2668,108 +3246,103 @@ void editing_tools_photo_canvas_paint_surface (EditingToolsPhotoCanvas* self, ca
 #line 274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = over;
-#line 275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_ == FALSE) {
-#line 2675 "EditingTools.c"
-		cairo_t* _tmp2_;
+	if (over == FALSE) {
+#line 3251 "EditingTools.c"
+		cairo_t* _tmp1_;
 #line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = self->priv->default_ctx;
+		_tmp1_ = self->priv->default_ctx;
 #line 276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 2681 "EditingTools.c"
+		cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
+#line 3257 "EditingTools.c"
 	} else {
-		cairo_t* _tmp3_;
+		cairo_t* _tmp2_;
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = self->priv->default_ctx;
+		_tmp2_ = self->priv->default_ctx;
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 2688 "EditingTools.c"
+		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_OVER);
+#line 3264 "EditingTools.c"
 	}
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->default_ctx;
+	_tmp3_ = self->priv->default_ctx;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->priv->scaled;
+	_tmp4_ = self->priv->scaled;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->priv->scaled_position;
+	_tmp5_ = self->priv->scaled_position;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _tmp6_.x;
+	_tmp6_ = _tmp5_.x;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->priv->scaled_position;
+	_tmp7_ = self->priv->scaled_position;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _tmp8_.y;
+	_tmp8_ = _tmp7_.y;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
+	cairo_set_source_surface (_tmp3_, _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp8_);
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->priv->default_ctx;
+	_tmp9_ = self->priv->default_ctx;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_paint (_tmp10_);
-#line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->priv->default_ctx;
+	cairo_paint (_tmp9_);
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = surface;
+	_tmp10_ = self->priv->default_ctx;
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->priv->scaled_position;
+	_tmp11_ = self->priv->scaled_position;
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _tmp13_.x;
+	_tmp12_ = _tmp11_.x;
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = self->priv->scaled_position;
+	_tmp13_ = self->priv->scaled_position;
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_.y;
+	_tmp14_ = _tmp13_.y;
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_surface (_tmp11_, _tmp12_, (gdouble) _tmp14_, (gdouble) _tmp16_);
+	cairo_set_source_surface (_tmp10_, surface, (gdouble) _tmp12_, (gdouble) _tmp14_);
 #line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->priv->default_ctx;
+	_tmp15_ = self->priv->default_ctx;
 #line 283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_paint (_tmp17_);
+	cairo_paint (_tmp15_);
 #line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->priv->default_ctx;
+	_tmp16_ = self->priv->default_ctx;
 #line 284 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_restore (_tmp18_);
-#line 2730 "EditingTools.c"
+	cairo_restore (_tmp16_);
+#line 3304 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self, cairo_surface_t* surface, Box* source_area, gboolean over) {
+void
+editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* self,
+                                               cairo_surface_t* surface,
+                                               Box* source_area,
+                                               gboolean over)
+{
 	cairo_t* _tmp0_;
-	gboolean _tmp1_;
-	cairo_t* _tmp4_;
-	cairo_surface_t* _tmp5_;
-	GdkRectangle _tmp6_;
-	gint _tmp7_;
-	GdkRectangle _tmp8_;
-	gint _tmp9_;
-	cairo_t* _tmp10_;
-	GdkRectangle _tmp11_;
-	gint _tmp12_;
-	Box _tmp13_;
-	gint _tmp14_;
-	GdkRectangle _tmp15_;
-	gint _tmp16_;
-	Box _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
-	gint _tmp20_;
-	cairo_t* _tmp21_;
-	cairo_t* _tmp22_;
-	cairo_surface_t* _tmp23_;
-	GdkRectangle _tmp24_;
-	gint _tmp25_;
-	GdkRectangle _tmp26_;
-	gint _tmp27_;
-	cairo_t* _tmp28_;
+	cairo_t* _tmp3_;
+	cairo_surface_t* _tmp4_;
+	GdkRectangle _tmp5_;
+	gint _tmp6_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	cairo_t* _tmp9_;
+	GdkRectangle _tmp10_;
+	gint _tmp11_;
+	Box _tmp12_;
+	gint _tmp13_;
+	GdkRectangle _tmp14_;
+	gint _tmp15_;
+	Box _tmp16_;
+	gint _tmp17_;
+	cairo_t* _tmp18_;
+	cairo_t* _tmp19_;
+	GdkRectangle _tmp20_;
+	gint _tmp21_;
+	GdkRectangle _tmp22_;
+	gint _tmp23_;
+	cairo_t* _tmp24_;
+	GdkRectangle _tmp25_;
+	gint _tmp26_;
+	Box _tmp27_;
+	gint _tmp28_;
 	GdkRectangle _tmp29_;
 	gint _tmp30_;
 	Box _tmp31_;
 	gint _tmp32_;
-	GdkRectangle _tmp33_;
-	gint _tmp34_;
-	Box _tmp35_;
-	gint _tmp36_;
-	gint _tmp37_;
-	gint _tmp38_;
-	cairo_t* _tmp39_;
-	cairo_t* _tmp40_;
+	cairo_t* _tmp33_;
+	cairo_t* _tmp34_;
 #line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2781,117 +3354,109 @@ void editing_tools_photo_canvas_paint_surface_area (EditingToolsPhotoCanvas* sel
 #line 288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_save (_tmp0_);
 #line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = over;
-#line 289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_ == FALSE) {
-#line 2788 "EditingTools.c"
-		cairo_t* _tmp2_;
+	if (over == FALSE) {
+#line 3359 "EditingTools.c"
+		cairo_t* _tmp1_;
 #line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = self->priv->default_ctx;
+		_tmp1_ = self->priv->default_ctx;
 #line 290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_SOURCE);
-#line 2794 "EditingTools.c"
+		cairo_set_operator (_tmp1_, CAIRO_OPERATOR_SOURCE);
+#line 3365 "EditingTools.c"
 	} else {
-		cairo_t* _tmp3_;
+		cairo_t* _tmp2_;
 #line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = self->priv->default_ctx;
+		_tmp2_ = self->priv->default_ctx;
 #line 292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cairo_set_operator (_tmp3_, CAIRO_OPERATOR_OVER);
-#line 2801 "EditingTools.c"
+		cairo_set_operator (_tmp2_, CAIRO_OPERATOR_OVER);
+#line 3372 "EditingTools.c"
 	}
 #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->default_ctx;
+	_tmp3_ = self->priv->default_ctx;
 #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->priv->scaled;
+	_tmp4_ = self->priv->scaled;
 #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->priv->scaled_position;
+	_tmp5_ = self->priv->scaled_position;
 #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _tmp6_.x;
+	_tmp6_ = _tmp5_.x;
 #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->priv->scaled_position;
+	_tmp7_ = self->priv->scaled_position;
 #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _tmp8_.y;
+	_tmp8_ = _tmp7_.y;
 #line 294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_surface (_tmp4_, _tmp5_, (gdouble) _tmp7_, (gdouble) _tmp9_);
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->priv->default_ctx;
-#line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->priv->scaled_position;
+	cairo_set_source_surface (_tmp3_, _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp8_);
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = _tmp11_.x;
+	_tmp9_ = self->priv->default_ctx;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = *source_area;
+	_tmp10_ = self->priv->scaled_position;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _tmp13_.left;
+	_tmp11_ = _tmp10_.x;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = self->priv->scaled_position;
+	_tmp12_ = *source_area;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_.y;
+	_tmp13_ = _tmp12_.left;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = *source_area;
+	_tmp14_ = self->priv->scaled_position;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = _tmp17_.top;
+	_tmp15_ = _tmp14_.y;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = box_get_width (source_area);
+	_tmp16_ = *source_area;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = box_get_height (source_area);
+	_tmp17_ = _tmp16_.top;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp10_, (gdouble) (_tmp12_ + _tmp14_), (gdouble) (_tmp16_ + _tmp18_), (gdouble) _tmp19_, (gdouble) _tmp20_);
+	cairo_rectangle (_tmp9_, (gdouble) (_tmp11_ + _tmp13_), (gdouble) (_tmp15_ + _tmp17_), (gdouble) box_get_width (source_area), (gdouble) box_get_height (source_area));
 #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = self->priv->default_ctx;
+	_tmp18_ = self->priv->default_ctx;
 #line 298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp21_);
+	cairo_fill (_tmp18_);
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->priv->default_ctx;
+	_tmp19_ = self->priv->default_ctx;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = surface;
+	_tmp20_ = self->priv->scaled_position;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->priv->scaled_position;
+	_tmp21_ = _tmp20_.x;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = _tmp24_.x;
+	_tmp22_ = self->priv->scaled_position;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = self->priv->scaled_position;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = _tmp26_.y;
+	_tmp23_ = _tmp22_.y;
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_surface (_tmp22_, _tmp23_, (gdouble) _tmp25_, (gdouble) _tmp27_);
+	cairo_set_source_surface (_tmp19_, surface, (gdouble) _tmp21_, (gdouble) _tmp23_);
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->priv->default_ctx;
+	_tmp24_ = self->priv->default_ctx;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->priv->scaled_position;
+	_tmp25_ = self->priv->scaled_position;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = _tmp29_.x;
+	_tmp26_ = _tmp25_.x;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = *source_area;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _tmp31_.left;
+	_tmp27_ = *source_area;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = self->priv->scaled_position;
+	_tmp28_ = _tmp27_.left;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = _tmp33_.y;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = *source_area;
+	_tmp29_ = self->priv->scaled_position;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = _tmp35_.top;
+	_tmp30_ = _tmp29_.y;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = box_get_width (source_area);
+	_tmp31_ = *source_area;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = box_get_height (source_area);
+	_tmp32_ = _tmp31_.top;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp28_, (gdouble) (_tmp30_ + _tmp32_), (gdouble) (_tmp34_ + _tmp36_), (gdouble) _tmp37_, (gdouble) _tmp38_);
+	cairo_rectangle (_tmp24_, (gdouble) (_tmp26_ + _tmp28_), (gdouble) (_tmp30_ + _tmp32_), (gdouble) box_get_width (source_area), (gdouble) box_get_height (source_area));
 #line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = self->priv->default_ctx;
+	_tmp33_ = self->priv->default_ctx;
 #line 304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp39_);
+	cairo_fill (_tmp33_);
 #line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = self->priv->default_ctx;
+	_tmp34_ = self->priv->default_ctx;
 #line 305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_restore (_tmp40_);
-#line 2891 "EditingTools.c"
+	cairo_restore (_tmp34_);
+#line 3452 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t* ctx, Box* box) {
+void
+editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self,
+                                     cairo_t* ctx,
+                                     Box* box)
+{
 	GdkRectangle rect = {0};
 	GdkRectangle _tmp0_ = {0};
 	gint _tmp1_;
@@ -2900,16 +3465,14 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 	gint _tmp4_;
 	GdkRectangle _tmp5_;
 	gint _tmp6_;
-	cairo_t* _tmp7_;
-	GdkRectangle _tmp8_;
-	gint _tmp9_;
-	GdkRectangle _tmp10_;
-	gint _tmp11_;
-	GdkRectangle _tmp12_;
-	gint _tmp13_;
-	GdkRectangle _tmp14_;
-	gint _tmp15_;
-	cairo_t* _tmp16_;
+	GdkRectangle _tmp7_;
+	gint _tmp8_;
+	GdkRectangle _tmp9_;
+	gint _tmp10_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	GdkRectangle _tmp13_;
+	gint _tmp14_;
 #line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2937,60 +3500,48 @@ void editing_tools_photo_canvas_draw_box (EditingToolsPhotoCanvas* self, cairo_t
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	rect.y = _tmp4_ + _tmp6_;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = ctx;
-#line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = rect;
+	_tmp7_ = rect;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _tmp8_.x;
+	_tmp8_ = _tmp7_.x;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = rect;
+	_tmp9_ = rect;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _tmp10_.y;
+	_tmp10_ = _tmp9_.y;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = rect;
+	_tmp11_ = rect;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_.width;
+	_tmp12_ = _tmp11_.width;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = rect;
+	_tmp13_ = rect;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = _tmp14_.height;
+	_tmp14_ = _tmp13_.height;
 #line 313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp7_, _tmp9_ + 0.5, _tmp11_ + 0.5, (gdouble) (_tmp13_ - 1), (gdouble) (_tmp15_ - 1));
-#line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = ctx;
+	cairo_rectangle (ctx, _tmp8_ + 0.5, _tmp10_ + 0.5, (gdouble) (_tmp12_ - 1), (gdouble) (_tmp14_ - 1));
 #line 314 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_stroke (_tmp16_);
-#line 2964 "EditingTools.c"
+	cairo_stroke (ctx);
+#line 3523 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_t* ctx, const gchar* text, gint x, gint y, gboolean use_scaled_pos) {
-	gboolean _tmp0_;
+void
+editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self,
+                                      cairo_t* ctx,
+                                      const gchar* text,
+                                      gint x,
+                                      gint y,
+                                      gboolean use_scaled_pos)
+{
 	cairo_text_extents_t extents = {0};
-	cairo_t* _tmp7_;
-	const gchar* _tmp8_;
-	cairo_text_extents_t _tmp9_ = {0};
-	gint _tmp10_;
+	cairo_text_extents_t _tmp4_ = {0};
+	cairo_text_extents_t _tmp5_;
+	gdouble _tmp6_;
+	gint pane_border = 0;
+	cairo_text_extents_t _tmp7_;
+	gdouble _tmp8_;
+	cairo_text_extents_t _tmp9_;
+	gdouble _tmp10_;
 	cairo_text_extents_t _tmp11_;
 	gdouble _tmp12_;
-	cairo_t* _tmp13_;
-	gint pane_border = 0;
-	cairo_t* _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	cairo_text_extents_t _tmp17_;
-	gdouble _tmp18_;
-	cairo_text_extents_t _tmp19_;
-	gdouble _tmp20_;
-	cairo_text_extents_t _tmp21_;
-	gdouble _tmp22_;
-	cairo_t* _tmp23_;
-	cairo_t* _tmp24_;
-	gint _tmp25_;
-	gint _tmp26_;
-	cairo_t* _tmp27_;
-	cairo_t* _tmp28_;
-	const gchar* _tmp29_;
 #line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -2998,99 +3549,63 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
 #line 317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (text != NULL);
 #line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = use_scaled_pos;
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp0_) {
-#line 3005 "EditingTools.c"
+	if (use_scaled_pos) {
+#line 3554 "EditingTools.c"
+		GdkRectangle _tmp0_;
 		gint _tmp1_;
 		GdkRectangle _tmp2_;
 		gint _tmp3_;
-		gint _tmp4_;
-		GdkRectangle _tmp5_;
-		gint _tmp6_;
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = x;
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = self->priv->scaled_position;
+		_tmp0_ = self->priv->scaled_position;
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp2_.x;
+		_tmp1_ = _tmp0_.x;
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		x = _tmp1_ + _tmp3_;
+		x = x + _tmp1_;
 #line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = y;
-#line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = self->priv->scaled_position;
+		_tmp2_ = self->priv->scaled_position;
 #line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_.y;
+		_tmp3_ = _tmp2_.y;
 #line 320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		y = _tmp4_ + _tmp6_;
-#line 3028 "EditingTools.c"
+		y = y + _tmp3_;
+#line 3571 "EditingTools.c"
 	}
 #line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = ctx;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = text;
-#line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_text_extents (_tmp7_, _tmp8_, &_tmp9_);
+	cairo_text_extents (ctx, text, &_tmp4_);
 #line 323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	extents = _tmp9_;
+	extents = _tmp4_;
 #line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = x;
+	_tmp5_ = extents;
 #line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = extents;
-#line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = _tmp11_.width;
+	_tmp6_ = _tmp5_.width;
 #line 324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	x = _tmp10_ - (((gint) _tmp12_) / 2);
-#line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = ctx;
+	x = x - (((gint) _tmp6_) / 2);
 #line 326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp13_, RESOURCES_ONIMAGE_FONT_BACKGROUND);
+	set_source_color_from_string (ctx, RESOURCES_ONIMAGE_FONT_BACKGROUND);
 #line 328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	pane_border = 5;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = ctx;
+	_tmp7_ = extents;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = x;
-#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = y;
-#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = extents;
-#line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = _tmp17_.height;
+	_tmp8_ = _tmp7_.height;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = extents;
+	_tmp9_ = extents;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _tmp19_.width;
+	_tmp10_ = _tmp9_.width;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = extents;
+	_tmp11_ = extents;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = _tmp21_.height;
+	_tmp12_ = _tmp11_.height;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp14_, (gdouble) (_tmp15_ - pane_border), (_tmp16_ - pane_border) - _tmp18_, _tmp20_ + (2 * pane_border), _tmp22_ + (2 * pane_border));
-#line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = ctx;
+	cairo_rectangle (ctx, (gdouble) (x - pane_border), (y - pane_border) - _tmp8_, _tmp10_ + (2 * pane_border), _tmp12_ + (2 * pane_border));
 #line 332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp23_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = ctx;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = x;
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = y;
+	cairo_fill (ctx);
 #line 334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_move_to (_tmp24_, (gdouble) _tmp25_, (gdouble) _tmp26_);
+	cairo_move_to (ctx, (gdouble) x, (gdouble) y);
 #line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = ctx;
-#line 335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp27_, RESOURCES_ONIMAGE_FONT_COLOR);
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = ctx;
-#line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = text;
+	set_source_color_from_string (ctx, RESOURCES_ONIMAGE_FONT_COLOR);
 #line 336 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_show_text (_tmp28_, _tmp29_);
-#line 3094 "EditingTools.c"
+	cairo_show_text (ctx, text);
+#line 3609 "EditingTools.c"
 }
 
 
@@ -3105,72 +3620,46 @@ void editing_tools_photo_canvas_draw_text (EditingToolsPhotoCanvas* self, cairo_
      * @param use_scaled_pos Whether to use absolute window positioning or take into account the 
      *      position of the scaled image.
      */
-void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos) {
-	gboolean _tmp0_;
-	cairo_t* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	cairo_t* _tmp10_;
-	gint _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	cairo_t* _tmp14_;
+void
+editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self,
+                                                 cairo_t* ctx,
+                                                 gint x,
+                                                 gint y,
+                                                 gint width,
+                                                 gboolean use_scaled_pos)
+{
 #line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 350 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
 #line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = use_scaled_pos;
-#line 351 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp0_) {
-#line 3127 "EditingTools.c"
+	if (use_scaled_pos) {
+#line 3638 "EditingTools.c"
+		GdkRectangle _tmp0_;
 		gint _tmp1_;
 		GdkRectangle _tmp2_;
 		gint _tmp3_;
-		gint _tmp4_;
-		GdkRectangle _tmp5_;
-		gint _tmp6_;
-#line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = x;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = self->priv->scaled_position;
+		_tmp0_ = self->priv->scaled_position;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp2_.x;
+		_tmp1_ = _tmp0_.x;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		x = _tmp1_ + _tmp3_;
-#line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = y;
+		x = x + _tmp1_;
 #line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = self->priv->scaled_position;
+		_tmp2_ = self->priv->scaled_position;
 #line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_.y;
+		_tmp3_ = _tmp2_.y;
 #line 353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		y = _tmp4_ + _tmp6_;
-#line 3150 "EditingTools.c"
+		y = y + _tmp3_;
+#line 3655 "EditingTools.c"
 	}
 #line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = ctx;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = x;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = y;
-#line 356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = ctx;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = x;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = width;
+	cairo_move_to (ctx, x + 0.5, y + 0.5);
 #line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = y;
-#line 357 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_line_to (_tmp10_, (gdouble) ((_tmp11_ + _tmp12_) - 1), _tmp13_ + 0.5);
-#line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = ctx;
+	cairo_line_to (ctx, (gdouble) ((x + width) - 1), y + 0.5);
 #line 358 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_stroke (_tmp14_);
-#line 3174 "EditingTools.c"
+	cairo_stroke (ctx);
+#line 3663 "EditingTools.c"
 }
 
 
@@ -3185,76 +3674,55 @@ void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* s
      * @param use_scaled_pos Whether to use absolute window positioning or take into account the 
      *      position of the scaled image.
      */
-void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos) {
-	gboolean _tmp0_;
-	cairo_t* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	cairo_t* _tmp10_;
-	gint _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	cairo_t* _tmp14_;
+void
+editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self,
+                                               cairo_t* ctx,
+                                               gint x,
+                                               gint y,
+                                               gint height,
+                                               gboolean use_scaled_pos)
+{
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
 #line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = use_scaled_pos;
-#line 373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp0_) {
-#line 3207 "EditingTools.c"
+	if (use_scaled_pos) {
+#line 3692 "EditingTools.c"
+		GdkRectangle _tmp0_;
 		gint _tmp1_;
 		GdkRectangle _tmp2_;
 		gint _tmp3_;
-		gint _tmp4_;
-		GdkRectangle _tmp5_;
-		gint _tmp6_;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = x;
-#line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = self->priv->scaled_position;
+		_tmp0_ = self->priv->scaled_position;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp2_.x;
+		_tmp1_ = _tmp0_.x;
 #line 374 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		x = _tmp1_ + _tmp3_;
+		x = x + _tmp1_;
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = y;
-#line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = self->priv->scaled_position;
+		_tmp2_ = self->priv->scaled_position;
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_.y;
+		_tmp3_ = _tmp2_.y;
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		y = _tmp4_ + _tmp6_;
-#line 3230 "EditingTools.c"
+		y = y + _tmp3_;
+#line 3709 "EditingTools.c"
 	}
 #line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = ctx;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = x;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = y;
-#line 378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_move_to (_tmp7_, _tmp8_ + 0.5, _tmp9_ + 0.5);
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = ctx;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = x;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = y;
+	cairo_move_to (ctx, x + 0.5, y + 0.5);
 #line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = height;
-#line 379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_line_to (_tmp10_, _tmp11_ + 0.5, (gdouble) ((_tmp12_ + _tmp13_) - 1));
-#line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = ctx;
+	cairo_line_to (ctx, x + 0.5, (gdouble) ((y + height) - 1));
 #line 380 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_stroke (_tmp14_);
-#line 3254 "EditingTools.c"
+	cairo_stroke (ctx);
+#line 3717 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint width) {
+void
+editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas* self,
+                                                  gint x,
+                                                  gint y,
+                                                  gint width)
+{
 	cairo_t* _tmp0_;
 	cairo_t* _tmp1_;
 	cairo_t* _tmp2_;
@@ -3266,13 +3734,10 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 	cairo_t* _tmp8_;
 	GdkRectangle _tmp9_;
 	gint _tmp10_;
-	gint _tmp11_;
-	GdkRectangle _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	cairo_t* _tmp16_;
-	cairo_t* _tmp17_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	cairo_t* _tmp13_;
+	cairo_t* _tmp14_;
 #line 383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3304,76 +3769,66 @@ void editing_tools_photo_canvas_erase_horizontal_line (EditingToolsPhotoCanvas*
 #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
 #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = x;
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->priv->scaled_position;
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_.y;
-#line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = y;
+	_tmp11_ = self->priv->scaled_position;
 #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = width;
+	_tmp12_ = _tmp11_.y;
 #line 388 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) (_tmp15_ - 1), (gdouble) 1);
+	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + x), (gdouble) (_tmp12_ + y), (gdouble) (width - 1), (gdouble) 1);
 #line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->priv->default_ctx;
+	_tmp13_ = self->priv->default_ctx;
 #line 390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp16_);
+	cairo_fill (_tmp13_);
 #line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->priv->default_ctx;
+	_tmp14_ = self->priv->default_ctx;
 #line 392 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_restore (_tmp17_);
-#line 3327 "EditingTools.c"
+	cairo_restore (_tmp14_);
+#line 3786 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint active_center_x, gint active_center_y, gint radius) {
+void
+editing_tools_photo_canvas_draw_circle (EditingToolsPhotoCanvas* self,
+                                        cairo_t* ctx,
+                                        gint active_center_x,
+                                        gint active_center_y,
+                                        gint radius)
+{
 	gint center_x = 0;
-	gint _tmp0_;
-	GdkRectangle _tmp1_;
-	gint _tmp2_;
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
 	gint center_y = 0;
+	GdkRectangle _tmp2_;
 	gint _tmp3_;
-	GdkRectangle _tmp4_;
-	gint _tmp5_;
-	cairo_t* _tmp6_;
-	gint _tmp7_;
-	cairo_t* _tmp8_;
 #line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 395 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
 #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = active_center_x;
-#line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = self->priv->scaled_position;
+	_tmp0_ = self->priv->scaled_position;
 #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _tmp1_.x;
+	_tmp1_ = _tmp0_.x;
 #line 397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	center_x = _tmp0_ + _tmp2_;
-#line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = active_center_y;
+	center_x = active_center_x + _tmp1_;
 #line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->scaled_position;
+	_tmp2_ = self->priv->scaled_position;
 #line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _tmp4_.y;
+	_tmp3_ = _tmp2_.y;
 #line 398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	center_y = _tmp3_ + _tmp5_;
+	center_y = active_center_y + _tmp3_;
 #line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = ctx;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = radius;
-#line 400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_arc (_tmp6_, (gdouble) center_x, (gdouble) center_y, (gdouble) _tmp7_, (gdouble) 0, 2 * G_PI);
+	cairo_arc (ctx, (gdouble) center_x, (gdouble) center_y, (gdouble) radius, (gdouble) 0, 2 * G_PI);
 #line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = ctx;
-#line 401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_stroke (_tmp8_);
-#line 3373 "EditingTools.c"
+	cairo_stroke (ctx);
+#line 3823 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self, gint x, gint y, gint height) {
+void
+editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* self,
+                                                gint x,
+                                                gint y,
+                                                gint height)
+{
 	cairo_t* _tmp0_;
 	cairo_t* _tmp1_;
 	cairo_t* _tmp2_;
@@ -3385,13 +3840,10 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 	cairo_t* _tmp8_;
 	GdkRectangle _tmp9_;
 	gint _tmp10_;
-	gint _tmp11_;
-	GdkRectangle _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	cairo_t* _tmp16_;
-	cairo_t* _tmp17_;
+	GdkRectangle _tmp11_;
+	gint _tmp12_;
+	cairo_t* _tmp13_;
+	cairo_t* _tmp14_;
 #line 404 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3423,50 +3875,43 @@ void editing_tools_photo_canvas_erase_vertical_line (EditingToolsPhotoCanvas* se
 #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = _tmp9_.x;
 #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = x;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->priv->scaled_position;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_.y;
-#line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = y;
+	_tmp11_ = self->priv->scaled_position;
 #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = height;
+	_tmp12_ = _tmp11_.y;
 #line 413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + _tmp11_), (gdouble) (_tmp13_ + _tmp14_), (gdouble) 1, (gdouble) _tmp15_);
+	cairo_rectangle (_tmp8_, (gdouble) (_tmp10_ + x), (gdouble) (_tmp12_ + y), (gdouble) 1, (gdouble) height);
 #line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->priv->default_ctx;
+	_tmp13_ = self->priv->default_ctx;
 #line 415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp16_);
+	cairo_fill (_tmp13_);
 #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->priv->default_ctx;
+	_tmp14_ = self->priv->default_ctx;
 #line 417 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_restore (_tmp17_);
-#line 3446 "EditingTools.c"
+	cairo_restore (_tmp14_);
+#line 3892 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* box) {
+void
+editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self,
+                                      Box* box)
+{
 	Box _tmp0_;
 	gint _tmp1_;
 	Box _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
-	Box _tmp5_;
-	gint _tmp6_;
-	Box _tmp7_;
-	gint _tmp8_;
+	Box _tmp4_;
+	gint _tmp5_;
+	Box _tmp6_;
+	gint _tmp7_;
+	Box _tmp8_;
 	gint _tmp9_;
 	Box _tmp10_;
 	gint _tmp11_;
 	Box _tmp12_;
 	gint _tmp13_;
-	gint _tmp14_;
-	Box _tmp15_;
-	gint _tmp16_;
-	Box _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
+	Box _tmp14_;
+	gint _tmp15_;
 #line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self));
 #line 420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3480,50 +3925,45 @@ void editing_tools_photo_canvas_erase_box (EditingToolsPhotoCanvas* self, Box* b
 #line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_.top;
 #line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = box_get_width (box);
-#line 421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, _tmp4_);
-#line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = *box;
+	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp1_, _tmp3_, box_get_width (box));
 #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_.left;
+	_tmp4_ = *box;
 #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = *box;
+	_tmp5_ = _tmp4_.left;
 #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _tmp7_.bottom;
+	_tmp6_ = *box;
 #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = box_get_width (box);
+	_tmp7_ = _tmp6_.bottom;
 #line 422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp6_, _tmp8_, _tmp9_);
+	editing_tools_photo_canvas_erase_horizontal_line (self, _tmp5_, _tmp7_, box_get_width (box));
 #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = *box;
-#line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _tmp10_.left;
+	_tmp8_ = *box;
 #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = *box;
+	_tmp9_ = _tmp8_.left;
 #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_.top;
+	_tmp10_ = *box;
 #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = box_get_height (box);
+	_tmp11_ = _tmp10_.top;
 #line 424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_erase_vertical_line (self, _tmp11_, _tmp13_, _tmp14_);
+	editing_tools_photo_canvas_erase_vertical_line (self, _tmp9_, _tmp11_, box_get_height (box));
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = *box;
-#line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_.right;
+	_tmp12_ = *box;
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = *box;
+	_tmp13_ = _tmp12_.right;
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = _tmp17_.top;
+	_tmp14_ = *box;
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = box_get_height (box);
+	_tmp15_ = _tmp14_.top;
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_erase_vertical_line (self, _tmp16_, _tmp18_, _tmp19_);
-#line 3523 "EditingTools.c"
+	editing_tools_photo_canvas_erase_vertical_line (self, _tmp13_, _tmp15_, box_get_height (box));
+#line 3960 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self, Box* area) {
+void
+editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
+                                            Box* area)
+{
 	GdkRectangle rect = {0};
 	GdkRectangle _tmp0_ = {0};
 	gint _tmp1_;
@@ -3564,23 +4004,26 @@ void editing_tools_photo_canvas_invalidate_area (EditingToolsPhotoCanvas* self,
 	_tmp8_ = rect;
 #line 433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gdk_window_invalidate_rect (_tmp7_, &_tmp8_, FALSE);
-#line 3568 "EditingTools.c"
+#line 4008 "EditingTools.c"
 }
 
 
-static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self, cairo_t* default_ctx, GdkPixbuf* pixbuf, GdkRectangle* pos) {
+static cairo_surface_t*
+editing_tools_photo_canvas_pixbuf_to_surface (EditingToolsPhotoCanvas* self,
+                                              cairo_t* default_ctx,
+                                              GdkPixbuf* pixbuf,
+                                              GdkRectangle* pos)
+{
 	cairo_surface_t* result = NULL;
 	cairo_surface_t* surface = NULL;
-	cairo_t* _tmp0_;
-	cairo_surface_t* _tmp1_;
-	GdkRectangle _tmp2_;
-	gint _tmp3_;
-	GdkRectangle _tmp4_;
-	gint _tmp5_;
-	cairo_surface_t* _tmp6_;
+	cairo_surface_t* _tmp0_;
+	GdkRectangle _tmp1_;
+	gint _tmp2_;
+	GdkRectangle _tmp3_;
+	gint _tmp4_;
+	cairo_surface_t* _tmp5_;
 	cairo_t* ctx = NULL;
-	cairo_t* _tmp7_;
-	GdkPixbuf* _tmp8_;
+	cairo_t* _tmp6_;
 #line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (self), NULL);
 #line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3590,29 +4033,25 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 #line 436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (pos != NULL, NULL);
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = default_ctx;
-#line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = cairo_get_target (_tmp0_);
+	_tmp0_ = cairo_get_target (default_ctx);
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = *pos;
+	_tmp1_ = *pos;
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_.width;
+	_tmp2_ = _tmp1_.width;
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = *pos;
+	_tmp3_ = *pos;
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _tmp4_.height;
+	_tmp4_ = _tmp3_.height;
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = cairo_surface_create_similar (_tmp1_, CAIRO_CONTENT_COLOR_ALPHA, _tmp3_, _tmp5_);
+	_tmp5_ = cairo_surface_create_similar (_tmp0_, CAIRO_CONTENT_COLOR_ALPHA, _tmp2_, _tmp4_);
 #line 438 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	surface = _tmp6_;
+	surface = _tmp5_;
 #line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = cairo_create (surface);
+	_tmp6_ = cairo_create (surface);
 #line 440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	ctx = _tmp7_;
-#line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = pixbuf;
+	ctx = _tmp6_;
 #line 441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	paint_pixmap_with_background (ctx, _tmp8_, 0, 0);
+	paint_pixmap_with_background (ctx, pixbuf, 0, 0);
 #line 442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
 #line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3621,11 +4060,18 @@ static cairo_surface_t* editing_tools_photo_canvas_pixbuf_to_surface (EditingToo
 	_cairo_destroy0 (ctx);
 #line 443 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 3625 "EditingTools.c"
+#line 4064 "EditingTools.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure,
+                                             GValue * return_value,
+                                             guint n_param_values,
+                                             const GValue * param_values,
+                                             gpointer invocation_hint,
+                                             gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__POINTER_BOXED) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer data2);
 	register GMarshalFunc_VOID__POINTER_BOXED callback;
 	register GCClosure * cc;
@@ -3640,23 +4086,30 @@ static void g_cclosure_user_marshal_VOID__POINTER_BOXED (GClosure * closure, GVa
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3644 "EditingTools.c"
+#line 4090 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 3650 "EditingTools.c"
+#line 4096 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__POINTER_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_pointer (param_values + 1), g_value_get_boxed (param_values + 2), data2);
-#line 3656 "EditingTools.c"
+#line 4102 "EditingTools.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure,
+                                                  GValue * return_value,
+                                                  guint n_param_values,
+                                                  const GValue * param_values,
+                                                  gpointer invocation_hint,
+                                                  gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gpointer data2);
 	register GMarshalFunc_VOID__BOXED_OBJECT_BOXED callback;
 	register GCClosure * cc;
@@ -3671,120 +4124,145 @@ static void g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED (GClosure * closure
 		data1 = closure->data;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 3675 "EditingTools.c"
+#line 4128 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 3681 "EditingTools.c"
+#line 4134 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__BOXED_OBJECT_BOXED) (marshal_data ? marshal_data : cc->callback);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_boxed (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), data2);
-#line 3687 "EditingTools.c"
+#line 4140 "EditingTools.c"
 }
 
 
-static void editing_tools_value_photo_canvas_init (GValue* value) {
+static void
+editing_tools_value_photo_canvas_init (GValue* value)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 3694 "EditingTools.c"
+#line 4149 "EditingTools.c"
 }
 
 
-static void editing_tools_value_photo_canvas_free_value (GValue* value) {
+static void
+editing_tools_value_photo_canvas_free_value (GValue* value)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (value->data[0].v_pointer);
-#line 3703 "EditingTools.c"
+#line 4160 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_value_photo_canvas_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+editing_tools_value_photo_canvas_copy_value (const GValue* src_value,
+                                             GValue* dest_value)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_photo_canvas_ref (src_value->data[0].v_pointer);
-#line 3713 "EditingTools.c"
+#line 4173 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 3717 "EditingTools.c"
+#line 4177 "EditingTools.c"
 	}
 }
 
 
-static gpointer editing_tools_value_photo_canvas_peek_pointer (const GValue* value) {
+static gpointer
+editing_tools_value_photo_canvas_peek_pointer (const GValue* value)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 3725 "EditingTools.c"
+#line 4187 "EditingTools.c"
 }
 
 
-static gchar* editing_tools_value_photo_canvas_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_value_photo_canvas_collect_value (GValue* value,
+                                                guint n_collect_values,
+                                                GTypeCValue* collect_values,
+                                                guint collect_flags)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 3732 "EditingTools.c"
+#line 4199 "EditingTools.c"
 		EditingToolsPhotoCanvas * object;
 		object = collect_values[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3739 "EditingTools.c"
+#line 4206 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 3743 "EditingTools.c"
+#line 4210 "EditingTools.c"
 		}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_photo_canvas_ref (object);
-#line 3747 "EditingTools.c"
+#line 4214 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 3751 "EditingTools.c"
+#line 4218 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 3755 "EditingTools.c"
+#line 4222 "EditingTools.c"
 }
 
 
-static gchar* editing_tools_value_photo_canvas_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_value_photo_canvas_lcopy_value (const GValue* value,
+                                              guint n_collect_values,
+                                              GTypeCValue* collect_values,
+                                              guint collect_flags)
+{
 	EditingToolsPhotoCanvas ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3766 "EditingTools.c"
+#line 4238 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 3772 "EditingTools.c"
+#line 4244 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3776 "EditingTools.c"
+#line 4248 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 3780 "EditingTools.c"
+#line 4252 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 3784 "EditingTools.c"
+#line 4256 "EditingTools.c"
 }
 
 
-GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+editing_tools_param_spec_photo_canvas (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags)
+{
 	EditingToolsParamSpecPhotoCanvas* spec;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
@@ -3794,20 +4272,25 @@ GParamSpec* editing_tools_param_spec_photo_canvas (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 3798 "EditingTools.c"
+#line 4276 "EditingTools.c"
 }
 
 
-gpointer editing_tools_value_get_photo_canvas (const GValue* value) {
+gpointer
+editing_tools_value_get_photo_canvas (const GValue* value)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS), NULL);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 3807 "EditingTools.c"
+#line 4287 "EditingTools.c"
 }
 
 
-void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
+void
+editing_tools_value_set_photo_canvas (GValue* value,
+                                      gpointer v_object)
+{
 	EditingToolsPhotoCanvas * old;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
@@ -3823,22 +4306,25 @@ void editing_tools_value_set_photo_canvas (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_ref (value->data[0].v_pointer);
-#line 3827 "EditingTools.c"
+#line 4310 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 3831 "EditingTools.c"
+#line 4314 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 3837 "EditingTools.c"
+#line 4320 "EditingTools.c"
 	}
 }
 
 
-void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
+void
+editing_tools_value_take_photo_canvas (GValue* value,
+                                       gpointer v_object)
+{
 	EditingToolsPhotoCanvas * old;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_PHOTO_CANVAS));
@@ -3852,22 +4338,24 @@ void editing_tools_value_take_photo_canvas (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 3856 "EditingTools.c"
+#line 4342 "EditingTools.c"
 	} else {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 3860 "EditingTools.c"
+#line 4346 "EditingTools.c"
 	}
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_photo_canvas_unref (old);
-#line 3866 "EditingTools.c"
+#line 4352 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass * klass) {
+static void
+editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass * klass)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_parent_class = g_type_class_peek_parent (klass);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3880,20 +4368,24 @@ static void editing_tools_photo_canvas_class_init (EditingToolsPhotoCanvasClass
 	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_NEW_SURFACE_SIGNAL] = g_signal_new ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__POINTER_BOXED, G_TYPE_NONE, 2, G_TYPE_POINTER, TYPE_DIMENSIONS);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_signals[EDITING_TOOLS_PHOTO_CANVAS_RESIZED_SCALED_PIXBUF_SIGNAL] = g_signal_new ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_user_marshal_VOID__BOXED_OBJECT_BOXED, G_TYPE_NONE, 3, TYPE_DIMENSIONS, gdk_pixbuf_get_type (), gdk_rectangle_get_type ());
-#line 3884 "EditingTools.c"
+#line 4372 "EditingTools.c"
 }
 
 
-static void editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas * self) {
+static void
+editing_tools_photo_canvas_instance_init (EditingToolsPhotoCanvas * self)
+{
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_PHOTO_CANVAS_GET_PRIVATE (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 3893 "EditingTools.c"
+#line 4383 "EditingTools.c"
 }
 
 
-static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj) {
+static void
+editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj)
+{
 	EditingToolsPhotoCanvas * self;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_PHOTO_CANVAS, EditingToolsPhotoCanvas);
@@ -3911,11 +4403,13 @@ static void editing_tools_photo_canvas_finalize (EditingToolsPhotoCanvas * obj)
 	_cairo_surface_destroy0 (self->priv->scaled);
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->scaled_pixbuf);
-#line 3915 "EditingTools.c"
+#line 4407 "EditingTools.c"
 }
 
 
-GType editing_tools_photo_canvas_get_type (void) {
+GType
+editing_tools_photo_canvas_get_type (void)
+{
 	static volatile gsize editing_tools_photo_canvas_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_photo_canvas_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { editing_tools_value_photo_canvas_init, editing_tools_value_photo_canvas_free_value, editing_tools_value_photo_canvas_copy_value, editing_tools_value_photo_canvas_peek_pointer, "p", editing_tools_value_photo_canvas_collect_value, "p", editing_tools_value_photo_canvas_lcopy_value };
@@ -3929,18 +4423,22 @@ GType editing_tools_photo_canvas_get_type (void) {
 }
 
 
-gpointer editing_tools_photo_canvas_ref (gpointer instance) {
+gpointer
+editing_tools_photo_canvas_ref (gpointer instance)
+{
 	EditingToolsPhotoCanvas * self;
 	self = instance;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 3940 "EditingTools.c"
+#line 4436 "EditingTools.c"
 }
 
 
-void editing_tools_photo_canvas_unref (gpointer instance) {
+void
+editing_tools_photo_canvas_unref (gpointer instance)
+{
 	EditingToolsPhotoCanvas * self;
 	self = instance;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -3949,56 +4447,64 @@ void editing_tools_photo_canvas_unref (gpointer instance) {
 		EDITING_TOOLS_PHOTO_CANVAS_GET_CLASS (self)->finalize (self);
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3953 "EditingTools.c"
+#line 4451 "EditingTools.c"
 	}
 }
 
 
-EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name) {
+EditingToolsEditingTool*
+editing_tools_editing_tool_construct (GType object_type,
+                                      const gchar* name)
+{
 	EditingToolsEditingTool* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
+	gchar* _tmp0_;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsEditingTool*) g_type_create_instance (object_type);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = name;
-#line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (name);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
 #line 469 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->name = _tmp1_;
+	self->name = _tmp0_;
 #line 468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 3976 "EditingTools.c"
+#line 4474 "EditingTools.c"
 }
 
 
-static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
+static gpointer
+_editing_tools_photo_canvas_ref0 (gpointer self)
+{
 #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 3983 "EditingTools.c"
+#line 4483 "EditingTools.c"
 }
 
 
-static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
+static gboolean
+_editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender,
+                                                                    GdkEventKey* event,
+                                                                    gpointer self)
+{
 	gboolean result;
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 3992 "EditingTools.c"
+#line 4496 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
+static void
+editing_tools_editing_tool_real_activate (EditingToolsEditingTool* self,
+                                          EditingToolsPhotoCanvas* canvas)
+{
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsEditingToolWindow* _tmp1_;
 	EditingToolsPhotoCanvas* _tmp2_;
-	EditingToolsPhotoCanvas* _tmp3_;
+	EditingToolsEditingToolWindow* _tmp3_;
 	EditingToolsEditingToolWindow* _tmp4_;
-	EditingToolsEditingToolWindow* _tmp5_;
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4010,47 +4516,50 @@ static void editing_tools_editing_tool_real_activate (EditingToolsEditingTool* s
 #line 479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_vala_assert (_tmp1_ == NULL, "tool_window == null");
 #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = canvas;
-#line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _editing_tools_photo_canvas_ref0 (_tmp2_);
+	_tmp2_ = _editing_tools_photo_canvas_ref0 (canvas);
 #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
 #line 481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->canvas = _tmp3_;
+	self->canvas = _tmp2_;
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = editing_tools_editing_tool_get_tool_window (self);
+	_tmp3_ = editing_tools_editing_tool_get_tool_window (self);
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->tool_window);
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->tool_window = _tmp4_;
+	self->priv->tool_window = _tmp3_;
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->priv->tool_window;
+	_tmp4_ = self->priv->tool_window;
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_ != NULL) {
-#line 4031 "EditingTools.c"
-		EditingToolsEditingToolWindow* _tmp6_;
+	if (_tmp4_ != NULL) {
+#line 4535 "EditingTools.c"
+		EditingToolsEditingToolWindow* _tmp5_;
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = self->priv->tool_window;
+		_tmp5_ = self->priv->tool_window;
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
-#line 4037 "EditingTools.c"
+		g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), "key-press-event", (GCallback) _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event, self);
+#line 4541 "EditingTools.c"
 	}
 #line 487 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ACTIVATED_SIGNAL], 0);
-#line 4041 "EditingTools.c"
+#line 4545 "EditingTools.c"
 }
 
 
-void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas) {
+void
+editing_tools_editing_tool_activate (EditingToolsEditingTool* self,
+                                     EditingToolsPhotoCanvas* canvas)
+{
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->activate (self, canvas);
-#line 4050 "EditingTools.c"
+#line 4557 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self) {
+static void
+editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool* self)
+{
 	gboolean _tmp0_ = FALSE;
 	EditingToolsPhotoCanvas* _tmp1_;
 	EditingToolsEditingToolWindow* _tmp3_;
@@ -4058,23 +4567,23 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp1_ = self->canvas;
 #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ == NULL) {
-#line 4062 "EditingTools.c"
+#line 4571 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp2_;
 #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->priv->tool_window;
 #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == NULL;
-#line 4068 "EditingTools.c"
+#line 4577 "EditingTools.c"
 	} else {
 #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 4072 "EditingTools.c"
+#line 4581 "EditingTools.c"
 	}
 #line 493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
 #line 494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 4078 "EditingTools.c"
+#line 4587 "EditingTools.c"
 	}
 #line 496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_photo_canvas_unref0 (self->canvas);
@@ -4084,7 +4593,7 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp3_ = self->priv->tool_window;
 #line 498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_ != NULL) {
-#line 4088 "EditingTools.c"
+#line 4597 "EditingTools.c"
 		EditingToolsEditingToolWindow* _tmp4_;
 		guint _tmp5_;
 #line 499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4097,24 +4606,28 @@ static void editing_tools_editing_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->tool_window);
 #line 500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tool_window = NULL;
-#line 4101 "EditingTools.c"
+#line 4610 "EditingTools.c"
 	}
 #line 503 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_DEACTIVATED_SIGNAL], 0);
-#line 4105 "EditingTools.c"
+#line 4614 "EditingTools.c"
 }
 
 
-void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self) {
+void
+editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self)
+{
 #line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->deactivate (self);
-#line 4114 "EditingTools.c"
+#line 4625 "EditingTools.c"
 }
 
 
-gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self) {
+gboolean
+editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self)
+{
 	gboolean result = FALSE;
 	EditingToolsPhotoCanvas* _tmp0_;
 #line 506 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4125,30 +4638,40 @@ gboolean editing_tools_editing_tool_is_activated (EditingToolsEditingTool* self)
 	result = _tmp0_ != NULL;
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4129 "EditingTools.c"
+#line 4642 "EditingTools.c"
 }
 
 
-static EditingToolsEditingToolWindow* editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self) {
+static EditingToolsEditingToolWindow*
+editing_tools_editing_tool_real_get_tool_window (EditingToolsEditingTool* self)
+{
 	EditingToolsEditingToolWindow* result = NULL;
 #line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = NULL;
 #line 511 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4139 "EditingTools.c"
+#line 4654 "EditingTools.c"
 }
 
 
-EditingToolsEditingToolWindow* editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self) {
+EditingToolsEditingToolWindow*
+editing_tools_editing_tool_get_tool_window (EditingToolsEditingTool* self)
+{
 #line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_tool_window (self);
-#line 4148 "EditingTools.c"
+#line 4665 "EditingTools.c"
 }
 
 
-static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
+static GdkPixbuf*
+editing_tools_editing_tool_real_get_display_pixbuf (EditingToolsEditingTool* self,
+                                                    Scaling* scaling,
+                                                    Photo* photo,
+                                                    Dimensions* max_dim,
+                                                    GError** error)
+{
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
 #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4163,147 +4686,201 @@ static GdkPixbuf* editing_tools_editing_tool_real_get_display_pixbuf (EditingToo
 	if (max_dim) {
 #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 4167 "EditingTools.c"
+#line 4690 "EditingTools.c"
 	}
 #line 529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4171 "EditingTools.c"
+#line 4694 "EditingTools.c"
 }
 
 
-GdkPixbuf* editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
+GdkPixbuf*
+editing_tools_editing_tool_get_display_pixbuf (EditingToolsEditingTool* self,
+                                               Scaling* scaling,
+                                               Photo* photo,
+                                               Dimensions* max_dim,
+                                               GError** error)
+{
 #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), NULL);
 #line 525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->get_display_pixbuf (self, scaling, photo, max_dim, error);
-#line 4180 "EditingTools.c"
+#line 4709 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self, gint x, gint y) {
+static void
+editing_tools_editing_tool_real_on_left_click (EditingToolsEditingTool* self,
+                                               gint x,
+                                               gint y)
+{
 }
 
 
-void editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self, gint x, gint y) {
+void
+editing_tools_editing_tool_on_left_click (EditingToolsEditingTool* self,
+                                          gint x,
+                                          gint y)
+{
 #line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_click (self, x, y);
-#line 4193 "EditingTools.c"
+#line 4730 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self, gint x, gint y) {
+static void
+editing_tools_editing_tool_real_on_left_released (EditingToolsEditingTool* self,
+                                                  gint x,
+                                                  gint y)
+{
 }
 
 
-void editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self, gint x, gint y) {
+void
+editing_tools_editing_tool_on_left_released (EditingToolsEditingTool* self,
+                                             gint x,
+                                             gint y)
+{
 #line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 535 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_left_released (self, x, y);
-#line 4206 "EditingTools.c"
+#line 4751 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) {
+static void
+editing_tools_editing_tool_real_on_motion (EditingToolsEditingTool* self,
+                                           gint x,
+                                           gint y,
+                                           GdkModifierType mask)
+{
 }
 
 
-void editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self, gint x, gint y, GdkModifierType mask) {
+void
+editing_tools_editing_tool_on_motion (EditingToolsEditingTool* self,
+                                      gint x,
+                                      gint y,
+                                      GdkModifierType mask)
+{
 #line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_motion (self, x, y, mask);
-#line 4219 "EditingTools.c"
+#line 4774 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self) {
+static gboolean
+editing_tools_editing_tool_real_on_leave_notify_event (EditingToolsEditingTool* self)
+{
 	gboolean result = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4229 "EditingTools.c"
+#line 4786 "EditingTools.c"
 }
 
 
-gboolean editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self) {
+gboolean
+editing_tools_editing_tool_on_leave_notify_event (EditingToolsEditingTool* self)
+{
 #line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_leave_notify_event (self);
-#line 4238 "EditingTools.c"
+#line 4797 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
+static gboolean
+editing_tools_editing_tool_real_on_keypress (EditingToolsEditingTool* self,
+                                             GdkEventKey* event)
+{
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	guint _tmp1_;
-	const gchar* _tmp2_;
+	guint _tmp0_;
+	const gchar* _tmp1_;
 #line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = event;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _tmp0_->keyval;
+	_tmp0_ = event->keyval;
 #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gdk_keyval_name (_tmp1_);
+	_tmp1_ = gdk_keyval_name (_tmp0_);
 #line 547 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (g_strcmp0 (_tmp2_, "Escape") == 0) {
+	if (g_strcmp0 (_tmp1_, "Escape") == 0) {
 #line 548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_notify_cancel (self);
 #line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
 #line 550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 4263 "EditingTools.c"
+#line 4822 "EditingTools.c"
 	}
 #line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4269 "EditingTools.c"
+#line 4828 "EditingTools.c"
 }
 
 
-gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event) {
+gboolean
+editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
+                                        GdkEventKey* event)
+{
 #line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self), FALSE);
 #line 545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->on_keypress (self, event);
-#line 4278 "EditingTools.c"
+#line 4840 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
+static void
+editing_tools_editing_tool_real_paint (EditingToolsEditingTool* self,
+                                       cairo_t* ctx)
+{
 #line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (ctx != NULL);
-#line 4285 "EditingTools.c"
+#line 4850 "EditingTools.c"
 }
 
 
-void editing_tools_editing_tool_paint (EditingToolsEditingTool* self, cairo_t* ctx) {
+void
+editing_tools_editing_tool_paint (EditingToolsEditingTool* self,
+                                  cairo_t* ctx)
+{
 #line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->paint (self, ctx);
-#line 4294 "EditingTools.c"
+#line 4862 "EditingTools.c"
 }
 
 
-void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self) {
+void
+editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self)
+{
 #line 560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_EDITING_TOOL (self));
 #line 561 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_emit (self, editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL], 0);
-#line 4303 "EditingTools.c"
+#line 4873 "EditingTools.c"
 }
 
 
-static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure, GValue * return_value, guint n_param_values, const GValue * param_values, gpointer invocation_hint, gpointer marshal_data) {
+static void
+g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure * closure,
+                                                           GValue * return_value,
+                                                           guint n_param_values,
+                                                           const GValue * param_values,
+                                                           gpointer invocation_hint,
+                                                           gpointer marshal_data)
+{
 	typedef void (*GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (gpointer data1, gpointer arg_1, gpointer arg_2, gpointer arg_3, gboolean arg_4, gpointer data2);
 	register GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN callback;
 	register GCClosure * cc;
@@ -4318,120 +4895,145 @@ static void g_cclosure_user_marshal_VOID__OBJECT_OBJECT_BOXED_BOOLEAN (GClosure
 		data1 = closure->data;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = param_values->data[0].v_pointer;
-#line 4322 "EditingTools.c"
+#line 4899 "EditingTools.c"
 	} else {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data1 = param_values->data[0].v_pointer;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		data2 = closure->data;
-#line 4328 "EditingTools.c"
+#line 4905 "EditingTools.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback = (GMarshalFunc_VOID__OBJECT_OBJECT_BOXED_BOOLEAN) (marshal_data ? marshal_data : cc->callback);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	callback (data1, g_value_get_object (param_values + 1), g_value_get_object (param_values + 2), g_value_get_boxed (param_values + 3), g_value_get_boolean (param_values + 4), data2);
-#line 4334 "EditingTools.c"
+#line 4911 "EditingTools.c"
 }
 
 
-static void editing_tools_value_editing_tool_init (GValue* value) {
+static void
+editing_tools_value_editing_tool_init (GValue* value)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 4341 "EditingTools.c"
+#line 4920 "EditingTools.c"
 }
 
 
-static void editing_tools_value_editing_tool_free_value (GValue* value) {
+static void
+editing_tools_value_editing_tool_free_value (GValue* value)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (value->data[0].v_pointer);
-#line 4350 "EditingTools.c"
+#line 4931 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_value_editing_tool_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+editing_tools_value_editing_tool_copy_value (const GValue* src_value,
+                                             GValue* dest_value)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_editing_tool_ref (src_value->data[0].v_pointer);
-#line 4360 "EditingTools.c"
+#line 4944 "EditingTools.c"
 	} else {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 4364 "EditingTools.c"
+#line 4948 "EditingTools.c"
 	}
 }
 
 
-static gpointer editing_tools_value_editing_tool_peek_pointer (const GValue* value) {
+static gpointer
+editing_tools_value_editing_tool_peek_pointer (const GValue* value)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4372 "EditingTools.c"
+#line 4958 "EditingTools.c"
 }
 
 
-static gchar* editing_tools_value_editing_tool_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_value_editing_tool_collect_value (GValue* value,
+                                                guint n_collect_values,
+                                                GTypeCValue* collect_values,
+                                                guint collect_flags)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 4379 "EditingTools.c"
+#line 4970 "EditingTools.c"
 		EditingToolsEditingTool * object;
 		object = collect_values[0].v_pointer;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4386 "EditingTools.c"
+#line 4977 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 4390 "EditingTools.c"
+#line 4981 "EditingTools.c"
 		}
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_editing_tool_ref (object);
-#line 4394 "EditingTools.c"
+#line 4985 "EditingTools.c"
 	} else {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4398 "EditingTools.c"
+#line 4989 "EditingTools.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4402 "EditingTools.c"
+#line 4993 "EditingTools.c"
 }
 
 
-static gchar* editing_tools_value_editing_tool_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_value_editing_tool_lcopy_value (const GValue* value,
+                                              guint n_collect_values,
+                                              GTypeCValue* collect_values,
+                                              guint collect_flags)
+{
 	EditingToolsEditingTool ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 4413 "EditingTools.c"
+#line 5009 "EditingTools.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 4419 "EditingTools.c"
+#line 5015 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 4423 "EditingTools.c"
+#line 5019 "EditingTools.c"
 	} else {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4427 "EditingTools.c"
+#line 5023 "EditingTools.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 4431 "EditingTools.c"
+#line 5027 "EditingTools.c"
 }
 
 
-GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+GParamSpec*
+editing_tools_param_spec_editing_tool (const gchar* name,
+                                       const gchar* nick,
+                                       const gchar* blurb,
+                                       GType object_type,
+                                       GParamFlags flags)
+{
 	EditingToolsParamSpecEditingTool* spec;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
@@ -4441,20 +5043,25 @@ GParamSpec* editing_tools_param_spec_editing_tool (const gchar* name, const gcha
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 4445 "EditingTools.c"
+#line 5047 "EditingTools.c"
 }
 
 
-gpointer editing_tools_value_get_editing_tool (const GValue* value) {
+gpointer
+editing_tools_value_get_editing_tool (const GValue* value)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL), NULL);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 4454 "EditingTools.c"
+#line 5058 "EditingTools.c"
 }
 
 
-void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
+void
+editing_tools_value_set_editing_tool (GValue* value,
+                                      gpointer v_object)
+{
 	EditingToolsEditingTool * old;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
@@ -4470,22 +5077,25 @@ void editing_tools_value_set_editing_tool (GValue* value, gpointer v_object) {
 		value->data[0].v_pointer = v_object;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_ref (value->data[0].v_pointer);
-#line 4474 "EditingTools.c"
+#line 5081 "EditingTools.c"
 	} else {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4478 "EditingTools.c"
+#line 5085 "EditingTools.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4484 "EditingTools.c"
+#line 5091 "EditingTools.c"
 	}
 }
 
 
-void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
+void
+editing_tools_value_take_editing_tool (GValue* value,
+                                       gpointer v_object)
+{
 	EditingToolsEditingTool * old;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_TYPE_EDITING_TOOL));
@@ -4499,22 +5109,24 @@ void editing_tools_value_take_editing_tool (GValue* value, gpointer v_object) {
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 4503 "EditingTools.c"
+#line 5113 "EditingTools.c"
 	} else {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 4507 "EditingTools.c"
+#line 5117 "EditingTools.c"
 	}
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_editing_tool_unref (old);
-#line 4513 "EditingTools.c"
+#line 5123 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass) {
+static void
+editing_tools_editing_tool_class_init (EditingToolsEditingToolClass * klass)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_parent_class = g_type_class_peek_parent (klass);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4551,11 +5163,13 @@ static void editing_tools_editing_tool_class_init (EditingToolsEditingToolClass
 	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_CANCELLED_SIGNAL] = g_signal_new ("cancelled", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL] = g_signal_new ("aborted", EDITING_TOOLS_TYPE_EDITING_TOOL, G_SIGNAL_RUN_LAST, 0, NULL, NULL, g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-#line 4555 "EditingTools.c"
+#line 5167 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self) {
+static void
+editing_tools_editing_tool_instance_init (EditingToolsEditingTool * self)
+{
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_EDITING_TOOL_GET_PRIVATE (self);
 #line 448 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4564,11 +5178,13 @@ static void editing_tools_editing_tool_instance_init (EditingToolsEditingTool *
 	self->priv->tool_window = NULL;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 4568 "EditingTools.c"
+#line 5182 "EditingTools.c"
 }
 
 
-static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj) {
+static void
+editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj)
+{
 	EditingToolsEditingTool * self;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool);
@@ -4582,11 +5198,13 @@ static void editing_tools_editing_tool_finalize (EditingToolsEditingTool * obj)
 	_cairo_surface_destroy0 (self->surface);
 #line 452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 4586 "EditingTools.c"
+#line 5202 "EditingTools.c"
 }
 
 
-GType editing_tools_editing_tool_get_type (void) {
+GType
+editing_tools_editing_tool_get_type (void)
+{
 	static volatile gsize editing_tools_editing_tool_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_editing_tool_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { editing_tools_value_editing_tool_init, editing_tools_value_editing_tool_free_value, editing_tools_value_editing_tool_copy_value, editing_tools_value_editing_tool_peek_pointer, "p", editing_tools_value_editing_tool_collect_value, "p", editing_tools_value_editing_tool_lcopy_value };
@@ -4600,18 +5218,22 @@ GType editing_tools_editing_tool_get_type (void) {
 }
 
 
-gpointer editing_tools_editing_tool_ref (gpointer instance) {
+gpointer
+editing_tools_editing_tool_ref (gpointer instance)
+{
 	EditingToolsEditingTool * self;
 	self = instance;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 4611 "EditingTools.c"
+#line 5231 "EditingTools.c"
 }
 
 
-void editing_tools_editing_tool_unref (gpointer instance) {
+void
+editing_tools_editing_tool_unref (gpointer instance)
+{
 	EditingToolsEditingTool * self;
 	self = instance;
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4620,33 +5242,37 @@ void editing_tools_editing_tool_unref (gpointer instance) {
 		EDITING_TOOLS_EDITING_TOOL_GET_CLASS (self)->finalize (self);
 #line 447 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 4624 "EditingTools.c"
+#line 5246 "EditingTools.c"
 	}
 }
 
 
-static EditingToolsCropToolReticleOrientation editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self) {
+static EditingToolsCropToolReticleOrientation
+editing_tools_crop_tool_reticle_orientation_toggle (EditingToolsCropToolReticleOrientation self)
+{
 	EditingToolsCropToolReticleOrientation result = 0;
 	EditingToolsCropToolReticleOrientation _tmp0_ = 0;
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (self == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT;
-#line 4636 "EditingTools.c"
+#line 5260 "EditingTools.c"
 	} else {
 #line 616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 4640 "EditingTools.c"
+#line 5264 "EditingTools.c"
 	}
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 615 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4646 "EditingTools.c"
+#line 5270 "EditingTools.c"
 }
 
 
-static GType editing_tools_crop_tool_reticle_orientation_get_type (void) {
+static GType
+editing_tools_crop_tool_reticle_orientation_get_type (void)
+{
 	static volatile gsize editing_tools_crop_tool_reticle_orientation_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_crop_tool_reticle_orientation_type_id__volatile)) {
 		static const GEnumValue values[] = {{EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE, "EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE", "landscape"}, {EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT, "EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT", "portrait"}, {0, NULL, NULL}};
@@ -4658,7 +5284,9 @@ static GType editing_tools_crop_tool_reticle_orientation_get_type (void) {
 }
 
 
-static GType editing_tools_crop_tool_constraint_mode_get_type (void) {
+static GType
+editing_tools_crop_tool_constraint_mode_get_type (void)
+{
 	static volatile gsize editing_tools_crop_tool_constraint_mode_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_crop_tool_constraint_mode_type_id__volatile)) {
 		static const GEnumValue values[] = {{EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL, "EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL", "normal"}, {EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM, "EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM", "custom"}, {0, NULL, NULL}};
@@ -4670,24 +5298,30 @@ static GType editing_tools_crop_tool_constraint_mode_get_type (void) {
 }
 
 
-static EditingToolsCropTool* editing_tools_crop_tool_construct (GType object_type) {
+static EditingToolsCropTool*
+editing_tools_crop_tool_construct (GType object_type)
+{
 	EditingToolsCropTool* self = NULL;
 #line 716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropTool*) editing_tools_editing_tool_construct (object_type, "CropTool");
 #line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 4680 "EditingTools.c"
+#line 5310 "EditingTools.c"
 }
 
 
-static EditingToolsCropTool* editing_tools_crop_tool_new (void) {
+static EditingToolsCropTool*
+editing_tools_crop_tool_new (void)
+{
 #line 715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_construct (EDITING_TOOLS_TYPE_CROP_TOOL);
-#line 4687 "EditingTools.c"
+#line 5319 "EditingTools.c"
 }
 
 
-EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
+EditingToolsCropTool*
+editing_tools_crop_tool_factory (void)
+{
 	EditingToolsCropTool* result = NULL;
 	EditingToolsCropTool* _tmp0_;
 #line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -4696,554 +5330,701 @@ EditingToolsCropTool* editing_tools_crop_tool_factory (void) {
 	result = _tmp0_;
 #line 720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4700 "EditingTools.c"
+#line 5334 "EditingTools.c"
 }
 
 
-gboolean editing_tools_crop_tool_is_available (Photo* photo, Scaling* scaling) {
+gboolean
+editing_tools_crop_tool_is_available (Photo* photo,
+                                      Scaling* scaling)
+{
 	gboolean result = FALSE;
 	Dimensions dim = {0};
-	Photo* _tmp0_;
+	Dimensions _tmp0_ = {0};
 	Dimensions _tmp1_ = {0};
-	Dimensions _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-	Dimensions _tmp4_;
-	gint _tmp5_;
+	gboolean _tmp2_ = FALSE;
+	Dimensions _tmp3_;
+	gint _tmp4_;
 #line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
 #line 723 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
 #line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = photo;
-#line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_get_original_dimensions (_tmp0_, &_tmp1_);
+	photo_get_original_dimensions (photo, &_tmp0_);
 #line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
+	scaling_get_scaled_dimensions (scaling, &_tmp0_, &_tmp1_);
 #line 724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	dim = _tmp2_;
+	dim = _tmp1_;
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = dim;
+	_tmp3_ = dim;
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _tmp4_.width;
+	_tmp4_ = _tmp3_.width;
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 4731 "EditingTools.c"
-		Dimensions _tmp6_;
-		gint _tmp7_;
+	if (_tmp4_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
+#line 5365 "EditingTools.c"
+		Dimensions _tmp5_;
+		gint _tmp6_;
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = dim;
+		_tmp5_ = dim;
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = _tmp6_.height;
+		_tmp6_ = _tmp5_.height;
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp7_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 4740 "EditingTools.c"
+		_tmp2_ = _tmp6_ > EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
+#line 5374 "EditingTools.c"
 	} else {
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = FALSE;
-#line 4744 "EditingTools.c"
+		_tmp2_ = FALSE;
+#line 5378 "EditingTools.c"
 	}
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 4750 "EditingTools.c"
+#line 5384 "EditingTools.c"
 }
 
 
-static void _vala_array_add7 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add7 (EditingToolsCropToolConstraintDescription** * array,
+                  int* length,
+                  int* size,
+                  EditingToolsCropToolConstraintDescription* value)
+{
 #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4761 "EditingTools.c"
+#line 5400 "EditingTools.c"
 	}
 #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4767 "EditingTools.c"
+#line 5406 "EditingTools.c"
 }
 
 
-static void _vala_array_add8 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add8 (EditingToolsCropToolConstraintDescription** * array,
+                  int* length,
+                  int* size,
+                  EditingToolsCropToolConstraintDescription* value)
+{
 #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4778 "EditingTools.c"
+#line 5422 "EditingTools.c"
 	}
 #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4784 "EditingTools.c"
+#line 5428 "EditingTools.c"
 }
 
 
-static void _vala_array_add9 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add9 (EditingToolsCropToolConstraintDescription** * array,
+                  int* length,
+                  int* size,
+                  EditingToolsCropToolConstraintDescription* value)
+{
 #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4795 "EditingTools.c"
+#line 5444 "EditingTools.c"
 	}
 #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4801 "EditingTools.c"
+#line 5450 "EditingTools.c"
 }
 
 
-static void _vala_array_add10 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add10 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4812 "EditingTools.c"
+#line 5466 "EditingTools.c"
 	}
 #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4818 "EditingTools.c"
+#line 5472 "EditingTools.c"
 }
 
 
-static void _vala_array_add11 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add11 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4829 "EditingTools.c"
+#line 5488 "EditingTools.c"
 	}
 #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4835 "EditingTools.c"
+#line 5494 "EditingTools.c"
 }
 
 
-static void _vala_array_add12 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add12 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4846 "EditingTools.c"
+#line 5510 "EditingTools.c"
 	}
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 737 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4852 "EditingTools.c"
+#line 5516 "EditingTools.c"
 }
 
 
-static void _vala_array_add13 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add13 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4863 "EditingTools.c"
+#line 5532 "EditingTools.c"
 	}
 #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4869 "EditingTools.c"
+#line 5538 "EditingTools.c"
 }
 
 
-static void _vala_array_add14 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add14 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4880 "EditingTools.c"
+#line 5554 "EditingTools.c"
 	}
 #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4886 "EditingTools.c"
+#line 5560 "EditingTools.c"
 }
 
 
-static void _vala_array_add15 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add15 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4897 "EditingTools.c"
+#line 5576 "EditingTools.c"
 	}
 #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 740 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4903 "EditingTools.c"
+#line 5582 "EditingTools.c"
 }
 
 
-static void _vala_array_add16 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add16 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4914 "EditingTools.c"
+#line 5598 "EditingTools.c"
 	}
 #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4920 "EditingTools.c"
+#line 5604 "EditingTools.c"
 }
 
 
-static void _vala_array_add17 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add17 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4931 "EditingTools.c"
+#line 5620 "EditingTools.c"
 	}
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 742 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4937 "EditingTools.c"
+#line 5626 "EditingTools.c"
 }
 
 
-static void _vala_array_add18 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add18 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4948 "EditingTools.c"
+#line 5642 "EditingTools.c"
 	}
 #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 743 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4954 "EditingTools.c"
+#line 5648 "EditingTools.c"
 }
 
 
-static void _vala_array_add19 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add19 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4965 "EditingTools.c"
+#line 5664 "EditingTools.c"
 	}
 #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4971 "EditingTools.c"
+#line 5670 "EditingTools.c"
 }
 
 
-static void _vala_array_add20 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add20 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4982 "EditingTools.c"
+#line 5686 "EditingTools.c"
 	}
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 4988 "EditingTools.c"
+#line 5692 "EditingTools.c"
 }
 
 
-static void _vala_array_add21 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add21 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 4999 "EditingTools.c"
+#line 5708 "EditingTools.c"
 	}
 #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5005 "EditingTools.c"
+#line 5714 "EditingTools.c"
 }
 
 
-static void _vala_array_add22 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add22 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5016 "EditingTools.c"
+#line 5730 "EditingTools.c"
 	}
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 747 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5022 "EditingTools.c"
+#line 5736 "EditingTools.c"
 }
 
 
-static void _vala_array_add23 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add23 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5033 "EditingTools.c"
+#line 5752 "EditingTools.c"
 	}
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5039 "EditingTools.c"
+#line 5758 "EditingTools.c"
 }
 
 
-static void _vala_array_add24 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add24 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5050 "EditingTools.c"
+#line 5774 "EditingTools.c"
 	}
 #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5056 "EditingTools.c"
+#line 5780 "EditingTools.c"
 }
 
 
-static void _vala_array_add25 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add25 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5067 "EditingTools.c"
+#line 5796 "EditingTools.c"
 	}
 #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 750 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5073 "EditingTools.c"
+#line 5802 "EditingTools.c"
 }
 
 
-static void _vala_array_add26 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add26 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5084 "EditingTools.c"
+#line 5818 "EditingTools.c"
 	}
 #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5090 "EditingTools.c"
+#line 5824 "EditingTools.c"
 }
 
 
-static void _vala_array_add27 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add27 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5101 "EditingTools.c"
+#line 5840 "EditingTools.c"
 	}
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5107 "EditingTools.c"
+#line 5846 "EditingTools.c"
 }
 
 
-static void _vala_array_add28 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add28 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5118 "EditingTools.c"
+#line 5862 "EditingTools.c"
 	}
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 753 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5124 "EditingTools.c"
+#line 5868 "EditingTools.c"
 }
 
 
-static void _vala_array_add29 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add29 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5135 "EditingTools.c"
+#line 5884 "EditingTools.c"
 	}
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5141 "EditingTools.c"
+#line 5890 "EditingTools.c"
 }
 
 
-static void _vala_array_add30 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add30 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5152 "EditingTools.c"
+#line 5906 "EditingTools.c"
 	}
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5158 "EditingTools.c"
+#line 5912 "EditingTools.c"
 }
 
 
-static void _vala_array_add31 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add31 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5169 "EditingTools.c"
+#line 5928 "EditingTools.c"
 	}
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 756 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5175 "EditingTools.c"
+#line 5934 "EditingTools.c"
 }
 
 
-static void _vala_array_add32 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add32 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5186 "EditingTools.c"
+#line 5950 "EditingTools.c"
 	}
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5192 "EditingTools.c"
+#line 5956 "EditingTools.c"
 }
 
 
-static void _vala_array_add33 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add33 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5203 "EditingTools.c"
+#line 5972 "EditingTools.c"
 	}
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5209 "EditingTools.c"
+#line 5978 "EditingTools.c"
 }
 
 
-static void _vala_array_add34 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add34 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5220 "EditingTools.c"
+#line 5994 "EditingTools.c"
 	}
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5226 "EditingTools.c"
+#line 6000 "EditingTools.c"
 }
 
 
-static void _vala_array_add35 (EditingToolsCropToolConstraintDescription** * array, int* length, int* size, EditingToolsCropToolConstraintDescription* value) {
+static void
+_vala_array_add35 (EditingToolsCropToolConstraintDescription** * array,
+                   int* length,
+                   int* size,
+                   EditingToolsCropToolConstraintDescription* value)
+{
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if ((*length) == (*size)) {
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*size = (*size) ? (2 * (*size)) : 4;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*array = g_renew (EditingToolsCropToolConstraintDescription*, *array, (*size) + 1);
-#line 5237 "EditingTools.c"
+#line 6016 "EditingTools.c"
 	}
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[(*length)++] = value;
 #line 760 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*array)[*length] = NULL;
-#line 5243 "EditingTools.c"
+#line 6022 "EditingTools.c"
 }
 
 
-static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_create_constraints (int* result_length1) {
+static EditingToolsCropToolConstraintDescription**
+editing_tools_crop_tool_create_constraints (int* result_length1)
+{
 	EditingToolsCropToolConstraintDescription** result = NULL;
 	EditingToolsCropToolConstraintDescription** _result_ = NULL;
 	EditingToolsCropToolConstraintDescription** _tmp0_;
@@ -5586,91 +6367,90 @@ static EditingToolsCropToolConstraintDescription** editing_tools_crop_tool_creat
 	if (result_length1) {
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*result_length1 = _tmp59__length1;
-#line 5590 "EditingTools.c"
+#line 6371 "EditingTools.c"
 	}
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp59_;
 #line 762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5596 "EditingTools.c"
+#line 6377 "EditingTools.c"
 }
 
 
-static gpointer _editing_tools_crop_tool_constraint_description_ref0 (gpointer self) {
+static gpointer
+_editing_tools_crop_tool_constraint_description_ref0 (gpointer self)
+{
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? editing_tools_crop_tool_constraint_description_ref (self) : NULL;
-#line 5603 "EditingTools.c"
+#line 6386 "EditingTools.c"
 }
 
 
-static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data, int constraint_data_length1) {
+static GtkListStore*
+editing_tools_crop_tool_create_constraint_list (EditingToolsCropToolConstraintDescription** constraint_data,
+                                                int constraint_data_length1)
+{
 	GtkListStore* result = NULL;
 	GtkListStore* _result_ = NULL;
 	GtkListStore* _tmp0_;
 	GtkTreeIter iter = {0};
-	EditingToolsCropToolConstraintDescription** _tmp1_;
-	gint _tmp1__length1;
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = gtk_list_store_new (1, G_TYPE_STRING, G_TYPE_STRING, -1);
 #line 766 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_ = _tmp0_;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = constraint_data;
-#line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1__length1 = constraint_data_length1;
-#line 5622 "EditingTools.c"
+#line 6402 "EditingTools.c"
 	{
 		EditingToolsCropToolConstraintDescription** constraint_collection = NULL;
 		gint constraint_collection_length1 = 0;
 		gint _constraint_collection_size_ = 0;
 		gint constraint_it = 0;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		constraint_collection = _tmp1_;
+		constraint_collection = constraint_data;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		constraint_collection_length1 = _tmp1__length1;
+		constraint_collection_length1 = constraint_data_length1;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		for (constraint_it = 0; constraint_it < _tmp1__length1; constraint_it = constraint_it + 1) {
-#line 5634 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp2_;
+		for (constraint_it = 0; constraint_it < constraint_data_length1; constraint_it = constraint_it + 1) {
+#line 6414 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp1_;
 			EditingToolsCropToolConstraintDescription* constraint = NULL;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp2_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
+			_tmp1_ = _editing_tools_crop_tool_constraint_description_ref0 (constraint_collection[constraint_it]);
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			constraint = _tmp2_;
-#line 5641 "EditingTools.c"
+			constraint = _tmp1_;
+#line 6421 "EditingTools.c"
 			{
-				GtkListStore* _tmp3_;
-				GtkTreeIter _tmp4_ = {0};
-				GtkListStore* _tmp5_;
-				GtkTreeIter _tmp6_;
-				EditingToolsCropToolConstraintDescription* _tmp7_;
-				const gchar* _tmp8_;
-				GValue _tmp9_ = {0};
+				GtkListStore* _tmp2_;
+				GtkTreeIter _tmp3_ = {0};
+				GtkListStore* _tmp4_;
+				GtkTreeIter _tmp5_;
+				EditingToolsCropToolConstraintDescription* _tmp6_;
+				const gchar* _tmp7_;
+				GValue _tmp8_ = {0};
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp3_ = _result_;
+				_tmp2_ = _result_;
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				gtk_list_store_append (_tmp3_, &_tmp4_);
+				gtk_list_store_append (_tmp2_, &_tmp3_);
 #line 770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				iter = _tmp4_;
+				iter = _tmp3_;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp5_ = _result_;
+				_tmp4_ = _result_;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp6_ = iter;
+				_tmp5_ = iter;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp7_ = constraint;
+				_tmp6_ = constraint;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp8_ = _tmp7_->name;
+				_tmp7_ = _tmp6_->name;
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				g_value_init (&_tmp9_, G_TYPE_STRING);
+				g_value_init (&_tmp8_, G_TYPE_STRING);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				g_value_set_string (&_tmp9_, _tmp8_);
+				g_value_set_string (&_tmp8_, _tmp7_);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				gtk_list_store_set_value (_tmp5_, &_tmp6_, 0, &_tmp9_);
+				gtk_list_store_set_value (_tmp4_, &_tmp5_, 0, &_tmp8_);
 #line 771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				G_IS_VALUE (&_tmp9_) ? (g_value_unset (&_tmp9_), NULL) : NULL;
+				G_IS_VALUE (&_tmp8_) ? (g_value_unset (&_tmp8_), NULL) : NULL;
 #line 769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				_editing_tools_crop_tool_constraint_description_unref0 (constraint);
-#line 5674 "EditingTools.c"
+#line 6454 "EditingTools.c"
 			}
 		}
 	}
@@ -5678,11 +6458,13 @@ static GtkListStore* editing_tools_crop_tool_create_constraint_list (EditingTool
 	result = _result_;
 #line 774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5682 "EditingTools.c"
+#line 6462 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	GtkButton* _tmp1_;
 	EditingToolsCropToolConstraintDescription* _tmp2_;
@@ -5704,22 +6486,23 @@ static void editing_tools_crop_tool_update_pivot_button_state (EditingToolsCropT
 	gtk_widget_set_sensitive (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _tmp4_);
 #line 778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp3_);
-#line 5708 "EditingTools.c"
+#line 6490 "EditingTools.c"
 }
 
 
-static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self) {
+static EditingToolsCropToolConstraintDescription*
+editing_tools_crop_tool_get_selected_constraint (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolConstraintDescription* result = NULL;
 	EditingToolsCropToolConstraintDescription* _result_ = NULL;
 	EditingToolsCropToolConstraintDescription** _tmp0_;
 	gint _tmp0__length1;
 	EditingToolsCropToolCropToolWindow* _tmp1_;
 	GtkComboBox* _tmp2_;
-	gint _tmp3_;
+	EditingToolsCropToolConstraintDescription* _tmp3_;
 	EditingToolsCropToolConstraintDescription* _tmp4_;
 	EditingToolsCropToolConstraintDescription* _tmp5_;
-	EditingToolsCropToolConstraintDescription* _tmp6_;
-	gfloat _tmp7_;
+	gfloat _tmp6_;
 #line 782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5731,111 +6514,104 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_se
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = _tmp1_->constraint_combo;
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = gtk_combo_box_get_active (_tmp2_);
+	_tmp3_ = _tmp0_[gtk_combo_box_get_active (_tmp2_)];
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp0_[_tmp3_];
+	_tmp4_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
 #line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp4_);
-#line 783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_result_ = _tmp5_;
+	_result_ = _tmp4_;
 #line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _result_;
+	_tmp5_ = _result_;
 #line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _tmp6_->aspect_ratio;
+	_tmp6_ = _tmp5_->aspect_ratio;
 #line 785 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 5748 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription* _tmp8_;
-		EditingToolsPhotoCanvas* _tmp9_;
-		GdkRectangle _tmp10_ = {0};
-		gint _tmp11_;
-		EditingToolsCropToolConstraintDescription* _tmp12_;
-		EditingToolsPhotoCanvas* _tmp13_;
-		GdkRectangle _tmp14_ = {0};
-		gint _tmp15_;
+	if (_tmp6_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
+#line 6529 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription* _tmp7_;
+		EditingToolsPhotoCanvas* _tmp8_;
+		GdkRectangle _tmp9_ = {0};
+		gint _tmp10_;
+		EditingToolsCropToolConstraintDescription* _tmp11_;
+		EditingToolsPhotoCanvas* _tmp12_;
+		GdkRectangle _tmp13_ = {0};
+		gint _tmp14_;
 #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = _result_;
+		_tmp7_ = _result_;
 #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp9_, &_tmp10_);
+		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
 #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = _tmp10_.width;
+		_tmp10_ = _tmp9_.width;
 #line 786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_->basis_width = _tmp11_;
+		_tmp7_->basis_width = _tmp10_;
 #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_ = _result_;
+		_tmp11_ = _result_;
 #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp13_, &_tmp14_);
+		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp12_, &_tmp13_);
 #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = _tmp14_.height;
+		_tmp14_ = _tmp13_.height;
 #line 787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_->basis_height = _tmp15_;
-#line 5777 "EditingTools.c"
+		_tmp11_->basis_height = _tmp14_;
+#line 6558 "EditingTools.c"
 	} else {
-		EditingToolsCropToolConstraintDescription* _tmp16_;
-		gfloat _tmp17_;
+		EditingToolsCropToolConstraintDescription* _tmp15_;
+		gfloat _tmp16_;
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp16_ = _result_;
+		_tmp15_ = _result_;
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = _tmp16_->aspect_ratio;
+		_tmp16_ = _tmp15_->aspect_ratio;
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp17_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 5787 "EditingTools.c"
+		if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
+#line 6568 "EditingTools.c"
 			GdkScreen* screen = NULL;
+			GdkScreen* _tmp17_;
 			GdkScreen* _tmp18_;
-			GdkScreen* _tmp19_;
-			EditingToolsCropToolConstraintDescription* _tmp20_;
-			GdkScreen* _tmp21_;
-			gint _tmp22_;
-			EditingToolsCropToolConstraintDescription* _tmp23_;
-			GdkScreen* _tmp24_;
-			gint _tmp25_;
+			EditingToolsCropToolConstraintDescription* _tmp19_;
+			GdkScreen* _tmp20_;
+			EditingToolsCropToolConstraintDescription* _tmp21_;
+			GdkScreen* _tmp22_;
 #line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp18_ = gdk_screen_get_default ();
+			_tmp17_ = gdk_screen_get_default ();
 #line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp19_ = _g_object_ref0 (_tmp18_);
+			_tmp18_ = _g_object_ref0 (_tmp17_);
 #line 789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			screen = _tmp19_;
+			screen = _tmp18_;
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp20_ = _result_;
+			_tmp19_ = _result_;
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp21_ = screen;
+			_tmp20_ = screen;
 #line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp22_ = gdk_screen_get_width (_tmp21_);
-#line 790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp20_->basis_width = _tmp22_;
-#line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp23_ = _result_;
+			_tmp19_->basis_width = gdk_screen_get_width (_tmp20_);
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp24_ = screen;
+			_tmp21_ = _result_;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp25_ = gdk_screen_get_height (_tmp24_);
+			_tmp22_ = screen;
 #line 791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp23_->basis_height = _tmp25_;
+			_tmp21_->basis_height = gdk_screen_get_height (_tmp22_);
 #line 788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 5821 "EditingTools.c"
+#line 6596 "EditingTools.c"
 		}
 	}
 #line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5828 "EditingTools.c"
+#line 6603 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
+static gboolean
+editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCropTool* self,
+                                                  GdkEventFocus* event)
+{
 	gboolean result = FALSE;
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	EditingToolsCropToolCropToolWindow* _tmp1_;
 	GtkEntry* _tmp2_;
 	GtkEntry* _tmp3_;
-	GdkEventFocus* _tmp4_;
-	gboolean _tmp5_;
 #line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5853,25 +6629,22 @@ static gboolean editing_tools_crop_tool_on_width_entry_focus_out (EditingToolsCr
 #line 798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
 #line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = event;
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp5_;
+	result = editing_tools_crop_tool_on_custom_entry_focus_out (self, event);
 #line 799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5864 "EditingTools.c"
+#line 6636 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
+static gboolean
+editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsCropTool* self,
+                                                   GdkEventFocus* event)
+{
 	gboolean result = FALSE;
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	EditingToolsCropToolCropToolWindow* _tmp1_;
 	GtkEntry* _tmp2_;
 	GtkEntry* _tmp3_;
-	GdkEventFocus* _tmp4_;
-	gboolean _tmp5_;
 #line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5889,51 +6662,48 @@ static gboolean editing_tools_crop_tool_on_height_entry_focus_out (EditingToolsC
 #line 803 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_->most_recently_edited = _tmp3_;
 #line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = event;
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = editing_tools_crop_tool_on_custom_entry_focus_out (self, _tmp4_);
-#line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp5_;
+	result = editing_tools_crop_tool_on_custom_entry_focus_out (self, event);
 #line 804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 5900 "EditingTools.c"
+#line 6669 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self, GdkEventFocus* event) {
+static gboolean
+editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsCropTool* self,
+                                                   GdkEventFocus* event)
+{
 	gboolean result = FALSE;
 	gint width = 0;
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	GtkEntry* _tmp1_;
 	const gchar* _tmp2_;
 	const gchar* _tmp3_;
-	gint _tmp4_;
 	gint height = 0;
-	EditingToolsCropToolCropToolWindow* _tmp5_;
-	GtkEntry* _tmp6_;
+	EditingToolsCropToolCropToolWindow* _tmp4_;
+	GtkEntry* _tmp5_;
+	const gchar* _tmp6_;
 	const gchar* _tmp7_;
-	const gchar* _tmp8_;
-	gint _tmp9_;
-	gint _tmp10_;
-	gint _tmp16_;
-	gboolean _tmp22_ = FALSE;
-	gint _tmp23_;
-	gint _tmp24_;
-	gint _tmp27_;
-	gint _tmp28_;
-	gfloat _tmp29_;
-	gint _tmp63_;
-	gint _tmp64_;
+	gint _tmp8_;
+	gint _tmp14_;
+	gboolean _tmp20_ = FALSE;
+	gint _tmp21_;
+	gint _tmp22_;
+	gint _tmp25_;
+	gint _tmp26_;
+	gfloat _tmp27_;
+	gint _tmp61_;
+	gint _tmp62_;
 	Box new_crop = {0};
+	Box _tmp63_;
+	Box _tmp64_ = {0};
 	Box _tmp65_;
-	Box _tmp66_ = {0};
-	Box _tmp67_;
+	Box _tmp66_;
+	EditingToolsPhotoCanvas* _tmp67_;
 	Box _tmp68_;
 	EditingToolsPhotoCanvas* _tmp69_;
-	Box _tmp70_;
-	EditingToolsPhotoCanvas* _tmp71_;
-	gint _tmp72_;
-	gint _tmp73_;
+	gint _tmp70_;
+	gint _tmp71_;
 #line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -5947,311 +6717,310 @@ static gboolean editing_tools_crop_tool_on_custom_entry_focus_out (EditingToolsC
 #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_;
 #line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = atoi (_tmp3_);
-#line 808 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	width = _tmp4_;
-#line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->priv->crop_tool_window;
+	width = atoi (_tmp3_);
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_->custom_height_entry;
+	_tmp4_ = self->priv->crop_tool_window;
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = gtk_entry_get_text (_tmp6_);
+	_tmp5_ = _tmp4_->custom_height_entry;
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _tmp7_;
+	_tmp6_ = gtk_entry_get_text (_tmp5_);
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = atoi (_tmp8_);
+	_tmp7_ = _tmp6_;
 #line 809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	height = _tmp9_;
+	height = atoi (_tmp7_);
 #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = width;
+	_tmp8_ = width;
 #line 811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp10_ < 1) {
-#line 5970 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp11_;
-		GtkEntry* _tmp12_;
-		gint _tmp13_;
-		gchar* _tmp14_;
-		gchar* _tmp15_;
+	if (_tmp8_ < 1) {
+#line 6736 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp9_;
+		GtkEntry* _tmp10_;
+		gint _tmp11_;
+		gchar* _tmp12_;
+		gchar* _tmp13_;
 #line 812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		width = 1;
 #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = self->priv->crop_tool_window;
+		_tmp9_ = self->priv->crop_tool_window;
 #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_ = _tmp11_->custom_width_entry;
+		_tmp10_ = _tmp9_->custom_width_entry;
 #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = width;
+		_tmp11_ = width;
 #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp14_ = g_strdup_printf ("%d", _tmp13_);
+		_tmp12_ = g_strdup_printf ("%d", _tmp11_);
 #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = _tmp14_;
+		_tmp13_ = _tmp12_;
 #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		gtk_entry_set_text (_tmp12_, _tmp15_);
+		gtk_entry_set_text (_tmp10_, _tmp13_);
 #line 813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_free0 (_tmp15_);
-#line 5992 "EditingTools.c"
+		_g_free0 (_tmp13_);
+#line 6758 "EditingTools.c"
 	}
 #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = height;
+	_tmp14_ = height;
 #line 816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp16_ < 1) {
-#line 5998 "EditingTools.c"
-		EditingToolsCropToolCropToolWindow* _tmp17_;
-		GtkEntry* _tmp18_;
-		gint _tmp19_;
-		gchar* _tmp20_;
-		gchar* _tmp21_;
+	if (_tmp14_ < 1) {
+#line 6764 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp15_;
+		GtkEntry* _tmp16_;
+		gint _tmp17_;
+		gchar* _tmp18_;
+		gchar* _tmp19_;
 #line 817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		height = 1;
 #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = self->priv->crop_tool_window;
+		_tmp15_ = self->priv->crop_tool_window;
 #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp18_ = _tmp17_->custom_height_entry;
+		_tmp16_ = _tmp15_->custom_height_entry;
 #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp19_ = height;
+		_tmp17_ = height;
 #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp20_ = g_strdup_printf ("%d", _tmp19_);
+		_tmp18_ = g_strdup_printf ("%d", _tmp17_);
 #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp21_ = _tmp20_;
+		_tmp19_ = _tmp18_;
 #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		gtk_entry_set_text (_tmp18_, _tmp21_);
+		gtk_entry_set_text (_tmp16_, _tmp19_);
 #line 818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_free0 (_tmp21_);
-#line 6020 "EditingTools.c"
+		_g_free0 (_tmp19_);
+#line 6786 "EditingTools.c"
 	}
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = width;
+	_tmp21_ = width;
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->priv->custom_width;
+	_tmp22_ = self->priv->custom_width;
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp23_ == _tmp24_) {
-#line 6028 "EditingTools.c"
-		gint _tmp25_;
-		gint _tmp26_;
+	if (_tmp21_ == _tmp22_) {
+#line 6794 "EditingTools.c"
+		gint _tmp23_;
+		gint _tmp24_;
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp25_ = height;
+		_tmp23_ = height;
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp26_ = self->priv->custom_height;
+		_tmp24_ = self->priv->custom_height;
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp22_ = _tmp25_ == _tmp26_;
-#line 6037 "EditingTools.c"
+		_tmp20_ = _tmp23_ == _tmp24_;
+#line 6803 "EditingTools.c"
 	} else {
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp22_ = FALSE;
-#line 6041 "EditingTools.c"
+		_tmp20_ = FALSE;
+#line 6807 "EditingTools.c"
 	}
 #line 821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp22_) {
+	if (_tmp20_) {
 #line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 6049 "EditingTools.c"
+#line 6815 "EditingTools.c"
 	}
 #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = width;
+	_tmp25_ = width;
 #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = height;
+	_tmp26_ = height;
 #line 824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_aspect_ratio = ((gfloat) _tmp27_) / ((gfloat) _tmp28_);
+	self->priv->custom_aspect_ratio = ((gfloat) _tmp25_) / ((gfloat) _tmp26_);
 #line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->priv->custom_aspect_ratio;
+	_tmp27_ = self->priv->custom_aspect_ratio;
 #line 826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp29_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
-#line 6061 "EditingTools.c"
+	if (_tmp27_ < EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO) {
+#line 6827 "EditingTools.c"
+		EditingToolsCropToolCropToolWindow* _tmp28_;
+		GtkEntry* _tmp29_;
 		EditingToolsCropToolCropToolWindow* _tmp30_;
 		GtkEntry* _tmp31_;
-		EditingToolsCropToolCropToolWindow* _tmp32_;
-		GtkEntry* _tmp33_;
 #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp30_ = self->priv->crop_tool_window;
+		_tmp28_ = self->priv->crop_tool_window;
 #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp31_ = _tmp30_->most_recently_edited;
+		_tmp29_ = _tmp28_->most_recently_edited;
 #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp32_ = self->priv->crop_tool_window;
+		_tmp30_ = self->priv->crop_tool_window;
 #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp33_ = _tmp32_->custom_height_entry;
+		_tmp31_ = _tmp30_->custom_height_entry;
 #line 827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp31_ == _tmp33_) {
-#line 6076 "EditingTools.c"
-			gint _tmp34_;
-			EditingToolsCropToolCropToolWindow* _tmp35_;
-			GtkEntry* _tmp36_;
-			gint _tmp37_;
-			gchar* _tmp38_;
-			gchar* _tmp39_;
+		if (_tmp29_ == _tmp31_) {
+#line 6842 "EditingTools.c"
+			gint _tmp32_;
+			EditingToolsCropToolCropToolWindow* _tmp33_;
+			GtkEntry* _tmp34_;
+			gint _tmp35_;
+			gchar* _tmp36_;
+			gchar* _tmp37_;
 #line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp34_ = width;
+			_tmp32_ = width;
 #line 828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			height = (gint) (_tmp34_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
+			height = (gint) (_tmp32_ / EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp35_ = self->priv->crop_tool_window;
+			_tmp33_ = self->priv->crop_tool_window;
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp36_ = _tmp35_->custom_height_entry;
+			_tmp34_ = _tmp33_->custom_height_entry;
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp37_ = height;
+			_tmp35_ = height;
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp38_ = g_strdup_printf ("%d", _tmp37_);
+			_tmp36_ = g_strdup_printf ("%d", _tmp35_);
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp39_ = _tmp38_;
+			_tmp37_ = _tmp36_;
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_entry_set_text (_tmp36_, _tmp39_);
+			gtk_entry_set_text (_tmp34_, _tmp37_);
 #line 829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_g_free0 (_tmp39_);
-#line 6101 "EditingTools.c"
+			_g_free0 (_tmp37_);
+#line 6867 "EditingTools.c"
 		} else {
-			gint _tmp40_;
-			EditingToolsCropToolCropToolWindow* _tmp41_;
-			GtkEntry* _tmp42_;
-			gint _tmp43_;
-			gchar* _tmp44_;
-			gchar* _tmp45_;
+			gint _tmp38_;
+			EditingToolsCropToolCropToolWindow* _tmp39_;
+			GtkEntry* _tmp40_;
+			gint _tmp41_;
+			gchar* _tmp42_;
+			gchar* _tmp43_;
 #line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp40_ = height;
+			_tmp38_ = height;
 #line 831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			width = (gint) (_tmp40_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
+			width = (gint) (_tmp38_ * EDITING_TOOLS_CROP_TOOL_MIN_ASPECT_RATIO);
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp41_ = self->priv->crop_tool_window;
+			_tmp39_ = self->priv->crop_tool_window;
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp42_ = _tmp41_->custom_width_entry;
+			_tmp40_ = _tmp39_->custom_width_entry;
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp43_ = width;
+			_tmp41_ = width;
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp44_ = g_strdup_printf ("%d", _tmp43_);
+			_tmp42_ = g_strdup_printf ("%d", _tmp41_);
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp45_ = _tmp44_;
+			_tmp43_ = _tmp42_;
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_entry_set_text (_tmp42_, _tmp45_);
+			gtk_entry_set_text (_tmp40_, _tmp43_);
 #line 832 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_g_free0 (_tmp45_);
-#line 6127 "EditingTools.c"
+			_g_free0 (_tmp43_);
+#line 6893 "EditingTools.c"
 		}
 	} else {
-		gfloat _tmp46_;
+		gfloat _tmp44_;
 #line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp46_ = self->priv->custom_aspect_ratio;
+		_tmp44_ = self->priv->custom_aspect_ratio;
 #line 834 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp46_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
-#line 6135 "EditingTools.c"
+		if (_tmp44_ > EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO) {
+#line 6901 "EditingTools.c"
+			EditingToolsCropToolCropToolWindow* _tmp45_;
+			GtkEntry* _tmp46_;
 			EditingToolsCropToolCropToolWindow* _tmp47_;
 			GtkEntry* _tmp48_;
-			EditingToolsCropToolCropToolWindow* _tmp49_;
-			GtkEntry* _tmp50_;
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp47_ = self->priv->crop_tool_window;
+			_tmp45_ = self->priv->crop_tool_window;
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp48_ = _tmp47_->most_recently_edited;
+			_tmp46_ = _tmp45_->most_recently_edited;
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp49_ = self->priv->crop_tool_window;
+			_tmp47_ = self->priv->crop_tool_window;
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp50_ = _tmp49_->custom_height_entry;
+			_tmp48_ = _tmp47_->custom_height_entry;
 #line 835 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp48_ == _tmp50_) {
-#line 6150 "EditingTools.c"
-				gint _tmp51_;
-				EditingToolsCropToolCropToolWindow* _tmp52_;
-				GtkEntry* _tmp53_;
-				gint _tmp54_;
-				gchar* _tmp55_;
-				gchar* _tmp56_;
+			if (_tmp46_ == _tmp48_) {
+#line 6916 "EditingTools.c"
+				gint _tmp49_;
+				EditingToolsCropToolCropToolWindow* _tmp50_;
+				GtkEntry* _tmp51_;
+				gint _tmp52_;
+				gchar* _tmp53_;
+				gchar* _tmp54_;
 #line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp51_ = width;
+				_tmp49_ = width;
 #line 836 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				height = (gint) (_tmp51_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
+				height = (gint) (_tmp49_ / EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp52_ = self->priv->crop_tool_window;
+				_tmp50_ = self->priv->crop_tool_window;
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp53_ = _tmp52_->custom_height_entry;
+				_tmp51_ = _tmp50_->custom_height_entry;
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp54_ = height;
+				_tmp52_ = height;
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp55_ = g_strdup_printf ("%d", _tmp54_);
+				_tmp53_ = g_strdup_printf ("%d", _tmp52_);
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp56_ = _tmp55_;
+				_tmp54_ = _tmp53_;
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				gtk_entry_set_text (_tmp53_, _tmp56_);
+				gtk_entry_set_text (_tmp51_, _tmp54_);
 #line 837 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_g_free0 (_tmp56_);
-#line 6175 "EditingTools.c"
+				_g_free0 (_tmp54_);
+#line 6941 "EditingTools.c"
 			} else {
-				gint _tmp57_;
-				EditingToolsCropToolCropToolWindow* _tmp58_;
-				GtkEntry* _tmp59_;
-				gint _tmp60_;
-				gchar* _tmp61_;
-				gchar* _tmp62_;
+				gint _tmp55_;
+				EditingToolsCropToolCropToolWindow* _tmp56_;
+				GtkEntry* _tmp57_;
+				gint _tmp58_;
+				gchar* _tmp59_;
+				gchar* _tmp60_;
 #line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp57_ = height;
+				_tmp55_ = height;
 #line 839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				width = (gint) (_tmp57_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
+				width = (gint) (_tmp55_ * EDITING_TOOLS_CROP_TOOL_MAX_ASPECT_RATIO);
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp58_ = self->priv->crop_tool_window;
+				_tmp56_ = self->priv->crop_tool_window;
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp59_ = _tmp58_->custom_width_entry;
+				_tmp57_ = _tmp56_->custom_width_entry;
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp60_ = width;
+				_tmp58_ = width;
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp61_ = g_strdup_printf ("%d", _tmp60_);
+				_tmp59_ = g_strdup_printf ("%d", _tmp58_);
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp62_ = _tmp61_;
+				_tmp60_ = _tmp59_;
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				gtk_entry_set_text (_tmp59_, _tmp62_);
+				gtk_entry_set_text (_tmp57_, _tmp60_);
 #line 840 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_g_free0 (_tmp62_);
-#line 6201 "EditingTools.c"
+				_g_free0 (_tmp60_);
+#line 6967 "EditingTools.c"
 			}
 		}
 	}
 #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp63_ = width;
+	_tmp61_ = width;
 #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp64_ = height;
+	_tmp62_ = height;
 #line 844 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_aspect_ratio = ((gfloat) _tmp63_) / ((gfloat) _tmp64_);
+	self->priv->custom_aspect_ratio = ((gfloat) _tmp61_) / ((gfloat) _tmp62_);
 #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = self->priv->scaled_crop;
+	_tmp63_ = self->priv->scaled_crop;
 #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_constrain_crop (self, &_tmp65_, &_tmp66_);
+	editing_tools_crop_tool_constrain_crop (self, &_tmp63_, &_tmp64_);
 #line 846 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_crop = _tmp66_;
+	new_crop = _tmp64_;
 #line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67_ = new_crop;
+	_tmp65_ = new_crop;
 #line 848 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_crop_resized (self, &_tmp67_);
+	editing_tools_crop_tool_crop_resized (self, &_tmp65_);
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = new_crop;
+	_tmp66_ = new_crop;
 #line 849 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_crop = _tmp68_;
+	self->priv->scaled_crop = _tmp66_;
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp67_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70_ = new_crop;
+	_tmp68_ = new_crop;
 #line 850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_invalidate_area (_tmp69_, &_tmp70_);
+	editing_tools_photo_canvas_invalidate_area (_tmp67_, &_tmp68_);
 #line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp69_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 851 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp71_);
+	editing_tools_photo_canvas_repaint (_tmp69_);
 #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp72_ = width;
+	_tmp70_ = width;
 #line 853 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_width = _tmp72_;
+	self->priv->custom_width = _tmp70_;
 #line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp73_ = height;
+	_tmp71_ = height;
 #line 854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_height = _tmp73_;
+	self->priv->custom_height = _tmp71_;
 #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 856 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6247 "EditingTools.c"
+#line 7013 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) {
+static void
+editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool* self,
+                                              const gchar* text,
+                                              gint length,
+                                              gint* position)
+{
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	GtkEntry* _tmp1_;
-	const gchar* _tmp2_;
-	gint _tmp3_;
 #line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 859 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6261,20 +7030,19 @@ static void editing_tools_crop_tool_on_width_insert_text (EditingToolsCropTool*
 #line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_width_entry;
 #line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = text;
-#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = length;
-#line 860 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6270 "EditingTools.c"
+	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, text, length, position);
+#line 7035 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self, const gchar* text, gint length, gint* position) {
+static void
+editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool* self,
+                                               const gchar* text,
+                                               gint length,
+                                               gint* position)
+{
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	GtkEntry* _tmp1_;
-	const gchar* _tmp2_;
-	gint _tmp3_;
 #line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 863 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6284,42 +7052,42 @@ static void editing_tools_crop_tool_on_height_insert_text (EditingToolsCropTool*
 #line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->custom_height_entry;
 #line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = text;
-#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = length;
-#line 864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, _tmp2_, _tmp3_, position);
-#line 6293 "EditingTools.c"
+	editing_tools_crop_tool_on_entry_insert_text (self, _tmp1_, text, length, position);
+#line 7057 "EditingTools.c"
 }
 
 
-static gchar string_get (const gchar* self, glong index) {
+static gchar
+string_get (const gchar* self,
+            glong index)
+{
 	gchar result = '\0';
-	glong _tmp0_;
-	gchar _tmp1_;
-#line 1110 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+	gchar _tmp0_;
+#line 1124 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	g_return_val_if_fail (self != NULL, '\0');
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp0_ = index;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	_tmp1_ = ((gchar*) self)[_tmp0_];
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
-	result = _tmp1_;
-#line 1111 "/usr/share/vala-0.36/vapi/glib-2.0.vapi"
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	_tmp0_ = ((gchar*) self)[index];
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
+	result = _tmp0_;
+#line 1125 "/usr/share/vala-0.40/vapi/glib-2.0.vapi"
 	return result;
-#line 6311 "EditingTools.c"
+#line 7075 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self, GtkEntry* sender, const gchar* text, gint length, gint* position) {
+static void
+editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool* self,
+                                              GtkEntry* sender,
+                                              const gchar* text,
+                                              gint length,
+                                              gint* position)
+{
 	gboolean _tmp0_;
-	gint _tmp1_;
 	gchar* new_text = NULL;
-	gchar* _tmp5_;
-	const gchar* _tmp21_;
-	gint _tmp22_;
-	gint _tmp23_;
-	GtkEntry* _tmp29_;
+	gchar* _tmp3_;
+	const gchar* _tmp13_;
+	gint _tmp14_;
+	gint _tmp15_;
 #line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6332,157 +7100,131 @@ static void editing_tools_crop_tool_on_entry_insert_text (EditingToolsCropTool*
 	if (_tmp0_) {
 #line 869 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6336 "EditingTools.c"
+#line 7104 "EditingTools.c"
 	}
 #line 871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = TRUE;
 #line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = length;
-#line 873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_ == -1) {
-#line 6344 "EditingTools.c"
-		const gchar* _tmp2_;
-		gint _tmp3_;
-		gint _tmp4_;
-#line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = text;
+	if (length == -1) {
+#line 7110 "EditingTools.c"
+		gint _tmp1_;
+		gint _tmp2_;
 #line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = strlen (_tmp2_);
+		_tmp1_ = strlen (text);
 #line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = _tmp3_;
+		_tmp2_ = _tmp1_;
 #line 874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		length = (gint) _tmp4_;
-#line 6356 "EditingTools.c"
+		length = (gint) _tmp2_;
+#line 7119 "EditingTools.c"
 	}
 #line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = g_strdup ("");
+	_tmp3_ = g_strdup ("");
 #line 877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_text = _tmp5_;
-#line 6362 "EditingTools.c"
+	new_text = _tmp3_;
+#line 7125 "EditingTools.c"
 	{
 		gint ctr = 0;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		ctr = 0;
-#line 6367 "EditingTools.c"
+#line 7130 "EditingTools.c"
 		{
-			gboolean _tmp6_ = FALSE;
+			gboolean _tmp4_ = FALSE;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp6_ = TRUE;
+			_tmp4_ = TRUE;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 6374 "EditingTools.c"
-				gint _tmp8_;
-				gint _tmp9_;
-				const gchar* _tmp10_;
-				gint _tmp11_;
-				gchar _tmp12_;
-				gboolean _tmp13_;
+#line 7137 "EditingTools.c"
+				gint _tmp6_;
+				gint _tmp7_;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (!_tmp6_) {
-#line 6383 "EditingTools.c"
-					gint _tmp7_;
+				if (!_tmp4_) {
+#line 7142 "EditingTools.c"
+					gint _tmp5_;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp7_ = ctr;
+					_tmp5_ = ctr;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					ctr = _tmp7_ + 1;
-#line 6389 "EditingTools.c"
+					ctr = _tmp5_ + 1;
+#line 7148 "EditingTools.c"
 				}
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp6_ = FALSE;
+				_tmp4_ = FALSE;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp8_ = ctr;
+				_tmp6_ = ctr;
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp9_ = length;
-#line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (!(_tmp8_ < _tmp9_)) {
+				if (!(_tmp6_ < length)) {
 #line 878 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 6401 "EditingTools.c"
+#line 7158 "EditingTools.c"
 				}
 #line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp10_ = text;
-#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp11_ = ctr;
+				_tmp7_ = ctr;
 #line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp12_ = string_get (_tmp10_, (glong) _tmp11_);
-#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp13_ = g_ascii_isdigit (_tmp12_);
-#line 879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp13_) {
-#line 6413 "EditingTools.c"
-					const gchar* _tmp14_;
-					const gchar* _tmp15_;
-					gint _tmp16_;
-					gchar _tmp17_;
-					gchar* _tmp18_;
-					gchar* _tmp19_;
-					gchar* _tmp20_;
-#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp14_ = new_text;
-#line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp15_ = text;
+				if (g_ascii_isdigit (string_get (text, (glong) _tmp7_))) {
+#line 7164 "EditingTools.c"
+					const gchar* _tmp8_;
+					gint _tmp9_;
+					gchar* _tmp10_;
+					gchar* _tmp11_;
+					gchar* _tmp12_;
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp16_ = ctr;
+					_tmp8_ = new_text;
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp17_ = string_get (_tmp15_, (glong) _tmp16_);
+					_tmp9_ = ctr;
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp18_ = g_strdup_printf ("%c", (gchar) _tmp17_);
+					_tmp10_ = g_strdup_printf ("%c", (gchar) string_get (text, (glong) _tmp9_));
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp19_ = _tmp18_;
+					_tmp11_ = _tmp10_;
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp20_ = g_strconcat (_tmp14_, _tmp19_, NULL);
+					_tmp12_ = g_strconcat (_tmp8_, _tmp11_, NULL);
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					_g_free0 (new_text);
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_text = _tmp20_;
+					new_text = _tmp12_;
 #line 880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_g_free0 (_tmp19_);
-#line 6441 "EditingTools.c"
+					_g_free0 (_tmp11_);
+#line 7186 "EditingTools.c"
 				}
 			}
 		}
 	}
 #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = new_text;
+	_tmp13_ = new_text;
 #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = strlen (_tmp21_);
+	_tmp14_ = strlen (_tmp13_);
 #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = _tmp22_;
+	_tmp15_ = _tmp14_;
 #line 884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp23_ > 0) {
-#line 6454 "EditingTools.c"
-		GtkEntry* _tmp24_;
-		const gchar* _tmp25_;
-		const gchar* _tmp26_;
-		gint _tmp27_;
-		gint _tmp28_;
-#line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp24_ = sender;
+	if (_tmp15_ > 0) {
+#line 7199 "EditingTools.c"
+		const gchar* _tmp16_;
+		const gchar* _tmp17_;
+		gint _tmp18_;
+		gint _tmp19_;
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp25_ = new_text;
+		_tmp16_ = new_text;
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp26_ = new_text;
+		_tmp17_ = new_text;
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp27_ = strlen (_tmp26_);
+		_tmp18_ = strlen (_tmp17_);
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp28_ = _tmp27_;
+		_tmp19_ = _tmp18_;
 #line 885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		gtk_editable_insert_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_EDITABLE, GtkEditable), _tmp25_, (gint) _tmp28_, position);
-#line 6472 "EditingTools.c"
+		g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (sender, gtk_editable_get_type (), GtkEditable), "insert-text", _tmp16_, (gint) _tmp19_, position);
+#line 7214 "EditingTools.c"
 	}
 #line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = sender;
-#line 887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_stop_emission_by_name (_tmp29_, "insert-text");
+	g_signal_stop_emission_by_name (sender, "insert-text");
 #line 889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->entry_insert_in_progress = FALSE;
 #line 867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (new_text);
-#line 6482 "EditingTools.c"
+#line 7222 "EditingTools.c"
 }
 
 
-static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self) {
+static gfloat
+editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsCropTool* self)
+{
 	gfloat result = 0.0F;
 	gfloat _result_ = 0.0F;
 	EditingToolsCropToolConstraintDescription* _tmp0_;
@@ -6490,7 +7232,7 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	gfloat _tmp2_;
 	gfloat _tmp3_;
 	gfloat _tmp4_;
-	EditingToolsCropToolReticleOrientation _tmp20_;
+	EditingToolsCropToolReticleOrientation _tmp18_;
 #line 892 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
 #line 893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6509,7 +7251,7 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 	_tmp4_ = _result_;
 #line 895 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6513 "EditingTools.c"
+#line 7255 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp5_;
 		GdkRectangle _tmp6_ = {0};
 		gint _tmp7_;
@@ -6530,21 +7272,19 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 		_tmp10_ = _tmp9_.height;
 #line 896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_result_ = ((gfloat) _tmp7_) / ((gfloat) _tmp10_);
-#line 6534 "EditingTools.c"
+#line 7276 "EditingTools.c"
 	} else {
 		gfloat _tmp11_;
 #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp11_ = _result_;
 #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp11_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6541 "EditingTools.c"
+#line 7283 "EditingTools.c"
 			GdkScreen* screen = NULL;
 			GdkScreen* _tmp12_;
 			GdkScreen* _tmp13_;
 			GdkScreen* _tmp14_;
-			gint _tmp15_;
-			GdkScreen* _tmp16_;
-			gint _tmp17_;
+			GdkScreen* _tmp15_;
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp12_ = gdk_screen_get_default ();
 #line 899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6554,59 +7294,58 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio (EditingToolsC
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp14_ = screen;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp15_ = gdk_screen_get_width (_tmp14_);
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp16_ = screen;
-#line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp17_ = gdk_screen_get_height (_tmp16_);
+			_tmp15_ = screen;
 #line 900 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_result_ = ((gfloat) _tmp15_) / ((gfloat) _tmp17_);
+			_result_ = ((gfloat) gdk_screen_get_width (_tmp14_)) / ((gfloat) gdk_screen_get_height (_tmp15_));
 #line 898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6567 "EditingTools.c"
+#line 7303 "EditingTools.c"
 		} else {
-			gfloat _tmp18_;
+			gfloat _tmp16_;
 #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp18_ = _result_;
+			_tmp16_ = _result_;
 #line 901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 6574 "EditingTools.c"
-				gfloat _tmp19_;
+			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
+#line 7310 "EditingTools.c"
+				gfloat _tmp17_;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp19_ = self->priv->custom_aspect_ratio;
+				_tmp17_ = self->priv->custom_aspect_ratio;
 #line 902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_result_ = _tmp19_;
-#line 6580 "EditingTools.c"
+				_result_ = _tmp17_;
+#line 7316 "EditingTools.c"
 			}
 		}
 	}
 #line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->priv->reticle_orientation;
+	_tmp18_ = self->priv->reticle_orientation;
 #line 904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp20_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 6588 "EditingTools.c"
-		gfloat _tmp21_;
+	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
+#line 7324 "EditingTools.c"
+		gfloat _tmp19_;
 #line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp21_ = _result_;
+		_tmp19_ = _result_;
 #line 905 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_result_ = 1.0f / _tmp21_;
-#line 6594 "EditingTools.c"
+		_result_ = 1.0f / _tmp19_;
+#line 7330 "EditingTools.c"
 	}
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6600 "EditingTools.c"
+#line 7336 "EditingTools.c"
 }
 
 
-static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self, EditingToolsCropToolConstraintDescription* constraint, Photo* photo) {
+static gfloat
+editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (EditingToolsCropTool* self,
+                                                                    EditingToolsCropToolConstraintDescription* constraint,
+                                                                    Photo* photo)
+{
 	gfloat result = 0.0F;
 	gfloat _result_ = 0.0F;
-	EditingToolsCropToolConstraintDescription* _tmp0_;
+	gfloat _tmp0_;
 	gfloat _tmp1_;
-	gfloat _tmp2_;
-	EditingToolsCropToolReticleOrientation _tmp18_;
+	EditingToolsCropToolReticleOrientation _tmp14_;
 #line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0.0F);
 #line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6614,120 +7353,110 @@ static gfloat editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint
 #line 910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), 0.0F);
 #line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = constraint;
-#line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _tmp0_->aspect_ratio;
+	_tmp0_ = constraint->aspect_ratio;
 #line 911 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_result_ = _tmp1_;
+	_result_ = _tmp0_;
 #line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _result_;
+	_tmp1_ = _result_;
 #line 913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
-#line 6627 "EditingTools.c"
+	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ORIGINAL_ASPECT_RATIO) {
+#line 7364 "EditingTools.c"
 		Dimensions orig_dim = {0};
-		Photo* _tmp3_;
-		Dimensions _tmp4_ = {0};
+		Dimensions _tmp2_ = {0};
+		Dimensions _tmp3_;
+		gint _tmp4_;
 		Dimensions _tmp5_;
 		gint _tmp6_;
-		Dimensions _tmp7_;
-		gint _tmp8_;
-#line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = photo;
 #line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		photo_get_original_dimensions (_tmp3_, &_tmp4_);
+		photo_get_original_dimensions (photo, &_tmp2_);
 #line 914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		orig_dim = _tmp4_;
+		orig_dim = _tmp2_;
 #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = orig_dim;
+		_tmp3_ = orig_dim;
 #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_.width;
+		_tmp4_ = _tmp3_.width;
 #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = orig_dim;
+		_tmp5_ = orig_dim;
 #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = _tmp7_.height;
+		_tmp6_ = _tmp5_.height;
 #line 915 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_result_ = ((gfloat) _tmp6_) / ((gfloat) _tmp8_);
-#line 6651 "EditingTools.c"
+		_result_ = ((gfloat) _tmp4_) / ((gfloat) _tmp6_);
+#line 7385 "EditingTools.c"
 	} else {
-		gfloat _tmp9_;
+		gfloat _tmp7_;
 #line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _result_;
+		_tmp7_ = _result_;
 #line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp9_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
-#line 6658 "EditingTools.c"
+		if (_tmp7_ == EDITING_TOOLS_CROP_TOOL_SCREEN_ASPECT_RATIO) {
+#line 7392 "EditingTools.c"
 			GdkScreen* screen = NULL;
+			GdkScreen* _tmp8_;
+			GdkScreen* _tmp9_;
 			GdkScreen* _tmp10_;
 			GdkScreen* _tmp11_;
-			GdkScreen* _tmp12_;
-			gint _tmp13_;
-			GdkScreen* _tmp14_;
-			gint _tmp15_;
 #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp10_ = gdk_screen_get_default ();
+			_tmp8_ = gdk_screen_get_default ();
 #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp11_ = _g_object_ref0 (_tmp10_);
+			_tmp9_ = _g_object_ref0 (_tmp8_);
 #line 917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			screen = _tmp11_;
+			screen = _tmp9_;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp12_ = screen;
+			_tmp10_ = screen;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp13_ = gdk_screen_get_width (_tmp12_);
+			_tmp11_ = screen;
 #line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp14_ = screen;
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp15_ = gdk_screen_get_height (_tmp14_);
-#line 918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_result_ = ((gfloat) _tmp13_) / ((gfloat) _tmp15_);
+			_result_ = ((gfloat) gdk_screen_get_width (_tmp10_)) / ((gfloat) gdk_screen_get_height (_tmp11_));
 #line 916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (screen);
-#line 6684 "EditingTools.c"
+#line 7412 "EditingTools.c"
 		} else {
-			gfloat _tmp16_;
+			gfloat _tmp12_;
 #line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp16_ = _result_;
+			_tmp12_ = _result_;
 #line 919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp16_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
-#line 6691 "EditingTools.c"
-				gfloat _tmp17_;
+			if (_tmp12_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
+#line 7419 "EditingTools.c"
+				gfloat _tmp13_;
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp17_ = self->priv->custom_aspect_ratio;
+				_tmp13_ = self->priv->custom_aspect_ratio;
 #line 920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_result_ = _tmp17_;
-#line 6697 "EditingTools.c"
+				_result_ = _tmp13_;
+#line 7425 "EditingTools.c"
 			}
 		}
 	}
 #line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->priv->reticle_orientation;
+	_tmp14_ = self->priv->reticle_orientation;
 #line 922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp18_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
-#line 6705 "EditingTools.c"
-		gfloat _tmp19_;
+	if (_tmp14_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_PORTRAIT) {
+#line 7433 "EditingTools.c"
+		gfloat _tmp15_;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp19_ = _result_;
+		_tmp15_ = _result_;
 #line 923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_result_ = 1.0f / _tmp19_;
-#line 6711 "EditingTools.c"
+		_result_ = 1.0f / _tmp15_;
+#line 7439 "EditingTools.c"
 	}
 #line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _result_;
 #line 925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 6717 "EditingTools.c"
+#line 7445 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolConstraintDescription* selected_constraint = NULL;
 	EditingToolsCropToolConstraintDescription* _tmp0_;
 	EditingToolsCropToolConstraintDescription* _tmp1_;
 	gfloat _tmp2_;
-	EditingToolsCropToolConstraintDescription* _tmp13_;
-	EditingToolsCropToolConstraintDescription* _tmp14_;
-	gboolean _tmp15_;
-	gboolean _tmp16_;
-	gfloat _tmp17_;
-	gfloat _tmp18_;
+	EditingToolsCropToolConstraintDescription* _tmp11_;
+	EditingToolsCropToolConstraintDescription* _tmp12_;
+	gboolean _tmp13_;
+	gboolean _tmp14_;
+	gfloat _tmp15_;
 #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -6742,7 +7471,7 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 	if (_tmp2_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO) {
 #line 932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 6746 "EditingTools.c"
+#line 7475 "EditingTools.c"
 	} else {
 		EditingToolsCropToolConstraintDescription* _tmp3_;
 		gfloat _tmp4_;
@@ -6754,115 +7483,106 @@ static void editing_tools_crop_tool_constraint_changed (EditingToolsCropTool* se
 		_tmp4_ = _tmp3_->aspect_ratio;
 #line 936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp4_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 6758 "EditingTools.c"
+#line 7487 "EditingTools.c"
 			ConfigFacade* _tmp5_;
 			ConfigFacade* _tmp6_;
-			gint _tmp7_;
+			ConfigFacade* _tmp7_;
 			ConfigFacade* _tmp8_;
-			ConfigFacade* _tmp9_;
+			gint _tmp9_;
 			gint _tmp10_;
-			gint _tmp11_;
-			gint _tmp12_;
 #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp5_ = config_facade_get_instance ();
 #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_tmp6_ = _tmp5_;
 #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp7_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			self->priv->custom_init_width = _tmp7_;
+			self->priv->custom_init_width = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 940 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_g_object_unref0 (_tmp6_);
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp8_ = config_facade_get_instance ();
-#line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp9_ = _tmp8_;
+			_tmp7_ = config_facade_get_instance ();
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp10_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+			_tmp8_ = _tmp7_;
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			self->priv->custom_init_height = _tmp10_;
+			self->priv->custom_init_height = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 941 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_g_object_unref0 (_tmp9_);
+			_g_object_unref0 (_tmp8_);
 #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp11_ = self->priv->custom_init_width;
+			_tmp9_ = self->priv->custom_init_width;
 #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp12_ = self->priv->custom_init_height;
+			_tmp10_ = self->priv->custom_init_height;
 #line 942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			self->priv->custom_aspect_ratio = ((gfloat) _tmp11_) / ((gfloat) _tmp12_);
-#line 6793 "EditingTools.c"
+			self->priv->custom_aspect_ratio = ((gfloat) _tmp9_) / ((gfloat) _tmp10_);
+#line 7516 "EditingTools.c"
 		}
 	}
 #line 946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
 #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = editing_tools_crop_tool_get_selected_constraint (self);
+	_tmp11_ = editing_tools_crop_tool_get_selected_constraint (self);
 #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _tmp13_;
+	_tmp12_ = _tmp11_;
 #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = _tmp14_->is_pivotable;
+	_tmp13_ = _tmp12_->is_pivotable;
 #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = !_tmp15_;
+	_tmp14_ = !_tmp13_;
 #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_editing_tools_crop_tool_constraint_description_unref0 (_tmp14_);
+	_editing_tools_crop_tool_constraint_description_unref0 (_tmp12_);
 #line 948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp16_) {
+	if (_tmp14_) {
 #line 949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->reticle_orientation = EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE;
-#line 6812 "EditingTools.c"
+#line 7535 "EditingTools.c"
 	}
 #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->priv->pre_aspect_ratio;
+	_tmp15_ = self->priv->pre_aspect_ratio;
 #line 951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp17_ != _tmp18_) {
-#line 6820 "EditingTools.c"
+	if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != _tmp15_) {
+#line 7541 "EditingTools.c"
 		Box new_crop = {0};
+		Box _tmp16_;
+		Box _tmp17_ = {0};
+		Box _tmp18_;
 		Box _tmp19_;
-		Box _tmp20_ = {0};
+		EditingToolsPhotoCanvas* _tmp20_;
 		Box _tmp21_;
-		Box _tmp22_;
-		EditingToolsPhotoCanvas* _tmp23_;
-		Box _tmp24_;
-		EditingToolsPhotoCanvas* _tmp25_;
-		gfloat _tmp26_;
+		EditingToolsPhotoCanvas* _tmp22_;
 #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp19_ = self->priv->scaled_crop;
+		_tmp16_ = self->priv->scaled_crop;
 #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_crop_tool_constrain_crop (self, &_tmp19_, &_tmp20_);
+		editing_tools_crop_tool_constrain_crop (self, &_tmp16_, &_tmp17_);
 #line 952 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		new_crop = _tmp20_;
+		new_crop = _tmp17_;
 #line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp21_ = new_crop;
+		_tmp18_ = new_crop;
 #line 954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_crop_tool_crop_resized (self, &_tmp21_);
+		editing_tools_crop_tool_crop_resized (self, &_tmp18_);
 #line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp22_ = new_crop;
+		_tmp19_ = new_crop;
 #line 955 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->scaled_crop = _tmp22_;
+		self->priv->scaled_crop = _tmp19_;
 #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp24_ = new_crop;
+		_tmp21_ = new_crop;
 #line 956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_);
+		editing_tools_photo_canvas_invalidate_area (_tmp20_, &_tmp21_);
 #line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_repaint (_tmp25_);
-#line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp26_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+		editing_tools_photo_canvas_repaint (_tmp22_);
 #line 959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->pre_aspect_ratio = _tmp26_;
-#line 6858 "EditingTools.c"
+		self->priv->pre_aspect_ratio = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+#line 7576 "EditingTools.c"
 	}
 #line 929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_editing_tools_crop_tool_constraint_description_unref0 (selected_constraint);
-#line 6862 "EditingTools.c"
+#line 7580 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolConstraintMode _tmp0_;
 	gboolean _tmp1_ = FALSE;
 	EditingToolsCropToolCropToolWindow* _tmp2_;
@@ -6915,7 +7635,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM) {
 #line 965 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 6919 "EditingTools.c"
+#line 7639 "EditingTools.c"
 	}
 #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
@@ -6925,7 +7645,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	if (_tmp3_ == -1) {
 #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 6929 "EditingTools.c"
+#line 7649 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp4_;
 		gint _tmp5_;
@@ -6935,11 +7655,11 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		_tmp5_ = _tmp4_->normal_height;
 #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = _tmp5_ == -1;
-#line 6939 "EditingTools.c"
+#line 7659 "EditingTools.c"
 	}
 #line 967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
-#line 6943 "EditingTools.c"
+#line 7663 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp6_;
 		EditingToolsCropToolCropToolWindow* _tmp7_;
 		EditingToolsCropToolCropToolWindow* _tmp8_;
@@ -6957,7 +7677,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		_tmp7_->normal_width = _tmp9_;
 #line 968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp8_->normal_height = _tmp10_;
-#line 6961 "EditingTools.c"
+#line 7681 "EditingTools.c"
 	}
 #line 971 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp11_ = self->priv->crop_tool_window;
@@ -7053,7 +7773,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	_tmp47_ = self->priv->reticle_orientation;
 #line 982 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp47_ == EDITING_TOOLS_CROP_TOOL_RETICLE_ORIENTATION_LANDSCAPE) {
-#line 7057 "EditingTools.c"
+#line 7777 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp48_;
 		GtkEntry* _tmp49_;
 		gint _tmp50_;
@@ -7092,7 +7812,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp54_, _tmp57_);
 #line 984 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp57_);
-#line 7096 "EditingTools.c"
+#line 7816 "EditingTools.c"
 	} else {
 		EditingToolsCropToolCropToolWindow* _tmp58_;
 		GtkEntry* _tmp59_;
@@ -7132,7 +7852,7 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 		gtk_entry_set_text (_tmp64_, _tmp67_);
 #line 987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (_tmp67_);
-#line 7136 "EditingTools.c"
+#line 7856 "EditingTools.c"
 	}
 #line 989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp68_ = self->priv->custom_init_width;
@@ -7146,11 +7866,13 @@ static void editing_tools_crop_tool_set_custom_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, gtk_widget_get_type (), GtkWidget));
 #line 993 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_CUSTOM;
-#line 7150 "EditingTools.c"
+#line 7870 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolConstraintMode _tmp0_;
 	EditingToolsCropToolCropToolWindow* _tmp1_;
 	GtkBox* _tmp2_;
@@ -7202,7 +7924,7 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL) {
 #line 998 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7206 "EditingTools.c"
+#line 7928 "EditingTools.c"
 	}
 #line 1000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = self->priv->crop_tool_window;
@@ -7312,167 +8034,146 @@ static void editing_tools_crop_tool_set_normal_constraint_mode (EditingToolsCrop
 	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget));
 #line 1016 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
-#line 7316 "EditingTools.c"
+#line 8038 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self, Box* crop, Box* result) {
+static void
+editing_tools_crop_tool_constrain_crop (EditingToolsCropTool* self,
+                                        Box* crop,
+                                        Box* result)
+{
 	gfloat user_aspect_ratio = 0.0F;
 	gfloat _tmp0_;
-	gfloat _tmp1_;
 	gfloat old_area = 0.0F;
-	gint _tmp3_;
-	gint _tmp4_;
+	gfloat _tmp2_;
+	gfloat _tmp3_;
+	gfloat _tmp4_;
 	gfloat _tmp5_;
-	gfloat _tmp6_;
-	gdouble _tmp7_;
-	gfloat _tmp8_;
-	gfloat _tmp9_;
-	gdouble _tmp10_;
 	Dimensions image_size = {0};
-	Dimensions _tmp11_ = {0};
+	Dimensions _tmp6_ = {0};
 	gdouble angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp12_;
-	Photo* _tmp13_;
-	Photo* _tmp14_;
-	gdouble _tmp15_ = 0.0;
-	Box _tmp16_;
-	Dimensions _tmp17_;
-	gint _tmp18_;
-	Dimensions _tmp19_;
-	gint _tmp20_;
-	gdouble _tmp21_;
-	Box _tmp22_ = {0};
-	gint _tmp23_;
-	gint _tmp24_;
-	gfloat _tmp25_;
-	Box _tmp30_;
+	EditingToolsPhotoCanvas* _tmp7_;
+	Photo* _tmp8_;
+	Photo* _tmp9_;
+	gdouble _tmp10_ = 0.0;
+	Box _tmp11_;
+	Dimensions _tmp12_;
+	gint _tmp13_;
+	Dimensions _tmp14_;
+	gint _tmp15_;
+	gdouble _tmp16_;
+	Box _tmp17_ = {0};
+	gfloat _tmp18_;
+	Box _tmp21_;
 #line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1019 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (crop != NULL);
 #line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1020 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	user_aspect_ratio = _tmp0_;
+	user_aspect_ratio = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = user_aspect_ratio;
+	_tmp0_ = user_aspect_ratio;
 #line 1021 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 7363 "EditingTools.c"
-		Box _tmp2_;
+	if (_tmp0_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
+#line 8080 "EditingTools.c"
+		Box _tmp1_;
 #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = *crop;
+		_tmp1_ = *crop;
 #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		*result = _tmp2_;
+		*result = _tmp1_;
 #line 1022 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 7371 "EditingTools.c"
+#line 8088 "EditingTools.c"
 	}
 #line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = box_get_width (crop);
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = box_get_height (crop);
-#line 1025 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	old_area = (gfloat) (_tmp3_ * _tmp4_);
-#line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = old_area;
+	old_area = (gfloat) (box_get_width (crop) * box_get_height (crop));
 #line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = user_aspect_ratio;
+	_tmp2_ = old_area;
 #line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = sqrt ((gdouble) (_tmp5_ / _tmp6_));
+	_tmp3_ = user_aspect_ratio;
 #line 1026 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_adjust_height (crop, (gint) _tmp7_);
-#line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = old_area;
+	box_adjust_height (crop, (gint) sqrt ((gdouble) (_tmp2_ / _tmp3_)));
 #line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = user_aspect_ratio;
+	_tmp4_ = old_area;
 #line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = sqrt ((gdouble) (_tmp8_ * _tmp9_));
+	_tmp5_ = user_aspect_ratio;
 #line 1027 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_adjust_width (crop, (gint) _tmp10_);
+	box_adjust_width (crop, (gint) sqrt ((gdouble) (_tmp4_ * _tmp5_)));
 #line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp11_);
+	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp6_);
 #line 1030 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	image_size = _tmp11_;
+	image_size = _tmp6_;
 #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_);
+	_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
 #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _tmp13_;
+	_tmp9_ = _tmp8_;
 #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_get_straighten (_tmp14_, &_tmp15_);
+	photo_get_straighten (_tmp9_, &_tmp10_);
 #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	angle = _tmp15_;
+	angle = _tmp10_;
 #line 1032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp9_);
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = *crop;
+	_tmp11_ = *crop;
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = image_size;
+	_tmp12_ = image_size;
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = _tmp17_.width;
+	_tmp13_ = _tmp12_.width;
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = image_size;
+	_tmp14_ = image_size;
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _tmp19_.height;
+	_tmp15_ = _tmp14_.height;
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = angle;
+	_tmp16_ = angle;
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	clamp_inside_rotated_image (&_tmp16_, _tmp18_, _tmp20_, _tmp21_, FALSE, &_tmp22_);
+	clamp_inside_rotated_image (&_tmp11_, _tmp13_, _tmp15_, _tmp16_, FALSE, &_tmp17_);
 #line 1033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	*crop = _tmp22_;
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = box_get_width (crop);
+	*crop = _tmp17_;
 #line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = box_get_height (crop);
+	_tmp18_ = user_aspect_ratio;
 #line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = user_aspect_ratio;
-#line 1036 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (((gfloat) _tmp23_) >= (_tmp24_ * _tmp25_)) {
-#line 7435 "EditingTools.c"
-		gint _tmp26_;
-		gfloat _tmp27_;
-#line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp26_ = box_get_height (crop);
+	if (((gfloat) box_get_width (crop)) >= (box_get_height (crop) * _tmp18_)) {
+#line 8140 "EditingTools.c"
+		gfloat _tmp19_;
 #line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp27_ = user_aspect_ratio;
+		_tmp19_ = user_aspect_ratio;
 #line 1037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		box_adjust_width (crop, (gint) (_tmp26_ * _tmp27_));
-#line 7444 "EditingTools.c"
+		box_adjust_width (crop, (gint) (box_get_height (crop) * _tmp19_));
+#line 8146 "EditingTools.c"
 	} else {
-		gint _tmp28_;
-		gfloat _tmp29_;
-#line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp28_ = box_get_width (crop);
+		gfloat _tmp20_;
 #line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp29_ = user_aspect_ratio;
+		_tmp20_ = user_aspect_ratio;
 #line 1039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		box_adjust_height (crop, (gint) (_tmp28_ / _tmp29_));
-#line 7454 "EditingTools.c"
+		box_adjust_height (crop, (gint) (box_get_width (crop) / _tmp20_));
+#line 8153 "EditingTools.c"
 	}
 #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = *crop;
+	_tmp21_ = *crop;
 #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	*result = _tmp30_;
+	*result = _tmp21_;
 #line 1041 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 7462 "EditingTools.c"
+#line 8161 "EditingTools.c"
 }
 
 
-static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self, gint* index) {
+static EditingToolsCropToolConstraintDescription*
+editing_tools_crop_tool_get_last_constraint (EditingToolsCropTool* self,
+                                             gint* index)
+{
 	gint _vala_index = 0;
 	EditingToolsCropToolConstraintDescription* result = NULL;
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
-	gint _tmp2_;
-	EditingToolsCropToolConstraintDescription* _tmp3_ = NULL;
-	gint _tmp4_;
-	EditingToolsCropToolConstraintDescription** _tmp5_;
-	gint _tmp5__length1;
-	EditingToolsCropToolConstraintDescription* _tmp9_;
+	EditingToolsCropToolConstraintDescription* _tmp2_ = NULL;
+	gint _tmp3_;
+	EditingToolsCropToolConstraintDescription** _tmp4_;
+	gint _tmp4__length1;
+	EditingToolsCropToolConstraintDescription* _tmp8_;
 #line 1044 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), NULL);
 #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -7480,406 +8181,360 @@ static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_get_la
 #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_;
 #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
-#line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_index = _tmp2_;
+	_vala_index = configuration_facade_get_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _vala_index;
+	_tmp3_ = _vala_index;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->priv->constraints;
+	_tmp4_ = self->priv->constraints;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5__length1 = self->priv->constraints_length1;
+	_tmp4__length1 = self->priv->constraints_length1;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp4_ < _tmp5__length1) {
-#line 7497 "EditingTools.c"
-		EditingToolsCropToolConstraintDescription** _tmp6_;
-		gint _tmp6__length1;
-		gint _tmp7_;
-		EditingToolsCropToolConstraintDescription* _tmp8_;
+	if (_tmp3_ < _tmp4__length1) {
+#line 8196 "EditingTools.c"
+		EditingToolsCropToolConstraintDescription** _tmp5_;
+		gint _tmp5__length1;
+		gint _tmp6_;
+		EditingToolsCropToolConstraintDescription* _tmp7_;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = self->priv->constraints;
+		_tmp5_ = self->priv->constraints;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6__length1 = self->priv->constraints_length1;
+		_tmp5__length1 = self->priv->constraints_length1;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = _vala_index;
+		_tmp6_ = _vala_index;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = _tmp6_[_tmp7_];
+		_tmp7_ = _tmp5_[_tmp6_];
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp8_;
-#line 7512 "EditingTools.c"
+		_tmp2_ = _tmp7_;
+#line 8211 "EditingTools.c"
 	} else {
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = NULL;
-#line 7516 "EditingTools.c"
+		_tmp2_ = NULL;
+#line 8215 "EditingTools.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp3_);
+	_tmp8_ = _editing_tools_crop_tool_constraint_description_ref0 (_tmp2_);
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp9_;
+	result = _tmp8_;
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (index) {
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*index = _vala_index;
-#line 7526 "EditingTools.c"
+#line 8225 "EditingTools.c"
 	}
 #line 1047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 7530 "EditingTools.c"
+#line 8229 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
+static void
+editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base,
+                                       EditingToolsPhotoCanvas* canvas)
+{
 	EditingToolsCropTool * self;
-	EditingToolsPhotoCanvas* _tmp0_;
-	EditingToolsPhotoCanvas* _tmp1_;
-	cairo_t* _tmp2_;
-	cairo_t* _tmp3_;
-	EditingToolsPhotoCanvas* _tmp4_;
-	Dimensions _tmp5_ = {0};
-	cairo_surface_t* _tmp6_;
-	EditingToolsPhotoCanvas* _tmp7_;
-	GdkRectangle _tmp8_ = {0};
-	gint _tmp9_;
-	EditingToolsPhotoCanvas* _tmp10_;
-	GdkRectangle _tmp11_ = {0};
-	gint _tmp12_;
-	cairo_surface_t* _tmp13_;
+	cairo_t* _tmp0_;
+	cairo_t* _tmp1_;
+	Dimensions _tmp2_ = {0};
+	cairo_surface_t* _tmp3_;
+	GdkRectangle _tmp4_ = {0};
+	gint _tmp5_;
+	GdkRectangle _tmp6_ = {0};
+	gint _tmp7_;
+	cairo_surface_t* _tmp8_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp14_;
-	cairo_t* _tmp15_;
-	cairo_t* _tmp16_;
-	cairo_t* _tmp17_;
-	EditingToolsPhotoCanvas* _tmp18_;
-	GtkWindow* _tmp19_;
-	GtkWindow* _tmp20_;
-	EditingToolsCropToolCropToolWindow* _tmp21_;
-	EditingToolsCropToolCropToolWindow* _tmp22_;
-	GtkComboBox* _tmp23_;
-	GtkListStore* _tmp24_;
-	EditingToolsPhotoCanvas* _tmp25_;
-	Photo* _tmp26_;
-	Photo* _tmp27_;
-	gboolean _tmp28_;
-	gboolean _tmp29_;
+	cairo_surface_t* _tmp9_;
+	cairo_t* _tmp10_;
+	cairo_t* _tmp11_;
+	cairo_t* _tmp12_;
+	GtkWindow* _tmp13_;
+	GtkWindow* _tmp14_;
+	EditingToolsCropToolCropToolWindow* _tmp15_;
+	EditingToolsCropToolCropToolWindow* _tmp16_;
+	GtkComboBox* _tmp17_;
+	GtkListStore* _tmp18_;
+	Photo* _tmp19_;
+	Photo* _tmp20_;
+	gboolean _tmp21_;
 	Dimensions uncropped_dim = {0};
-	EditingToolsPhotoCanvas* _tmp61_;
-	Photo* _tmp62_;
-	Photo* _tmp63_;
-	Dimensions _tmp64_ = {0};
-	Dimensions _tmp65_;
+	Photo* _tmp49_;
+	Photo* _tmp50_;
+	Dimensions _tmp51_ = {0};
+	Dimensions _tmp52_;
 	Box crop = {0};
-	EditingToolsPhotoCanvas* _tmp66_;
-	Photo* _tmp67_;
-	Photo* _tmp68_;
-	Box _tmp69_ = {0};
-	gboolean _tmp70_;
-	gboolean _tmp71_;
-	Dimensions _tmp84_;
-	EditingToolsPhotoCanvas* _tmp85_;
-	GdkRectangle _tmp86_ = {0};
-	Dimensions _tmp87_ = {0};
-	Box _tmp88_ = {0};
-	ConfigFacade* _tmp89_;
-	ConfigFacade* _tmp90_;
-	gint _tmp91_;
-	ConfigFacade* _tmp92_;
-	ConfigFacade* _tmp93_;
-	gint _tmp94_;
-	gint _tmp95_;
-	gint _tmp96_;
-	gint _tmp97_;
-	gint _tmp98_;
-	EditingToolsPhotoCanvas* _tmp99_;
-	EditingToolsCropToolCropToolWindow* _tmp100_;
-	EditingToolsPhotoCanvas* _tmp101_;
-	Photo* _tmp102_;
-	Photo* _tmp103_;
-	gboolean _tmp104_;
-	gboolean _tmp105_;
+	Photo* _tmp53_;
+	Photo* _tmp54_;
+	Box _tmp55_ = {0};
+	gboolean _tmp56_;
+	gboolean _tmp57_;
+	Dimensions _tmp70_;
+	GdkRectangle _tmp71_ = {0};
+	Dimensions _tmp72_ = {0};
+	Box _tmp73_ = {0};
+	ConfigFacade* _tmp74_;
+	ConfigFacade* _tmp75_;
+	ConfigFacade* _tmp76_;
+	ConfigFacade* _tmp77_;
+	gint _tmp78_;
+	gint _tmp79_;
+	gint _tmp80_;
+	gint _tmp81_;
+	EditingToolsCropToolCropToolWindow* _tmp82_;
+	Photo* _tmp83_;
+	Photo* _tmp84_;
+	gboolean _tmp85_;
 	Box new_crop = {0};
-	Box _tmp114_;
-	Box _tmp115_ = {0};
-	Box _tmp116_;
-	Box _tmp117_;
-	EditingToolsPhotoCanvas* _tmp118_;
-	Box _tmp119_;
-	EditingToolsPhotoCanvas* _tmp120_;
-	gfloat _tmp121_;
+	Box _tmp93_;
+	Box _tmp94_ = {0};
+	Box _tmp95_;
+	Box _tmp96_;
+	Box _tmp97_;
 #line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
-#line 1051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_bind_canvas_handlers (self, _tmp0_);
+	editing_tools_crop_tool_bind_canvas_handlers (self, canvas);
 #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = canvas;
+	_tmp0_ = editing_tools_photo_canvas_get_default_ctx (canvas);
 #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = editing_tools_photo_canvas_get_default_ctx (_tmp1_);
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_;
-#line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = canvas;
+	_tmp1_ = _tmp0_;
 #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_surface_dim (_tmp4_, &_tmp5_);
+	editing_tools_photo_canvas_get_surface_dim (canvas, &_tmp2_);
 #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_prepare_ctx (self, _tmp3_, &_tmp5_);
+	editing_tools_crop_tool_prepare_ctx (self, _tmp1_, &_tmp2_);
 #line 1053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_cairo_destroy0 (_tmp3_);
+	_cairo_destroy0 (_tmp1_);
 #line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->priv->crop_surface;
+	_tmp3_ = self->priv->crop_surface;
 #line 1055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp6_ != NULL) {
+	if (_tmp3_ != NULL) {
 #line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1056 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 7641 "EditingTools.c"
+#line 8318 "EditingTools.c"
 	}
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = canvas;
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp7_, &_tmp8_);
-#line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _tmp8_.width;
+	editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp4_);
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = canvas;
+	_tmp5_ = _tmp4_.width;
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_);
+	editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp6_);
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = _tmp11_.height;
+	_tmp7_ = _tmp6_.height;
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp9_, _tmp12_);
+	_tmp8_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp5_, _tmp7_);
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1058 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->crop_surface = _tmp13_;
+	self->priv->crop_surface = _tmp8_;
 #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->priv->crop_surface;
+	_tmp9_ = self->priv->crop_surface;
 #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = cairo_create (_tmp14_);
+	_tmp10_ = cairo_create (_tmp9_);
 #line 1062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	ctx = _tmp15_;
+	ctx = _tmp10_;
 #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = ctx;
+	_tmp11_ = ctx;
 #line 1063 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_rgba (_tmp16_, 0.0, 0.0, 0.0, 1.0);
+	cairo_set_source_rgba (_tmp11_, 0.0, 0.0, 0.0, 1.0);
 #line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = ctx;
+	_tmp12_ = ctx;
 #line 1064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_paint (_tmp17_);
-#line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = canvas;
+	cairo_paint (_tmp12_);
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = editing_tools_photo_canvas_get_container (_tmp18_);
+	_tmp13_ = editing_tools_photo_canvas_get_container (canvas);
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _tmp19_;
+	_tmp14_ = _tmp13_;
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = editing_tools_crop_tool_crop_tool_window_new (_tmp20_);
+	_tmp15_ = editing_tools_crop_tool_crop_tool_window_new (_tmp14_);
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp21_);
+	g_object_ref_sink (_tmp15_);
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->crop_tool_window);
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->crop_tool_window = _tmp21_;
+	self->priv->crop_tool_window = _tmp15_;
 #line 1067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp20_);
+	_g_object_unref0 (_tmp14_);
 #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->priv->crop_tool_window;
+	_tmp16_ = self->priv->crop_tool_window;
 #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = _tmp22_->constraint_combo;
+	_tmp17_ = _tmp16_->constraint_combo;
 #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->priv->constraint_list;
+	_tmp18_ = self->priv->constraint_list;
 #line 1070 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_combo_box_set_model (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, GTK_TYPE_TREE_MODEL, GtkTreeModel));
-#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = canvas;
-#line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = editing_tools_photo_canvas_get_photo (_tmp25_);
+	gtk_combo_box_set_model (_tmp17_, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_tree_model_get_type (), GtkTreeModel));
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = _tmp26_;
+	_tmp19_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = photo_has_crop (_tmp27_);
+	_tmp20_ = _tmp19_;
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = !_tmp28_;
+	_tmp21_ = !photo_has_crop (_tmp20_);
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp27_);
+	_g_object_unref0 (_tmp20_);
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp29_) {
-#line 7713 "EditingTools.c"
+	if (_tmp21_) {
+#line 8380 "EditingTools.c"
 		gint index = 0;
 		EditingToolsCropToolConstraintDescription* desc = NULL;
-		gint _tmp30_ = 0;
-		EditingToolsCropToolConstraintDescription* _tmp31_;
-		gboolean _tmp32_ = FALSE;
-		EditingToolsCropToolConstraintDescription* _tmp33_;
+		gint _tmp22_ = 0;
+		EditingToolsCropToolConstraintDescription* _tmp23_;
+		gboolean _tmp24_ = FALSE;
+		EditingToolsCropToolConstraintDescription* _tmp25_;
 #line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp31_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp30_);
+		_tmp23_ = editing_tools_crop_tool_get_last_constraint (self, &_tmp22_);
 #line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		index = _tmp30_;
+		index = _tmp22_;
 #line 1073 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		desc = _tmp31_;
+		desc = _tmp23_;
 #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp33_ = desc;
+		_tmp25_ = desc;
 #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp33_ != NULL) {
-#line 7730 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp34_;
-			gboolean _tmp35_;
+		if (_tmp25_ != NULL) {
+#line 8397 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp26_;
 #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp34_ = desc;
+			_tmp26_ = desc;
 #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp35_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp34_);
-#line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp32_ = !_tmp35_;
-#line 7739 "EditingTools.c"
+			_tmp24_ = !editing_tools_crop_tool_constraint_description_is_separator (_tmp26_);
+#line 8403 "EditingTools.c"
 		} else {
 #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp32_ = FALSE;
-#line 7743 "EditingTools.c"
+			_tmp24_ = FALSE;
+#line 8407 "EditingTools.c"
 		}
 #line 1074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp32_) {
-#line 7747 "EditingTools.c"
-			EditingToolsCropToolCropToolWindow* _tmp36_;
-			GtkComboBox* _tmp37_;
-			gint _tmp38_;
+		if (_tmp24_) {
+#line 8411 "EditingTools.c"
+			EditingToolsCropToolCropToolWindow* _tmp27_;
+			GtkComboBox* _tmp28_;
+			gint _tmp29_;
 #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp36_ = self->priv->crop_tool_window;
+			_tmp27_ = self->priv->crop_tool_window;
 #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp37_ = _tmp36_->constraint_combo;
+			_tmp28_ = _tmp27_->constraint_combo;
 #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp38_ = index;
+			_tmp29_ = index;
 #line 1075 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_combo_box_set_active (_tmp37_, _tmp38_);
-#line 7759 "EditingTools.c"
+			gtk_combo_box_set_active (_tmp28_, _tmp29_);
+#line 8423 "EditingTools.c"
 		}
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 7763 "EditingTools.c"
+#line 8427 "EditingTools.c"
 	} else {
 		Photo* photo = NULL;
-		EditingToolsPhotoCanvas* _tmp39_;
-		Photo* _tmp40_;
+		Photo* _tmp30_;
 		Dimensions cropped_dim = {0};
-		Photo* _tmp41_;
-		Dimensions _tmp42_ = {0};
+		Photo* _tmp31_;
+		Dimensions _tmp32_ = {0};
 		gfloat ratio = 0.0F;
-		Dimensions _tmp43_;
-		gint _tmp44_;
-		Dimensions _tmp45_;
-		gint _tmp46_;
-#line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp39_ = canvas;
+		Dimensions _tmp33_;
+		gint _tmp34_;
+		Dimensions _tmp35_;
+		gint _tmp36_;
 #line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp40_ = editing_tools_photo_canvas_get_photo (_tmp39_);
+		_tmp30_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 1079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		photo = _tmp40_;
+		photo = _tmp30_;
 #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp41_ = photo;
+		_tmp31_ = photo;
 #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp42_);
+		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp32_);
 #line 1080 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cropped_dim = _tmp42_;
+		cropped_dim = _tmp32_;
 #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp43_ = cropped_dim;
+		_tmp33_ = cropped_dim;
 #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp44_ = _tmp43_.width;
+		_tmp34_ = _tmp33_.width;
 #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp45_ = cropped_dim;
+		_tmp35_ = cropped_dim;
 #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp46_ = _tmp45_.height;
+		_tmp36_ = _tmp35_.height;
 #line 1081 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		ratio = ((gfloat) _tmp44_) / ((gfloat) _tmp46_);
-#line 7798 "EditingTools.c"
+		ratio = ((gfloat) _tmp34_) / ((gfloat) _tmp36_);
+#line 8459 "EditingTools.c"
 		{
 			gint index = 0;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			index = 1;
-#line 7803 "EditingTools.c"
+#line 8464 "EditingTools.c"
 			{
-				gboolean _tmp47_ = FALSE;
+				gboolean _tmp37_ = FALSE;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp47_ = TRUE;
+				_tmp37_ = TRUE;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				while (TRUE) {
-#line 7810 "EditingTools.c"
-					gint _tmp49_;
-					EditingToolsCropToolConstraintDescription** _tmp50_;
-					gint _tmp50__length1;
-					gfloat _tmp51_;
-					EditingToolsCropToolConstraintDescription** _tmp52_;
-					gint _tmp52__length1;
-					gint _tmp53_;
-					EditingToolsCropToolConstraintDescription* _tmp54_;
-					Photo* _tmp55_;
-					gfloat _tmp56_;
-					gdouble _tmp57_;
+#line 8471 "EditingTools.c"
+					gint _tmp39_;
+					EditingToolsCropToolConstraintDescription** _tmp40_;
+					gint _tmp40__length1;
+					gfloat _tmp41_;
+					EditingToolsCropToolConstraintDescription** _tmp42_;
+					gint _tmp42__length1;
+					gint _tmp43_;
+					EditingToolsCropToolConstraintDescription* _tmp44_;
+					Photo* _tmp45_;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					if (!_tmp47_) {
-#line 7824 "EditingTools.c"
-						gint _tmp48_;
+					if (!_tmp37_) {
+#line 8483 "EditingTools.c"
+						gint _tmp38_;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-						_tmp48_ = index;
+						_tmp38_ = index;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-						index = _tmp48_ + 1;
-#line 7830 "EditingTools.c"
+						index = _tmp38_ + 1;
+#line 8489 "EditingTools.c"
 					}
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp47_ = FALSE;
+					_tmp37_ = FALSE;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp49_ = index;
+					_tmp39_ = index;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp50_ = self->priv->constraints;
+					_tmp40_ = self->priv->constraints;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp50__length1 = self->priv->constraints_length1;
+					_tmp40__length1 = self->priv->constraints_length1;
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					if (!(_tmp49_ < _tmp50__length1)) {
+					if (!(_tmp39_ < _tmp40__length1)) {
 #line 1082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						break;
-#line 7844 "EditingTools.c"
+#line 8503 "EditingTools.c"
 					}
 #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp51_ = ratio;
-#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp52_ = self->priv->constraints;
+					_tmp41_ = ratio;
 #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp52__length1 = self->priv->constraints_length1;
+					_tmp42_ = self->priv->constraints;
 #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp53_ = index;
+					_tmp42__length1 = self->priv->constraints_length1;
 #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp54_ = _tmp52_[_tmp53_];
+					_tmp43_ = index;
 #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp55_ = photo;
+					_tmp44_ = _tmp42_[_tmp43_];
 #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp56_ = editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp54_, _tmp55_);
+					_tmp45_ = photo;
 #line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp57_ = fabs ((gdouble) (_tmp51_ - _tmp56_));
-#line 1083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					if (_tmp57_ < 0.005) {
-#line 7864 "EditingTools.c"
-						EditingToolsCropToolCropToolWindow* _tmp58_;
-						GtkComboBox* _tmp59_;
-						gint _tmp60_;
+					if (fabs ((gdouble) (_tmp41_ - editing_tools_crop_tool_get_constraint_aspect_ratio_for_constraint (self, _tmp44_, _tmp45_))) < 0.005) {
+#line 8519 "EditingTools.c"
+						EditingToolsCropToolCropToolWindow* _tmp46_;
+						GtkComboBox* _tmp47_;
+						gint _tmp48_;
 #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-						_tmp58_ = self->priv->crop_tool_window;
+						_tmp46_ = self->priv->crop_tool_window;
 #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-						_tmp59_ = _tmp58_->constraint_combo;
+						_tmp47_ = _tmp46_->constraint_combo;
 #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-						_tmp60_ = index;
+						_tmp48_ = index;
 #line 1084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-						gtk_combo_box_set_active (_tmp59_, _tmp60_);
-#line 7876 "EditingTools.c"
+						gtk_combo_box_set_active (_tmp47_, _tmp48_);
+#line 8531 "EditingTools.c"
 					}
 				}
 			}
 		}
 #line 1071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
-#line 7883 "EditingTools.c"
+#line 8538 "EditingTools.c"
 	}
 #line 1089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_update_pivot_button_state (self);
@@ -7888,361 +8543,375 @@ static void editing_tools_crop_tool_real_activate (EditingToolsEditingTool* base
 #line 1092 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_bind_window_handlers (self);
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp61_ = canvas;
-#line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp62_ = editing_tools_photo_canvas_get_photo (_tmp61_);
+	_tmp49_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp63_ = _tmp62_;
+	_tmp50_ = _tmp49_;
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp63_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp64_);
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp51_);
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = _tmp64_;
+	_tmp52_ = _tmp51_;
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp63_);
+	_g_object_unref0 (_tmp50_);
 #line 1095 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	uncropped_dim = _tmp65_;
+	uncropped_dim = _tmp52_;
 #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp66_ = canvas;
+	_tmp53_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67_ = editing_tools_photo_canvas_get_photo (_tmp66_);
+	_tmp54_ = _tmp53_;
 #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = _tmp67_;
+	_tmp56_ = photo_get_crop (_tmp54_, &_tmp55_, PHOTO_EXCEPTION_NONE);
 #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70_ = photo_get_crop (_tmp68_, &_tmp69_, PHOTO_EXCEPTION_NONE);
+	crop = _tmp55_;
 #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	crop = _tmp69_;
+	_tmp57_ = !_tmp56_;
 #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = !_tmp70_;
+	_g_object_unref0 (_tmp54_);
 #line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp68_);
-#line 1098 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp71_) {
-#line 7921 "EditingTools.c"
+	if (_tmp57_) {
+#line 8572 "EditingTools.c"
 		gint xofs = 0;
-		Dimensions _tmp72_;
-		gint _tmp73_;
+		Dimensions _tmp58_;
+		gint _tmp59_;
 		gint yofs = 0;
-		Dimensions _tmp74_;
-		gint _tmp75_;
-		gint _tmp76_;
-		gint _tmp77_;
-		Dimensions _tmp78_;
-		gint _tmp79_;
-		gint _tmp80_;
-		Dimensions _tmp81_;
-		gint _tmp82_;
-		gint _tmp83_;
+		Dimensions _tmp60_;
+		gint _tmp61_;
+		gint _tmp62_;
+		gint _tmp63_;
+		Dimensions _tmp64_;
+		gint _tmp65_;
+		gint _tmp66_;
+		Dimensions _tmp67_;
+		gint _tmp68_;
+		gint _tmp69_;
 #line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp72_ = uncropped_dim;
+		_tmp58_ = uncropped_dim;
 #line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp73_ = _tmp72_.width;
+		_tmp59_ = _tmp58_.width;
 #line 1099 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		xofs = (gint) (_tmp73_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT);
+		xofs = (gint) (_tmp59_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_X_PCT);
 #line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp74_ = uncropped_dim;
+		_tmp60_ = uncropped_dim;
 #line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp75_ = _tmp74_.height;
+		_tmp61_ = _tmp60_.height;
 #line 1100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		yofs = (gint) (_tmp75_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT);
+		yofs = (gint) (_tmp61_ * EDITING_TOOLS_CROP_TOOL_CROP_INIT_Y_PCT);
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp76_ = xofs;
+		_tmp62_ = xofs;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp77_ = yofs;
+		_tmp63_ = yofs;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp78_ = uncropped_dim;
+		_tmp64_ = uncropped_dim;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp79_ = _tmp78_.width;
+		_tmp65_ = _tmp64_.width;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp80_ = xofs;
+		_tmp66_ = xofs;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp81_ = uncropped_dim;
+		_tmp67_ = uncropped_dim;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp82_ = _tmp81_.height;
+		_tmp68_ = _tmp67_.height;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp83_ = yofs;
+		_tmp69_ = yofs;
 #line 1104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		box_init (&crop, _tmp76_, _tmp77_, _tmp79_ - _tmp80_, _tmp82_ - _tmp83_);
-#line 7966 "EditingTools.c"
+		box_init (&crop, _tmp62_, _tmp63_, _tmp65_ - _tmp66_, _tmp68_ - _tmp69_);
+#line 8617 "EditingTools.c"
 	}
 #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp84_ = uncropped_dim;
+	_tmp70_ = uncropped_dim;
 #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp85_ = canvas;
+	editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp71_);
 #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp85_, &_tmp86_);
+	dimensions_for_rectangle (&_tmp71_, &_tmp72_);
 #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	dimensions_for_rectangle (&_tmp86_, &_tmp87_);
+	box_get_scaled_similar (&crop, &_tmp70_, &_tmp72_, &_tmp73_);
 #line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_get_scaled_similar (&crop, &_tmp84_, &_tmp87_, &_tmp88_);
-#line 1109 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_crop = _tmp88_;
-#line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp89_ = config_facade_get_instance ();
+	self->priv->scaled_crop = _tmp73_;
 #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp90_ = _tmp89_;
+	_tmp74_ = config_facade_get_instance ();
 #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp91_ = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp90_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	_tmp75_ = _tmp74_;
 #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_width = _tmp91_;
+	self->priv->custom_width = configuration_facade_get_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp75_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp90_);
+	_g_object_unref0 (_tmp75_);
 #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp92_ = config_facade_get_instance ();
+	_tmp76_ = config_facade_get_instance ();
 #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp93_ = _tmp92_;
+	_tmp77_ = _tmp76_;
 #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp94_ = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp93_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
+	self->priv->custom_height = configuration_facade_get_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp77_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade));
 #line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_height = _tmp94_;
-#line 1115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp93_);
+	_g_object_unref0 (_tmp77_);
 #line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp95_ = self->priv->custom_width;
+	_tmp78_ = self->priv->custom_width;
 #line 1116 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_init_width = _tmp95_;
+	self->priv->custom_init_width = _tmp78_;
 #line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp96_ = self->priv->custom_height;
+	_tmp79_ = self->priv->custom_height;
 #line 1117 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->custom_init_height = _tmp96_;
+	self->priv->custom_init_height = _tmp79_;
 #line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp97_ = self->priv->custom_init_width;
+	_tmp80_ = self->priv->custom_init_width;
 #line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp98_ = self->priv->custom_init_height;
+	_tmp81_ = self->priv->custom_init_height;
 #line 1118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->pre_aspect_ratio = ((gfloat) _tmp97_) / ((gfloat) _tmp98_);
+	self->priv->pre_aspect_ratio = ((gfloat) _tmp80_) / ((gfloat) _tmp81_);
 #line 1120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->constraint_mode = EDITING_TOOLS_CROP_TOOL_CONSTRAINT_MODE_NORMAL;
 #line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp99_ = canvas;
-#line 1122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp99_);
+	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas);
 #line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp100_ = self->priv->crop_tool_window;
+	_tmp82_ = self->priv->crop_tool_window;
 #line 1124 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp100_, gtk_widget_get_type (), GtkWidget));
-#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp101_ = canvas;
-#line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp102_ = editing_tools_photo_canvas_get_photo (_tmp101_);
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp82_, gtk_widget_get_type (), GtkWidget));
 #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp103_ = _tmp102_;
+	_tmp83_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp104_ = photo_has_crop (_tmp103_);
+	_tmp84_ = _tmp83_;
 #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp105_ = !_tmp104_;
+	_tmp85_ = !photo_has_crop (_tmp84_);
 #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp103_);
+	_g_object_unref0 (_tmp84_);
 #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp105_) {
-#line 8038 "EditingTools.c"
+	if (_tmp85_) {
+#line 8677 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription* desc = NULL;
-		EditingToolsCropToolConstraintDescription* _tmp106_;
-		gboolean _tmp107_ = FALSE;
-		gboolean _tmp108_ = FALSE;
-		EditingToolsCropToolConstraintDescription* _tmp109_;
+		EditingToolsCropToolConstraintDescription* _tmp86_;
+		gboolean _tmp87_ = FALSE;
+		gboolean _tmp88_ = FALSE;
+		EditingToolsCropToolConstraintDescription* _tmp89_;
 #line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp106_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
+		_tmp86_ = editing_tools_crop_tool_get_last_constraint (self, NULL);
 #line 1128 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		desc = _tmp106_;
+		desc = _tmp86_;
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp109_ = desc;
+		_tmp89_ = desc;
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp109_ != NULL) {
-#line 8052 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp110_;
-			gboolean _tmp111_;
+		if (_tmp89_ != NULL) {
+#line 8691 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp90_;
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp110_ = desc;
+			_tmp90_ = desc;
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp111_ = editing_tools_crop_tool_constraint_description_is_separator (_tmp110_);
-#line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp108_ = !_tmp111_;
-#line 8061 "EditingTools.c"
+			_tmp88_ = !editing_tools_crop_tool_constraint_description_is_separator (_tmp90_);
+#line 8697 "EditingTools.c"
 		} else {
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp108_ = FALSE;
-#line 8065 "EditingTools.c"
+			_tmp88_ = FALSE;
+#line 8701 "EditingTools.c"
 		}
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp108_) {
-#line 8069 "EditingTools.c"
-			EditingToolsCropToolConstraintDescription* _tmp112_;
-			gfloat _tmp113_;
+		if (_tmp88_) {
+#line 8705 "EditingTools.c"
+			EditingToolsCropToolConstraintDescription* _tmp91_;
+			gfloat _tmp92_;
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp112_ = desc;
+			_tmp91_ = desc;
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp113_ = _tmp112_->aspect_ratio;
+			_tmp92_ = _tmp91_->aspect_ratio;
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp107_ = _tmp113_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
-#line 8078 "EditingTools.c"
+			_tmp87_ = _tmp92_ == EDITING_TOOLS_CROP_TOOL_CUSTOM_ASPECT_RATIO;
+#line 8714 "EditingTools.c"
 		} else {
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp107_ = FALSE;
-#line 8082 "EditingTools.c"
+			_tmp87_ = FALSE;
+#line 8718 "EditingTools.c"
 		}
 #line 1129 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp107_) {
+		if (_tmp87_) {
 #line 1130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			editing_tools_crop_tool_set_custom_constraint_mode (self);
-#line 8088 "EditingTools.c"
+#line 8724 "EditingTools.c"
 		}
 #line 1127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_editing_tools_crop_tool_constraint_description_unref0 (desc);
-#line 8092 "EditingTools.c"
+#line 8728 "EditingTools.c"
 	}
 #line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp114_ = self->priv->scaled_crop;
+	_tmp93_ = self->priv->scaled_crop;
 #line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_constrain_crop (self, &_tmp114_, &_tmp115_);
+	editing_tools_crop_tool_constrain_crop (self, &_tmp93_, &_tmp94_);
 #line 1137 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_crop = _tmp115_;
+	new_crop = _tmp94_;
 #line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp116_ = new_crop;
+	_tmp95_ = new_crop;
 #line 1139 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_crop_resized (self, &_tmp116_);
+	editing_tools_crop_tool_crop_resized (self, &_tmp95_);
 #line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp117_ = new_crop;
+	_tmp96_ = new_crop;
 #line 1140 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_crop = _tmp117_;
+	self->priv->scaled_crop = _tmp96_;
 #line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp118_ = canvas;
+	_tmp97_ = new_crop;
 #line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp119_ = new_crop;
-#line 1141 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_invalidate_area (_tmp118_, &_tmp119_);
-#line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp120_ = canvas;
+	editing_tools_photo_canvas_invalidate_area (canvas, &_tmp97_);
 #line 1142 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp120_);
+	editing_tools_photo_canvas_repaint (canvas);
 #line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp121_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1144 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->pre_aspect_ratio = _tmp121_;
+	self->priv->pre_aspect_ratio = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1050 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8124 "EditingTools.c"
+#line 8754 "EditingTools.c"
 }
 
 
-static void _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
+static void
+_editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender,
+                                                                             cairo_t* ctx,
+                                                                             Dimensions* dim,
+                                                                             gpointer self)
+{
 #line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_prepare_ctx ((EditingToolsCropTool*) self, ctx, dim);
-#line 8131 "EditingTools.c"
+#line 8766 "EditingTools.c"
 }
 
 
-static void _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
+static void
+_editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                             Dimensions* old_dim,
+                                                                                             GdkPixbuf* scaled,
+                                                                                             GdkRectangle* scaled_position,
+                                                                                             gpointer self)
+{
 #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_resized_pixbuf ((EditingToolsCropTool*) self, old_dim, scaled, scaled_position);
-#line 8138 "EditingTools.c"
+#line 8779 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
-	EditingToolsPhotoCanvas* _tmp1_;
+static void
+editing_tools_crop_tool_bind_canvas_handlers (EditingToolsCropTool* self,
+                                              EditingToolsPhotoCanvas* canvas)
+{
 #line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
-#line 1148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
+	g_signal_connect (canvas, "new-surface", (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
 #line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = canvas;
-#line 1149 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8157 "EditingTools.c"
+	g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 8795 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
+static void
+editing_tools_crop_tool_unbind_canvas_handlers (EditingToolsCropTool* self,
+                                                EditingToolsPhotoCanvas* canvas)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	EditingToolsPhotoCanvas* _tmp2_;
-	guint _tmp3_;
 #line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
+	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE);
 #line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 1153 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = canvas;
+	g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_crop_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
 #line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
 #line 1154 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 8182 "EditingTools.c"
+	g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 8817 "EditingTools.c"
 }
 
 
-static void _editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_crop_tool_on_crop_ok_gtk_button_clicked (GtkButton* _sender,
+                                                        gpointer self)
+{
 #line 1159 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_crop_ok ((EditingToolsCropTool*) self);
-#line 8189 "EditingTools.c"
+#line 8827 "EditingTools.c"
 }
 
 
-static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender,
+                                                              gpointer self)
+{
 #line 1160 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 8196 "EditingTools.c"
+#line 8837 "EditingTools.c"
 }
 
 
-static void _editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender, gpointer self) {
+static void
+_editing_tools_crop_tool_constraint_changed_gtk_combo_box_changed (GtkComboBox* _sender,
+                                                                   gpointer self)
+{
 #line 1161 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed ((EditingToolsCropTool*) self);
-#line 8203 "EditingTools.c"
+#line 8847 "EditingTools.c"
 }
 
 
-static void _editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_crop_tool_on_pivot_button_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                     gpointer self)
+{
 #line 1162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_pivot_button_clicked ((EditingToolsCropTool*) self);
-#line 8210 "EditingTools.c"
+#line 8857 "EditingTools.c"
 }
 
 
-static gboolean _editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
+static gboolean
+_editing_tools_crop_tool_on_width_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender,
+                                                                              GdkEventFocus* event,
+                                                                              gpointer self)
+{
 	gboolean result;
 	result = editing_tools_crop_tool_on_width_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1165 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8219 "EditingTools.c"
+#line 8870 "EditingTools.c"
 }
 
 
-static gboolean _editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender, GdkEventFocus* event, gpointer self) {
+static gboolean
+_editing_tools_crop_tool_on_height_entry_focus_out_gtk_widget_focus_out_event (GtkWidget* _sender,
+                                                                               GdkEventFocus* event,
+                                                                               gpointer self)
+{
 	gboolean result;
 	result = editing_tools_crop_tool_on_height_entry_focus_out ((EditingToolsCropTool*) self, event);
 #line 1166 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8228 "EditingTools.c"
+#line 8883 "EditingTools.c"
 }
 
 
-static void _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
+static void
+_editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text (GtkEditable* _sender,
+                                                                        const gchar* new_text,
+                                                                        gint new_text_length,
+                                                                        gint* position,
+                                                                        gpointer self)
+{
 #line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_width_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8235 "EditingTools.c"
+#line 8896 "EditingTools.c"
 }
 
 
-static void _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender, const gchar* new_text, gint new_text_length, gint* position, gpointer self) {
+static void
+_editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text (GtkEditable* _sender,
+                                                                         const gchar* new_text,
+                                                                         gint new_text_length,
+                                                                         gint* position,
+                                                                         gpointer self)
+{
 #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_on_height_insert_text ((EditingToolsCropTool*) self, new_text, new_text_length, position);
-#line 8242 "EditingTools.c"
+#line 8909 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	EditingToolsCropToolCropToolWindow* _tmp1_;
 	GtkButton* _tmp2_;
@@ -8307,18 +8976,20 @@ static void editing_tools_crop_tool_bind_window_handlers (EditingToolsCropTool*
 #line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_->custom_width_entry;
 #line 1167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
 #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp15_ = self->priv->crop_tool_window;
 #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp16_ = _tmp15_->custom_height_entry;
 #line 1168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, GTK_TYPE_EDITABLE, GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
-#line 8318 "EditingTools.c"
+	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_editable_get_type (), GtkEditable), "insert-text", (GCallback) _editing_tools_crop_tool_on_height_insert_text_gtk_editable_insert_text, self);
+#line 8987 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolCropToolWindow* _tmp0_;
 	guint _tmp1_;
 	EditingToolsCropToolCropToolWindow* _tmp2_;
@@ -8403,70 +9074,62 @@ static void editing_tools_crop_tool_unbind_window_handlers (EditingToolsCropTool
 #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = _tmp20_->custom_width_entry;
 #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("insert-text", GTK_TYPE_EDITABLE, &_tmp22_, NULL, FALSE);
+	g_signal_parse_name ("insert-text", gtk_editable_get_type (), &_tmp22_, NULL, FALSE);
 #line 1181 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, GTK_TYPE_EDITABLE, GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
-#line 8410 "EditingTools.c"
+	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_editable_get_type (), GtkEditable), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp22_, 0, NULL, (GCallback) _editing_tools_crop_tool_on_width_insert_text_gtk_editable_insert_text, self);
+#line 9081 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) {
+static gboolean
+editing_tools_crop_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                          GdkEventKey* event)
+{
 	EditingToolsCropTool * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_;
-	guint _tmp3_;
-	const gchar* _tmp4_;
-	GdkEventKey* _tmp11_;
-	gboolean _tmp12_;
+	guint _tmp2_;
+	const gchar* _tmp3_;
 #line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1184 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = event;
-#line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_->keyval;
+	_tmp2_ = event->keyval;
 #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = gdk_keyval_name (_tmp3_);
+	_tmp3_ = gdk_keyval_name (_tmp2_);
 #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
+	if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) {
 #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 8438 "EditingTools.c"
+#line 9107 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_;
-		guint _tmp6_;
-		const gchar* _tmp7_;
+		guint _tmp4_;
+		const gchar* _tmp5_;
 #line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = event;
+		_tmp4_ = event->keyval;
 #line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_->keyval;
-#line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = gdk_keyval_name (_tmp6_);
+		_tmp5_ = gdk_keyval_name (_tmp4_);
 #line 1186 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 8451 "EditingTools.c"
+		_tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0;
+#line 9117 "EditingTools.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 8457 "EditingTools.c"
+#line 9123 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_;
-		guint _tmp9_;
-		const gchar* _tmp10_;
-#line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = event;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _tmp8_->keyval;
+		_tmp6_ = event->keyval;
 #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = gdk_keyval_name (_tmp9_);
+		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 1187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 8470 "EditingTools.c"
+		_tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0;
+#line 9133 "EditingTools.c"
 	}
 #line 1185 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -8476,27 +9139,24 @@ static gboolean editing_tools_crop_tool_real_on_keypress (EditingToolsEditingToo
 		result = TRUE;
 #line 1189 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 8480 "EditingTools.c"
+#line 9143 "EditingTools.c"
 	}
 #line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = event;
-#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp12_;
+	result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event);
 #line 1192 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8490 "EditingTools.c"
+#line 9149 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropTool* self)
+{
 	EditingToolsCropToolConstraintDescription* _tmp0_;
 	EditingToolsCropToolConstraintDescription* _tmp1_;
 	gfloat _tmp2_;
 	gboolean _tmp3_;
 	EditingToolsCropToolReticleOrientation _tmp21_;
-	EditingToolsCropToolReticleOrientation _tmp22_;
 #line 1195 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8511,7 +9171,7 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 	_editing_tools_crop_tool_constraint_description_unref0 (_tmp1_);
 #line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp3_) {
-#line 8515 "EditingTools.c"
+#line 9175 "EditingTools.c"
 		gchar* width_text = NULL;
 		EditingToolsCropToolCropToolWindow* _tmp4_;
 		GtkEntry* _tmp5_;
@@ -8584,21 +9244,21 @@ static void editing_tools_crop_tool_on_pivot_button_clicked (EditingToolsCropToo
 		_g_free0 (height_text);
 #line 1196 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (width_text);
-#line 8588 "EditingTools.c"
+#line 9248 "EditingTools.c"
 	}
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp21_ = self->priv->reticle_orientation;
 #line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_);
-#line 1206 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->reticle_orientation = _tmp22_;
+	self->priv->reticle_orientation = editing_tools_crop_tool_reticle_orientation_toggle (_tmp21_);
 #line 1207 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_changed (self);
-#line 8598 "EditingTools.c"
+#line 9256 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base) {
+static void
+editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* base)
+{
 	EditingToolsCropTool * self;
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsCropToolCropToolWindow* _tmp2_;
@@ -8609,19 +9269,19 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1211 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 8613 "EditingTools.c"
+#line 9273 "EditingTools.c"
 		EditingToolsPhotoCanvas* _tmp1_;
 #line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1212 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_unbind_canvas_handlers (self, _tmp1_);
-#line 8619 "EditingTools.c"
+#line 9279 "EditingTools.c"
 	}
 #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->crop_tool_window;
 #line 1214 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp2_ != NULL) {
-#line 8625 "EditingTools.c"
+#line 9285 "EditingTools.c"
 		EditingToolsCropToolCropToolWindow* _tmp3_;
 		EditingToolsCropToolCropToolWindow* _tmp4_;
 #line 1215 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8638,13 +9298,13 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (self->priv->crop_tool_window);
 #line 1218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_tool_window = NULL;
-#line 8642 "EditingTools.c"
+#line 9302 "EditingTools.c"
 	}
 #line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp5_ != NULL) {
-#line 8648 "EditingTools.c"
+#line 9308 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
 		EditingToolsPhotoCanvas* _tmp6_;
 		GdkWindow* _tmp7_;
@@ -8689,7 +9349,7 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 		_g_object_unref0 (display);
 #line 1222 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 8693 "EditingTools.c"
+#line 9353 "EditingTools.c"
 	}
 #line 1230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
@@ -8697,11 +9357,13 @@ static void editing_tools_crop_tool_real_deactivate (EditingToolsEditingTool* ba
 	self->priv->crop_surface = NULL;
 #line 1232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 8701 "EditingTools.c"
+#line 9361 "EditingTools.c"
 }
 
 
-static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base) {
+static EditingToolsEditingToolWindow*
+editing_tools_crop_tool_real_get_tool_window (EditingToolsEditingTool* base)
+{
 	EditingToolsCropTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsCropToolCropToolWindow* _tmp0_;
@@ -8716,21 +9378,25 @@ static EditingToolsEditingToolWindow* editing_tools_crop_tool_real_get_tool_wind
 	result = _tmp1_;
 #line 1236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8720 "EditingTools.c"
+#line 9382 "EditingTools.c"
 }
 
 
-static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
+static GdkPixbuf*
+editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsEditingTool* base,
+                                                 Scaling* scaling,
+                                                 Photo* photo,
+                                                 Dimensions* max_dim,
+                                                 GError** error)
+{
 	EditingToolsCropTool * self;
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_;
-	Dimensions _tmp1_ = {0};
-	GdkPixbuf* _tmp2_ = NULL;
-	Photo* _tmp3_;
-	Scaling _tmp4_;
-	GdkPixbuf* _tmp5_;
-	GdkPixbuf* _tmp6_;
+	Dimensions _tmp0_ = {0};
+	GdkPixbuf* _tmp1_ = NULL;
+	Scaling _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
@@ -8739,67 +9405,63 @@ static GdkPixbuf* editing_tools_crop_tool_real_get_display_pixbuf (EditingToolsE
 #line 1239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = photo;
-#line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp1_);
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp0_);
 #line 1241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_max_dim = _tmp1_;
+	_vala_max_dim = _tmp0_;
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = photo;
+	_tmp2_ = *scaling;
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = *scaling;
+	_tmp3_ = photo_get_pixbuf_with_options (photo, &_tmp2_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = photo_get_pixbuf_with_options (_tmp3_, &_tmp4_, PHOTO_EXCEPTION_CROP, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
-#line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _tmp5_;
+	_tmp1_ = _tmp3_;
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 8762 "EditingTools.c"
+#line 9424 "EditingTools.c"
 	}
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp2_;
+	_tmp4_ = _tmp1_;
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = NULL;
+	_tmp1_ = NULL;
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp6_;
+	result = _tmp4_;
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp2_);
+	_g_object_unref0 (_tmp1_);
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 8776 "EditingTools.c"
+#line 9438 "EditingTools.c"
 	}
 #line 1243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 8780 "EditingTools.c"
+#line 9442 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cairo_t* ctx, Dimensions* dim) {
-	cairo_t* _tmp0_;
-	cairo_surface_t* _tmp1_;
+static void
+editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self,
+                                     cairo_t* ctx,
+                                     Dimensions* dim)
+{
+	cairo_surface_t* _tmp0_;
+	cairo_t* _tmp1_;
 	cairo_t* _tmp2_;
 	cairo_t* _tmp3_;
-	cairo_t* _tmp4_;
+	cairo_surface_t* _tmp4_;
 	cairo_t* _tmp5_;
-	cairo_surface_t* _tmp6_;
+	cairo_t* _tmp6_;
 	cairo_t* _tmp7_;
-	cairo_t* _tmp8_;
+	cairo_surface_t* _tmp8_;
 	cairo_t* _tmp9_;
 	cairo_t* _tmp10_;
-	cairo_surface_t* _tmp11_;
-	cairo_t* _tmp12_;
+	cairo_t* _tmp11_;
+	cairo_surface_t* _tmp12_;
 	cairo_t* _tmp13_;
 	cairo_t* _tmp14_;
-	cairo_t* _tmp15_;
-	cairo_surface_t* _tmp16_;
-	cairo_t* _tmp17_;
-	cairo_t* _tmp18_;
 #line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8807,105 +9469,99 @@ static void editing_tools_crop_tool_prepare_ctx (EditingToolsCropTool* self, cai
 #line 1246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (dim != NULL);
 #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = ctx;
-#line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = cairo_get_target (_tmp0_);
+	_tmp0_ = cairo_get_target (ctx);
 #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = cairo_create (_tmp1_);
+	_tmp1_ = cairo_create (_tmp0_);
 #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_black_ctx);
 #line 1247 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->wide_black_ctx = _tmp2_;
+	self->priv->wide_black_ctx = _tmp1_;
 #line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->priv->wide_black_ctx;
+	_tmp2_ = self->priv->wide_black_ctx;
 #line 1248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp3_, "#000");
+	set_source_color_from_string (_tmp2_, "#000");
 #line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->wide_black_ctx;
+	_tmp3_ = self->priv->wide_black_ctx;
 #line 1249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_line_width (_tmp4_, (gdouble) 1);
-#line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = ctx;
+	cairo_set_line_width (_tmp3_, (gdouble) 1);
 #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = cairo_get_target (_tmp5_);
+	_tmp4_ = cairo_get_target (ctx);
 #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = cairo_create (_tmp6_);
+	_tmp5_ = cairo_create (_tmp4_);
 #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wide_white_ctx);
 #line 1251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->wide_white_ctx = _tmp7_;
+	self->priv->wide_white_ctx = _tmp5_;
 #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->priv->wide_white_ctx;
+	_tmp6_ = self->priv->wide_white_ctx;
 #line 1252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp8_, "#FFF");
+	set_source_color_from_string (_tmp6_, "#FFF");
 #line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = self->priv->wide_white_ctx;
+	_tmp7_ = self->priv->wide_white_ctx;
 #line 1253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_line_width (_tmp9_, (gdouble) 1);
+	cairo_set_line_width (_tmp7_, (gdouble) 1);
 #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = ctx;
+	_tmp8_ = cairo_get_target (ctx);
 #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = cairo_get_target (_tmp10_);
-#line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = cairo_create (_tmp11_);
+	_tmp9_ = cairo_create (_tmp8_);
 #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
 #line 1255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->thin_white_ctx = _tmp12_;
+	self->priv->thin_white_ctx = _tmp9_;
 #line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->priv->thin_white_ctx;
+	_tmp10_ = self->priv->thin_white_ctx;
 #line 1256 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp13_, "#FFF");
+	set_source_color_from_string (_tmp10_, "#FFF");
 #line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->priv->thin_white_ctx;
+	_tmp11_ = self->priv->thin_white_ctx;
 #line 1257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_line_width (_tmp14_, 0.5);
+	cairo_set_line_width (_tmp11_, 0.5);
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = ctx;
+	_tmp12_ = cairo_get_target (ctx);
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = cairo_get_target (_tmp15_);
-#line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = cairo_create (_tmp16_);
+	_tmp13_ = cairo_create (_tmp12_);
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->text_ctx);
 #line 1259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->text_ctx = _tmp17_;
+	self->priv->text_ctx = _tmp13_;
 #line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->priv->text_ctx;
+	_tmp14_ = self->priv->text_ctx;
 #line 1260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_select_font_face (_tmp18_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
-#line 8878 "EditingTools.c"
+	cairo_select_font_face (_tmp14_, "Sans", CAIRO_FONT_SLANT_NORMAL, CAIRO_FONT_WEIGHT_NORMAL);
+#line 9532 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
+static void
+editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* self,
+                                           Dimensions* old_dim,
+                                           GdkPixbuf* scaled,
+                                           GdkRectangle* scaled_position)
+{
 	Dimensions new_dim = {0};
-	GdkPixbuf* _tmp0_;
-	Dimensions _tmp1_ = {0};
+	Dimensions _tmp0_ = {0};
 	Dimensions uncropped_dim = {0};
-	EditingToolsPhotoCanvas* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Photo* _tmp2_;
 	Photo* _tmp3_;
-	Photo* _tmp4_;
-	Dimensions _tmp5_ = {0};
-	Dimensions _tmp6_;
+	Dimensions _tmp4_ = {0};
+	Dimensions _tmp5_;
 	Box crop = {0};
+	Dimensions _tmp6_;
 	Dimensions _tmp7_;
-	Dimensions _tmp8_;
-	Box _tmp9_ = {0};
+	Box _tmp8_ = {0};
+	Dimensions _tmp9_;
 	Dimensions _tmp10_;
-	Dimensions _tmp11_;
-	Box _tmp12_ = {0};
-	cairo_surface_t* _tmp13_;
-	GdkPixbuf* _tmp14_;
+	Box _tmp11_ = {0};
+	cairo_surface_t* _tmp12_;
+	gint _tmp13_;
+	gint _tmp14_;
 	gint _tmp15_;
 	gint _tmp16_;
-	GdkPixbuf* _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
-	cairo_surface_t* _tmp20_;
+	cairo_surface_t* _tmp17_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp21_;
-	cairo_t* _tmp22_;
+	cairo_surface_t* _tmp18_;
+	cairo_t* _tmp19_;
 #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -8915,86 +9571,84 @@ static void editing_tools_crop_tool_on_resized_pixbuf (EditingToolsCropTool* sel
 #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (scaled_position != NULL);
 #line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = scaled;
-#line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	dimensions_for_pixbuf (_tmp0_, &_tmp1_);
+	dimensions_for_pixbuf (scaled, &_tmp0_);
 #line 1264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_dim = _tmp1_;
+	new_dim = _tmp0_;
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = editing_tools_photo_canvas_get_photo (_tmp2_);
+	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp5_);
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp4_);
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp3_);
 #line 1265 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	uncropped_dim = _tmp6_;
+	uncropped_dim = _tmp5_;
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = *old_dim;
+	_tmp6_ = *old_dim;
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = uncropped_dim;
+	_tmp7_ = uncropped_dim;
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp7_, &_tmp8_, &_tmp9_);
+	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp6_, &_tmp7_, &_tmp8_);
 #line 1268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	crop = _tmp9_;
+	crop = _tmp8_;
 #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = uncropped_dim;
+	_tmp9_ = uncropped_dim;
 #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = new_dim;
+	_tmp10_ = new_dim;
 #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_get_scaled_similar (&crop, &_tmp10_, &_tmp11_, &_tmp12_);
+	box_get_scaled_similar (&crop, &_tmp9_, &_tmp10_, &_tmp11_);
 #line 1271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_crop = _tmp12_;
+	self->priv->scaled_crop = _tmp11_;
 #line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->priv->crop_surface;
+	_tmp12_ = self->priv->crop_surface;
 #line 1272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp13_ != NULL) {
+	if (_tmp12_ != NULL) {
 #line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->crop_surface = NULL;
-#line 8962 "EditingTools.c"
+#line 9616 "EditingTools.c"
 	}
 #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = scaled;
+	_tmp13_ = gdk_pixbuf_get_width (scaled);
 #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = gdk_pixbuf_get_width (_tmp14_);
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_;
-#line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = scaled;
+	_tmp14_ = _tmp13_;
 #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
+	_tmp15_ = gdk_pixbuf_get_height (scaled);
 #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _tmp18_;
+	_tmp16_ = _tmp15_;
 #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp16_, _tmp19_);
+	_tmp17_ = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, _tmp14_, _tmp16_);
 #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_surface_destroy0 (self->priv->crop_surface);
 #line 1275 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->crop_surface = _tmp20_;
+	self->priv->crop_surface = _tmp17_;
 #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = self->priv->crop_surface;
+	_tmp18_ = self->priv->crop_surface;
 #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = cairo_create (_tmp21_);
+	_tmp19_ = cairo_create (_tmp18_);
 #line 1276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	ctx = _tmp22_;
+	ctx = _tmp19_;
 #line 1277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 1.0);
 #line 1278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_paint (ctx);
 #line 1263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 8994 "EditingTools.c"
+#line 9644 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
+static void
+editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool* base,
+                                            gint x,
+                                            gint y)
+{
 	EditingToolsCropTool * self;
 	GdkRectangle scaled_pixbuf_pos = {0};
 	EditingToolsPhotoCanvas* _tmp0_;
@@ -9005,18 +9659,11 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 	GdkRectangle _tmp4_;
 	gint _tmp5_;
 	Box _tmp6_ = {0};
-	gint _tmp7_;
+	GdkRectangle _tmp7_;
 	gint _tmp8_;
-	BoxLocation _tmp9_;
+	GdkRectangle _tmp9_;
 	gint _tmp10_;
-	GdkRectangle _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	GdkRectangle _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
-	EditingToolsPhotoCanvas* _tmp18_;
+	EditingToolsPhotoCanvas* _tmp11_;
 #line 1282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1283 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9038,51 +9685,39 @@ static void editing_tools_crop_tool_real_on_left_click (EditingToolsEditingTool*
 #line 1286 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	offset_scaled_crop = _tmp6_;
 #line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = x;
-#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = y;
-#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->in_manipulation = _tmp9_;
+	self->priv->in_manipulation = box_approx_location (&offset_scaled_crop, x, y);
 #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = x;
+	_tmp7_ = scaled_pixbuf_pos;
 #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = scaled_pixbuf_pos;
+	_tmp8_ = _tmp7_.x;
 #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = _tmp11_.x;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	x = _tmp10_ - _tmp12_;
+	x = x - _tmp8_;
 #line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = x;
-#line 1290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->last_grab_x = _tmp13_;
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = y;
+	self->priv->last_grab_x = x;
 #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = scaled_pixbuf_pos;
+	_tmp9_ = scaled_pixbuf_pos;
 #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_.y;
-#line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	y = _tmp14_ - _tmp16_;
+	_tmp10_ = _tmp9_.y;
 #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = y;
+	y = y - _tmp10_;
 #line 1291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->last_grab_y = _tmp17_;
+	self->priv->last_grab_y = y;
 #line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp18_);
-#line 9077 "EditingTools.c"
+	editing_tools_photo_canvas_repaint (_tmp11_);
+#line 9710 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
+static void
+editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTool* base,
+                                               gint x,
+                                               gint y)
+{
 	EditingToolsCropTool * self;
 	BoxLocation _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	EditingToolsPhotoCanvas* _tmp3_;
+	EditingToolsPhotoCanvas* _tmp1_;
 #line 1297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9091,7 +9726,7 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 	if (_tmp0_ == BOX_LOCATION_OUTSIDE) {
 #line 1300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 9095 "EditingTools.c"
+#line 9730 "EditingTools.c"
 	}
 #line 1303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->in_manipulation = BOX_LOCATION_OUTSIDE;
@@ -9100,86 +9735,69 @@ static void editing_tools_crop_tool_real_on_left_released (EditingToolsEditingTo
 #line 1305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->last_grab_y = -1;
 #line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = x;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = y;
-#line 1307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_update_cursor (self, _tmp1_, _tmp2_);
+	editing_tools_crop_tool_update_cursor (self, x, y);
 #line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 9113 "EditingTools.c"
+	editing_tools_photo_canvas_repaint (_tmp1_);
+#line 9744 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
+static void
+editing_tools_crop_tool_real_on_motion (EditingToolsEditingTool* base,
+                                        gint x,
+                                        gint y,
+                                        GdkModifierType mask)
+{
 	EditingToolsCropTool * self;
 	BoxLocation _tmp0_;
-	gint _tmp3_;
-	gint _tmp4_;
-	EditingToolsPhotoCanvas* _tmp5_;
+	EditingToolsPhotoCanvas* _tmp1_;
 #line 1313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->in_manipulation;
 #line 1316 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 9129 "EditingTools.c"
-		gint _tmp1_;
-		gint _tmp2_;
-#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = x;
-#line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = y;
 #line 1317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_crop_tool_on_canvas_manipulation (self, _tmp1_, _tmp2_);
-#line 9138 "EditingTools.c"
+		editing_tools_crop_tool_on_canvas_manipulation (self, x, y);
+#line 9765 "EditingTools.c"
 	}
 #line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = x;
-#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = y;
-#line 1319 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_update_cursor (self, _tmp3_, _tmp4_);
+	editing_tools_crop_tool_update_cursor (self, x, y);
 #line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp5_);
-#line 9150 "EditingTools.c"
+	editing_tools_photo_canvas_repaint (_tmp1_);
+#line 9773 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, cairo_t* default_ctx) {
+static void
+editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base,
+                                    cairo_t* default_ctx)
+{
 	EditingToolsCropTool * self;
 	gint w = 0;
 	EditingToolsPhotoCanvas* _tmp0_;
 	GdkWindow* _tmp1_;
 	GdkWindow* _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
 	gint h = 0;
-	EditingToolsPhotoCanvas* _tmp5_;
+	EditingToolsPhotoCanvas* _tmp4_;
+	GdkWindow* _tmp5_;
 	GdkWindow* _tmp6_;
-	GdkWindow* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	cairo_t* _tmp10_;
-	cairo_t* _tmp11_;
-	cairo_t* _tmp12_;
-	cairo_t* _tmp13_;
+	gint _tmp7_;
 	cairo_t* ctx = NULL;
-	cairo_surface_t* _tmp14_;
-	cairo_t* _tmp15_;
+	cairo_surface_t* _tmp8_;
+	cairo_t* _tmp9_;
+	Box _tmp10_;
+	gint _tmp11_;
+	Box _tmp12_;
+	gint _tmp13_;
+	EditingToolsPhotoCanvas* _tmp14_;
+	cairo_surface_t* _tmp15_;
 	Box _tmp16_;
-	gint _tmp17_;
-	Box _tmp18_;
-	gint _tmp19_;
-	gint _tmp20_;
-	gint _tmp21_;
-	EditingToolsPhotoCanvas* _tmp22_;
-	cairo_surface_t* _tmp23_;
-	Box _tmp24_;
 #line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
 #line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9193,47 +9811,35 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = gdk_window_get_width (_tmp2_);
 #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_;
-#line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp2_);
 #line 1325 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	w = _tmp4_;
-#line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	w = _tmp3_;
 #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _tmp6_;
+	_tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_);
 #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = gdk_window_get_height (_tmp7_);
+	_tmp6_ = _tmp5_;
 #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _tmp8_;
+	_tmp7_ = gdk_window_get_height (_tmp6_);
 #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 1326 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	h = _tmp9_;
+	h = _tmp7_;
 #line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = default_ctx;
-#line 1328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_rgba (_tmp10_, 0.0, 0.0, 0.0, 1.0);
-#line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = default_ctx;
+	cairo_set_source_rgba (default_ctx, 0.0, 0.0, 0.0, 1.0);
 #line 1329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (_tmp11_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
+	cairo_rectangle (default_ctx, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
 #line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = default_ctx;
-#line 1330 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_fill (_tmp12_);
-#line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = default_ctx;
+	cairo_fill (default_ctx);
 #line 1331 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_paint (_tmp13_);
+	cairo_paint (default_ctx);
 #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->priv->crop_surface;
+	_tmp8_ = self->priv->crop_surface;
 #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = cairo_create (_tmp14_);
+	_tmp9_ = cairo_create (_tmp8_);
 #line 1333 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	ctx = _tmp15_;
+	ctx = _tmp9_;
 #line 1334 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
 #line 1335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9243,78 +9849,73 @@ static void editing_tools_crop_tool_real_paint (EditingToolsEditingTool* base, c
 #line 1339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.0);
 #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->priv->scaled_crop;
-#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = _tmp16_.left;
-#line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->priv->scaled_crop;
+	_tmp10_ = self->priv->scaled_crop;
 #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _tmp18_.top;
+	_tmp11_ = _tmp10_.left;
 #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = box_get_width (&self->priv->scaled_crop);
+	_tmp12_ = self->priv->scaled_crop;
 #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = box_get_height (&self->priv->scaled_crop);
+	_tmp13_ = _tmp12_.top;
 #line 1340 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (ctx, (gdouble) _tmp17_, (gdouble) _tmp19_, (gdouble) _tmp20_, (gdouble) _tmp21_);
+	cairo_rectangle (ctx, (gdouble) _tmp11_, (gdouble) _tmp13_, (gdouble) box_get_width (&self->priv->scaled_crop), (gdouble) box_get_height (&self->priv->scaled_crop));
 #line 1342 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (ctx);
 #line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->priv->crop_surface;
+	_tmp15_ = self->priv->crop_surface;
 #line 1343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_paint_surface (_tmp22_, _tmp23_, TRUE);
+	editing_tools_photo_canvas_paint_surface (_tmp14_, _tmp15_, TRUE);
 #line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->priv->scaled_crop;
+	_tmp16_ = self->priv->scaled_crop;
 #line 1346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_paint_crop_tool (self, &_tmp24_);
+	editing_tools_crop_tool_paint_crop_tool (self, &_tmp16_);
 #line 1323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 9274 "EditingTools.c"
+#line 9876 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
+static void
+editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self)
+{
 	ConfigFacade* _tmp0_;
 	ConfigFacade* _tmp1_;
 	EditingToolsCropToolCropToolWindow* _tmp2_;
 	GtkComboBox* _tmp3_;
-	gint _tmp4_;
+	ConfigFacade* _tmp4_;
 	ConfigFacade* _tmp5_;
-	ConfigFacade* _tmp6_;
-	gint _tmp7_;
+	gint _tmp6_;
+	ConfigFacade* _tmp7_;
 	ConfigFacade* _tmp8_;
-	ConfigFacade* _tmp9_;
-	gint _tmp10_;
+	gint _tmp9_;
 	Box crop = {0};
-	EditingToolsPhotoCanvas* _tmp11_;
-	GdkRectangle _tmp12_ = {0};
-	Dimensions _tmp13_ = {0};
-	EditingToolsPhotoCanvas* _tmp14_;
+	EditingToolsPhotoCanvas* _tmp10_;
+	GdkRectangle _tmp11_ = {0};
+	Dimensions _tmp12_ = {0};
+	EditingToolsPhotoCanvas* _tmp13_;
+	Photo* _tmp14_;
 	Photo* _tmp15_;
-	Photo* _tmp16_;
-	Dimensions _tmp17_ = {0};
-	Box _tmp18_ = {0};
-	Box _tmp19_;
+	Dimensions _tmp16_ = {0};
+	Box _tmp17_ = {0};
+	Box _tmp18_;
 	GdkPixbuf* cropped = NULL;
-	EditingToolsPhotoCanvas* _tmp20_;
+	EditingToolsPhotoCanvas* _tmp19_;
+	GdkPixbuf* _tmp20_;
 	GdkPixbuf* _tmp21_;
-	GdkPixbuf* _tmp22_;
-	Box _tmp23_;
-	gint _tmp24_;
-	Box _tmp25_;
-	gint _tmp26_;
-	gint _tmp27_;
-	gint _tmp28_;
-	GdkPixbuf* _tmp29_;
-	GdkPixbuf* _tmp30_;
-	EditingToolsPhotoCanvas* _tmp31_;
-	Photo* _tmp32_;
-	Photo* _tmp33_;
-	Box _tmp34_;
-	CropCommand* _tmp35_;
-	CropCommand* _tmp36_;
-	Dimensions _tmp37_ = {0};
+	Box _tmp22_;
+	gint _tmp23_;
+	Box _tmp24_;
+	gint _tmp25_;
+	GdkPixbuf* _tmp26_;
+	GdkPixbuf* _tmp27_;
+	EditingToolsPhotoCanvas* _tmp28_;
+	Photo* _tmp29_;
+	Photo* _tmp30_;
+	Box _tmp31_;
+	CropCommand* _tmp32_;
+	CropCommand* _tmp33_;
+	Dimensions _tmp34_ = {0};
 #line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9326,106 +9927,104 @@ static void editing_tools_crop_tool_on_crop_ok (EditingToolsCropTool* self) {
 #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = _tmp2_->constraint_combo;
 #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = gtk_combo_box_get_active (_tmp3_);
-#line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp4_);
+	configuration_facade_set_last_crop_menu_choice (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), gtk_combo_box_get_active (_tmp3_));
 #line 1353 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp1_);
 #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = config_facade_get_instance ();
+	_tmp4_ = config_facade_get_instance ();
 #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_;
+	_tmp5_ = _tmp4_;
 #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = self->priv->custom_width;
+	_tmp6_ = self->priv->custom_width;
 #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp7_);
+	configuration_facade_set_last_crop_width (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp6_);
 #line 1355 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp6_);
+	_g_object_unref0 (_tmp5_);
 #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = config_facade_get_instance ();
+	_tmp7_ = config_facade_get_instance ();
 #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = _tmp8_;
+	_tmp8_ = _tmp7_;
 #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->priv->custom_height;
+	_tmp9_ = self->priv->custom_height;
 #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp10_);
+	configuration_facade_set_last_crop_height (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_CONFIGURATION_FACADE, ConfigurationFacade), _tmp9_);
 #line 1356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp9_);
+	_g_object_unref0 (_tmp8_);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp11_, &_tmp12_);
+	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp10_, &_tmp11_);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	dimensions_for_rectangle (&_tmp12_, &_tmp13_);
+	dimensions_for_rectangle (&_tmp11_, &_tmp12_);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = editing_tools_photo_canvas_get_photo (_tmp14_);
+	_tmp14_ = editing_tools_photo_canvas_get_photo (_tmp13_);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = _tmp15_;
+	_tmp15_ = _tmp14_;
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp17_);
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp16_);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp13_, &_tmp17_, &_tmp18_);
+	box_get_scaled_similar (&self->priv->scaled_crop, &_tmp12_, &_tmp16_, &_tmp17_);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _tmp18_;
+	_tmp18_ = _tmp17_;
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp16_);
+	_g_object_unref0 (_tmp15_);
 #line 1359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	crop = _tmp19_;
-#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	crop = _tmp18_;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp20_);
+	_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = _tmp21_;
+	_tmp20_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp19_);
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->priv->scaled_crop;
+	_tmp21_ = _tmp20_;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = _tmp23_.left;
-#line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->priv->scaled_crop;
+	_tmp22_ = self->priv->scaled_crop;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _tmp25_.top;
+	_tmp23_ = _tmp22_.left;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = box_get_width (&self->priv->scaled_crop);
+	_tmp24_ = self->priv->scaled_crop;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = box_get_height (&self->priv->scaled_crop);
+	_tmp25_ = _tmp24_.top;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = gdk_pixbuf_new_subpixbuf (_tmp22_, _tmp24_, _tmp26_, _tmp27_, _tmp28_);
+	_tmp26_ = gdk_pixbuf_new_subpixbuf (_tmp21_, _tmp23_, _tmp25_, box_get_width (&self->priv->scaled_crop), box_get_height (&self->priv->scaled_crop));
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = _tmp29_;
+	_tmp27_ = _tmp26_;
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp22_);
+	_g_object_unref0 (_tmp21_);
 #line 1364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cropped = _tmp30_;
-#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	cropped = _tmp27_;
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = editing_tools_photo_canvas_get_photo (_tmp31_);
+	_tmp28_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = _tmp32_;
+	_tmp29_ = editing_tools_photo_canvas_get_photo (_tmp28_);
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = crop;
+	_tmp30_ = _tmp29_;
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = crop_command_new (_tmp33_, &_tmp34_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP);
+	_tmp31_ = crop;
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = _tmp35_;
+	_tmp32_ = crop_command_new (_tmp30_, &_tmp31_, RESOURCES_CROP_LABEL, RESOURCES_CROP_TOOLTIP);
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_get_dimensions (&crop, &_tmp37_);
+	_tmp33_ = _tmp32_;
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, TYPE_COMMAND, Command), cropped, &_tmp37_, TRUE);
+	box_get_dimensions (&crop, &_tmp34_);
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp36_);
+	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, TYPE_COMMAND, Command), cropped, &_tmp34_, TRUE);
 #line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp33_);
+#line 1369 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
+	_g_object_unref0 (_tmp30_);
 #line 1349 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (cropped);
-#line 9425 "EditingTools.c"
+#line 10020 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, gint x, gint y) {
+static void
+editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self,
+                                       gint x,
+                                       gint y)
+{
 	GdkRectangle scaled_pos = {0};
 	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
@@ -9436,11 +10035,8 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 	gint _tmp5_;
 	Box _tmp6_ = {0};
 	GdkCursorType cursor_type = 0;
-	gint _tmp7_;
-	gint _tmp8_;
-	BoxLocation _tmp9_;
-	GdkCursorType _tmp10_;
-	GdkCursorType _tmp11_;
+	GdkCursorType _tmp7_;
+	GdkCursorType _tmp8_;
 #line 1373 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1375 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9464,214 +10060,197 @@ static void editing_tools_crop_tool_update_cursor (EditingToolsCropTool* self, g
 #line 1378 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cursor_type = GDK_LEFT_PTR;
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = x;
-#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = y;
-#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = box_approx_location (&offset_scaled_crop, _tmp7_, _tmp8_);
-#line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	switch (_tmp9_) {
+	switch (box_approx_location (&offset_scaled_crop, x, y)) {
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 9477 "EditingTools.c"
+#line 10067 "EditingTools.c"
 		{
 #line 1381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_LEFT_SIDE;
 #line 1382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9483 "EditingTools.c"
+#line 10073 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 9487 "EditingTools.c"
+#line 10077 "EditingTools.c"
 		{
 #line 1385 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_SIDE;
 #line 1386 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9493 "EditingTools.c"
+#line 10083 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 9497 "EditingTools.c"
+#line 10087 "EditingTools.c"
 		{
 #line 1389 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_RIGHT_SIDE;
 #line 1390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9503 "EditingTools.c"
+#line 10093 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 9507 "EditingTools.c"
+#line 10097 "EditingTools.c"
 		{
 #line 1393 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_SIDE;
 #line 1394 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9513 "EditingTools.c"
+#line 10103 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 9517 "EditingTools.c"
+#line 10107 "EditingTools.c"
 		{
 #line 1397 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_LEFT_CORNER;
 #line 1398 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9523 "EditingTools.c"
+#line 10113 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 9527 "EditingTools.c"
+#line 10117 "EditingTools.c"
 		{
 #line 1401 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_LEFT_CORNER;
 #line 1402 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9533 "EditingTools.c"
+#line 10123 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 9537 "EditingTools.c"
+#line 10127 "EditingTools.c"
 		{
 #line 1405 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_TOP_RIGHT_CORNER;
 #line 1406 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9543 "EditingTools.c"
+#line 10133 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 9547 "EditingTools.c"
+#line 10137 "EditingTools.c"
 		{
 #line 1409 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_BOTTOM_RIGHT_CORNER;
 #line 1410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9553 "EditingTools.c"
+#line 10143 "EditingTools.c"
 		}
 #line 1379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 9557 "EditingTools.c"
+#line 10147 "EditingTools.c"
 		{
 #line 1413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			cursor_type = GDK_FLEUR;
 #line 1414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9563 "EditingTools.c"
+#line 10153 "EditingTools.c"
 		}
 		default:
 		{
 #line 1418 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 9569 "EditingTools.c"
+#line 10159 "EditingTools.c"
 		}
 	}
 #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = cursor_type;
+	_tmp7_ = cursor_type;
 #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->priv->current_cursor_type;
+	_tmp8_ = self->priv->current_cursor_type;
 #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp10_ != _tmp11_) {
-#line 9578 "EditingTools.c"
+	if (_tmp7_ != _tmp8_) {
+#line 10168 "EditingTools.c"
 		GdkWindow* drawing_window = NULL;
-		EditingToolsPhotoCanvas* _tmp12_;
-		GdkWindow* _tmp13_;
+		EditingToolsPhotoCanvas* _tmp9_;
+		GdkWindow* _tmp10_;
 		GdkDisplay* display = NULL;
-		GdkWindow* _tmp14_;
-		GdkDisplay* _tmp15_;
-		GdkDisplay* _tmp16_;
+		GdkWindow* _tmp11_;
+		GdkDisplay* _tmp12_;
+		GdkDisplay* _tmp13_;
 		GdkCursor* cursor = NULL;
-		GdkDisplay* _tmp17_;
-		GdkCursorType _tmp18_;
-		GdkCursor* _tmp19_;
-		GdkWindow* _tmp20_;
-		GdkCursor* _tmp21_;
-		GdkCursorType _tmp22_;
+		GdkDisplay* _tmp14_;
+		GdkCursorType _tmp15_;
+		GdkCursor* _tmp16_;
+		GdkWindow* _tmp17_;
+		GdkCursor* _tmp18_;
+		GdkCursorType _tmp19_;
 #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = editing_tools_photo_canvas_get_drawing_window (_tmp12_);
+		_tmp10_ = editing_tools_photo_canvas_get_drawing_window (_tmp9_);
 #line 1422 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		drawing_window = _tmp13_;
+		drawing_window = _tmp10_;
 #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp14_ = drawing_window;
+		_tmp11_ = drawing_window;
 #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = gdk_window_get_display (_tmp14_);
+		_tmp12_ = gdk_window_get_display (_tmp11_);
 #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp16_ = _g_object_ref0 (_tmp15_);
+		_tmp13_ = _g_object_ref0 (_tmp12_);
 #line 1423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		display = _tmp16_;
+		display = _tmp13_;
 #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = display;
+		_tmp14_ = display;
 #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp18_ = cursor_type;
+		_tmp15_ = cursor_type;
 #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp19_ = gdk_cursor_new_for_display (_tmp17_, _tmp18_);
+		_tmp16_ = gdk_cursor_new_for_display (_tmp14_, _tmp15_);
 #line 1424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		cursor = _tmp19_;
+		cursor = _tmp16_;
 #line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp20_ = drawing_window;
+		_tmp17_ = drawing_window;
 #line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp21_ = cursor;
+		_tmp18_ = cursor;
 #line 1425 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		gdk_window_set_cursor (_tmp20_, _tmp21_);
+		gdk_window_set_cursor (_tmp17_, _tmp18_);
 #line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp22_ = cursor_type;
+		_tmp19_ = cursor_type;
 #line 1426 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->current_cursor_type = _tmp22_;
+		self->priv->current_cursor_type = _tmp19_;
 #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (cursor);
 #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (display);
 #line 1421 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (drawing_window);
-#line 9631 "EditingTools.c"
+#line 10221 "EditingTools.c"
 	}
 }
 
 
-static gint editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self, gdouble center_x, gdouble center_y, gdouble bounds_x, gdouble bounds_y, gdouble user_x) {
+static gint
+editing_tools_crop_tool_eval_radial_line (EditingToolsCropTool* self,
+                                          gdouble center_x,
+                                          gdouble center_y,
+                                          gdouble bounds_x,
+                                          gdouble bounds_y,
+                                          gdouble user_x)
+{
 	gint result = 0;
 	gdouble decision_slope = 0.0;
-	gdouble _tmp0_;
-	gdouble _tmp1_;
-	gdouble _tmp2_;
-	gdouble _tmp3_;
 	gdouble decision_intercept = 0.0;
-	gdouble _tmp4_;
-	gdouble _tmp5_;
-	gdouble _tmp6_;
 #line 1430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), 0);
 #line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = bounds_y;
-#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = center_y;
-#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = bounds_x;
-#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = center_x;
-#line 1432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	decision_slope = (_tmp0_ - _tmp1_) / (_tmp2_ - _tmp3_);
-#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = bounds_y;
+	decision_slope = (bounds_y - center_y) / (bounds_x - center_x);
 #line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = bounds_x;
-#line 1433 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	decision_intercept = _tmp4_ - (decision_slope * _tmp5_);
-#line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = user_x;
+	decision_intercept = bounds_y - (decision_slope * bounds_x);
 #line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = (gint) ((decision_slope * _tmp6_) + decision_intercept);
+	result = (gint) ((decision_slope * user_x) + decision_intercept);
 #line 1435 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 9671 "EditingTools.c"
+#line 10247 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self, Dimensions* result) {
+static void
+editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool* self,
+                                              Dimensions* result)
+{
 	Dimensions photo_dims = {0};
 	EditingToolsPhotoCanvas* _tmp0_;
 	Photo* _tmp1_;
@@ -9691,19 +10270,17 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 	Dimensions _tmp13_;
 	gint _tmp14_;
 	gdouble _tmp15_;
-	gdouble _tmp16_;
-	gdouble _tmp17_;
-	EditingToolsPhotoCanvas* _tmp18_;
-	Photo* _tmp19_;
-	Photo* _tmp20_;
-	Dimensions _tmp21_ = {0};
-	Dimensions _tmp22_;
-	gint _tmp23_;
-	gdouble _tmp24_;
-	Dimensions _tmp25_;
-	gint _tmp26_;
-	gdouble _tmp27_;
-	Dimensions _tmp28_ = {0};
+	EditingToolsPhotoCanvas* _tmp16_;
+	Photo* _tmp17_;
+	Photo* _tmp18_;
+	Dimensions _tmp19_ = {0};
+	Dimensions _tmp20_;
+	gint _tmp21_;
+	gdouble _tmp22_;
+	Dimensions _tmp23_;
+	gint _tmp24_;
+	gdouble _tmp25_;
+	Dimensions _tmp26_ = {0};
 #line 1439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1440 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9743,150 +10320,147 @@ static void editing_tools_crop_tool_get_photo_dimensions (EditingToolsCropTool*
 #line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp14_ = _tmp13_.height;
 #line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_);
-#line 1442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	scale_factor = _tmp15_;
-#line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = scale_factor;
+	scale_factor = MIN (((gdouble) _tmp8_) / _tmp10_, ((gdouble) _tmp12_) / _tmp14_);
 #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = MIN (_tmp16_, 1.0);
+	_tmp15_ = scale_factor;
 #line 1444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	scale_factor = _tmp17_;
+	scale_factor = MIN (_tmp15_, 1.0);
 #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
+	_tmp17_ = editing_tools_photo_canvas_get_photo (_tmp16_);
 #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = _tmp19_;
+	_tmp18_ = _tmp17_;
 #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp21_);
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP | PHOTO_EXCEPTION_STRAIGHTEN, &_tmp19_);
 #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_dims = _tmp21_;
+	photo_dims = _tmp19_;
 #line 1446 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp20_);
+	_g_object_unref0 (_tmp18_);
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = photo_dims;
+	_tmp20_ = photo_dims;
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = _tmp22_.width;
+	_tmp21_ = _tmp20_.width;
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = scale_factor;
+	_tmp22_ = scale_factor;
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = photo_dims;
+	_tmp23_ = photo_dims;
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _tmp25_.height;
+	_tmp24_ = _tmp23_.height;
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = scale_factor;
+	_tmp25_ = scale_factor;
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_.width = (gint) (_tmp23_ * _tmp24_);
+	_tmp26_.width = (gint) (_tmp21_ * _tmp22_);
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_.height = (gint) (_tmp26_ * _tmp27_);
+	_tmp26_.height = (gint) (_tmp24_ * _tmp25_);
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	*result = _tmp28_;
+	*result = _tmp26_;
 #line 1449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 9788 "EditingTools.c"
+#line 10361 "EditingTools.c"
 }
 
 
-static gboolean _box_equal (const Box * s1, const Box * s2) {
+static gboolean
+_box_equal (const Box * s1,
+            const Box * s2)
+{
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == s2) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return TRUE;
-#line 9797 "EditingTools.c"
+#line 10373 "EditingTools.c"
 	}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1 == NULL) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 9803 "EditingTools.c"
+#line 10379 "EditingTools.c"
 	}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s2 == NULL) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 9809 "EditingTools.c"
+#line 10385 "EditingTools.c"
 	}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->left != s2->left) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 9815 "EditingTools.c"
+#line 10391 "EditingTools.c"
 	}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->top != s2->top) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 9821 "EditingTools.c"
+#line 10397 "EditingTools.c"
 	}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->right != s2->right) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 9827 "EditingTools.c"
+#line 10403 "EditingTools.c"
 	}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (s1->bottom != s2->bottom) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return FALSE;
-#line 9833 "EditingTools.c"
+#line 10409 "EditingTools.c"
 	}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return TRUE;
-#line 9837 "EditingTools.c"
+#line 10413 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self, gint x, gint y) {
+static gboolean
+editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCropTool* self,
+                                                gint x,
+                                                gint y)
+{
 	gboolean result = FALSE;
 	GdkRectangle scaled_pos = {0};
 	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_;
-	GdkRectangle _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
-	gint _tmp11_;
-	GdkRectangle _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
 	gint left = 0;
-	Box _tmp20_;
-	gint _tmp21_;
+	Box _tmp14_;
+	gint _tmp15_;
 	gint top = 0;
-	Box _tmp22_;
-	gint _tmp23_;
+	Box _tmp16_;
+	gint _tmp17_;
 	gint right = 0;
-	Box _tmp24_;
-	gint _tmp25_;
+	Box _tmp18_;
+	gint _tmp19_;
 	gint bottom = 0;
-	Box _tmp26_;
-	gint _tmp27_;
+	Box _tmp20_;
+	gint _tmp21_;
 	gint center_x = 0;
-	gint _tmp28_;
-	gint _tmp29_;
+	gint _tmp22_;
+	gint _tmp23_;
 	gint center_y = 0;
-	gint _tmp30_;
-	gint _tmp31_;
-	BoxLocation _tmp32_;
+	gint _tmp24_;
+	gint _tmp25_;
+	BoxLocation _tmp26_;
 	gint width = 0;
-	gint _tmp199_;
-	gint _tmp200_;
+	gint _tmp137_;
+	gint _tmp138_;
 	gint height = 0;
-	gint _tmp201_;
-	gint _tmp202_;
+	gint _tmp139_;
+	gint _tmp140_;
 	Dimensions photo_dims = {0};
-	Dimensions _tmp203_ = {0};
+	Dimensions _tmp141_ = {0};
 	gdouble angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp204_;
-	Photo* _tmp205_;
-	Photo* _tmp206_;
-	gdouble _tmp207_ = 0.0;
+	EditingToolsPhotoCanvas* _tmp142_;
+	Photo* _tmp143_;
+	Photo* _tmp144_;
+	gdouble _tmp145_ = 0.0;
 	Box new_crop = {0};
-	gfloat _tmp208_;
-	BoxLocation _tmp254_;
-	Box _tmp257_;
-	gfloat _tmp258_;
+	BoxLocation _tmp191_;
+	Box _tmp194_;
 #line 1453 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self), FALSE);
 #line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -9896,954 +10470,768 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 #line 1454 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	scaled_pos = _tmp1_;
 #line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = x;
-#line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = scaled_pos;
+	_tmp2_ = scaled_pos;
 #line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_.x;
+	_tmp3_ = _tmp2_.x;
 #line 1458 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	x = _tmp2_ - _tmp4_;
-#line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = x;
+	x = x - _tmp3_;
 #line 1459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_ < 0) {
+	if (x < 0) {
 #line 1460 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		x = 0;
-#line 9913 "EditingTools.c"
+#line 10483 "EditingTools.c"
 	} else {
-		gint _tmp6_;
-		GdkRectangle _tmp7_;
-		gint _tmp8_;
-#line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = x;
+		GdkRectangle _tmp4_;
+		gint _tmp5_;
 #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = scaled_pos;
+		_tmp4_ = scaled_pos;
 #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = _tmp7_.width;
+		_tmp5_ = _tmp4_.width;
 #line 1461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp6_ >= _tmp8_) {
-#line 9926 "EditingTools.c"
-			GdkRectangle _tmp9_;
-			gint _tmp10_;
+		if (x >= _tmp5_) {
+#line 10493 "EditingTools.c"
+			GdkRectangle _tmp6_;
+			gint _tmp7_;
 #line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp9_ = scaled_pos;
+			_tmp6_ = scaled_pos;
 #line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp10_ = _tmp9_.width;
+			_tmp7_ = _tmp6_.width;
 #line 1462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			x = _tmp10_ - 1;
-#line 9935 "EditingTools.c"
+			x = _tmp7_ - 1;
+#line 10502 "EditingTools.c"
 		}
 	}
 #line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = y;
-#line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = scaled_pos;
+	_tmp8_ = scaled_pos;
 #line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _tmp12_.y;
+	_tmp9_ = _tmp8_.y;
 #line 1464 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	y = _tmp11_ - _tmp13_;
-#line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = y;
+	y = y - _tmp9_;
 #line 1465 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp14_ < 0) {
+	if (y < 0) {
 #line 1466 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y = 0;
-#line 9952 "EditingTools.c"
+#line 10515 "EditingTools.c"
 	} else {
-		gint _tmp15_;
-		GdkRectangle _tmp16_;
-		gint _tmp17_;
-#line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = y;
+		GdkRectangle _tmp10_;
+		gint _tmp11_;
 #line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp16_ = scaled_pos;
+		_tmp10_ = scaled_pos;
 #line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = _tmp16_.height;
+		_tmp11_ = _tmp10_.height;
 #line 1467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp15_ >= _tmp17_) {
-#line 9965 "EditingTools.c"
-			GdkRectangle _tmp18_;
-			gint _tmp19_;
+		if (y >= _tmp11_) {
+#line 10525 "EditingTools.c"
+			GdkRectangle _tmp12_;
+			gint _tmp13_;
 #line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp18_ = scaled_pos;
+			_tmp12_ = scaled_pos;
 #line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp19_ = _tmp18_.height;
+			_tmp13_ = _tmp12_.height;
 #line 1468 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			y = _tmp19_ - 1;
-#line 9974 "EditingTools.c"
+			y = _tmp13_ - 1;
+#line 10534 "EditingTools.c"
 		}
 	}
 #line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->priv->scaled_crop;
+	_tmp14_ = self->priv->scaled_crop;
 #line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = _tmp20_.left;
+	_tmp15_ = _tmp14_.left;
 #line 1472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	left = _tmp21_;
+	left = _tmp15_;
 #line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->priv->scaled_crop;
+	_tmp16_ = self->priv->scaled_crop;
 #line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = _tmp22_.top;
+	_tmp17_ = _tmp16_.top;
 #line 1473 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	top = _tmp23_;
+	top = _tmp17_;
 #line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->priv->scaled_crop;
+	_tmp18_ = self->priv->scaled_crop;
 #line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = _tmp24_.right;
+	_tmp19_ = _tmp18_.right;
 #line 1474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	right = _tmp25_;
+	right = _tmp19_;
 #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = self->priv->scaled_crop;
+	_tmp20_ = self->priv->scaled_crop;
 #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = _tmp26_.bottom;
+	_tmp21_ = _tmp20_.bottom;
 #line 1475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	bottom = _tmp27_;
+	bottom = _tmp21_;
 #line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = left;
+	_tmp22_ = left;
 #line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = right;
+	_tmp23_ = right;
 #line 1478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	center_x = (_tmp28_ + _tmp29_) / 2;
+	center_x = (_tmp22_ + _tmp23_) / 2;
 #line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = top;
+	_tmp24_ = top;
 #line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = bottom;
+	_tmp25_ = bottom;
 #line 1479 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	center_y = (_tmp30_ + _tmp31_) / 2;
+	center_y = (_tmp24_ + _tmp25_) / 2;
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = self->priv->in_manipulation;
+	_tmp26_ = self->priv->in_manipulation;
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	switch (_tmp32_) {
+	switch (_tmp26_) {
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_LEFT_SIDE:
-#line 10019 "EditingTools.c"
+#line 10579 "EditingTools.c"
 		{
-			gint _tmp33_;
-			gfloat _tmp34_;
 #line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp33_ = x;
-#line 1483 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			left = _tmp33_;
-#line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp34_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+			left = x;
 #line 1484 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp34_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10031 "EditingTools.c"
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
+#line 10585 "EditingTools.c"
 				gfloat new_height = 0.0F;
-				gint _tmp35_;
-				gint _tmp36_;
-				gfloat _tmp37_;
-				gint _tmp38_;
-				gfloat _tmp39_;
+				gint _tmp27_;
+				gint _tmp28_;
+				gint _tmp29_;
+				gfloat _tmp30_;
 #line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp35_ = right;
-#line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp36_ = left;
+				_tmp27_ = right;
 #line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp37_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+				_tmp28_ = left;
 #line 1485 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				new_height = ((gfloat) (_tmp35_ - _tmp36_)) / _tmp37_;
+				new_height = ((gfloat) (_tmp27_ - _tmp28_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp38_ = top;
+				_tmp29_ = top;
 #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp39_ = new_height;
+				_tmp30_ = new_height;
 #line 1486 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				bottom = _tmp38_ + ((gint) _tmp39_);
-#line 10052 "EditingTools.c"
+				bottom = _tmp29_ + ((gint) _tmp30_);
+#line 10603 "EditingTools.c"
 			}
 #line 1488 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10056 "EditingTools.c"
+#line 10607 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_SIDE:
-#line 10060 "EditingTools.c"
+#line 10611 "EditingTools.c"
 		{
-			gint _tmp40_;
-			gfloat _tmp41_;
-#line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp40_ = y;
 #line 1491 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			top = _tmp40_;
+			top = y;
 #line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp41_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1492 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp41_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10072 "EditingTools.c"
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
+#line 10617 "EditingTools.c"
 				gfloat new_width = 0.0F;
-				gint _tmp42_;
-				gint _tmp43_;
-				gfloat _tmp44_;
-				gint _tmp45_;
-				gfloat _tmp46_;
-#line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp42_ = bottom;
+				gint _tmp31_;
+				gint _tmp32_;
+				gint _tmp33_;
+				gfloat _tmp34_;
 #line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp43_ = top;
+				_tmp31_ = bottom;
 #line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp44_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+				_tmp32_ = top;
 #line 1493 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				new_width = ((gfloat) (_tmp42_ - _tmp43_)) * _tmp44_;
+				new_width = ((gfloat) (_tmp31_ - _tmp32_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp45_ = left;
+				_tmp33_ = left;
 #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp46_ = new_width;
+				_tmp34_ = new_width;
 #line 1494 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				right = _tmp45_ + ((gint) _tmp46_);
-#line 10093 "EditingTools.c"
+				right = _tmp33_ + ((gint) _tmp34_);
+#line 10635 "EditingTools.c"
 			}
 #line 1496 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10097 "EditingTools.c"
+#line 10639 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_RIGHT_SIDE:
-#line 10101 "EditingTools.c"
+#line 10643 "EditingTools.c"
 		{
-			gint _tmp47_;
-			gfloat _tmp48_;
-#line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp47_ = x;
 #line 1499 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			right = _tmp47_;
+			right = x;
 #line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp48_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp48_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10113 "EditingTools.c"
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
+#line 10649 "EditingTools.c"
 				gfloat new_height = 0.0F;
-				gint _tmp49_;
-				gint _tmp50_;
-				gfloat _tmp51_;
-				gint _tmp52_;
-				gfloat _tmp53_;
-#line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp49_ = right;
+				gint _tmp35_;
+				gint _tmp36_;
+				gint _tmp37_;
+				gfloat _tmp38_;
 #line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp50_ = left;
+				_tmp35_ = right;
 #line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp51_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+				_tmp36_ = left;
 #line 1501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				new_height = ((gfloat) (_tmp49_ - _tmp50_)) / _tmp51_;
+				new_height = ((gfloat) (_tmp35_ - _tmp36_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp52_ = top;
+				_tmp37_ = top;
 #line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp53_ = new_height;
+				_tmp38_ = new_height;
 #line 1502 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				bottom = _tmp52_ + ((gint) _tmp53_);
-#line 10134 "EditingTools.c"
+				bottom = _tmp37_ + ((gint) _tmp38_);
+#line 10667 "EditingTools.c"
 			}
 #line 1504 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10138 "EditingTools.c"
+#line 10671 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_SIDE:
-#line 10142 "EditingTools.c"
+#line 10675 "EditingTools.c"
 		{
-			gint _tmp54_;
-			gfloat _tmp55_;
 #line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp54_ = y;
-#line 1507 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			bottom = _tmp54_;
-#line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp55_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+			bottom = y;
 #line 1508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp55_ != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10154 "EditingTools.c"
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) != EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
+#line 10681 "EditingTools.c"
 				gfloat new_width = 0.0F;
-				gint _tmp56_;
-				gint _tmp57_;
-				gfloat _tmp58_;
-				gint _tmp59_;
-				gfloat _tmp60_;
+				gint _tmp39_;
+				gint _tmp40_;
+				gint _tmp41_;
+				gfloat _tmp42_;
 #line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp56_ = bottom;
+				_tmp39_ = bottom;
 #line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp57_ = top;
+				_tmp40_ = top;
 #line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp58_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				new_width = ((gfloat) (_tmp56_ - _tmp57_)) * _tmp58_;
+				new_width = ((gfloat) (_tmp39_ - _tmp40_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp59_ = left;
+				_tmp41_ = left;
 #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp60_ = new_width;
+				_tmp42_ = new_width;
 #line 1510 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				right = _tmp59_ + ((gint) _tmp60_);
-#line 10175 "EditingTools.c"
+				right = _tmp41_ + ((gint) _tmp42_);
+#line 10699 "EditingTools.c"
 			}
 #line 1512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10179 "EditingTools.c"
+#line 10703 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_LEFT:
-#line 10183 "EditingTools.c"
+#line 10707 "EditingTools.c"
 		{
-			gfloat _tmp61_;
-#line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp61_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp61_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10190 "EditingTools.c"
-				gint _tmp62_;
-				gint _tmp63_;
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
 #line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp62_ = y;
-#line 1516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				top = _tmp62_;
-#line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp63_ = x;
+				top = y;
 #line 1517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				left = _tmp63_;
-#line 10201 "EditingTools.c"
+				left = x;
+#line 10715 "EditingTools.c"
 			} else {
-				gint _tmp64_;
-				gint _tmp65_;
-				gint _tmp66_;
-				gint _tmp67_;
-				gint _tmp68_;
-				gint _tmp69_;
-				gint _tmp70_;
-#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp64_ = y;
-#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp65_ = center_x;
-#line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp66_ = center_y;
+				gint _tmp43_;
+				gint _tmp44_;
+				gint _tmp45_;
+				gint _tmp46_;
 #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp67_ = left;
+				_tmp43_ = center_x;
 #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp68_ = top;
+				_tmp44_ = center_y;
 #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp69_ = x;
+				_tmp45_ = left;
 #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp70_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp65_, (gdouble) _tmp66_, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_);
+				_tmp46_ = top;
 #line 1519 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp64_ < _tmp70_) {
-#line 10226 "EditingTools.c"
-					gint _tmp71_;
+				if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp43_, (gdouble) _tmp44_, (gdouble) _tmp45_, (gdouble) _tmp46_, (gdouble) x)) {
+#line 10731 "EditingTools.c"
 					gfloat new_width = 0.0F;
-					gint _tmp72_;
-					gint _tmp73_;
-					gfloat _tmp74_;
-					gint _tmp75_;
-					gfloat _tmp76_;
-#line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp71_ = y;
+					gint _tmp47_;
+					gint _tmp48_;
+					gint _tmp49_;
+					gfloat _tmp50_;
 #line 1520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					top = _tmp71_;
+					top = y;
 #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp72_ = bottom;
+					_tmp47_ = bottom;
 #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp73_ = top;
+					_tmp48_ = top;
 #line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp74_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1521 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_width = ((gfloat) (_tmp72_ - _tmp73_)) * _tmp74_;
+					new_width = ((gfloat) (_tmp47_ - _tmp48_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp75_ = right;
+					_tmp49_ = right;
 #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp76_ = new_width;
+					_tmp50_ = new_width;
 #line 1522 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					left = _tmp75_ - ((gint) _tmp76_);
-#line 10252 "EditingTools.c"
+					left = _tmp49_ - ((gint) _tmp50_);
+#line 10751 "EditingTools.c"
 				} else {
-					gint _tmp77_;
 					gfloat new_height = 0.0F;
-					gint _tmp78_;
-					gint _tmp79_;
-					gfloat _tmp80_;
-					gint _tmp81_;
-					gfloat _tmp82_;
-#line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp77_ = x;
+					gint _tmp51_;
+					gint _tmp52_;
+					gint _tmp53_;
+					gfloat _tmp54_;
 #line 1524 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					left = _tmp77_;
+					left = x;
 #line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp78_ = right;
+					_tmp51_ = right;
 #line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp79_ = left;
+					_tmp52_ = left;
 #line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp80_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_height = ((gfloat) (_tmp78_ - _tmp79_)) / _tmp80_;
+					new_height = ((gfloat) (_tmp51_ - _tmp52_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp81_ = bottom;
+					_tmp53_ = bottom;
 #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp82_ = new_height;
+					_tmp54_ = new_height;
 #line 1526 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					top = _tmp81_ - ((gint) _tmp82_);
-#line 10279 "EditingTools.c"
+					top = _tmp53_ - ((gint) _tmp54_);
+#line 10772 "EditingTools.c"
 				}
 			}
 #line 1529 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10284 "EditingTools.c"
+#line 10777 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_LEFT:
-#line 10288 "EditingTools.c"
+#line 10781 "EditingTools.c"
 		{
-			gfloat _tmp83_;
-#line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp83_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1532 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp83_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10295 "EditingTools.c"
-				gint _tmp84_;
-				gint _tmp85_;
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
 #line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp84_ = y;
-#line 1533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				bottom = _tmp84_;
-#line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp85_ = x;
+				bottom = y;
 #line 1534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				left = _tmp85_;
-#line 10306 "EditingTools.c"
+				left = x;
+#line 10789 "EditingTools.c"
 			} else {
-				gint _tmp86_;
-				gint _tmp87_;
-				gint _tmp88_;
-				gint _tmp89_;
-				gint _tmp90_;
-				gint _tmp91_;
-				gint _tmp92_;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp86_ = y;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp87_ = center_x;
-#line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp88_ = center_y;
+				gint _tmp55_;
+				gint _tmp56_;
+				gint _tmp57_;
+				gint _tmp58_;
 #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp89_ = left;
+				_tmp55_ = center_x;
 #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp90_ = bottom;
+				_tmp56_ = center_y;
 #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp91_ = x;
+				_tmp57_ = left;
 #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp92_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp87_, (gdouble) _tmp88_, (gdouble) _tmp89_, (gdouble) _tmp90_, (gdouble) _tmp91_);
+				_tmp58_ = bottom;
 #line 1536 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp86_ < _tmp92_) {
-#line 10331 "EditingTools.c"
-					gint _tmp93_;
+				if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp55_, (gdouble) _tmp56_, (gdouble) _tmp57_, (gdouble) _tmp58_, (gdouble) x)) {
+#line 10805 "EditingTools.c"
 					gfloat new_height = 0.0F;
-					gint _tmp94_;
-					gint _tmp95_;
-					gfloat _tmp96_;
-					gint _tmp97_;
-					gfloat _tmp98_;
+					gint _tmp59_;
+					gint _tmp60_;
+					gint _tmp61_;
+					gfloat _tmp62_;
 #line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp93_ = x;
-#line 1537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					left = _tmp93_;
-#line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp94_ = right;
+					left = x;
 #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp95_ = left;
+					_tmp59_ = right;
 #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp96_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+					_tmp60_ = left;
 #line 1538 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_height = ((gfloat) (_tmp94_ - _tmp95_)) / _tmp96_;
+					new_height = ((gfloat) (_tmp59_ - _tmp60_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp97_ = top;
+					_tmp61_ = top;
 #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp98_ = new_height;
+					_tmp62_ = new_height;
 #line 1539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					bottom = _tmp97_ + ((gint) _tmp98_);
-#line 10357 "EditingTools.c"
+					bottom = _tmp61_ + ((gint) _tmp62_);
+#line 10825 "EditingTools.c"
 				} else {
-					gint _tmp99_;
 					gfloat new_width = 0.0F;
-					gint _tmp100_;
-					gint _tmp101_;
-					gfloat _tmp102_;
-					gint _tmp103_;
-					gfloat _tmp104_;
+					gint _tmp63_;
+					gint _tmp64_;
+					gint _tmp65_;
+					gfloat _tmp66_;
 #line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp99_ = y;
-#line 1541 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					bottom = _tmp99_;
-#line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp100_ = bottom;
+					bottom = y;
 #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp101_ = top;
+					_tmp63_ = bottom;
 #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp102_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+					_tmp64_ = top;
 #line 1542 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_width = ((gfloat) (_tmp100_ - _tmp101_)) * _tmp102_;
+					new_width = ((gfloat) (_tmp63_ - _tmp64_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp103_ = right;
+					_tmp65_ = right;
 #line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp104_ = new_width;
+					_tmp66_ = new_width;
 #line 1543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					left = _tmp103_ - ((gint) _tmp104_);
-#line 10384 "EditingTools.c"
+					left = _tmp65_ - ((gint) _tmp66_);
+#line 10846 "EditingTools.c"
 				}
 			}
 #line 1546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10389 "EditingTools.c"
+#line 10851 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_TOP_RIGHT:
-#line 10393 "EditingTools.c"
+#line 10855 "EditingTools.c"
 		{
-			gfloat _tmp105_;
-#line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp105_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1549 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp105_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10400 "EditingTools.c"
-				gint _tmp106_;
-				gint _tmp107_;
-#line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp106_ = y;
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
 #line 1550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				top = _tmp106_;
+				top = y;
 #line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp107_ = x;
-#line 1551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				right = _tmp107_;
-#line 10411 "EditingTools.c"
+				right = x;
+#line 10863 "EditingTools.c"
 			} else {
-				gint _tmp108_;
-				gint _tmp109_;
-				gint _tmp110_;
-				gint _tmp111_;
-				gint _tmp112_;
-				gint _tmp113_;
-				gint _tmp114_;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp108_ = y;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp109_ = center_x;
-#line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp110_ = center_y;
+				gint _tmp67_;
+				gint _tmp68_;
+				gint _tmp69_;
+				gint _tmp70_;
 #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp111_ = right;
+				_tmp67_ = center_x;
 #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp112_ = top;
+				_tmp68_ = center_y;
 #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp113_ = x;
+				_tmp69_ = right;
 #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp114_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp109_, (gdouble) _tmp110_, (gdouble) _tmp111_, (gdouble) _tmp112_, (gdouble) _tmp113_);
+				_tmp70_ = top;
 #line 1553 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp108_ < _tmp114_) {
-#line 10436 "EditingTools.c"
-					gint _tmp115_;
+				if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp67_, (gdouble) _tmp68_, (gdouble) _tmp69_, (gdouble) _tmp70_, (gdouble) x)) {
+#line 10879 "EditingTools.c"
 					gfloat new_width = 0.0F;
-					gint _tmp116_;
-					gint _tmp117_;
-					gfloat _tmp118_;
-					gint _tmp119_;
-					gfloat _tmp120_;
-#line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp115_ = y;
+					gint _tmp71_;
+					gint _tmp72_;
+					gint _tmp73_;
+					gfloat _tmp74_;
 #line 1554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					top = _tmp115_;
+					top = y;
 #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp116_ = bottom;
+					_tmp71_ = bottom;
 #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp117_ = top;
+					_tmp72_ = top;
 #line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp118_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1555 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_width = ((gfloat) (_tmp116_ - _tmp117_)) * _tmp118_;
+					new_width = ((gfloat) (_tmp71_ - _tmp72_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp119_ = left;
+					_tmp73_ = left;
 #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp120_ = new_width;
+					_tmp74_ = new_width;
 #line 1556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					right = _tmp119_ + ((gint) _tmp120_);
-#line 10462 "EditingTools.c"
+					right = _tmp73_ + ((gint) _tmp74_);
+#line 10899 "EditingTools.c"
 				} else {
-					gint _tmp121_;
 					gfloat new_height = 0.0F;
-					gint _tmp122_;
-					gint _tmp123_;
-					gfloat _tmp124_;
-					gint _tmp125_;
-					gfloat _tmp126_;
-#line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp121_ = x;
+					gint _tmp75_;
+					gint _tmp76_;
+					gint _tmp77_;
+					gfloat _tmp78_;
 #line 1558 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					right = _tmp121_;
-#line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp122_ = right;
+					right = x;
 #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp123_ = left;
+					_tmp75_ = right;
 #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp124_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+					_tmp76_ = left;
 #line 1559 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_height = ((gfloat) (_tmp122_ - _tmp123_)) / _tmp124_;
+					new_height = ((gfloat) (_tmp75_ - _tmp76_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp125_ = bottom;
+					_tmp77_ = bottom;
 #line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp126_ = new_height;
+					_tmp78_ = new_height;
 #line 1560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					top = _tmp125_ - ((gint) _tmp126_);
-#line 10489 "EditingTools.c"
+					top = _tmp77_ - ((gint) _tmp78_);
+#line 10920 "EditingTools.c"
 				}
 			}
 #line 1563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10494 "EditingTools.c"
+#line 10925 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10498 "EditingTools.c"
+#line 10929 "EditingTools.c"
 		{
-			gfloat _tmp127_;
-#line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp127_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp127_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10505 "EditingTools.c"
-				gint _tmp128_;
-				gint _tmp129_;
+			if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
 #line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp128_ = y;
-#line 1567 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				bottom = _tmp128_;
-#line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp129_ = x;
+				bottom = y;
 #line 1568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				right = _tmp129_;
-#line 10516 "EditingTools.c"
+				right = x;
+#line 10937 "EditingTools.c"
 			} else {
-				gint _tmp130_;
-				gint _tmp131_;
-				gint _tmp132_;
-				gint _tmp133_;
-				gint _tmp134_;
-				gint _tmp135_;
-				gint _tmp136_;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp130_ = y;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp131_ = center_x;
-#line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp132_ = center_y;
+				gint _tmp79_;
+				gint _tmp80_;
+				gint _tmp81_;
+				gint _tmp82_;
 #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp133_ = right;
+				_tmp79_ = center_x;
 #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp134_ = bottom;
+				_tmp80_ = center_y;
 #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp135_ = x;
+				_tmp81_ = right;
 #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp136_ = editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp131_, (gdouble) _tmp132_, (gdouble) _tmp133_, (gdouble) _tmp134_, (gdouble) _tmp135_);
+				_tmp82_ = bottom;
 #line 1570 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp130_ < _tmp136_) {
-#line 10541 "EditingTools.c"
-					gint _tmp137_;
+				if (y < editing_tools_crop_tool_eval_radial_line (self, (gdouble) _tmp79_, (gdouble) _tmp80_, (gdouble) _tmp81_, (gdouble) _tmp82_, (gdouble) x)) {
+#line 10953 "EditingTools.c"
 					gfloat new_height = 0.0F;
-					gint _tmp138_;
-					gint _tmp139_;
-					gfloat _tmp140_;
-					gint _tmp141_;
-					gfloat _tmp142_;
+					gint _tmp83_;
+					gint _tmp84_;
+					gint _tmp85_;
+					gfloat _tmp86_;
 #line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp137_ = x;
-#line 1571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					right = _tmp137_;
-#line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp138_ = right;
+					right = x;
 #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp139_ = left;
+					_tmp83_ = right;
 #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp140_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+					_tmp84_ = left;
 #line 1572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_height = ((gfloat) (_tmp138_ - _tmp139_)) / _tmp140_;
+					new_height = ((gfloat) (_tmp83_ - _tmp84_)) / editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp141_ = top;
+					_tmp85_ = top;
 #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp142_ = new_height;
+					_tmp86_ = new_height;
 #line 1573 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					bottom = _tmp141_ + ((gint) _tmp142_);
-#line 10567 "EditingTools.c"
+					bottom = _tmp85_ + ((gint) _tmp86_);
+#line 10973 "EditingTools.c"
 				} else {
-					gint _tmp143_;
 					gfloat new_width = 0.0F;
-					gint _tmp144_;
-					gint _tmp145_;
-					gfloat _tmp146_;
-					gint _tmp147_;
-					gfloat _tmp148_;
-#line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp143_ = y;
+					gint _tmp87_;
+					gint _tmp88_;
+					gint _tmp89_;
+					gfloat _tmp90_;
 #line 1575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					bottom = _tmp143_;
+					bottom = y;
 #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp144_ = bottom;
+					_tmp87_ = bottom;
 #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp145_ = top;
+					_tmp88_ = top;
 #line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp146_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1576 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					new_width = ((gfloat) (_tmp144_ - _tmp145_)) * _tmp146_;
+					new_width = ((gfloat) (_tmp87_ - _tmp88_)) * editing_tools_crop_tool_get_constraint_aspect_ratio (self);
 #line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp147_ = left;
+					_tmp89_ = left;
 #line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp148_ = new_width;
+					_tmp90_ = new_width;
 #line 1577 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					right = _tmp147_ + ((gint) _tmp148_);
-#line 10594 "EditingTools.c"
+					right = _tmp89_ + ((gint) _tmp90_);
+#line 10994 "EditingTools.c"
 				}
 			}
 #line 1580 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10599 "EditingTools.c"
+#line 10999 "EditingTools.c"
 		}
 #line 1481 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case BOX_LOCATION_INSIDE:
-#line 10603 "EditingTools.c"
+#line 11003 "EditingTools.c"
 		{
-			gint _tmp149_;
-			gint _tmp150_;
+			gint _tmp91_;
+			gint _tmp92_;
 			gint delta_x = 0;
-			gint _tmp151_;
-			gint _tmp152_;
+			gint _tmp93_;
 			gint delta_y = 0;
-			gint _tmp153_;
-			gint _tmp154_;
-			gint _tmp155_;
-			gint _tmp156_;
+			gint _tmp94_;
 			gint width = 0;
-			gint _tmp157_;
-			gint _tmp158_;
+			gint _tmp95_;
+			gint _tmp96_;
 			gint height = 0;
-			gint _tmp159_;
-			gint _tmp160_;
-			gint _tmp161_;
-			gint _tmp162_;
-			gint _tmp163_;
-			gint _tmp164_;
-			gint _tmp165_;
-			gint _tmp166_;
-			gint _tmp167_;
-			gint _tmp168_;
-			gint _tmp169_;
-			gint _tmp170_;
-			gint _tmp171_;
-			GdkRectangle _tmp172_;
-			gint _tmp173_;
-			gint _tmp176_;
-			GdkRectangle _tmp177_;
-			gint _tmp178_;
+			gint _tmp97_;
+			gint _tmp98_;
+			gint _tmp99_;
+			gint _tmp100_;
+			gint _tmp101_;
+			gint _tmp102_;
+			gint _tmp103_;
+			gint _tmp104_;
+			gint _tmp105_;
+			gint _tmp106_;
+			gint _tmp107_;
+			gint _tmp108_;
+			gint _tmp109_;
+			GdkRectangle _tmp110_;
+			gint _tmp111_;
+			gint _tmp114_;
+			GdkRectangle _tmp115_;
+			gint _tmp116_;
 			gint adj_width = 0;
-			gint _tmp181_;
-			gint _tmp182_;
+			gint _tmp119_;
+			gint _tmp120_;
 			gint adj_height = 0;
-			gint _tmp183_;
-			gint _tmp184_;
-			gint _tmp185_;
-			gint _tmp186_;
-			gint _tmp192_;
-			gint _tmp193_;
+			gint _tmp121_;
+			gint _tmp122_;
+			gint _tmp123_;
+			gint _tmp124_;
+			gint _tmp130_;
+			gint _tmp131_;
 #line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp149_ = self->priv->last_grab_x;
+			_tmp91_ = self->priv->last_grab_x;
 #line 1583 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_vala_assert (_tmp149_ >= 0, "last_grab_x >= 0");
+			_vala_assert (_tmp91_ >= 0, "last_grab_x >= 0");
 #line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp150_ = self->priv->last_grab_y;
+			_tmp92_ = self->priv->last_grab_y;
 #line 1584 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_vala_assert (_tmp150_ >= 0, "last_grab_y >= 0");
+			_vala_assert (_tmp92_ >= 0, "last_grab_y >= 0");
 #line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp151_ = x;
+			_tmp93_ = self->priv->last_grab_x;
 #line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp152_ = self->priv->last_grab_x;
-#line 1586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			delta_x = _tmp151_ - _tmp152_;
-#line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp153_ = y;
+			delta_x = x - _tmp93_;
 #line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp154_ = self->priv->last_grab_y;
+			_tmp94_ = self->priv->last_grab_y;
 #line 1587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			delta_y = _tmp153_ - _tmp154_;
+			delta_y = y - _tmp94_;
 #line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp155_ = x;
-#line 1589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			self->priv->last_grab_x = _tmp155_;
-#line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp156_ = y;
+			self->priv->last_grab_x = x;
 #line 1590 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			self->priv->last_grab_y = _tmp156_;
+			self->priv->last_grab_y = y;
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp157_ = right;
+			_tmp95_ = right;
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp158_ = left;
+			_tmp96_ = left;
 #line 1592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			width = (_tmp157_ - _tmp158_) + 1;
+			width = (_tmp95_ - _tmp96_) + 1;
 #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp159_ = bottom;
+			_tmp97_ = bottom;
 #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp160_ = top;
+			_tmp98_ = top;
 #line 1593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			height = (_tmp159_ - _tmp160_) + 1;
+			height = (_tmp97_ - _tmp98_) + 1;
 #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp161_ = left;
+			_tmp99_ = left;
 #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp162_ = delta_x;
+			_tmp100_ = delta_x;
 #line 1595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			left = _tmp161_ + _tmp162_;
+			left = _tmp99_ + _tmp100_;
 #line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp163_ = top;
+			_tmp101_ = top;
 #line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp164_ = delta_y;
+			_tmp102_ = delta_y;
 #line 1596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			top = _tmp163_ + _tmp164_;
+			top = _tmp101_ + _tmp102_;
 #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp165_ = right;
+			_tmp103_ = right;
 #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp166_ = delta_x;
+			_tmp104_ = delta_x;
 #line 1597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			right = _tmp165_ + _tmp166_;
+			right = _tmp103_ + _tmp104_;
 #line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp167_ = bottom;
+			_tmp105_ = bottom;
 #line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp168_ = delta_y;
+			_tmp106_ = delta_y;
 #line 1598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			bottom = _tmp167_ + _tmp168_;
+			bottom = _tmp105_ + _tmp106_;
 #line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp169_ = left;
+			_tmp107_ = left;
 #line 1601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp169_ < 0) {
+			if (_tmp107_ < 0) {
 #line 1602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				left = 0;
-#line 10717 "EditingTools.c"
+#line 11105 "EditingTools.c"
 			}
 #line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp170_ = top;
+			_tmp108_ = top;
 #line 1604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp170_ < 0) {
+			if (_tmp108_ < 0) {
 #line 1605 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				top = 0;
-#line 10725 "EditingTools.c"
+#line 11113 "EditingTools.c"
 			}
 #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp171_ = right;
+			_tmp109_ = right;
 #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp172_ = scaled_pos;
+			_tmp110_ = scaled_pos;
 #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp173_ = _tmp172_.width;
+			_tmp111_ = _tmp110_.width;
 #line 1607 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp171_ >= _tmp173_) {
-#line 10735 "EditingTools.c"
-				GdkRectangle _tmp174_;
-				gint _tmp175_;
+			if (_tmp109_ >= _tmp111_) {
+#line 11123 "EditingTools.c"
+				GdkRectangle _tmp112_;
+				gint _tmp113_;
 #line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp174_ = scaled_pos;
+				_tmp112_ = scaled_pos;
 #line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp175_ = _tmp174_.width;
+				_tmp113_ = _tmp112_.width;
 #line 1608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				right = _tmp175_ - 1;
-#line 10744 "EditingTools.c"
+				right = _tmp113_ - 1;
+#line 11132 "EditingTools.c"
 			}
 #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp176_ = bottom;
+			_tmp114_ = bottom;
 #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp177_ = scaled_pos;
+			_tmp115_ = scaled_pos;
 #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp178_ = _tmp177_.height;
+			_tmp116_ = _tmp115_.height;
 #line 1610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp176_ >= _tmp178_) {
-#line 10754 "EditingTools.c"
-				GdkRectangle _tmp179_;
-				gint _tmp180_;
+			if (_tmp114_ >= _tmp116_) {
+#line 11142 "EditingTools.c"
+				GdkRectangle _tmp117_;
+				gint _tmp118_;
 #line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp179_ = scaled_pos;
+				_tmp117_ = scaled_pos;
 #line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp180_ = _tmp179_.height;
+				_tmp118_ = _tmp117_.height;
 #line 1611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				bottom = _tmp180_ - 1;
-#line 10763 "EditingTools.c"
+				bottom = _tmp118_ - 1;
+#line 11151 "EditingTools.c"
 			}
 #line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp181_ = right;
+			_tmp119_ = right;
 #line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp182_ = left;
+			_tmp120_ = left;
 #line 1613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			adj_width = (_tmp181_ - _tmp182_) + 1;
+			adj_width = (_tmp119_ - _tmp120_) + 1;
 #line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp183_ = bottom;
+			_tmp121_ = bottom;
 #line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp184_ = top;
+			_tmp122_ = top;
 #line 1614 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			adj_height = (_tmp183_ - _tmp184_) + 1;
+			adj_height = (_tmp121_ - _tmp122_) + 1;
 #line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp185_ = adj_width;
+			_tmp123_ = adj_width;
 #line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp186_ = width;
+			_tmp124_ = width;
 #line 1617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp185_ != _tmp186_) {
-#line 10783 "EditingTools.c"
-				gint _tmp187_;
+			if (_tmp123_ != _tmp124_) {
+#line 11171 "EditingTools.c"
+				gint _tmp125_;
 #line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp187_ = delta_x;
+				_tmp125_ = delta_x;
 #line 1618 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp187_ < 0) {
-#line 10789 "EditingTools.c"
-					gint _tmp188_;
-					gint _tmp189_;
+				if (_tmp125_ < 0) {
+#line 11177 "EditingTools.c"
+					gint _tmp126_;
+					gint _tmp127_;
 #line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp188_ = left;
+					_tmp126_ = left;
 #line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp189_ = width;
+					_tmp127_ = width;
 #line 1619 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					right = (_tmp188_ + _tmp189_) - 1;
-#line 10798 "EditingTools.c"
+					right = (_tmp126_ + _tmp127_) - 1;
+#line 11186 "EditingTools.c"
 				} else {
-					gint _tmp190_;
-					gint _tmp191_;
+					gint _tmp128_;
+					gint _tmp129_;
 #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp190_ = right;
+					_tmp128_ = right;
 #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp191_ = width;
+					_tmp129_ = width;
 #line 1621 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					left = (_tmp190_ - _tmp191_) + 1;
-#line 10808 "EditingTools.c"
+					left = (_tmp128_ - _tmp129_) + 1;
+#line 11196 "EditingTools.c"
 				}
 			}
 #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp192_ = adj_height;
+			_tmp130_ = adj_height;
 #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp193_ = height;
+			_tmp131_ = height;
 #line 1624 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (_tmp192_ != _tmp193_) {
-#line 10817 "EditingTools.c"
-				gint _tmp194_;
+			if (_tmp130_ != _tmp131_) {
+#line 11205 "EditingTools.c"
+				gint _tmp132_;
 #line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp194_ = delta_y;
+				_tmp132_ = delta_y;
 #line 1625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp194_ < 0) {
-#line 10823 "EditingTools.c"
-					gint _tmp195_;
-					gint _tmp196_;
+				if (_tmp132_ < 0) {
+#line 11211 "EditingTools.c"
+					gint _tmp133_;
+					gint _tmp134_;
 #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp195_ = top;
+					_tmp133_ = top;
 #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp196_ = height;
+					_tmp134_ = height;
 #line 1626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					bottom = (_tmp195_ + _tmp196_) - 1;
-#line 10832 "EditingTools.c"
+					bottom = (_tmp133_ + _tmp134_) - 1;
+#line 11220 "EditingTools.c"
 				} else {
-					gint _tmp197_;
-					gint _tmp198_;
+					gint _tmp135_;
+					gint _tmp136_;
 #line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp197_ = bottom;
+					_tmp135_ = bottom;
 #line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp198_ = height;
+					_tmp136_ = height;
 #line 1628 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					top = (_tmp197_ - _tmp198_) + 1;
-#line 10842 "EditingTools.c"
+					top = (_tmp135_ - _tmp136_) + 1;
+#line 11230 "EditingTools.c"
 				}
 			}
 #line 1630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 10847 "EditingTools.c"
+#line 11235 "EditingTools.c"
 		}
 		default:
 		{
@@ -10851,100 +11239,98 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			result = FALSE;
 #line 1634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return result;
-#line 10855 "EditingTools.c"
+#line 11243 "EditingTools.c"
 		}
 	}
 #line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp199_ = right;
+	_tmp137_ = right;
 #line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp200_ = left;
+	_tmp138_ = left;
 #line 1644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	width = (_tmp199_ - _tmp200_) + 1;
+	width = (_tmp137_ - _tmp138_) + 1;
 #line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp201_ = bottom;
+	_tmp139_ = bottom;
 #line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp202_ = top;
+	_tmp140_ = top;
 #line 1645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	height = (_tmp201_ - _tmp202_) + 1;
+	height = (_tmp139_ - _tmp140_) + 1;
 #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp203_);
+	editing_tools_crop_tool_get_photo_dimensions (self, &_tmp141_);
 #line 1647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_dims = _tmp203_;
+	photo_dims = _tmp141_;
 #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp204_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp142_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp205_ = editing_tools_photo_canvas_get_photo (_tmp204_);
+	_tmp143_ = editing_tools_photo_canvas_get_photo (_tmp142_);
 #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp206_ = _tmp205_;
+	_tmp144_ = _tmp143_;
 #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_get_straighten (_tmp206_, &_tmp207_);
+	photo_get_straighten (_tmp144_, &_tmp145_);
 #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	angle = _tmp207_;
+	angle = _tmp145_;
 #line 1649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp206_);
+	_g_object_unref0 (_tmp144_);
 #line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp208_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
-#line 1652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp208_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 10890 "EditingTools.c"
-		gint _tmp209_;
-		gint _tmp210_;
-		gint _tmp211_;
-		gint _tmp212_;
-		BoxLocation _tmp213_;
-		BoxLocation _tmp218_;
-		gint _tmp223_;
-		gint _tmp224_;
-		gint _tmp225_;
-		gint _tmp226_;
-		Box _tmp227_ = {0};
-		Dimensions _tmp228_;
-		gint _tmp229_;
-		Dimensions _tmp230_;
-		gint _tmp231_;
-		gdouble _tmp232_;
-		BoxLocation _tmp233_;
-		Box _tmp234_ = {0};
+	if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
+#line 11276 "EditingTools.c"
+		gint _tmp146_;
+		gint _tmp147_;
+		gint _tmp148_;
+		gint _tmp149_;
+		BoxLocation _tmp150_;
+		BoxLocation _tmp155_;
+		gint _tmp160_;
+		gint _tmp161_;
+		gint _tmp162_;
+		gint _tmp163_;
+		Box _tmp164_ = {0};
+		Dimensions _tmp165_;
+		gint _tmp166_;
+		Dimensions _tmp167_;
+		gint _tmp168_;
+		gdouble _tmp169_;
+		BoxLocation _tmp170_;
+		Box _tmp171_ = {0};
 #line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp209_ = right;
+		_tmp146_ = right;
 #line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp210_ = left;
+		_tmp147_ = left;
 #line 1653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		width = (_tmp209_ - _tmp210_) + 1;
+		width = (_tmp146_ - _tmp147_) + 1;
 #line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp211_ = bottom;
+		_tmp148_ = bottom;
 #line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp212_ = top;
+		_tmp149_ = top;
 #line 1654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		height = (_tmp211_ - _tmp212_) + 1;
+		height = (_tmp148_ - _tmp149_) + 1;
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp213_ = self->priv->in_manipulation;
+		_tmp150_ = self->priv->in_manipulation;
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		switch (_tmp213_) {
+		switch (_tmp150_) {
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_LEFT_SIDE:
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_LEFT:
-#line 10931 "EditingTools.c"
+#line 11317 "EditingTools.c"
 			{
-				gint _tmp214_;
+				gint _tmp151_;
 #line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp214_ = width;
+				_tmp151_ = width;
 #line 1660 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp214_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 10938 "EditingTools.c"
-					gint _tmp215_;
+				if (_tmp151_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
+#line 11324 "EditingTools.c"
+					gint _tmp152_;
 #line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp215_ = right;
+					_tmp152_ = right;
 #line 1661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					left = _tmp215_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 10944 "EditingTools.c"
+					left = _tmp152_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
+#line 11330 "EditingTools.c"
 				}
 #line 1662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 10948 "EditingTools.c"
+#line 11334 "EditingTools.c"
 			}
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_RIGHT_SIDE:
@@ -10952,60 +11338,60 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_TOP_RIGHT:
 #line 1656 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 10956 "EditingTools.c"
+#line 11342 "EditingTools.c"
 			{
-				gint _tmp216_;
+				gint _tmp153_;
 #line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp216_ = width;
+				_tmp153_ = width;
 #line 1667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp216_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 10963 "EditingTools.c"
-					gint _tmp217_;
+				if (_tmp153_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
+#line 11349 "EditingTools.c"
+					gint _tmp154_;
 #line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp217_ = left;
+					_tmp154_ = left;
 #line 1668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					right = _tmp217_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 10969 "EditingTools.c"
+					right = _tmp154_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
+#line 11355 "EditingTools.c"
 				}
 #line 1669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 10973 "EditingTools.c"
+#line 11359 "EditingTools.c"
 			}
 			default:
 			{
 #line 1672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 10979 "EditingTools.c"
+#line 11365 "EditingTools.c"
 			}
 		}
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp218_ = self->priv->in_manipulation;
+		_tmp155_ = self->priv->in_manipulation;
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		switch (_tmp218_) {
+		switch (_tmp155_) {
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_SIDE:
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_LEFT:
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_TOP_RIGHT:
-#line 10992 "EditingTools.c"
+#line 11378 "EditingTools.c"
 			{
-				gint _tmp219_;
+				gint _tmp156_;
 #line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp219_ = height;
+				_tmp156_ = height;
 #line 1679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp219_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 10999 "EditingTools.c"
-					gint _tmp220_;
+				if (_tmp156_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
+#line 11385 "EditingTools.c"
+					gint _tmp157_;
 #line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp220_ = bottom;
+					_tmp157_ = bottom;
 #line 1680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					top = _tmp220_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11005 "EditingTools.c"
+					top = _tmp157_ - EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
+#line 11391 "EditingTools.c"
 				}
 #line 1681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11009 "EditingTools.c"
+#line 11395 "EditingTools.c"
 			}
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_SIDE:
@@ -11013,226 +11399,220 @@ static gboolean editing_tools_crop_tool_on_canvas_manipulation (EditingToolsCrop
 			case BOX_LOCATION_BOTTOM_LEFT:
 #line 1675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			case BOX_LOCATION_BOTTOM_RIGHT:
-#line 11017 "EditingTools.c"
+#line 11403 "EditingTools.c"
 			{
-				gint _tmp221_;
+				gint _tmp158_;
 #line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp221_ = height;
+				_tmp158_ = height;
 #line 1686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (_tmp221_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
-#line 11024 "EditingTools.c"
-					gint _tmp222_;
+				if (_tmp158_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE) {
+#line 11410 "EditingTools.c"
+					gint _tmp159_;
 #line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp222_ = top;
+					_tmp159_ = top;
 #line 1687 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					bottom = _tmp222_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11030 "EditingTools.c"
+					bottom = _tmp159_ + EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
+#line 11416 "EditingTools.c"
 				}
 #line 1688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11034 "EditingTools.c"
+#line 11420 "EditingTools.c"
 			}
 			default:
 			{
 #line 1691 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 11040 "EditingTools.c"
+#line 11426 "EditingTools.c"
 			}
 		}
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp223_ = left;
+		_tmp160_ = left;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp224_ = top;
+		_tmp161_ = top;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp225_ = right;
+		_tmp162_ = right;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp226_ = bottom;
+		_tmp163_ = bottom;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		box_init (&_tmp227_, _tmp223_, _tmp224_, _tmp225_, _tmp226_);
+		box_init (&_tmp164_, _tmp160_, _tmp161_, _tmp162_, _tmp163_);
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp228_ = photo_dims;
+		_tmp165_ = photo_dims;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp229_ = _tmp228_.width;
+		_tmp166_ = _tmp165_.width;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp230_ = photo_dims;
+		_tmp167_ = photo_dims;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp231_ = _tmp230_.height;
+		_tmp168_ = _tmp167_.height;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp232_ = angle;
+		_tmp169_ = angle;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp233_ = self->priv->in_manipulation;
+		_tmp170_ = self->priv->in_manipulation;
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		clamp_inside_rotated_image (&_tmp227_, _tmp229_, _tmp231_, _tmp232_, _tmp233_ == BOX_LOCATION_INSIDE, &_tmp234_);
+		clamp_inside_rotated_image (&_tmp164_, _tmp166_, _tmp168_, _tmp169_, _tmp170_ == BOX_LOCATION_INSIDE, &_tmp171_);
 #line 1697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		new_crop = _tmp234_;
-#line 11069 "EditingTools.c"
+		new_crop = _tmp171_;
+#line 11455 "EditingTools.c"
 	} else {
-		gint _tmp235_;
-		gint _tmp236_;
-		gint _tmp237_;
-		gint _tmp238_;
+		gint _tmp172_;
+		gint _tmp173_;
+		gint _tmp174_;
+		gint _tmp175_;
 		Box adjusted = {0};
-		Box _tmp239_;
-		Dimensions _tmp240_;
-		gint _tmp241_;
-		Dimensions _tmp242_;
-		gint _tmp243_;
-		gdouble _tmp244_;
-		BoxLocation _tmp245_;
-		Box _tmp246_ = {0};
-		gboolean _tmp247_ = FALSE;
-		gboolean _tmp248_ = FALSE;
-		Box _tmp249_;
-		Box _tmp250_;
+		Box _tmp176_;
+		Dimensions _tmp177_;
+		gint _tmp178_;
+		Dimensions _tmp179_;
+		gint _tmp180_;
+		gdouble _tmp181_;
+		BoxLocation _tmp182_;
+		Box _tmp183_ = {0};
+		gboolean _tmp184_ = FALSE;
+		gboolean _tmp185_ = FALSE;
+		Box _tmp186_;
+		Box _tmp187_;
 #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp235_ = left;
+		_tmp172_ = left;
 #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp236_ = top;
+		_tmp173_ = top;
 #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp237_ = right;
+		_tmp174_ = right;
 #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp238_ = bottom;
+		_tmp175_ = bottom;
 #line 1706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		box_init (&new_crop, _tmp235_, _tmp236_, _tmp237_, _tmp238_);
+		box_init (&new_crop, _tmp172_, _tmp173_, _tmp174_, _tmp175_);
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp239_ = new_crop;
+		_tmp176_ = new_crop;
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp240_ = photo_dims;
+		_tmp177_ = photo_dims;
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp241_ = _tmp240_.width;
+		_tmp178_ = _tmp177_.width;
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp242_ = photo_dims;
+		_tmp179_ = photo_dims;
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp243_ = _tmp242_.height;
+		_tmp180_ = _tmp179_.height;
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp244_ = angle;
+		_tmp181_ = angle;
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp245_ = self->priv->in_manipulation;
+		_tmp182_ = self->priv->in_manipulation;
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		clamp_inside_rotated_image (&_tmp239_, _tmp241_, _tmp243_, _tmp244_, _tmp245_ == BOX_LOCATION_INSIDE, &_tmp246_);
+		clamp_inside_rotated_image (&_tmp176_, _tmp178_, _tmp180_, _tmp181_, _tmp182_ == BOX_LOCATION_INSIDE, &_tmp183_);
 #line 1707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		adjusted = _tmp246_;
+		adjusted = _tmp183_;
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp249_ = adjusted;
+		_tmp186_ = adjusted;
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp250_ = new_crop;
+		_tmp187_ = new_crop;
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_box_equal (&_tmp249_, &_tmp250_) != TRUE) {
+		if (_box_equal (&_tmp186_, &_tmp187_) != TRUE) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp248_ = TRUE;
-#line 11124 "EditingTools.c"
+			_tmp185_ = TRUE;
+#line 11510 "EditingTools.c"
 		} else {
-			gint _tmp251_;
+			gint _tmp188_;
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp251_ = width;
+			_tmp188_ = width;
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp248_ = _tmp251_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11131 "EditingTools.c"
+			_tmp185_ = _tmp188_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
+#line 11517 "EditingTools.c"
 		}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp248_) {
+		if (_tmp185_) {
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp247_ = TRUE;
-#line 11137 "EditingTools.c"
+			_tmp184_ = TRUE;
+#line 11523 "EditingTools.c"
 		} else {
-			gint _tmp252_;
+			gint _tmp189_;
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp252_ = height;
+			_tmp189_ = height;
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp247_ = _tmp252_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
-#line 11144 "EditingTools.c"
+			_tmp184_ = _tmp189_ < EDITING_TOOLS_CROP_TOOL_CROP_MIN_SIZE;
+#line 11530 "EditingTools.c"
 		}
 #line 1711 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp247_) {
-#line 11148 "EditingTools.c"
-			Box _tmp253_;
+		if (_tmp184_) {
+#line 11534 "EditingTools.c"
+			Box _tmp190_;
 #line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp253_ = self->priv->scaled_crop;
+			_tmp190_ = self->priv->scaled_crop;
 #line 1712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			new_crop = _tmp253_;
-#line 11154 "EditingTools.c"
+			new_crop = _tmp190_;
+#line 11540 "EditingTools.c"
 		}
 	}
 #line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp254_ = self->priv->in_manipulation;
+	_tmp191_ = self->priv->in_manipulation;
 #line 1716 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp254_ != BOX_LOCATION_INSIDE) {
-#line 11161 "EditingTools.c"
-		Box _tmp255_;
+	if (_tmp191_ != BOX_LOCATION_INSIDE) {
+#line 11547 "EditingTools.c"
+		Box _tmp192_;
 #line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp255_ = new_crop;
+		_tmp192_ = new_crop;
 #line 1717 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_crop_tool_crop_resized (self, &_tmp255_);
-#line 11167 "EditingTools.c"
+		editing_tools_crop_tool_crop_resized (self, &_tmp192_);
+#line 11553 "EditingTools.c"
 	} else {
-		Box _tmp256_;
+		Box _tmp193_;
 #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp256_ = new_crop;
+		_tmp193_ = new_crop;
 #line 1719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_crop_tool_crop_moved (self, &_tmp256_);
-#line 11174 "EditingTools.c"
+		editing_tools_crop_tool_crop_moved (self, &_tmp193_);
+#line 11560 "EditingTools.c"
 	}
 #line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp257_ = new_crop;
+	_tmp194_ = new_crop;
 #line 1722 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->scaled_crop = _tmp257_;
-#line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp258_ = editing_tools_crop_tool_get_constraint_aspect_ratio (self);
+	self->priv->scaled_crop = _tmp194_;
 #line 1724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp258_ == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
-#line 11184 "EditingTools.c"
-		gint _tmp259_;
-		gint _tmp260_;
-		gint _tmp261_;
-		gint _tmp262_;
+	if (editing_tools_crop_tool_get_constraint_aspect_ratio (self) == EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO) {
+#line 11568 "EditingTools.c"
+		gint _tmp195_;
+		gint _tmp196_;
 #line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp259_ = box_get_width (&self->priv->scaled_crop);
-#line 1725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->custom_init_width = _tmp259_;
-#line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp260_ = box_get_height (&self->priv->scaled_crop);
+		self->priv->custom_init_width = box_get_width (&self->priv->scaled_crop);
 #line 1726 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->custom_init_height = _tmp260_;
+		self->priv->custom_init_height = box_get_height (&self->priv->scaled_crop);
 #line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp261_ = self->priv->custom_init_width;
+		_tmp195_ = self->priv->custom_init_width;
 #line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp262_ = self->priv->custom_init_height;
+		_tmp196_ = self->priv->custom_init_height;
 #line 1727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->custom_aspect_ratio = ((gfloat) _tmp261_) / ((gfloat) _tmp262_);
-#line 11203 "EditingTools.c"
+		self->priv->custom_aspect_ratio = ((gfloat) _tmp195_) / ((gfloat) _tmp196_);
+#line 11581 "EditingTools.c"
 	}
 #line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 1730 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11209 "EditingTools.c"
+#line 11587 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Box* new_crop) {
+static void
+editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self,
+                                      Box* new_crop)
+{
 	Box _tmp0_;
-	gboolean _tmp1_;
-	EditingToolsPhotoCanvas* _tmp2_;
-	Box _tmp3_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Box _tmp2_;
 	Box horizontal = {0};
 	gboolean horizontal_enlarged = FALSE;
 	Box vertical = {0};
 	gboolean vertical_enlarged = FALSE;
 	BoxComplements complements = 0;
-	Box _tmp4_;
-	Box _tmp5_ = {0};
-	gboolean _tmp6_ = FALSE;
-	Box _tmp7_ = {0};
-	gboolean _tmp8_ = FALSE;
+	Box _tmp3_;
+	Box _tmp4_ = {0};
+	gboolean _tmp5_ = FALSE;
+	Box _tmp6_ = {0};
+	gboolean _tmp7_ = FALSE;
+	BoxComplements _tmp8_;
 	BoxComplements _tmp9_;
-	BoxComplements _tmp10_;
-	gboolean _tmp11_ = FALSE;
-	BoxComplements _tmp12_;
-	gboolean _tmp17_ = FALSE;
-	BoxComplements _tmp18_;
-	Box _tmp23_;
-	EditingToolsPhotoCanvas* _tmp24_;
-	Box _tmp25_;
+	gboolean _tmp10_ = FALSE;
+	BoxComplements _tmp11_;
+	gboolean _tmp16_ = FALSE;
+	BoxComplements _tmp17_;
+	Box _tmp22_;
+	EditingToolsPhotoCanvas* _tmp23_;
+	Box _tmp24_;
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11240,139 +11620,139 @@ static void editing_tools_crop_tool_crop_resized (EditingToolsCropTool* self, Bo
 #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
 #line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1734 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_) {
+	if (box_equals (&self->priv->scaled_crop, &_tmp0_)) {
 #line 1736 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11249 "EditingTools.c"
+#line 11627 "EditingTools.c"
 	}
 #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->priv->scaled_crop;
+	_tmp2_ = self->priv->scaled_crop;
 #line 1739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
+	editing_tools_photo_canvas_invalidate_area (_tmp1_, &_tmp2_);
 #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = *new_crop;
+	_tmp3_ = *new_crop;
 #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = box_resized_complements (&self->priv->scaled_crop, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_, &_tmp8_);
+	_tmp8_ = box_resized_complements (&self->priv->scaled_crop, &_tmp3_, &_tmp4_, &_tmp5_, &_tmp6_, &_tmp7_);
 #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	horizontal = _tmp5_;
+	horizontal = _tmp4_;
 #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	horizontal_enlarged = _tmp6_;
+	horizontal_enlarged = _tmp5_;
 #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	vertical = _tmp7_;
+	vertical = _tmp6_;
 #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	vertical_enlarged = _tmp8_;
+	vertical_enlarged = _tmp7_;
 #line 1745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	complements = _tmp9_;
+	complements = _tmp8_;
 #line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = complements;
+	_tmp9_ = complements;
 #line 1749 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_assert (_tmp10_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE");
+	_vala_assert (_tmp9_ != BOX_COMPLEMENTS_NONE, "complements != BoxComplements.NONE");
 #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = complements;
+	_tmp11_ = complements;
 #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp12_ == BOX_COMPLEMENTS_HORIZONTAL) {
+	if (_tmp11_ == BOX_COMPLEMENTS_HORIZONTAL) {
 #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = TRUE;
-#line 11281 "EditingTools.c"
+		_tmp10_ = TRUE;
+#line 11659 "EditingTools.c"
 	} else {
-		BoxComplements _tmp13_;
+		BoxComplements _tmp12_;
 #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = complements;
+		_tmp12_ = complements;
 #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = _tmp13_ == BOX_COMPLEMENTS_BOTH;
-#line 11288 "EditingTools.c"
+		_tmp10_ = _tmp12_ == BOX_COMPLEMENTS_BOTH;
+#line 11666 "EditingTools.c"
 	}
 #line 1751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp11_) {
-#line 11292 "EditingTools.c"
-		gdouble _tmp14_ = 0.0;
-		gboolean _tmp15_;
-		Box _tmp16_;
+	if (_tmp10_) {
+#line 11670 "EditingTools.c"
+		gdouble _tmp13_ = 0.0;
+		gboolean _tmp14_;
+		Box _tmp15_;
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = horizontal_enlarged;
+		_tmp14_ = horizontal_enlarged;
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp15_) {
+		if (_tmp14_) {
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp14_ = 0.0;
-#line 11302 "EditingTools.c"
+			_tmp13_ = 0.0;
+#line 11680 "EditingTools.c"
 		} else {
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp14_ = 0.5;
-#line 11306 "EditingTools.c"
+			_tmp13_ = 0.5;
+#line 11684 "EditingTools.c"
 		}
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp16_ = horizontal;
+		_tmp15_ = horizontal;
 #line 1752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_crop_tool_set_area_alpha (self, &_tmp16_, _tmp14_);
-#line 11312 "EditingTools.c"
+		editing_tools_crop_tool_set_area_alpha (self, &_tmp15_, _tmp13_);
+#line 11690 "EditingTools.c"
 	}
 #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = complements;
+	_tmp17_ = complements;
 #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp18_ == BOX_COMPLEMENTS_VERTICAL) {
+	if (_tmp17_ == BOX_COMPLEMENTS_VERTICAL) {
 #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = TRUE;
-#line 11320 "EditingTools.c"
+		_tmp16_ = TRUE;
+#line 11698 "EditingTools.c"
 	} else {
-		BoxComplements _tmp19_;
+		BoxComplements _tmp18_;
 #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp19_ = complements;
+		_tmp18_ = complements;
 #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = _tmp19_ == BOX_COMPLEMENTS_BOTH;
-#line 11327 "EditingTools.c"
+		_tmp16_ = _tmp18_ == BOX_COMPLEMENTS_BOTH;
+#line 11705 "EditingTools.c"
 	}
 #line 1754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp17_) {
-#line 11331 "EditingTools.c"
-		gdouble _tmp20_ = 0.0;
-		gboolean _tmp21_;
-		Box _tmp22_;
+	if (_tmp16_) {
+#line 11709 "EditingTools.c"
+		gdouble _tmp19_ = 0.0;
+		gboolean _tmp20_;
+		Box _tmp21_;
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp21_ = vertical_enlarged;
+		_tmp20_ = vertical_enlarged;
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp21_) {
+		if (_tmp20_) {
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp20_ = 0.0;
-#line 11341 "EditingTools.c"
+			_tmp19_ = 0.0;
+#line 11719 "EditingTools.c"
 		} else {
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp20_ = 0.5;
-#line 11345 "EditingTools.c"
+			_tmp19_ = 0.5;
+#line 11723 "EditingTools.c"
 		}
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp22_ = vertical;
+		_tmp21_ = vertical;
 #line 1755 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_crop_tool_set_area_alpha (self, &_tmp22_, _tmp20_);
-#line 11351 "EditingTools.c"
+		editing_tools_crop_tool_set_area_alpha (self, &_tmp21_, _tmp19_);
+#line 11729 "EditingTools.c"
 	}
 #line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = *new_crop;
+	_tmp22_ = *new_crop;
 #line 1757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_paint_crop_tool (self, &_tmp23_);
+	editing_tools_crop_tool_paint_crop_tool (self, &_tmp22_);
 #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp23_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = *new_crop;
+	_tmp24_ = *new_crop;
 #line 1758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_invalidate_area (_tmp24_, &_tmp25_);
-#line 11363 "EditingTools.c"
+	editing_tools_photo_canvas_invalidate_area (_tmp23_, &_tmp24_);
+#line 11741 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box* new_crop) {
+static void
+editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self,
+                                    Box* new_crop)
+{
 	Box _tmp0_;
-	gboolean _tmp1_;
-	EditingToolsPhotoCanvas* _tmp2_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	Box _tmp2_;
 	Box _tmp3_;
 	Box _tmp4_;
 	Box _tmp5_;
-	Box _tmp6_;
-	EditingToolsPhotoCanvas* _tmp7_;
-	Box _tmp8_;
+	EditingToolsPhotoCanvas* _tmp6_;
+	Box _tmp7_;
 #line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11380,55 +11760,54 @@ static void editing_tools_crop_tool_crop_moved (EditingToolsCropTool* self, Box*
 #line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = *new_crop;
 #line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = box_equals (&self->priv->scaled_crop, &_tmp0_);
-#line 1762 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp1_) {
+	if (box_equals (&self->priv->scaled_crop, &_tmp0_)) {
 #line 1764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 11389 "EditingTools.c"
+#line 11767 "EditingTools.c"
 	}
 #line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->priv->scaled_crop;
+	_tmp2_ = self->priv->scaled_crop;
 #line 1767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_invalidate_area (_tmp2_, &_tmp3_);
+	editing_tools_photo_canvas_invalidate_area (_tmp1_, &_tmp2_);
 #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->scaled_crop;
+	_tmp3_ = self->priv->scaled_crop;
 #line 1769 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.5);
+	editing_tools_crop_tool_set_area_alpha (self, &_tmp3_, 0.5);
 #line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = *new_crop;
+	_tmp4_ = *new_crop;
 #line 1770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_set_area_alpha (self, &_tmp5_, 0.0);
+	editing_tools_crop_tool_set_area_alpha (self, &_tmp4_, 0.0);
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = *new_crop;
+	_tmp5_ = *new_crop;
 #line 1774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_crop_tool_paint_crop_tool (self, &_tmp6_);
+	editing_tools_crop_tool_paint_crop_tool (self, &_tmp5_);
 #line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = *new_crop;
+	_tmp7_ = *new_crop;
 #line 1775 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_invalidate_area (_tmp7_, &_tmp8_);
-#line 11415 "EditingTools.c"
+	editing_tools_photo_canvas_invalidate_area (_tmp6_, &_tmp7_);
+#line 11793 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self, Box* area, gdouble alpha) {
+static void
+editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
+                                        Box* area,
+                                        gdouble alpha)
+{
 	cairo_t* ctx = NULL;
 	cairo_surface_t* _tmp0_;
 	cairo_t* _tmp1_;
-	gdouble _tmp2_;
-	Box _tmp3_;
-	gint _tmp4_;
-	Box _tmp5_;
-	gint _tmp6_;
-	gint _tmp7_;
-	gint _tmp8_;
-	EditingToolsPhotoCanvas* _tmp9_;
-	cairo_surface_t* _tmp10_;
-	Box _tmp11_;
+	Box _tmp2_;
+	gint _tmp3_;
+	Box _tmp4_;
+	gint _tmp5_;
+	EditingToolsPhotoCanvas* _tmp6_;
+	cairo_surface_t* _tmp7_;
+	Box _tmp8_;
 #line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11442,50 +11821,47 @@ static void editing_tools_crop_tool_set_area_alpha (EditingToolsCropTool* self,
 #line 1780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_set_operator (ctx, CAIRO_OPERATOR_SOURCE);
 #line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = alpha;
-#line 1781 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp2_);
-#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = *area;
+	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, alpha);
 #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_.left;
+	_tmp2_ = *area;
 #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = *area;
+	_tmp3_ = _tmp2_.left;
 #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_.top;
+	_tmp4_ = *area;
 #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = box_get_width (area);
+	_tmp5_ = _tmp4_.top;
 #line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = box_get_height (area);
-#line 1782 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_rectangle (ctx, (gdouble) _tmp4_, (gdouble) _tmp6_, (gdouble) _tmp7_, (gdouble) _tmp8_);
+	cairo_rectangle (ctx, (gdouble) _tmp3_, (gdouble) _tmp5_, (gdouble) box_get_width (area), (gdouble) box_get_height (area));
 #line 1783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cairo_fill (ctx);
 #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->priv->crop_surface;
+	_tmp7_ = self->priv->crop_surface;
 #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = *area;
+	_tmp8_ = *area;
 #line 1784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_paint_surface_area (_tmp9_, _tmp10_, &_tmp11_, TRUE);
+	editing_tools_photo_canvas_paint_surface_area (_tmp6_, _tmp7_, &_tmp8_, TRUE);
 #line 1778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (ctx);
-#line 11475 "EditingTools.c"
+#line 11848 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self, Box* crop) {
+static void
+editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
+                                         Box* crop)
+{
 	BoxLocation _tmp0_;
-	EditingToolsPhotoCanvas* _tmp65_;
-	cairo_t* _tmp66_;
-	Box _tmp67_;
-	EditingToolsPhotoCanvas* _tmp68_;
-	cairo_t* _tmp69_;
-	Box _tmp70_ = {0};
-	EditingToolsPhotoCanvas* _tmp71_;
-	cairo_t* _tmp72_;
-	Box _tmp73_ = {0};
+	EditingToolsPhotoCanvas* _tmp55_;
+	cairo_t* _tmp56_;
+	Box _tmp57_;
+	EditingToolsPhotoCanvas* _tmp58_;
+	cairo_t* _tmp59_;
+	Box _tmp60_ = {0};
+	EditingToolsPhotoCanvas* _tmp61_;
+	cairo_t* _tmp62_;
+	Box _tmp63_ = {0};
 #line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_CROP_TOOL (self));
 #line 1787 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -11494,335 +11870,302 @@ static void editing_tools_crop_tool_paint_crop_tool (EditingToolsCropTool* self,
 	_tmp0_ = self->priv->in_manipulation;
 #line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != BOX_LOCATION_OUTSIDE) {
-#line 11498 "EditingTools.c"
+#line 11874 "EditingTools.c"
 		gint one_third_x = 0;
-		gint _tmp1_;
 		gint one_third_y = 0;
-		gint _tmp2_;
-		EditingToolsPhotoCanvas* _tmp3_;
-		cairo_t* _tmp4_;
+		EditingToolsPhotoCanvas* _tmp1_;
+		cairo_t* _tmp2_;
+		Box _tmp3_;
+		gint _tmp4_;
 		Box _tmp5_;
 		gint _tmp6_;
-		Box _tmp7_;
-		gint _tmp8_;
-		gint _tmp9_;
-		gint _tmp10_;
-		EditingToolsPhotoCanvas* _tmp11_;
-		cairo_t* _tmp12_;
-		Box _tmp13_;
+		gint _tmp7_;
+		EditingToolsPhotoCanvas* _tmp8_;
+		cairo_t* _tmp9_;
+		Box _tmp10_;
+		gint _tmp11_;
+		Box _tmp12_;
+		gint _tmp13_;
 		gint _tmp14_;
-		Box _tmp15_;
-		gint _tmp16_;
-		gint _tmp17_;
+		EditingToolsPhotoCanvas* _tmp15_;
+		cairo_t* _tmp16_;
+		Box _tmp17_;
 		gint _tmp18_;
-		EditingToolsPhotoCanvas* _tmp19_;
-		cairo_t* _tmp20_;
-		Box _tmp21_;
-		gint _tmp22_;
-		gint _tmp23_;
+		gint _tmp19_;
+		Box _tmp20_;
+		gint _tmp21_;
+		EditingToolsPhotoCanvas* _tmp22_;
+		cairo_t* _tmp23_;
 		Box _tmp24_;
 		gint _tmp25_;
 		gint _tmp26_;
-		EditingToolsPhotoCanvas* _tmp27_;
-		cairo_t* _tmp28_;
-		Box _tmp29_;
-		gint _tmp30_;
-		gint _tmp31_;
-		Box _tmp32_;
-		gint _tmp33_;
-		gint _tmp34_;
+		Box _tmp27_;
+		gint _tmp28_;
 		Box adj_crop = {0};
-		EditingToolsPhotoCanvas* _tmp35_;
-		GdkRectangle _tmp36_ = {0};
-		Dimensions _tmp37_ = {0};
-		EditingToolsPhotoCanvas* _tmp38_;
-		Photo* _tmp39_;
-		Photo* _tmp40_;
-		Dimensions _tmp41_ = {0};
-		Box _tmp42_ = {0};
-		Box _tmp43_;
+		EditingToolsPhotoCanvas* _tmp29_;
+		GdkRectangle _tmp30_ = {0};
+		Dimensions _tmp31_ = {0};
+		EditingToolsPhotoCanvas* _tmp32_;
+		Photo* _tmp33_;
+		Photo* _tmp34_;
+		Dimensions _tmp35_ = {0};
+		Box _tmp36_ = {0};
+		Box _tmp37_;
 		gchar* text = NULL;
-		gint _tmp44_;
+		gchar* _tmp38_;
+		gchar* _tmp39_;
+		gchar* _tmp40_;
+		gchar* _tmp41_;
+		gchar* _tmp42_;
+		gchar* _tmp43_;
+		gchar* _tmp44_;
 		gchar* _tmp45_;
-		gchar* _tmp46_;
-		gchar* _tmp47_;
-		gchar* _tmp48_;
-		gint _tmp49_;
-		gchar* _tmp50_;
-		gchar* _tmp51_;
-		gchar* _tmp52_;
-		gchar* _tmp53_;
 		gint x = 0;
-		Box _tmp54_;
-		gint _tmp55_;
-		gint _tmp56_;
+		Box _tmp46_;
+		gint _tmp47_;
 		gint y = 0;
-		Box _tmp57_;
-		gint _tmp58_;
-		gint _tmp59_;
-		EditingToolsPhotoCanvas* _tmp60_;
-		cairo_t* _tmp61_;
-		const gchar* _tmp62_;
-		gint _tmp63_;
-		gint _tmp64_;
-#line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = box_get_width (crop);
+		Box _tmp48_;
+		gint _tmp49_;
+		EditingToolsPhotoCanvas* _tmp50_;
+		cairo_t* _tmp51_;
+		const gchar* _tmp52_;
+		gint _tmp53_;
+		gint _tmp54_;
 #line 1790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		one_third_x = _tmp1_ / 3;
+		one_third_x = box_get_width (crop) / 3;
 #line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = box_get_height (crop);
-#line 1791 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		one_third_y = _tmp2_ / 3;
-#line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		one_third_y = box_get_height (crop) / 3;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = self->priv->thin_white_ctx;
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = *crop;
+		_tmp2_ = self->priv->thin_white_ctx;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_.left;
+		_tmp3_ = *crop;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = *crop;
+		_tmp4_ = _tmp3_.left;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = _tmp7_.top;
+		_tmp5_ = *crop;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = one_third_y;
+		_tmp6_ = _tmp5_.top;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = box_get_width (crop);
+		_tmp7_ = one_third_y;
 #line 1793 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_draw_horizontal_line (_tmp3_, _tmp4_, _tmp6_, _tmp8_ + _tmp9_, _tmp10_, TRUE);
-#line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		editing_tools_photo_canvas_draw_horizontal_line (_tmp1_, _tmp2_, _tmp4_, _tmp6_ + _tmp7_, box_get_width (crop), TRUE);
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_ = self->priv->thin_white_ctx;
+		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = *crop;
+		_tmp9_ = self->priv->thin_white_ctx;
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp14_ = _tmp13_.left;
+		_tmp10_ = *crop;
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = *crop;
+		_tmp11_ = _tmp10_.left;
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp16_ = _tmp15_.top;
+		_tmp12_ = *crop;
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp17_ = one_third_y;
+		_tmp13_ = _tmp12_.top;
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp18_ = box_get_width (crop);
+		_tmp14_ = one_third_y;
 #line 1794 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_draw_horizontal_line (_tmp11_, _tmp12_, _tmp14_, _tmp16_ + (_tmp17_ * 2), _tmp18_, TRUE);
-#line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		editing_tools_photo_canvas_draw_horizontal_line (_tmp8_, _tmp9_, _tmp11_, _tmp13_ + (_tmp14_ * 2), box_get_width (crop), TRUE);
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp20_ = self->priv->thin_white_ctx;
+		_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp21_ = *crop;
+		_tmp16_ = self->priv->thin_white_ctx;
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp22_ = _tmp21_.left;
+		_tmp17_ = *crop;
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp23_ = one_third_x;
+		_tmp18_ = _tmp17_.left;
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp24_ = *crop;
+		_tmp19_ = one_third_x;
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp25_ = _tmp24_.top;
+		_tmp20_ = *crop;
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp26_ = box_get_height (crop);
+		_tmp21_ = _tmp20_.top;
 #line 1796 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, _tmp22_ + _tmp23_, _tmp25_, _tmp26_, TRUE);
-#line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		editing_tools_photo_canvas_draw_vertical_line (_tmp15_, _tmp16_, _tmp18_ + _tmp19_, _tmp21_, box_get_height (crop), TRUE);
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp28_ = self->priv->thin_white_ctx;
+		_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp29_ = *crop;
+		_tmp23_ = self->priv->thin_white_ctx;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp30_ = _tmp29_.left;
+		_tmp24_ = *crop;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp31_ = one_third_x;
+		_tmp25_ = _tmp24_.left;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp32_ = *crop;
+		_tmp26_ = one_third_x;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp33_ = _tmp32_.top;
+		_tmp27_ = *crop;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp34_ = box_get_height (crop);
+		_tmp28_ = _tmp27_.top;
 #line 1797 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_draw_vertical_line (_tmp27_, _tmp28_, _tmp30_ + (_tmp31_ * 2), _tmp33_, _tmp34_, TRUE);
+		editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp25_ + (_tmp26_ * 2), _tmp28_, box_get_height (crop), TRUE);
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp35_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp35_, &_tmp36_);
+		editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp29_, &_tmp30_);
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		dimensions_for_rectangle (&_tmp36_, &_tmp37_);
+		dimensions_for_rectangle (&_tmp30_, &_tmp31_);
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp38_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp32_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp39_ = editing_tools_photo_canvas_get_photo (_tmp38_);
+		_tmp33_ = editing_tools_photo_canvas_get_photo (_tmp32_);
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp40_ = _tmp39_;
+		_tmp34_ = _tmp33_;
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp41_);
+		media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_CROP, &_tmp35_);
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		box_get_scaled_similar (&self->priv->scaled_crop, &_tmp37_, &_tmp41_, &_tmp42_);
+		box_get_scaled_similar (&self->priv->scaled_crop, &_tmp31_, &_tmp35_, &_tmp36_);
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp43_ = _tmp42_;
+		_tmp37_ = _tmp36_;
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp40_);
+		_g_object_unref0 (_tmp34_);
 #line 1801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		adj_crop = _tmp43_;
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp44_ = box_get_width (&adj_crop);
+		adj_crop = _tmp37_;
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp45_ = g_strdup_printf ("%i", _tmp44_);
+		_tmp38_ = g_strdup_printf ("%i", box_get_width (&adj_crop));
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp46_ = _tmp45_;
+		_tmp39_ = _tmp38_;
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp47_ = g_strconcat (_tmp46_, "x", NULL);
+		_tmp40_ = g_strconcat (_tmp39_, "x", NULL);
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp48_ = _tmp47_;
+		_tmp41_ = _tmp40_;
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp49_ = box_get_height (&adj_crop);
+		_tmp42_ = g_strdup_printf ("%i", box_get_height (&adj_crop));
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp50_ = g_strdup_printf ("%i", _tmp49_);
-#line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp51_ = _tmp50_;
+		_tmp43_ = _tmp42_;
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp52_ = g_strconcat (_tmp48_, _tmp51_, NULL);
+		_tmp44_ = g_strconcat (_tmp41_, _tmp43_, NULL);
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp53_ = _tmp52_;
+		_tmp45_ = _tmp44_;
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_free0 (_tmp51_);
+		_g_free0 (_tmp43_);
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_free0 (_tmp48_);
+		_g_free0 (_tmp41_);
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_free0 (_tmp46_);
+		_g_free0 (_tmp39_);
 #line 1804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		text = _tmp53_;
+		text = _tmp45_;
 #line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp54_ = *crop;
+		_tmp46_ = *crop;
 #line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp55_ = _tmp54_.left;
+		_tmp47_ = _tmp46_.left;
 #line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp56_ = box_get_width (crop);
-#line 1805 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		x = _tmp55_ + (_tmp56_ / 2);
-#line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp57_ = *crop;
+		x = _tmp47_ + (box_get_width (crop) / 2);
 #line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp58_ = _tmp57_.top;
+		_tmp48_ = *crop;
 #line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp59_ = box_get_height (crop);
+		_tmp49_ = _tmp48_.top;
 #line 1806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		y = _tmp58_ + (_tmp59_ / 2);
+		y = _tmp49_ + (box_get_height (crop) / 2);
 #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp60_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp50_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp61_ = self->priv->text_ctx;
+		_tmp51_ = self->priv->text_ctx;
 #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp62_ = text;
+		_tmp52_ = text;
 #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp63_ = x;
+		_tmp53_ = x;
 #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp64_ = y;
+		_tmp54_ = y;
 #line 1807 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_draw_text (_tmp60_, _tmp61_, _tmp62_, _tmp63_, _tmp64_, TRUE);
+		editing_tools_photo_canvas_draw_text (_tmp50_, _tmp51_, _tmp52_, _tmp53_, _tmp54_, TRUE);
 #line 1789 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_free0 (text);
-#line 11729 "EditingTools.c"
+#line 12075 "EditingTools.c"
 	}
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp55_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp66_ = self->priv->wide_black_ctx;
+	_tmp56_ = self->priv->wide_black_ctx;
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67_ = *crop;
+	_tmp57_ = *crop;
 #line 1811 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_draw_box (_tmp65_, _tmp66_, &_tmp67_);
+	editing_tools_photo_canvas_draw_box (_tmp55_, _tmp56_, &_tmp57_);
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp69_ = self->priv->wide_white_ctx;
+	_tmp59_ = self->priv->wide_white_ctx;
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_get_reduced (crop, 1, &_tmp70_);
+	box_get_reduced (crop, 1, &_tmp60_);
 #line 1812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_draw_box (_tmp68_, _tmp69_, &_tmp70_);
+	editing_tools_photo_canvas_draw_box (_tmp58_, _tmp59_, &_tmp60_);
 #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp61_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp72_ = self->priv->wide_white_ctx;
+	_tmp62_ = self->priv->wide_white_ctx;
 #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	box_get_reduced (crop, 2, &_tmp73_);
+	box_get_reduced (crop, 2, &_tmp63_);
 #line 1813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_draw_box (_tmp71_, _tmp72_, &_tmp73_);
-#line 11755 "EditingTools.c"
+	editing_tools_photo_canvas_draw_box (_tmp61_, _tmp62_, &_tmp63_);
+#line 12101 "EditingTools.c"
 }
 
 
-static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_construct (GType object_type, const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
+static EditingToolsCropToolConstraintDescription*
+editing_tools_crop_tool_constraint_description_construct (GType object_type,
+                                                          const gchar* new_name,
+                                                          gint new_basis_width,
+                                                          gint new_basis_height,
+                                                          gboolean new_pivotable,
+                                                          gfloat new_aspect_ratio)
+{
 	EditingToolsCropToolConstraintDescription* self = NULL;
-	const gchar* _tmp0_;
-	gchar* _tmp1_;
-	gint _tmp2_;
-	gint _tmp3_;
-	gfloat _tmp4_;
-	gboolean _tmp8_;
+	gchar* _tmp0_;
 #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (new_name != NULL, NULL);
 #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsCropToolConstraintDescription*) g_type_create_instance (object_type);
 #line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = new_name;
-#line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = g_strdup (_tmp0_);
+	_tmp0_ = g_strdup (new_name);
 #line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
 #line 595 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->name = _tmp1_;
-#line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = new_basis_width;
+	self->name = _tmp0_;
 #line 596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->basis_width = _tmp2_;
+	self->basis_width = new_basis_width;
 #line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = new_basis_height;
-#line 597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->basis_height = _tmp3_;
-#line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = new_aspect_ratio;
+	self->basis_height = new_basis_height;
 #line 598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp4_ == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
-#line 11791 "EditingTools.c"
-		gint _tmp5_;
-		gint _tmp6_;
+	if (new_aspect_ratio == EDITING_TOOLS_CROP_TOOL_COMPUTE_FROM_BASIS) {
+#line 12131 "EditingTools.c"
+		gint _tmp1_;
+		gint _tmp2_;
 #line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = self->basis_width;
+		_tmp1_ = self->basis_width;
 #line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = self->basis_height;
+		_tmp2_ = self->basis_height;
 #line 599 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->aspect_ratio = ((gfloat) _tmp5_) / ((gfloat) _tmp6_);
-#line 11800 "EditingTools.c"
+		self->aspect_ratio = ((gfloat) _tmp1_) / ((gfloat) _tmp2_);
+#line 12140 "EditingTools.c"
 	} else {
-		gfloat _tmp7_;
 #line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = new_aspect_ratio;
-#line 601 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->aspect_ratio = _tmp7_;
-#line 11807 "EditingTools.c"
+		self->aspect_ratio = new_aspect_ratio;
+#line 12144 "EditingTools.c"
 	}
 #line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = new_pivotable;
-#line 602 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->is_pivotable = _tmp8_;
+	self->is_pivotable = new_pivotable;
 #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 11815 "EditingTools.c"
+#line 12150 "EditingTools.c"
 }
 
 
-static EditingToolsCropToolConstraintDescription* editing_tools_crop_tool_constraint_description_new (const gchar* new_name, gint new_basis_width, gint new_basis_height, gboolean new_pivotable, gfloat new_aspect_ratio) {
+static EditingToolsCropToolConstraintDescription*
+editing_tools_crop_tool_constraint_description_new (const gchar* new_name,
+                                                    gint new_basis_width,
+                                                    gint new_basis_height,
+                                                    gboolean new_pivotable,
+                                                    gfloat new_aspect_ratio)
+{
 #line 593 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_constraint_description_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, new_name, new_basis_width, new_basis_height, new_pivotable, new_aspect_ratio);
-#line 11822 "EditingTools.c"
+#line 12163 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self) {
+static gboolean
+editing_tools_crop_tool_constraint_description_is_separator (EditingToolsCropToolConstraintDescription* self)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
@@ -11832,124 +12175,149 @@ static gboolean editing_tools_crop_tool_constraint_description_is_separator (Edi
 	_tmp1_ = self->is_pivotable;
 #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp1_) {
-#line 11836 "EditingTools.c"
+#line 12179 "EditingTools.c"
 		gfloat _tmp2_;
 #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp2_ = self->aspect_ratio;
 #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp2_ == EDITING_TOOLS_CROP_TOOL_SEPARATOR;
-#line 11842 "EditingTools.c"
+#line 12185 "EditingTools.c"
 	} else {
 #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = FALSE;
-#line 11846 "EditingTools.c"
+#line 12189 "EditingTools.c"
 	}
 #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = _tmp0_;
 #line 606 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 11852 "EditingTools.c"
+#line 12195 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_value_constraint_description_init (GValue* value) {
+static void
+editing_tools_crop_tool_value_constraint_description_init (GValue* value)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	value->data[0].v_pointer = NULL;
-#line 11859 "EditingTools.c"
+#line 12204 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_value_constraint_description_free_value (GValue* value) {
+static void
+editing_tools_crop_tool_value_constraint_description_free_value (GValue* value)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (value->data[0].v_pointer) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (value->data[0].v_pointer);
-#line 11868 "EditingTools.c"
+#line 12215 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+editing_tools_crop_tool_value_constraint_description_copy_value (const GValue* src_value,
+                                                                 GValue* dest_value)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (src_value->data[0].v_pointer) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (src_value->data[0].v_pointer);
-#line 11878 "EditingTools.c"
+#line 12228 "EditingTools.c"
 	} else {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 11882 "EditingTools.c"
+#line 12232 "EditingTools.c"
 	}
 }
 
 
-static gpointer editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value) {
+static gpointer
+editing_tools_crop_tool_value_constraint_description_peek_pointer (const GValue* value)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 11890 "EditingTools.c"
+#line 12242 "EditingTools.c"
 }
 
 
-static gchar* editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_crop_tool_value_constraint_description_collect_value (GValue* value,
+                                                                    guint n_collect_values,
+                                                                    GTypeCValue* collect_values,
+                                                                    guint collect_flags)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (collect_values[0].v_pointer) {
-#line 11897 "EditingTools.c"
+#line 12254 "EditingTools.c"
 		EditingToolsCropToolConstraintDescription * object;
 		object = collect_values[0].v_pointer;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11904 "EditingTools.c"
+#line 12261 "EditingTools.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 11908 "EditingTools.c"
+#line 12265 "EditingTools.c"
 		}
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = editing_tools_crop_tool_constraint_description_ref (object);
-#line 11912 "EditingTools.c"
+#line 12269 "EditingTools.c"
 	} else {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 11916 "EditingTools.c"
+#line 12273 "EditingTools.c"
 	}
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 11920 "EditingTools.c"
+#line 12277 "EditingTools.c"
 }
 
 
-static gchar* editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_crop_tool_value_constraint_description_lcopy_value (const GValue* value,
+                                                                  guint n_collect_values,
+                                                                  GTypeCValue* collect_values,
+                                                                  guint collect_flags)
+{
 	EditingToolsCropToolConstraintDescription ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!object_p) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 11931 "EditingTools.c"
+#line 12293 "EditingTools.c"
 	}
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!value->data[0].v_pointer) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = NULL;
-#line 11937 "EditingTools.c"
+#line 12299 "EditingTools.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = value->data[0].v_pointer;
-#line 11941 "EditingTools.c"
+#line 12303 "EditingTools.c"
 	} else {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*object_p = editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 11945 "EditingTools.c"
+#line 12307 "EditingTools.c"
 	}
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return NULL;
-#line 11949 "EditingTools.c"
+#line 12311 "EditingTools.c"
 }
 
 
-static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+editing_tools_crop_tool_param_spec_constraint_description (const gchar* name,
+                                                           const gchar* nick,
+                                                           const gchar* blurb,
+                                                           GType object_type,
+                                                           GParamFlags flags)
+{
 	EditingToolsCropToolParamSpecConstraintDescription* spec;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
@@ -11959,20 +12327,25 @@ static GParamSpec* editing_tools_crop_tool_param_spec_constraint_description (co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return G_PARAM_SPEC (spec);
-#line 11963 "EditingTools.c"
+#line 12331 "EditingTools.c"
 }
 
 
-static gpointer editing_tools_crop_tool_value_get_constraint_description (const GValue* value) {
+static gpointer
+editing_tools_crop_tool_value_get_constraint_description (const GValue* value)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION), NULL);
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return value->data[0].v_pointer;
-#line 11972 "EditingTools.c"
+#line 12342 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_value_set_constraint_description (GValue* value, gpointer v_object) {
+static void
+editing_tools_crop_tool_value_set_constraint_description (GValue* value,
+                                                          gpointer v_object)
+{
 	EditingToolsCropToolConstraintDescription * old;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
@@ -11988,22 +12361,25 @@ static void editing_tools_crop_tool_value_set_constraint_description (GValue* va
 		value->data[0].v_pointer = v_object;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_ref (value->data[0].v_pointer);
-#line 11992 "EditingTools.c"
+#line 12365 "EditingTools.c"
 	} else {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 11996 "EditingTools.c"
+#line 12369 "EditingTools.c"
 	}
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12002 "EditingTools.c"
+#line 12375 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_crop_tool_value_take_constraint_description (GValue* value, gpointer v_object) {
+static void
+editing_tools_crop_tool_value_take_constraint_description (GValue* value,
+                                                           gpointer v_object)
+{
 	EditingToolsCropToolConstraintDescription * old;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION));
@@ -12017,38 +12393,44 @@ static void editing_tools_crop_tool_value_take_constraint_description (GValue* v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = v_object;
-#line 12021 "EditingTools.c"
+#line 12397 "EditingTools.c"
 	} else {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		value->data[0].v_pointer = NULL;
-#line 12025 "EditingTools.c"
+#line 12401 "EditingTools.c"
 	}
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (old) {
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		editing_tools_crop_tool_constraint_description_unref (old);
-#line 12031 "EditingTools.c"
+#line 12407 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass) {
+static void
+editing_tools_crop_tool_constraint_description_class_init (EditingToolsCropToolConstraintDescriptionClass * klass)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_constraint_description_parent_class = g_type_class_peek_parent (klass);
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsCropToolConstraintDescriptionClass *) klass)->finalize = editing_tools_crop_tool_constraint_description_finalize;
-#line 12041 "EditingTools.c"
+#line 12419 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self) {
+static void
+editing_tools_crop_tool_constraint_description_instance_init (EditingToolsCropToolConstraintDescription * self)
+{
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->ref_count = 1;
-#line 12048 "EditingTools.c"
+#line 12428 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj) {
+static void
+editing_tools_crop_tool_constraint_description_finalize (EditingToolsCropToolConstraintDescription * obj)
+{
 	EditingToolsCropToolConstraintDescription * self;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CONSTRAINT_DESCRIPTION, EditingToolsCropToolConstraintDescription);
@@ -12056,11 +12438,13 @@ static void editing_tools_crop_tool_constraint_description_finalize (EditingTool
 	g_signal_handlers_destroy (self);
 #line 587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_free0 (self->name);
-#line 12060 "EditingTools.c"
+#line 12442 "EditingTools.c"
 }
 
 
-static GType editing_tools_crop_tool_constraint_description_get_type (void) {
+static GType
+editing_tools_crop_tool_constraint_description_get_type (void)
+{
 	static volatile gsize editing_tools_crop_tool_constraint_description_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_crop_tool_constraint_description_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { editing_tools_crop_tool_value_constraint_description_init, editing_tools_crop_tool_value_constraint_description_free_value, editing_tools_crop_tool_value_constraint_description_copy_value, editing_tools_crop_tool_value_constraint_description_peek_pointer, "p", editing_tools_crop_tool_value_constraint_description_collect_value, "p", editing_tools_crop_tool_value_constraint_description_lcopy_value };
@@ -12074,18 +12458,22 @@ static GType editing_tools_crop_tool_constraint_description_get_type (void) {
 }
 
 
-static gpointer editing_tools_crop_tool_constraint_description_ref (gpointer instance) {
+static gpointer
+editing_tools_crop_tool_constraint_description_ref (gpointer instance)
+{
 	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return instance;
-#line 12085 "EditingTools.c"
+#line 12471 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_constraint_description_unref (gpointer instance) {
+static void
+editing_tools_crop_tool_constraint_description_unref (gpointer instance)
+{
 	EditingToolsCropToolConstraintDescription * self;
 	self = instance;
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12094,260 +12482,270 @@ static void editing_tools_crop_tool_constraint_description_unref (gpointer insta
 		EDITING_TOOLS_CROP_TOOL_CONSTRAINT_DESCRIPTION_GET_CLASS (self)->finalize (self);
 #line 586 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 12098 "EditingTools.c"
+#line 12486 "EditingTools.c"
 	}
 }
 
 
-static gboolean _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model, GtkTreeIter* iter, gpointer self) {
+static gboolean
+_editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func (GtkTreeModel* model,
+                                                                                                            GtkTreeIter* iter,
+                                                                                                            gpointer self)
+{
 	gboolean result;
 	result = editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (model, iter);
 #line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12108 "EditingTools.c"
+#line 12500 "EditingTools.c"
 }
 
 
-static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_construct (GType object_type, GtkWindow* container) {
+static EditingToolsCropToolCropToolWindow*
+editing_tools_crop_tool_crop_tool_window_construct (GType object_type,
+                                                    GtkWindow* container)
+{
 	EditingToolsCropToolCropToolWindow * self = NULL;
-	GtkWindow* _tmp0_;
+	GtkButton* _tmp0_;
 	GtkButton* _tmp1_;
 	GtkButton* _tmp2_;
 	GtkButton* _tmp3_;
-	GtkButton* _tmp4_;
-	GtkComboBox* _tmp5_;
+	GtkComboBox* _tmp4_;
 	GtkCellRendererText* combo_text_renderer = NULL;
-	GtkCellRendererText* _tmp6_;
+	GtkCellRendererText* _tmp5_;
+	GtkComboBox* _tmp6_;
 	GtkComboBox* _tmp7_;
 	GtkComboBox* _tmp8_;
 	GtkComboBox* _tmp9_;
-	GtkComboBox* _tmp10_;
 	GtkImage* image = NULL;
-	GtkImage* _tmp11_;
+	GtkImage* _tmp10_;
+	GtkButton* _tmp11_;
 	GtkButton* _tmp12_;
-	GtkButton* _tmp13_;
+	GtkEntry* _tmp13_;
 	GtkEntry* _tmp14_;
 	GtkEntry* _tmp15_;
 	GtkEntry* _tmp16_;
-	GtkEntry* _tmp17_;
+	GtkBox* _tmp17_;
 	GtkBox* _tmp18_;
 	GtkBox* _tmp19_;
-	GtkBox* _tmp20_;
-	GtkButton* _tmp21_;
-	GtkBox* _tmp22_;
-	GtkButton* _tmp23_;
+	GtkButton* _tmp20_;
+	GtkBox* _tmp21_;
+	GtkButton* _tmp22_;
+	GtkBox* _tmp23_;
 	GtkBox* _tmp24_;
-	GtkBox* _tmp25_;
-	GtkComboBox* _tmp26_;
-	GtkBox* _tmp27_;
-	GtkButton* _tmp28_;
+	GtkComboBox* _tmp25_;
+	GtkBox* _tmp26_;
+	GtkButton* _tmp27_;
+	GtkBox* _tmp28_;
 	GtkBox* _tmp29_;
 	GtkBox* _tmp30_;
-	GtkBox* _tmp31_;
 #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = container;
-#line 642 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
+	self = (EditingToolsCropToolCropToolWindow*) editing_tools_editing_tool_window_construct (object_type, container);
 #line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = self->cancel_button;
+	_tmp0_ = self->cancel_button;
 #line 644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions"));
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), _ ("Return to current photo dimensions"));
 #line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = self->cancel_button;
+	_tmp1_ = self->cancel_button;
 #line 645 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp2_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp1_, GTK_POS_LEFT);
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->ok_button;
+	_tmp2_ = self->ok_button;
 #line 647 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo"));
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), _ ("Set the crop for this photo"));
 #line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->ok_button;
+	_tmp3_ = self->ok_button;
 #line 648 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT);
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = (GtkComboBox*) gtk_combo_box_new ();
+	_tmp4_ = (GtkComboBox*) gtk_combo_box_new ();
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp5_);
+	g_object_ref_sink (_tmp4_);
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->constraint_combo);
 #line 650 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->constraint_combo = _tmp5_;
+	self->constraint_combo = _tmp4_;
 #line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
+	_tmp5_ = (GtkCellRendererText*) gtk_cell_renderer_text_new ();
 #line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp6_);
+	g_object_ref_sink (_tmp5_);
 #line 651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	combo_text_renderer = _tmp6_;
+	combo_text_renderer = _tmp5_;
 #line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = self->constraint_combo;
+	_tmp6_ = self->constraint_combo;
 #line 652 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
+	gtk_cell_layout_pack_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), TRUE);
 #line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->constraint_combo;
+	_tmp7_ = self->constraint_combo;
 #line 653 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, GTK_TYPE_CELL_LAYOUT, GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
+	gtk_cell_layout_add_attribute (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_cell_layout_get_type (), GtkCellLayout), G_TYPE_CHECK_INSTANCE_CAST (combo_text_renderer, gtk_cell_renderer_get_type (), GtkCellRenderer), "text", 0);
 #line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = self->constraint_combo;
+	_tmp8_ = self->constraint_combo;
 #line 654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_combo_box_set_row_separator_func (_tmp9_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
+	gtk_combo_box_set_row_separator_func (_tmp8_, _editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func_gtk_tree_view_row_separator_func, NULL, NULL);
 #line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->constraint_combo;
+	_tmp9_ = self->constraint_combo;
 #line 655 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_combo_box_set_active (_tmp10_, 0);
+	gtk_combo_box_set_active (_tmp9_, 0);
 #line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", GTK_ICON_SIZE_LARGE_TOOLBAR);
+	_tmp10_ = (GtkImage*) gtk_image_new_from_icon_name ("crop-pivot-reticle", (GtkIconSize) GTK_ICON_SIZE_LARGE_TOOLBAR);
 #line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp11_);
+	g_object_ref_sink (_tmp10_);
 #line 657 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	image = _tmp11_;
+	image = _tmp10_;
 #line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->pivot_reticle_button;
+	_tmp11_ = self->pivot_reticle_button;
 #line 658 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image (_tmp12_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
+	gtk_button_set_image (_tmp11_, G_TYPE_CHECK_INSTANCE_CAST (image, gtk_widget_get_type (), GtkWidget));
 #line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->pivot_reticle_button;
+	_tmp12_ = self->pivot_reticle_button;
 #line 659 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations"));
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), _ ("Pivot the crop rectangle between portrait and landscape orientations"));
 #line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->custom_width_entry;
+	_tmp13_ = self->custom_width_entry;
 #line 661 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp14_, 4);
+	gtk_entry_set_width_chars (_tmp13_, 4);
 #line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = self->custom_width_entry;
+	_tmp14_ = self->custom_width_entry;
 #line 662 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp15_, "editable", TRUE, NULL);
+	g_object_set (_tmp14_, "editable", TRUE, NULL);
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->custom_height_entry;
+	_tmp15_ = self->custom_height_entry;
 #line 663 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_entry_set_width_chars (_tmp16_, 4);
+	gtk_entry_set_width_chars (_tmp15_, 4);
 #line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->custom_height_entry;
+	_tmp16_ = self->custom_height_entry;
 #line 664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_set (_tmp17_, "editable", TRUE, NULL);
+	g_object_set (_tmp16_, "editable", TRUE, NULL);
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp17_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp18_);
+	g_object_ref_sink (_tmp17_);
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->response_layout);
 #line 666 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->response_layout = _tmp18_;
+	self->response_layout = _tmp17_;
 #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->response_layout;
+	_tmp18_ = self->response_layout;
 #line 667 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_homogeneous (_tmp19_, TRUE);
+	gtk_box_set_homogeneous (_tmp18_, TRUE);
 #line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->response_layout;
+	_tmp19_ = self->response_layout;
 #line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = self->cancel_button;
+	_tmp20_ = self->cancel_button;
 #line 668 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget));
 #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = self->response_layout;
+	_tmp21_ = self->response_layout;
 #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->ok_button;
+	_tmp22_ = self->ok_button;
 #line 669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget));
 #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_CROP_TOOL_CROP_TOOL_WINDOW_CONTROL_SPACING);
 #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp24_);
+	g_object_ref_sink (_tmp23_);
 #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->layout);
 #line 671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->layout = _tmp24_;
+	self->layout = _tmp23_;
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->layout;
+	_tmp24_ = self->layout;
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = self->constraint_combo;
+	_tmp25_ = self->constraint_combo;
 #line 672 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget));
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = self->layout;
+	_tmp26_ = self->layout;
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->pivot_reticle_button;
+	_tmp27_ = self->pivot_reticle_button;
 #line 673 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget));
 #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->layout;
+	_tmp28_ = self->layout;
 #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->response_layout;
+	_tmp29_ = self->response_layout;
 #line 674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget));
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->layout;
+	_tmp30_ = self->layout;
 #line 676 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget));
 #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (image);
 #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (combo_text_renderer);
 #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12290 "EditingTools.c"
+#line 12682 "EditingTools.c"
 }
 
 
-static EditingToolsCropToolCropToolWindow* editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container) {
+static EditingToolsCropToolCropToolWindow*
+editing_tools_crop_tool_crop_tool_window_new (GtkWindow* container)
+{
 #line 641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_crop_tool_crop_tool_window_construct (EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, container);
-#line 12297 "EditingTools.c"
+#line 12691 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model, GtkTreeIter* iter) {
+static gboolean
+editing_tools_crop_tool_crop_tool_window_constraint_combo_separator_func (GtkTreeModel* model,
+                                                                          GtkTreeIter* iter)
+{
 	gboolean result = FALSE;
 	GValue val = {0};
-	GtkTreeModel* _tmp0_;
-	GtkTreeIter _tmp1_;
-	GValue _tmp2_ = {0};
+	GtkTreeIter _tmp0_;
+	GValue _tmp1_ = {0};
+	gchar* _tmp2_;
 	gchar* _tmp3_;
-	gchar* _tmp4_;
-	gboolean _tmp5_;
+	gboolean _tmp4_;
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_TREE_MODEL (model), FALSE);
 #line 679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (iter != NULL, FALSE);
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = model;
-#line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = *iter;
+	_tmp0_ = *iter;
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_tree_model_get_value (_tmp0_, &_tmp1_, 0, &_tmp2_);
+	gtk_tree_model_get_value (model, &_tmp0_, 0, &_tmp1_);
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 681 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	val = _tmp2_;
+	val = _tmp1_;
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = g_value_dup_string (&val);
+	_tmp2_ = g_value_dup_string (&val);
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_;
+	_tmp3_ = _tmp2_;
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = g_strcmp0 (_tmp4_, "-") == 0;
+	_tmp4_ = g_strcmp0 (_tmp3_, "-") == 0;
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_free0 (_tmp4_);
+	_g_free0 (_tmp3_);
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp5_;
+	result = _tmp4_;
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_IS_VALUE (&val) ? (g_value_unset (&val), NULL) : NULL;
 #line 683 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12338 "EditingTools.c"
+#line 12732 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass) {
+static void
+editing_tools_crop_tool_crop_tool_window_class_init (EditingToolsCropToolCropToolWindowClass * klass)
+{
 #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_crop_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_crop_tool_crop_tool_window_finalize;
-#line 12347 "EditingTools.c"
+#line 12743 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingToolsCropToolCropToolWindow * self) {
+static void
+editing_tools_crop_tool_crop_tool_window_instance_init (EditingToolsCropToolCropToolWindow * self)
+{
 	GtkButton* _tmp0_;
 	GtkButton* _tmp1_;
 	GtkButton* _tmp2_;
@@ -12400,11 +12798,13 @@ static void editing_tools_crop_tool_crop_tool_window_instance_init (EditingTools
 	self->normal_width = -1;
 #line 639 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->normal_height = -1;
-#line 12404 "EditingTools.c"
+#line 12802 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) {
+static void
+editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj)
+{
 	EditingToolsCropToolCropToolWindow * self;
 #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_CROP_TOOL_TYPE_CROP_TOOL_WINDOW, EditingToolsCropToolCropToolWindow);
@@ -12430,11 +12830,13 @@ static void editing_tools_crop_tool_crop_tool_window_finalize (GObject * obj) {
 	_g_object_unref0 (self->layout);
 #line 625 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_crop_tool_crop_tool_window_parent_class)->finalize (obj);
-#line 12434 "EditingTools.c"
+#line 12834 "EditingTools.c"
 }
 
 
-static GType editing_tools_crop_tool_crop_tool_window_get_type (void) {
+static GType
+editing_tools_crop_tool_crop_tool_window_get_type (void)
+{
 	static volatile gsize editing_tools_crop_tool_crop_tool_window_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_crop_tool_crop_tool_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsCropToolCropToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_crop_tool_crop_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsCropToolCropToolWindow), 0, (GInstanceInitFunc) editing_tools_crop_tool_crop_tool_window_instance_init, NULL };
@@ -12446,7 +12848,9 @@ static GType editing_tools_crop_tool_crop_tool_window_get_type (void) {
 }
 
 
-static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass) {
+static void
+editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klass)
+{
 #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_crop_tool_parent_class = g_type_class_peek_parent (klass);
 #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12471,11 +12875,13 @@ static void editing_tools_crop_tool_class_init (EditingToolsCropToolClass * klas
 	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_crop_tool_real_on_motion;
 #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_crop_tool_real_paint;
-#line 12475 "EditingTools.c"
+#line 12879 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self) {
+static void
+editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
+{
 	gint _tmp0_;
 	EditingToolsCropToolConstraintDescription** _tmp1_;
 	gint _tmp2_;
@@ -12543,11 +12949,13 @@ static void editing_tools_crop_tool_instance_init (EditingToolsCropTool * self)
 	self->priv->custom_init_height = -1;
 #line 713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->pre_aspect_ratio = EDITING_TOOLS_CROP_TOOL_ANY_ASPECT_RATIO;
-#line 12547 "EditingTools.c"
+#line 12953 "EditingTools.c"
 }
 
 
-static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) {
+static void
+editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj)
+{
 	EditingToolsCropTool * self;
 #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_CROP_TOOL, EditingToolsCropTool);
@@ -12569,11 +12977,13 @@ static void editing_tools_crop_tool_finalize (EditingToolsEditingTool * obj) {
 	_g_object_unref0 (self->priv->constraint_list);
 #line 565 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_crop_tool_parent_class)->finalize (obj);
-#line 12573 "EditingTools.c"
+#line 12981 "EditingTools.c"
 }
 
 
-GType editing_tools_crop_tool_get_type (void) {
+GType
+editing_tools_crop_tool_get_type (void)
+{
 	static volatile gsize editing_tools_crop_tool_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_crop_tool_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsCropToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_crop_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsCropTool), 0, (GInstanceInitFunc) editing_tools_crop_tool_instance_init, NULL };
@@ -12585,7 +12995,9 @@ GType editing_tools_crop_tool_get_type (void) {
 }
 
 
-static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self) {
+static void
+editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self)
+{
 	GdkPoint default_center = {0};
 	GdkPoint _tmp0_;
 #line 1826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12598,11 +13010,14 @@ static void editing_tools_redeye_instance_init (EditingToolsRedeyeInstance *self
 	(*self).center = _tmp0_;
 #line 1829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	(*self).radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
-#line 12602 "EditingTools.c"
+#line 13014 "EditingTools.c"
 }
 
 
-void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst, GdkRectangle* result) {
+void
+editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* inst,
+                                              GdkRectangle* result)
+{
 	GdkRectangle _result_ = {0};
 	EditingToolsRedeyeInstance _tmp0_;
 	GdkPoint _tmp1_;
@@ -12662,11 +13077,14 @@ void editing_tools_redeye_instance_to_bounds_rect (EditingToolsRedeyeInstance* i
 	*result = _result_;
 #line 1839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 12666 "EditingTools.c"
+#line 13081 "EditingTools.c"
 }
 
 
-void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, EditingToolsRedeyeInstance* result) {
+void
+editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect,
+                                                EditingToolsRedeyeInstance* result)
+{
 	GdkRectangle in_rect = {0};
 	GdkRectangle _tmp0_;
 	EditingToolsRedeyeInstance _result_ = {0};
@@ -12724,11 +13142,13 @@ void editing_tools_redeye_instance_from_bounds_rect (GdkRectangle* rect, Editing
 	*result = _result_;
 #line 1850 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 12728 "EditingTools.c"
+#line 13146 "EditingTools.c"
 }
 
 
-EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self) {
+EditingToolsRedeyeInstance*
+editing_tools_redeye_instance_dup (const EditingToolsRedeyeInstance* self)
+{
 	EditingToolsRedeyeInstance* dup;
 #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	dup = g_new0 (EditingToolsRedeyeInstance, 1);
@@ -12736,18 +13156,22 @@ EditingToolsRedeyeInstance* editing_tools_redeye_instance_dup (const EditingTool
 	memcpy (dup, self, sizeof (EditingToolsRedeyeInstance));
 #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return dup;
-#line 12740 "EditingTools.c"
+#line 13160 "EditingTools.c"
 }
 
 
-void editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self) {
+void
+editing_tools_redeye_instance_free (EditingToolsRedeyeInstance* self)
+{
 #line 1818 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_free (self);
-#line 12747 "EditingTools.c"
+#line 13169 "EditingTools.c"
 }
 
 
-GType editing_tools_redeye_instance_get_type (void) {
+GType
+editing_tools_redeye_instance_get_type (void)
+{
 	static volatile gsize editing_tools_redeye_instance_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_redeye_instance_type_id__volatile)) {
 		GType editing_tools_redeye_instance_type_id;
@@ -12758,24 +13182,30 @@ GType editing_tools_redeye_instance_get_type (void) {
 }
 
 
-static EditingToolsRedeyeTool* editing_tools_redeye_tool_construct (GType object_type) {
+static EditingToolsRedeyeTool*
+editing_tools_redeye_tool_construct (GType object_type)
+{
 	EditingToolsRedeyeTool* self = NULL;
 #line 1902 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsRedeyeTool*) editing_tools_editing_tool_construct (object_type, "RedeyeTool");
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 12768 "EditingTools.c"
+#line 13194 "EditingTools.c"
 }
 
 
-static EditingToolsRedeyeTool* editing_tools_redeye_tool_new (void) {
+static EditingToolsRedeyeTool*
+editing_tools_redeye_tool_new (void)
+{
 #line 1901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_construct (EDITING_TOOLS_TYPE_REDEYE_TOOL);
-#line 12775 "EditingTools.c"
+#line 13203 "EditingTools.c"
 }
 
 
-EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
+EditingToolsRedeyeTool*
+editing_tools_redeye_tool_factory (void)
+{
 	EditingToolsRedeyeTool* result = NULL;
 	EditingToolsRedeyeTool* _tmp0_;
 #line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12784,148 +13214,151 @@ EditingToolsRedeyeTool* editing_tools_redeye_tool_factory (void) {
 	result = _tmp0_;
 #line 1906 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12788 "EditingTools.c"
+#line 13218 "EditingTools.c"
 }
 
 
-gboolean editing_tools_redeye_tool_is_available (Photo* photo, Scaling* scaling) {
+gboolean
+editing_tools_redeye_tool_is_available (Photo* photo,
+                                        Scaling* scaling)
+{
 	gboolean result = FALSE;
 	Dimensions dim = {0};
-	Photo* _tmp0_;
+	Dimensions _tmp0_ = {0};
 	Dimensions _tmp1_ = {0};
-	Dimensions _tmp2_ = {0};
-	gboolean _tmp3_ = FALSE;
-	Dimensions _tmp4_;
-	gint _tmp5_;
+	gboolean _tmp2_ = FALSE;
+	Dimensions _tmp3_;
+	gint _tmp4_;
 #line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
 #line 1909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (scaling != NULL, FALSE);
 #line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = photo;
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp0_);
 #line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp1_);
+	scaling_get_scaled_dimensions (scaling, &_tmp0_, &_tmp1_);
 #line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	scaling_get_scaled_dimensions (scaling, &_tmp1_, &_tmp2_);
-#line 1910 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	dim = _tmp2_;
+	dim = _tmp1_;
 #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = dim;
+	_tmp3_ = dim;
 #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _tmp4_.width;
+	_tmp4_ = _tmp3_.width;
 #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
-#line 12819 "EditingTools.c"
-		Dimensions _tmp6_;
-		gint _tmp7_;
+	if (_tmp4_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2)) {
+#line 13249 "EditingTools.c"
+		Dimensions _tmp5_;
+		gint _tmp6_;
 #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = dim;
+		_tmp5_ = dim;
 #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = _tmp6_.height;
+		_tmp6_ = _tmp5_.height;
 #line 1913 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp7_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
-#line 12828 "EditingTools.c"
+		_tmp2_ = _tmp6_ >= (EDITING_TOOLS_REDEYE_INSTANCE_MAX_RADIUS * 2);
+#line 13258 "EditingTools.c"
 	} else {
 #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = FALSE;
-#line 12832 "EditingTools.c"
+		_tmp2_ = FALSE;
+#line 13262 "EditingTools.c"
 	}
 #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp3_;
+	result = _tmp2_;
 #line 1912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 12838 "EditingTools.c"
+#line 13268 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas, EditingToolsRedeyeInstance* result) {
+static void
+editing_tools_redeye_tool_new_interaction_instance (EditingToolsRedeyeTool* self,
+                                                    EditingToolsPhotoCanvas* canvas,
+                                                    EditingToolsRedeyeInstance* result)
+{
 	GdkRectangle photo_bounds = {0};
-	EditingToolsPhotoCanvas* _tmp0_;
-	GdkRectangle _tmp1_ = {0};
+	GdkRectangle _tmp0_ = {0};
 	GdkPoint photo_center = {0};
-	GdkPoint _tmp2_ = {0};
-	GdkRectangle _tmp3_;
-	gint _tmp4_;
-	GdkRectangle _tmp5_;
-	gint _tmp6_;
-	GdkRectangle _tmp7_;
-	gint _tmp8_;
-	GdkRectangle _tmp9_;
-	gint _tmp10_;
+	GdkPoint _tmp1_ = {0};
+	GdkRectangle _tmp2_;
+	gint _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
+	gint _tmp9_;
 	EditingToolsRedeyeInstance _result_ = {0};
-	GdkPoint _tmp11_;
-	gint _tmp12_;
-	GdkPoint _tmp13_;
-	gint _tmp14_;
+	GdkPoint _tmp10_;
+	gint _tmp11_;
+	GdkPoint _tmp12_;
+	gint _tmp13_;
 #line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1916 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
+	editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp0_);
 #line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp0_, &_tmp1_);
-#line 1917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_bounds = _tmp1_;
+	photo_bounds = _tmp0_;
 #line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_.x = 0;
+	_tmp1_.x = 0;
 #line 1918 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_center = _tmp2_;
+	photo_center = _tmp1_;
 #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = photo_bounds;
+	_tmp2_ = photo_bounds;
 #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_.x;
+	_tmp3_ = _tmp2_.x;
 #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = photo_bounds;
+	_tmp4_ = photo_bounds;
 #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _tmp5_.width;
+	_tmp5_ = _tmp4_.width;
 #line 1919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_center.x = _tmp4_ + (_tmp6_ / 2);
+	photo_center.x = _tmp3_ + (_tmp5_ / 2);
 #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = photo_bounds;
+	_tmp6_ = photo_bounds;
 #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _tmp7_.y;
+	_tmp7_ = _tmp6_.y;
 #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = photo_bounds;
+	_tmp8_ = photo_bounds;
 #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = _tmp9_.height;
+	_tmp9_ = _tmp8_.height;
 #line 1920 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo_center.y = _tmp8_ + (_tmp10_ / 2);
+	photo_center.y = _tmp7_ + (_tmp9_ / 2);
 #line 1922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_instance_init (&_result_);
 #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = photo_center;
+	_tmp10_ = photo_center;
 #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = _tmp11_.x;
+	_tmp11_ = _tmp10_.x;
 #line 1923 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_result_.center.x = _tmp12_;
+	_result_.center.x = _tmp11_;
 #line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = photo_center;
+	_tmp12_ = photo_center;
 #line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _tmp13_.y;
+	_tmp13_ = _tmp12_.y;
 #line 1924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_result_.center.y = _tmp14_;
+	_result_.center.y = _tmp13_;
 #line 1925 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_result_.radius = EDITING_TOOLS_REDEYE_INSTANCE_DEFAULT_RADIUS;
 #line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	*result = _result_;
 #line 1927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return;
-#line 12915 "EditingTools.c"
+#line 13346 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self, cairo_t* ctx, Dimensions* dim) {
-	cairo_t* _tmp0_;
-	cairo_surface_t* _tmp1_;
+static void
+editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
+                                       cairo_t* ctx,
+                                       Dimensions* dim)
+{
+	cairo_surface_t* _tmp0_;
+	cairo_t* _tmp1_;
 	cairo_t* _tmp2_;
 	cairo_t* _tmp3_;
-	cairo_t* _tmp4_;
+	cairo_surface_t* _tmp4_;
 	cairo_t* _tmp5_;
-	cairo_surface_t* _tmp6_;
+	cairo_t* _tmp6_;
 	cairo_t* _tmp7_;
-	cairo_t* _tmp8_;
-	cairo_t* _tmp9_;
 #line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -12933,46 +13366,45 @@ static void editing_tools_redeye_tool_prepare_ctx (EditingToolsRedeyeTool* self,
 #line 1930 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (dim != NULL);
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = ctx;
-#line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = cairo_get_target (_tmp0_);
+	_tmp0_ = cairo_get_target (ctx);
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = cairo_create (_tmp1_);
+	_tmp1_ = cairo_create (_tmp0_);
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->wider_gray_ctx);
 #line 1931 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->wider_gray_ctx = _tmp2_;
+	self->priv->wider_gray_ctx = _tmp1_;
 #line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->priv->wider_gray_ctx;
+	_tmp2_ = self->priv->wider_gray_ctx;
 #line 1932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp3_, "#111");
+	set_source_color_from_string (_tmp2_, "#111");
 #line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->wider_gray_ctx;
+	_tmp3_ = self->priv->wider_gray_ctx;
 #line 1933 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_line_width (_tmp4_, (gdouble) 3);
-#line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = ctx;
+	cairo_set_line_width (_tmp3_, (gdouble) 3);
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = cairo_get_target (_tmp5_);
+	_tmp4_ = cairo_get_target (ctx);
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = cairo_create (_tmp6_);
+	_tmp5_ = cairo_create (_tmp4_);
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_cairo_destroy0 (self->priv->thin_white_ctx);
 #line 1935 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->thin_white_ctx = _tmp7_;
+	self->priv->thin_white_ctx = _tmp5_;
 #line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->priv->thin_white_ctx;
+	_tmp6_ = self->priv->thin_white_ctx;
 #line 1936 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	set_source_color_from_string (_tmp8_, "#FFF");
+	set_source_color_from_string (_tmp6_, "#FFF");
 #line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = self->priv->thin_white_ctx;
+	_tmp7_ = self->priv->thin_white_ctx;
 #line 1937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	cairo_set_line_width (_tmp9_, (gdouble) 1);
-#line 12972 "EditingTools.c"
+	cairo_set_line_width (_tmp7_, (gdouble) 1);
+#line 13401 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self, EditingToolsRedeyeInstance* inst) {
+static void
+editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTool* self,
+                                                EditingToolsRedeyeInstance* inst)
+{
 	EditingToolsPhotoCanvas* _tmp0_;
 	cairo_t* _tmp1_;
 	EditingToolsRedeyeInstance _tmp2_;
@@ -13041,16 +13473,18 @@ static void editing_tools_redeye_tool_draw_redeye_instance (EditingToolsRedeyeTo
 	_tmp19_ = _tmp18_.radius;
 #line 1943 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_draw_circle (_tmp10_, _tmp11_, _tmp14_, _tmp17_, _tmp19_);
-#line 13045 "EditingTools.c"
+#line 13477 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self, GtkScrollType type) {
+static gboolean
+editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRedeyeTool* self,
+                                                 GtkScrollType type)
+{
 	gboolean result = FALSE;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	EditingToolsPhotoCanvas* _tmp3_;
+	EditingToolsPhotoCanvas* _tmp2_;
 #line 1947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self), FALSE);
 #line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13058,22 +13492,22 @@ static gboolean editing_tools_redeye_tool_on_size_slider_adjust (EditingToolsRed
 #line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->slider;
 #line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 1948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->user_interaction_instance.radius = (gint) _tmp2_;
+	self->priv->user_interaction_instance.radius = (gint) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
 #line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp3_);
+	editing_tools_photo_canvas_repaint (_tmp2_);
 #line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
 #line 1953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13073 "EditingTools.c"
+#line 13505 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
+static void
+editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self)
+{
 	GdkRectangle bounds_rect_user = {0};
 	EditingToolsRedeyeInstance _tmp0_;
 	GdkRectangle _tmp1_ = {0};
@@ -13230,111 +13664,108 @@ static void editing_tools_redeye_tool_on_apply (EditingToolsRedeyeTool* self) {
 	_command_manager_unref0 (_tmp37_);
 #line 1956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 13234 "EditingTools.c"
+#line 13668 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self, GeeMap* map) {
-	GeeMap* _tmp0_;
-	EditingToolsPhotoCanvas* _tmp1_;
+static void
+editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool* self,
+                                             GeeMap* map)
+{
+	EditingToolsPhotoCanvas* _tmp0_;
+	Photo* _tmp1_;
 	Photo* _tmp2_;
-	Photo* _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
-	EditingToolsPhotoCanvas* _tmp17_;
+	gboolean _tmp3_;
+	EditingToolsPhotoCanvas* _tmp15_;
 	GError * _inner_error_ = NULL;
 #line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 1987 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = map;
-#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
 #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
+	_tmp2_ = _tmp1_;
 #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = !_tmp4_;
+	_tmp3_ = !gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
 #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 1988 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_) {
+	if (_tmp3_) {
 #line 1989 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13269 "EditingTools.c"
+#line 13700 "EditingTools.c"
 	}
 	{
-		GdkPixbuf* _tmp6_ = NULL;
-		EditingToolsPhotoCanvas* _tmp7_;
-		Photo* _tmp8_;
-		Photo* _tmp9_;
-		EditingToolsPhotoCanvas* _tmp10_;
-		Scaling _tmp11_ = {0};
+		GdkPixbuf* _tmp4_ = NULL;
+		EditingToolsPhotoCanvas* _tmp5_;
+		Photo* _tmp6_;
+		Photo* _tmp7_;
+		EditingToolsPhotoCanvas* _tmp8_;
+		Scaling _tmp9_ = {0};
+		GdkPixbuf* _tmp10_;
+		GdkPixbuf* _tmp11_;
 		GdkPixbuf* _tmp12_;
-		GdkPixbuf* _tmp13_;
-		GdkPixbuf* _tmp14_;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
+		_tmp6_ = editing_tools_photo_canvas_get_photo (_tmp5_);
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _tmp8_;
+		_tmp7_ = _tmp6_;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_get_scaling (_tmp10_, &_tmp11_);
+		editing_tools_photo_canvas_get_scaling (_tmp8_, &_tmp9_);
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp12_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp11_, &_inner_error_);
+		_tmp10_ = photo_source_get_pixbuf (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, TYPE_PHOTO_SOURCE, PhotoSource), &_tmp9_, &_inner_error_);
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp13_ = _tmp12_;
+		_tmp11_ = _tmp10_;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp9_);
+		_g_object_unref0 (_tmp7_);
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp13_;
+		_tmp4_ = _tmp11_;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 13301 "EditingTools.c"
+#line 13732 "EditingTools.c"
 			goto __catch26_g_error;
 		}
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp14_ = _tmp6_;
+		_tmp12_ = _tmp4_;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = NULL;
+		_tmp4_ = NULL;
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->current_pixbuf);
 #line 1992 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->current_pixbuf = _tmp14_;
+		self->priv->current_pixbuf = _tmp12_;
 #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp6_);
-#line 13314 "EditingTools.c"
+		_g_object_unref0 (_tmp4_);
+#line 13745 "EditingTools.c"
 	}
 	goto __finally26;
 	__catch26_g_error:
 	{
 		GError* err = NULL;
-		GError* _tmp15_;
-		const gchar* _tmp16_;
+		GError* _tmp13_;
+		const gchar* _tmp14_;
 #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		err = _inner_error_;
 #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_inner_error_ = NULL;
 #line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp15_ = err;
+		_tmp13_ = err;
 #line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp16_ = _tmp15_->message;
+		_tmp14_ = _tmp13_->message;
 #line 1994 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_warning ("EditingTools.vala:1994: %s", _tmp16_);
+		g_warning ("EditingTools.vala:1994: %s", _tmp14_);
 #line 1995 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_ABORTED_SIGNAL], 0);
 #line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_error_free0 (err);
 #line 1997 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13338 "EditingTools.c"
+#line 13769 "EditingTools.c"
 	}
 	__finally26:
 #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13345,17 +13776,19 @@ static void editing_tools_redeye_tool_on_photos_altered (EditingToolsRedeyeTool*
 		g_clear_error (&_inner_error_);
 #line 1991 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 13349 "EditingTools.c"
+#line 13780 "EditingTools.c"
 	}
 #line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp15_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2000 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp17_);
-#line 13355 "EditingTools.c"
+	editing_tools_photo_canvas_repaint (_tmp15_);
+#line 13786 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
+static void
+editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self)
+{
 	GdkPixbuf* _tmp0_;
 	EditingToolsPhotoCanvas* _tmp1_;
 	Photo* _tmp2_;
@@ -13377,11 +13810,13 @@ static void editing_tools_redeye_tool_on_close (EditingToolsRedeyeTool* self) {
 	g_signal_emit (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), editing_tools_editing_tool_signals[EDITING_TOOLS_EDITING_TOOL_APPLIED_SIGNAL], 0, NULL, _tmp0_, &_tmp4_, FALSE);
 #line 2004 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp3_);
-#line 13381 "EditingTools.c"
+#line 13814 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self) {
+static void
+editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool* self)
+{
 	GdkRectangle scaled_pixbuf_position = {0};
 	EditingToolsPhotoCanvas* _tmp0_;
 	GdkRectangle _tmp1_ = {0};
@@ -13483,199 +13918,178 @@ static void editing_tools_redeye_tool_on_canvas_resize (EditingToolsRedeyeTool*
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 2029 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 13487 "EditingTools.c"
+#line 13922 "EditingTools.c"
 }
 
 
-static void _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                            GeeMap* items,
+                                                                            gpointer self)
+{
 #line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_photos_altered ((EditingToolsRedeyeTool*) self, items);
-#line 13494 "EditingTools.c"
+#line 13933 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
+static void
+editing_tools_redeye_tool_real_activate (EditingToolsEditingTool* base,
+                                         EditingToolsPhotoCanvas* canvas)
+{
 	EditingToolsRedeyeTool * self;
-	EditingToolsPhotoCanvas* _tmp0_;
-	EditingToolsRedeyeInstance _tmp1_ = {0};
-	EditingToolsPhotoCanvas* _tmp2_;
-	cairo_t* _tmp3_;
-	cairo_t* _tmp4_;
-	EditingToolsPhotoCanvas* _tmp5_;
-	Dimensions _tmp6_ = {0};
-	EditingToolsPhotoCanvas* _tmp7_;
-	EditingToolsPhotoCanvas* _tmp8_;
-	GdkRectangle _tmp9_ = {0};
-	EditingToolsPhotoCanvas* _tmp10_;
-	GdkPixbuf* _tmp11_;
-	EditingToolsPhotoCanvas* _tmp12_;
-	GtkWindow* _tmp13_;
-	GtkWindow* _tmp14_;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp15_;
-	EditingToolsRedeyeToolRedeyeToolWindow* _tmp16_;
-	GtkScale* _tmp17_;
-	EditingToolsRedeyeInstance _tmp18_;
-	gint _tmp19_;
+	EditingToolsRedeyeInstance _tmp0_ = {0};
+	cairo_t* _tmp1_;
+	cairo_t* _tmp2_;
+	Dimensions _tmp3_ = {0};
+	GdkRectangle _tmp4_ = {0};
+	GdkPixbuf* _tmp5_;
+	GtkWindow* _tmp6_;
+	GtkWindow* _tmp7_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp8_;
+	EditingToolsRedeyeToolRedeyeToolWindow* _tmp9_;
+	GtkScale* _tmp10_;
+	EditingToolsRedeyeInstance _tmp11_;
+	gint _tmp12_;
 	GdkDisplay* display = NULL;
-	EditingToolsPhotoCanvas* _tmp20_;
-	GdkWindow* _tmp21_;
-	GdkWindow* _tmp22_;
-	GdkDisplay* _tmp23_;
-	GdkDisplay* _tmp24_;
-	GdkDisplay* _tmp25_;
-	GdkDisplay* _tmp26_;
-	GdkCursor* _tmp27_;
-	GdkDisplay* _tmp28_;
-	GdkCursor* _tmp29_;
+	GdkWindow* _tmp13_;
+	GdkWindow* _tmp14_;
+	GdkDisplay* _tmp15_;
+	GdkDisplay* _tmp16_;
+	GdkDisplay* _tmp17_;
+	GdkDisplay* _tmp18_;
+	GdkCursor* _tmp19_;
+	GdkDisplay* _tmp20_;
+	GdkCursor* _tmp21_;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp30_;
-	Photo* _tmp31_;
-	Photo* _tmp32_;
-	DataCollection* _tmp33_;
-	DataCollection* _tmp34_;
-	DataCollection* _tmp35_;
-	EditingToolsPhotoCanvas* _tmp37_;
+	Photo* _tmp22_;
+	Photo* _tmp23_;
+	DataCollection* _tmp24_;
+	DataCollection* _tmp25_;
+	DataCollection* _tmp26_;
 #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
-#line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_redeye_tool_new_interaction_instance (self, _tmp0_, &_tmp1_);
+	editing_tools_redeye_tool_new_interaction_instance (self, canvas, &_tmp0_);
 #line 2033 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->user_interaction_instance = _tmp1_;
-#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = canvas;
-#line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = editing_tools_photo_canvas_get_default_ctx (_tmp2_);
+	self->priv->user_interaction_instance = _tmp0_;
 #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_;
+	_tmp1_ = editing_tools_photo_canvas_get_default_ctx (canvas);
 #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = canvas;
+	_tmp2_ = _tmp1_;
 #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_surface_dim (_tmp5_, &_tmp6_);
+	editing_tools_photo_canvas_get_surface_dim (canvas, &_tmp3_);
 #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_redeye_tool_prepare_ctx (self, _tmp4_, &_tmp6_);
+	editing_tools_redeye_tool_prepare_ctx (self, _tmp2_, &_tmp3_);
 #line 2035 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_cairo_destroy0 (_tmp4_);
-#line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = canvas;
+	_cairo_destroy0 (_tmp2_);
 #line 2037 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_redeye_tool_bind_canvas_handlers (self, _tmp7_);
+	editing_tools_redeye_tool_bind_canvas_handlers (self, canvas);
 #line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = canvas;
+	editing_tools_photo_canvas_get_scaled_pixbuf_position (canvas, &_tmp4_);
 #line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_get_scaled_pixbuf_position (_tmp8_, &_tmp9_);
-#line 2039 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->old_scaled_pixbuf_position = _tmp9_;
-#line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = canvas;
+	self->priv->old_scaled_pixbuf_position = _tmp4_;
 #line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp10_);
+	_tmp5_ = editing_tools_photo_canvas_get_scaled_pixbuf (canvas);
 #line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 2040 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->current_pixbuf = _tmp11_;
+	self->priv->current_pixbuf = _tmp5_;
 #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = canvas;
+	_tmp6_ = editing_tools_photo_canvas_get_container (canvas);
 #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = editing_tools_photo_canvas_get_container (_tmp12_);
-#line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _tmp13_;
+	_tmp7_ = _tmp6_;
 #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp14_);
+	_tmp8_ = editing_tools_redeye_tool_redeye_tool_window_new (_tmp7_);
 #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp15_);
+	g_object_ref_sink (_tmp8_);
 #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->redeye_tool_window);
 #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->redeye_tool_window = _tmp15_;
+	self->priv->redeye_tool_window = _tmp8_;
 #line 2042 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp7_);
 #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->priv->redeye_tool_window;
+	_tmp9_ = self->priv->redeye_tool_window;
 #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = _tmp16_->slider;
+	_tmp10_ = _tmp9_->slider;
 #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->priv->user_interaction_instance;
+	_tmp11_ = self->priv->user_interaction_instance;
 #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = _tmp18_.radius;
+	_tmp12_ = _tmp11_.radius;
 #line 2043 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) _tmp19_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_range_get_type (), GtkRange), (gdouble) _tmp12_);
 #line 2045 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_bind_window_handlers (self);
 #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = canvas;
+	_tmp13_ = editing_tools_photo_canvas_get_drawing_window (canvas);
 #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = editing_tools_photo_canvas_get_drawing_window (_tmp20_);
-#line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = _tmp21_;
+	_tmp14_ = _tmp13_;
 #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = gdk_window_get_display (_tmp22_);
+	_tmp15_ = gdk_window_get_display (_tmp14_);
 #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = _g_object_ref0 (_tmp23_);
+	_tmp16_ = _g_object_ref0 (_tmp15_);
 #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = _tmp24_;
+	_tmp17_ = _tmp16_;
 #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp22_);
+	_g_object_unref0 (_tmp14_);
 #line 2047 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	display = _tmp25_;
+	display = _tmp17_;
 #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = display;
+	_tmp18_ = display;
 #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = gdk_cursor_new_for_display (_tmp26_, GDK_LEFT_PTR);
+	_tmp19_ = gdk_cursor_new_for_display (_tmp18_, GDK_LEFT_PTR);
 #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_arrow_cursor);
 #line 2048 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->cached_arrow_cursor = _tmp27_;
+	self->priv->cached_arrow_cursor = _tmp19_;
 #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = display;
+	_tmp20_ = display;
 #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = gdk_cursor_new_for_display (_tmp28_, GDK_FLEUR);
+	_tmp21_ = gdk_cursor_new_for_display (_tmp20_, GDK_FLEUR);
 #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->cached_grab_cursor);
 #line 2049 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->cached_grab_cursor = _tmp29_;
+	self->priv->cached_grab_cursor = _tmp21_;
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = canvas;
+	_tmp22_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = editing_tools_photo_canvas_get_photo (_tmp30_);
-#line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = _tmp31_;
+	_tmp23_ = _tmp22_;
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_DATA_OBJECT, DataObject));
+	_tmp24_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_DATA_OBJECT, DataObject));
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = _tmp33_;
+	_tmp25_ = _tmp24_;
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp32_);
+	_g_object_unref0 (_tmp23_);
 #line 2051 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	owner = _tmp34_;
+	owner = _tmp25_;
 #line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = owner;
+	_tmp26_ = owner;
 #line 2052 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp35_ != NULL) {
-#line 13659 "EditingTools.c"
-		DataCollection* _tmp36_;
+	if (_tmp26_ != NULL) {
+#line 14073 "EditingTools.c"
+		DataCollection* _tmp27_;
 #line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp36_ = owner;
+		_tmp27_ = owner;
 #line 2053 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_connect (_tmp36_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 13665 "EditingTools.c"
+		g_signal_connect (_tmp27_, "items-altered", (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
+#line 14079 "EditingTools.c"
 	}
 #line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = canvas;
-#line 2055 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp37_);
+	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas);
 #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
 #line 2032 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (display);
-#line 13675 "EditingTools.c"
+#line 14087 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base) {
+static void
+editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool* base)
+{
 	EditingToolsRedeyeTool * self;
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp10_;
@@ -13685,7 +14099,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 13689 "EditingTools.c"
+#line 14103 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_;
 		Photo* _tmp2_;
@@ -13712,7 +14126,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_tmp6_ = owner;
 #line 2061 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 13716 "EditingTools.c"
+#line 14130 "EditingTools.c"
 			DataCollection* _tmp7_;
 			guint _tmp8_;
 #line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13721,7 +14135,7 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
 #line 2062 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_photos_altered_data_collection_items_altered, self);
-#line 13725 "EditingTools.c"
+#line 14139 "EditingTools.c"
 		}
 #line 2064 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -13729,13 +14143,13 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		editing_tools_redeye_tool_unbind_canvas_handlers (self, _tmp9_);
 #line 2059 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 13733 "EditingTools.c"
+#line 14147 "EditingTools.c"
 	}
 #line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->redeye_tool_window;
 #line 2067 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 13739 "EditingTools.c"
+#line 14153 "EditingTools.c"
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp11_;
 		EditingToolsRedeyeToolRedeyeToolWindow* _tmp12_;
 #line 2068 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13752,96 +14166,114 @@ static void editing_tools_redeye_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->redeye_tool_window);
 #line 2071 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->redeye_tool_window = NULL;
-#line 13756 "EditingTools.c"
+#line 14170 "EditingTools.c"
 	}
 #line 2074 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 13760 "EditingTools.c"
+#line 14174 "EditingTools.c"
 }
 
 
-static void _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender, cairo_t* ctx, Dimensions* dim, gpointer self) {
+static void
+_editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface (EditingToolsPhotoCanvas* _sender,
+                                                                               cairo_t* ctx,
+                                                                               Dimensions* dim,
+                                                                               gpointer self)
+{
 #line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_prepare_ctx ((EditingToolsRedeyeTool*) self, ctx, dim);
-#line 13767 "EditingTools.c"
+#line 14186 "EditingTools.c"
 }
 
 
-static void _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
+static void
+_editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                              Dimensions* old_dim,
+                                                                                              GdkPixbuf* scaled,
+                                                                                              GdkRectangle* scaled_position,
+                                                                                              gpointer self)
+{
 #line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_canvas_resize ((EditingToolsRedeyeTool*) self);
-#line 13774 "EditingTools.c"
+#line 14199 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
-	EditingToolsPhotoCanvas* _tmp1_;
+static void
+editing_tools_redeye_tool_bind_canvas_handlers (EditingToolsRedeyeTool* self,
+                                                EditingToolsPhotoCanvas* canvas)
+{
 #line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2077 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
-#line 2078 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (_tmp0_, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = canvas;
+	g_signal_connect (canvas, "new-surface", (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
 #line 2079 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (_tmp1_, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 13793 "EditingTools.c"
+	g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 14215 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
+static void
+editing_tools_redeye_tool_unbind_canvas_handlers (EditingToolsRedeyeTool* self,
+                                                  EditingToolsPhotoCanvas* canvas)
+{
+	guint _tmp0_;
 	guint _tmp1_;
-	EditingToolsPhotoCanvas* _tmp2_;
-	guint _tmp3_;
 #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_REDEYE_TOOL (self));
 #line 2082 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
+	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE);
 #line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("new-surface", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
-#line 2083 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
-#line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = canvas;
+	g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_redeye_tool_prepare_ctx_editing_tools_photo_canvas_new_surface, self);
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp3_, NULL, FALSE);
+	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
 #line 2084 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (_tmp2_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp3_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 13818 "EditingTools.c"
+	g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_redeye_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 14237 "EditingTools.c"
 }
 
 
-static void _editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_redeye_tool_on_apply_gtk_button_clicked (GtkButton* _sender,
+                                                        gpointer self)
+{
 #line 2088 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_apply ((EditingToolsRedeyeTool*) self);
-#line 13825 "EditingTools.c"
+#line 14247 "EditingTools.c"
 }
 
 
-static void _editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_redeye_tool_on_close_gtk_button_clicked (GtkButton* _sender,
+                                                        gpointer self)
+{
 #line 2089 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_on_close ((EditingToolsRedeyeTool*) self);
-#line 13832 "EditingTools.c"
+#line 14257 "EditingTools.c"
 }
 
 
-static gboolean _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender, GtkScrollType scroll, gdouble new_value, gpointer self) {
+static gboolean
+_editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value (GtkRange* _sender,
+                                                                         GtkScrollType scroll,
+                                                                         gdouble new_value,
+                                                                         gpointer self)
+{
 	gboolean result;
 	result = editing_tools_redeye_tool_on_size_slider_adjust ((EditingToolsRedeyeTool*) self, scroll);
 #line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13841 "EditingTools.c"
+#line 14271 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self) {
+static void
+editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTool* self)
+{
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
 	GtkButton* _tmp1_;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp2_;
@@ -13868,11 +14300,13 @@ static void editing_tools_redeye_tool_bind_window_handlers (EditingToolsRedeyeTo
 	_tmp5_ = _tmp4_->slider;
 #line 2090 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_range_get_type (), GtkRange), "change-value", (GCallback) _editing_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 13872 "EditingTools.c"
+#line 14304 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self) {
+static void
+editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeyeTool* self)
+{
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
 	GtkButton* _tmp1_;
 	guint _tmp2_;
@@ -13908,11 +14342,13 @@ static void editing_tools_redeye_tool_unbind_window_handlers (EditingToolsRedeye
 	g_signal_parse_name ("change-value", gtk_range_get_type (), &_tmp8_, NULL, FALSE);
 #line 2096 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.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_tools_redeye_tool_on_size_slider_adjust_gtk_range_change_value, self);
-#line 13912 "EditingTools.c"
+#line 14346 "EditingTools.c"
 }
 
 
-static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base) {
+static EditingToolsEditingToolWindow*
+editing_tools_redeye_tool_real_get_tool_window (EditingToolsEditingTool* base)
+{
 	EditingToolsRedeyeTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsRedeyeToolRedeyeToolWindow* _tmp0_;
@@ -13927,11 +14363,14 @@ static EditingToolsEditingToolWindow* editing_tools_redeye_tool_real_get_tool_wi
 	result = _tmp1_;
 #line 2100 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 13931 "EditingTools.c"
+#line 14367 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
+static void
+editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
+                                      cairo_t* ctx)
+{
 	EditingToolsRedeyeTool * self;
 	GdkPixbuf* _tmp0_ = NULL;
 	GdkPixbuf* _tmp1_;
@@ -13951,7 +14390,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp1_ = self->priv->current_pixbuf;
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_ != NULL) {
-#line 13955 "EditingTools.c"
+#line 14394 "EditingTools.c"
 		GdkPixbuf* _tmp2_;
 		GdkPixbuf* _tmp3_;
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -13962,7 +14401,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp3_;
-#line 13966 "EditingTools.c"
+#line 14405 "EditingTools.c"
 	} else {
 		EditingToolsPhotoCanvas* _tmp4_;
 		GdkPixbuf* _tmp5_;
@@ -13974,7 +14413,7 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 		_g_object_unref0 (_tmp0_);
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = _tmp5_;
-#line 13978 "EditingTools.c"
+#line 14417 "EditingTools.c"
 	}
 #line 2104 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -14000,19 +14439,20 @@ static void editing_tools_redeye_tool_real_paint (EditingToolsEditingTool* base,
 	editing_tools_redeye_tool_draw_redeye_instance (self, &_tmp12_);
 #line 2103 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp0_);
-#line 14004 "EditingTools.c"
+#line 14443 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
+static void
+editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingTool* base,
+                                              gint x,
+                                              gint y)
+{
 	EditingToolsRedeyeTool * self;
 	GdkRectangle bounds_rect = {0};
 	EditingToolsRedeyeInstance _tmp0_;
 	GdkRectangle _tmp1_ = {0};
-	gint _tmp2_;
-	gint _tmp3_;
-	GdkRectangle _tmp4_;
-	gboolean _tmp5_;
+	GdkRectangle _tmp2_;
 #line 2114 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14022,52 +14462,49 @@ static void editing_tools_redeye_tool_real_on_left_click (EditingToolsEditingToo
 #line 2115 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	bounds_rect = _tmp1_;
 #line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = x;
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = y;
+	_tmp2_ = bounds_rect;
 #line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = bounds_rect;
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = coord_in_rectangle (_tmp2_, _tmp3_, &_tmp4_);
-#line 2118 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_) {
-#line 14035 "EditingTools.c"
-		gint _tmp6_;
-		gint _tmp7_;
-		EditingToolsRedeyeInstance _tmp8_;
-		GdkPoint _tmp9_;
+	if (coord_in_rectangle (x, y, &_tmp2_)) {
+#line 14469 "EditingTools.c"
+		EditingToolsRedeyeInstance _tmp3_;
+		GdkPoint _tmp4_;
 #line 2119 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->is_reticle_move_in_progress = TRUE;
 #line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = x;
-#line 2120 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->reticle_move_mouse_start_point.x = _tmp6_;
-#line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = y;
+		self->priv->reticle_move_mouse_start_point.x = x;
 #line 2121 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->reticle_move_mouse_start_point.y = _tmp7_;
+		self->priv->reticle_move_mouse_start_point.y = y;
 #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = self->priv->user_interaction_instance;
+		_tmp3_ = self->priv->user_interaction_instance;
 #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _tmp8_.center;
+		_tmp4_ = _tmp3_.center;
 #line 2122 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->reticle_move_anchor = _tmp9_;
-#line 14056 "EditingTools.c"
+		self->priv->reticle_move_anchor = _tmp4_;
+#line 14484 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
+static void
+editing_tools_redeye_tool_real_on_left_released (EditingToolsEditingTool* base,
+                                                 gint x,
+                                                 gint y)
+{
 	EditingToolsRedeyeTool * self;
 #line 2126 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2127 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->is_reticle_move_in_progress = FALSE;
-#line 14067 "EditingTools.c"
+#line 14499 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
+static void
+editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* base,
+                                          gint x,
+                                          gint y,
+                                          GdkModifierType mask)
+{
 	EditingToolsRedeyeTool * self;
 	gboolean _tmp0_;
 #line 2130 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14076,7 +14513,7 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 	_tmp0_ = self->priv->is_reticle_move_in_progress;
 #line 2131 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
-#line 14080 "EditingTools.c"
+#line 14517 "EditingTools.c"
 		GdkRectangle active_region_rect = {0};
 		EditingToolsPhotoCanvas* _tmp1_;
 		GdkRectangle _tmp2_ = {0};
@@ -14105,32 +14542,28 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 		EditingToolsRedeyeInstance _tmp21_;
 		gint _tmp22_;
 		gint delta_x = 0;
-		gint _tmp23_;
-		GdkPoint _tmp24_;
-		gint _tmp25_;
+		GdkPoint _tmp23_;
+		gint _tmp24_;
 		gint delta_y = 0;
+		GdkPoint _tmp25_;
 		gint _tmp26_;
 		GdkPoint _tmp27_;
 		gint _tmp28_;
-		GdkPoint _tmp29_;
-		gint _tmp30_;
+		gint _tmp29_;
+		GdkPoint _tmp30_;
 		gint _tmp31_;
-		GdkPoint _tmp32_;
-		gint _tmp33_;
+		gint _tmp32_;
+		GdkPoint _tmp33_;
 		gint _tmp34_;
-		GdkPoint _tmp35_;
+		gint _tmp35_;
 		gint _tmp36_;
 		gint _tmp37_;
-		gint _tmp38_;
+		GdkPoint _tmp38_;
 		gint _tmp39_;
 		gint _tmp40_;
-		GdkPoint _tmp41_;
+		gint _tmp41_;
 		gint _tmp42_;
-		gint _tmp43_;
-		gint _tmp44_;
-		gint _tmp45_;
-		gint _tmp46_;
-		EditingToolsPhotoCanvas* _tmp47_;
+		EditingToolsPhotoCanvas* _tmp43_;
 #line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2133 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14186,192 +14619,167 @@ static void editing_tools_redeye_tool_real_on_motion (EditingToolsEditingTool* b
 #line 2143 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		y_clamp_high = ((_tmp18_ + _tmp20_) - _tmp22_) - 1;
 #line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp23_ = x;
-#line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp24_ = self->priv->reticle_move_mouse_start_point;
+		_tmp23_ = self->priv->reticle_move_mouse_start_point;
 #line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp25_ = _tmp24_.x;
+		_tmp24_ = _tmp23_.x;
 #line 2147 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		delta_x = _tmp23_ - _tmp25_;
+		delta_x = x - _tmp24_;
 #line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp26_ = y;
+		_tmp25_ = self->priv->reticle_move_mouse_start_point;
 #line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp27_ = self->priv->reticle_move_mouse_start_point;
+		_tmp26_ = _tmp25_.y;
 #line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp28_ = _tmp27_.y;
-#line 2148 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		delta_y = _tmp26_ - _tmp28_;
+		delta_y = y - _tmp26_;
 #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp29_ = self->priv->reticle_move_anchor;
+		_tmp27_ = self->priv->reticle_move_anchor;
 #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp30_ = _tmp29_.x;
+		_tmp28_ = _tmp27_.x;
 #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp31_ = delta_x;
+		_tmp29_ = delta_x;
 #line 2150 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->user_interaction_instance.center.x = _tmp30_ + _tmp31_;
+		self->priv->user_interaction_instance.center.x = _tmp28_ + _tmp29_;
 #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp32_ = self->priv->reticle_move_anchor;
+		_tmp30_ = self->priv->reticle_move_anchor;
 #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp33_ = _tmp32_.y;
+		_tmp31_ = _tmp30_.y;
 #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp34_ = delta_y;
+		_tmp32_ = delta_y;
 #line 2152 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->user_interaction_instance.center.y = _tmp33_ + _tmp34_;
-#line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp35_ = self->priv->reticle_move_anchor;
+		self->priv->user_interaction_instance.center.y = _tmp31_ + _tmp32_;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp36_ = _tmp35_.x;
+		_tmp33_ = self->priv->reticle_move_anchor;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp37_ = delta_x;
+		_tmp34_ = _tmp33_.x;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp38_ = x_clamp_low;
+		_tmp35_ = delta_x;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp39_ = x_clamp_high;
+		_tmp36_ = x_clamp_low;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp40_ = CLAMP (_tmp36_ + _tmp37_, _tmp38_, _tmp39_);
+		_tmp37_ = x_clamp_high;
 #line 2155 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->user_interaction_instance.center.x = _tmp40_;
+		self->priv->user_interaction_instance.center.x = CLAMP (_tmp34_ + _tmp35_, _tmp36_, _tmp37_);
 #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp41_ = self->priv->reticle_move_anchor;
+		_tmp38_ = self->priv->reticle_move_anchor;
 #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp42_ = _tmp41_.y;
+		_tmp39_ = _tmp38_.y;
 #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp43_ = delta_y;
+		_tmp40_ = delta_y;
 #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp44_ = y_clamp_low;
+		_tmp41_ = y_clamp_low;
 #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp45_ = y_clamp_high;
+		_tmp42_ = y_clamp_high;
 #line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp46_ = CLAMP (_tmp42_ + _tmp43_, _tmp44_, _tmp45_);
-#line 2158 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->user_interaction_instance.center.y = _tmp46_;
+		self->priv->user_interaction_instance.center.y = CLAMP (_tmp39_ + _tmp40_, _tmp41_, _tmp42_);
 #line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp43_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2162 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_photo_canvas_repaint (_tmp47_);
-#line 14253 "EditingTools.c"
+		editing_tools_photo_canvas_repaint (_tmp43_);
+#line 14678 "EditingTools.c"
 	} else {
 		GdkRectangle bounds = {0};
-		EditingToolsRedeyeInstance _tmp48_;
-		GdkRectangle _tmp49_ = {0};
-		gint _tmp50_;
-		gint _tmp51_;
-		GdkRectangle _tmp52_;
-		gboolean _tmp53_;
+		EditingToolsRedeyeInstance _tmp44_;
+		GdkRectangle _tmp45_ = {0};
+		GdkRectangle _tmp46_;
 #line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp48_ = self->priv->user_interaction_instance;
+		_tmp44_ = self->priv->user_interaction_instance;
 #line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		editing_tools_redeye_instance_to_bounds_rect (&_tmp48_, &_tmp49_);
+		editing_tools_redeye_instance_to_bounds_rect (&_tmp44_, &_tmp45_);
 #line 2164 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		bounds = _tmp49_;
+		bounds = _tmp45_;
 #line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp50_ = x;
+		_tmp46_ = bounds;
 #line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp51_ = y;
-#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp52_ = bounds;
-#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp53_ = coord_in_rectangle (_tmp50_, _tmp51_, &_tmp52_);
-#line 2167 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		if (_tmp53_) {
-#line 14278 "EditingTools.c"
-			EditingToolsPhotoCanvas* _tmp54_;
-			GdkWindow* _tmp55_;
-			GdkWindow* _tmp56_;
-			GdkCursor* _tmp57_;
+		if (coord_in_rectangle (x, y, &_tmp46_)) {
+#line 14694 "EditingTools.c"
+			EditingToolsPhotoCanvas* _tmp47_;
+			GdkWindow* _tmp48_;
+			GdkWindow* _tmp49_;
+			GdkCursor* _tmp50_;
 #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp54_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+			_tmp47_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp55_ = editing_tools_photo_canvas_get_drawing_window (_tmp54_);
+			_tmp48_ = editing_tools_photo_canvas_get_drawing_window (_tmp47_);
 #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp56_ = _tmp55_;
+			_tmp49_ = _tmp48_;
 #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp57_ = self->priv->cached_grab_cursor;
+			_tmp50_ = self->priv->cached_grab_cursor;
 #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gdk_window_set_cursor (_tmp56_, _tmp57_);
+			gdk_window_set_cursor (_tmp49_, _tmp50_);
 #line 2168 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_g_object_unref0 (_tmp56_);
-#line 14295 "EditingTools.c"
+			_g_object_unref0 (_tmp49_);
+#line 14711 "EditingTools.c"
 		} else {
-			EditingToolsPhotoCanvas* _tmp58_;
-			GdkWindow* _tmp59_;
-			GdkWindow* _tmp60_;
-			GdkCursor* _tmp61_;
+			EditingToolsPhotoCanvas* _tmp51_;
+			GdkWindow* _tmp52_;
+			GdkWindow* _tmp53_;
+			GdkCursor* _tmp54_;
 #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp58_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+			_tmp51_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp59_ = editing_tools_photo_canvas_get_drawing_window (_tmp58_);
+			_tmp52_ = editing_tools_photo_canvas_get_drawing_window (_tmp51_);
 #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp60_ = _tmp59_;
+			_tmp53_ = _tmp52_;
 #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp61_ = self->priv->cached_arrow_cursor;
+			_tmp54_ = self->priv->cached_arrow_cursor;
 #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gdk_window_set_cursor (_tmp60_, _tmp61_);
+			gdk_window_set_cursor (_tmp53_, _tmp54_);
 #line 2170 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_g_object_unref0 (_tmp60_);
-#line 14313 "EditingTools.c"
+			_g_object_unref0 (_tmp53_);
+#line 14729 "EditingTools.c"
 		}
 	}
 }
 
 
-static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) {
+static gboolean
+editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                            GdkEventKey* event)
+{
 	EditingToolsRedeyeTool * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_;
-	guint _tmp3_;
-	const gchar* _tmp4_;
-	GdkEventKey* _tmp11_;
-	gboolean _tmp12_;
+	guint _tmp2_;
+	const gchar* _tmp3_;
 #line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
 #line 2175 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = event;
+	_tmp2_ = event->keyval;
 #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_->keyval;
+	_tmp3_ = gdk_keyval_name (_tmp2_);
 #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
+	if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) {
 #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 14343 "EditingTools.c"
+#line 14757 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_;
-		guint _tmp6_;
-		const gchar* _tmp7_;
-#line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = event;
+		guint _tmp4_;
+		const gchar* _tmp5_;
 #line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_->keyval;
+		_tmp4_ = event->keyval;
 #line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = gdk_keyval_name (_tmp6_);
+		_tmp5_ = gdk_keyval_name (_tmp4_);
 #line 2177 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 14356 "EditingTools.c"
+		_tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0;
+#line 14767 "EditingTools.c"
 	}
 #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 14362 "EditingTools.c"
+#line 14773 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_;
-		guint _tmp9_;
-		const gchar* _tmp10_;
-#line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = event;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _tmp8_->keyval;
+		_tmp6_ = event->keyval;
 #line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = gdk_keyval_name (_tmp9_);
+		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 2178 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 14375 "EditingTools.c"
+		_tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0;
+#line 14783 "EditingTools.c"
 	}
 #line 2176 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -14381,116 +14789,118 @@ static gboolean editing_tools_redeye_tool_real_on_keypress (EditingToolsEditingT
 		result = TRUE;
 #line 2180 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 14385 "EditingTools.c"
+#line 14793 "EditingTools.c"
 	}
 #line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = event;
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp12_;
+	result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event);
 #line 2183 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14395 "EditingTools.c"
+#line 14799 "EditingTools.c"
 }
 
 
-static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type, GtkWindow* container) {
+static EditingToolsRedeyeToolRedeyeToolWindow*
+editing_tools_redeye_tool_redeye_tool_window_construct (GType object_type,
+                                                        GtkWindow* container)
+{
 	EditingToolsRedeyeToolRedeyeToolWindow * self = NULL;
-	GtkWindow* _tmp0_;
+	GtkScale* _tmp0_;
 	GtkScale* _tmp1_;
-	GtkScale* _tmp2_;
+	GtkButton* _tmp2_;
 	GtkButton* _tmp3_;
 	GtkButton* _tmp4_;
 	GtkButton* _tmp5_;
-	GtkButton* _tmp6_;
 	GtkBox* layout = NULL;
-	GtkBox* _tmp7_;
-	GtkLabel* _tmp8_;
-	GtkScale* _tmp9_;
+	GtkBox* _tmp6_;
+	GtkLabel* _tmp7_;
+	GtkScale* _tmp8_;
+	GtkButton* _tmp9_;
 	GtkButton* _tmp10_;
-	GtkButton* _tmp11_;
 #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = container;
-#line 1868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
+	self = (EditingToolsRedeyeToolRedeyeToolWindow*) editing_tools_editing_tool_window_construct (object_type, container);
 #line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = self->slider;
+	_tmp0_ = self->slider;
 #line 1870 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), 80, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_widget_get_type (), GtkWidget), 80, -1);
 #line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = self->slider;
+	_tmp1_ = self->slider;
 #line 1871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_draw_value (_tmp2_, FALSE);
+	gtk_scale_set_draw_value (_tmp1_, FALSE);
 #line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->close_button;
+	_tmp2_ = self->close_button;
 #line 1873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool"));
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), _ ("Close the red-eye tool"));
 #line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->close_button;
+	_tmp3_ = self->close_button;
 #line 1874 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp4_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp3_, GTK_POS_LEFT);
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->apply_button;
+	_tmp4_ = self->apply_button;
 #line 1876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region"));
+	gtk_widget_set_tooltip_text (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), _ ("Remove any red-eye effects in the selected region"));
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->apply_button;
+	_tmp5_ = self->apply_button;
 #line 1877 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_button_set_image_position (_tmp6_, GTK_POS_LEFT);
+	gtk_button_set_image_position (_tmp5_, GTK_POS_LEFT);
 #line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp6_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_REDEYE_TOOL_REDEYE_TOOL_WINDOW_CONTROL_SPACING);
 #line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp6_);
 #line 1879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	layout = _tmp7_;
+	layout = _tmp6_;
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->priv->slider_label;
+	_tmp7_ = self->priv->slider_label;
 #line 1880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget));
 #line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = self->slider;
+	_tmp8_ = self->slider;
 #line 1881 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget));
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->close_button;
+	_tmp9_ = self->close_button;
 #line 1882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget));
 #line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->apply_button;
+	_tmp10_ = self->apply_button;
 #line 1883 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget));
 #line 1885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (layout, gtk_widget_get_type (), GtkWidget));
 #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (layout);
 #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14472 "EditingTools.c"
+#line 14876 "EditingTools.c"
 }
 
 
-static EditingToolsRedeyeToolRedeyeToolWindow* editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container) {
+static EditingToolsRedeyeToolRedeyeToolWindow*
+editing_tools_redeye_tool_redeye_tool_window_new (GtkWindow* container)
+{
 #line 1867 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_redeye_tool_redeye_tool_window_construct (EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, container);
-#line 14479 "EditingTools.c"
+#line 14885 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass) {
+static void
+editing_tools_redeye_tool_redeye_tool_window_class_init (EditingToolsRedeyeToolRedeyeToolWindowClass * klass)
+{
 #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_redeye_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsRedeyeToolRedeyeToolWindowPrivate));
 #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_redeye_tool_redeye_tool_window_finalize;
-#line 14490 "EditingTools.c"
+#line 14898 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingToolsRedeyeToolRedeyeToolWindow * self) {
+static void
+editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingToolsRedeyeToolRedeyeToolWindow * self)
+{
 	GtkLabel* _tmp0_;
 	GtkButton* _tmp1_;
 	GtkButton* _tmp2_;
@@ -14521,11 +14931,13 @@ static void editing_tools_redeye_tool_redeye_tool_window_instance_init (EditingT
 	g_object_ref_sink (_tmp3_);
 #line 1864 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->slider = _tmp3_;
-#line 14525 "EditingTools.c"
+#line 14935 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj) {
+static void
+editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj)
+{
 	EditingToolsRedeyeToolRedeyeToolWindow * self;
 #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_REDEYE_TOOL_TYPE_REDEYE_TOOL_WINDOW, EditingToolsRedeyeToolRedeyeToolWindow);
@@ -14539,11 +14951,13 @@ static void editing_tools_redeye_tool_redeye_tool_window_finalize (GObject * obj
 	_g_object_unref0 (self->slider);
 #line 1855 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_redeye_tool_redeye_tool_window_parent_class)->finalize (obj);
-#line 14543 "EditingTools.c"
+#line 14955 "EditingTools.c"
 }
 
 
-static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) {
+static GType
+editing_tools_redeye_tool_redeye_tool_window_get_type (void)
+{
 	static volatile gsize editing_tools_redeye_tool_redeye_tool_window_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_redeye_tool_redeye_tool_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsRedeyeToolRedeyeToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_redeye_tool_redeye_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsRedeyeToolRedeyeToolWindow), 0, (GInstanceInitFunc) editing_tools_redeye_tool_redeye_tool_window_instance_init, NULL };
@@ -14555,7 +14969,9 @@ static GType editing_tools_redeye_tool_redeye_tool_window_get_type (void) {
 }
 
 
-static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass) {
+static void
+editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass * klass)
+{
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_redeye_tool_parent_class = g_type_class_peek_parent (klass);
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14578,11 +14994,13 @@ static void editing_tools_redeye_tool_class_init (EditingToolsRedeyeToolClass *
 	((EditingToolsEditingToolClass *) klass)->on_motion = (void (*) (EditingToolsEditingTool *, gint, gint, GdkModifierType)) editing_tools_redeye_tool_real_on_motion;
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_redeye_tool_real_on_keypress;
-#line 14582 "EditingTools.c"
+#line 14998 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self) {
+static void
+editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * self)
+{
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_REDEYE_TOOL_GET_PRIVATE (self);
 #line 1889 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14595,11 +15013,13 @@ static void editing_tools_redeye_tool_instance_init (EditingToolsRedeyeTool * se
 	self->priv->is_reticle_move_in_progress = FALSE;
 #line 1899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->current_pixbuf = NULL;
-#line 14599 "EditingTools.c"
+#line 15017 "EditingTools.c"
 }
 
 
-static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) {
+static void
+editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj)
+{
 	EditingToolsRedeyeTool * self;
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_REDEYE_TOOL, EditingToolsRedeyeTool);
@@ -14617,11 +15037,13 @@ static void editing_tools_redeye_tool_finalize (EditingToolsEditingTool * obj) {
 	_g_object_unref0 (self->priv->current_pixbuf);
 #line 1854 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_redeye_tool_parent_class)->finalize (obj);
-#line 14621 "EditingTools.c"
+#line 15041 "EditingTools.c"
 }
 
 
-GType editing_tools_redeye_tool_get_type (void) {
+GType
+editing_tools_redeye_tool_get_type (void)
+{
 	static volatile gsize editing_tools_redeye_tool_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_redeye_tool_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsRedeyeToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_redeye_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsRedeyeTool), 0, (GInstanceInitFunc) editing_tools_redeye_tool_instance_init, NULL };
@@ -14633,24 +15055,30 @@ GType editing_tools_redeye_tool_get_type (void) {
 }
 
 
-static EditingToolsAdjustTool* editing_tools_adjust_tool_construct (GType object_type) {
+static EditingToolsAdjustTool*
+editing_tools_adjust_tool_construct (GType object_type)
+{
 	EditingToolsAdjustTool* self = NULL;
 #line 2501 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = (EditingToolsAdjustTool*) editing_tools_editing_tool_construct (object_type, "AdjustTool");
 #line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 14643 "EditingTools.c"
+#line 15067 "EditingTools.c"
 }
 
 
-static EditingToolsAdjustTool* editing_tools_adjust_tool_new (void) {
+static EditingToolsAdjustTool*
+editing_tools_adjust_tool_new (void)
+{
 #line 2500 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_construct (EDITING_TOOLS_TYPE_ADJUST_TOOL);
-#line 14650 "EditingTools.c"
+#line 15076 "EditingTools.c"
 }
 
 
-EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
+EditingToolsAdjustTool*
+editing_tools_adjust_tool_factory (void)
+{
 	EditingToolsAdjustTool* result = NULL;
 	EditingToolsAdjustTool* _tmp0_;
 #line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -14659,11 +15087,14 @@ EditingToolsAdjustTool* editing_tools_adjust_tool_factory (void) {
 	result = _tmp0_;
 #line 2505 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14663 "EditingTools.c"
+#line 15091 "EditingTools.c"
 }
 
 
-gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling) {
+gboolean
+editing_tools_adjust_tool_is_available (Photo* photo,
+                                        Scaling* scaling)
+{
 	gboolean result = FALSE;
 #line 2508 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
@@ -14673,560 +15104,519 @@ gboolean editing_tools_adjust_tool_is_available (Photo* photo, Scaling* scaling)
 	result = TRUE;
 #line 2509 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 14677 "EditingTools.c"
+#line 15108 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender, GeeMap* items, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered (DataCollection* _sender,
+                                                                            GeeMap* items,
+                                                                            gpointer self)
+{
 #line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_photos_altered ((EditingToolsAdjustTool*) self, items);
-#line 14684 "EditingTools.c"
+#line 15119 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
+static void
+editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* base,
+                                         EditingToolsPhotoCanvas* canvas)
+{
 	EditingToolsAdjustTool * self;
-	EditingToolsPhotoCanvas* _tmp0_;
+	GtkWindow* _tmp0_;
 	GtkWindow* _tmp1_;
-	GtkWindow* _tmp2_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp2_;
 	Photo* photo = NULL;
-	EditingToolsPhotoCanvas* _tmp4_;
-	Photo* _tmp5_;
-	Photo* _tmp6_;
-	PixelTransformationBundle* _tmp7_;
-	PixelTransformationBundle* _tmp8_;
-	PixelTransformer* _tmp9_;
-	PixelTransformer* _tmp10_;
+	Photo* _tmp3_;
+	Photo* _tmp4_;
+	PixelTransformationBundle* _tmp5_;
+	PixelTransformationBundle* _tmp6_;
+	PixelTransformer* _tmp7_;
+	PixelTransformer* _tmp8_;
 	ExpansionTransformation* expansion_trans = NULL;
-	PixelTransformationBundle* _tmp11_;
-	PixelTransformation* _tmp12_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
-	RGBHistogramManipulator* _tmp14_;
-	ExpansionTransformation* _tmp15_;
-	gint _tmp16_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
-	RGBHistogramManipulator* _tmp18_;
-	ExpansionTransformation* _tmp19_;
-	gint _tmp20_;
+	PixelTransformationBundle* _tmp9_;
+	PixelTransformation* _tmp10_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp11_;
+	RGBHistogramManipulator* _tmp12_;
+	ExpansionTransformation* _tmp13_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp14_;
+	RGBHistogramManipulator* _tmp15_;
+	ExpansionTransformation* _tmp16_;
 	ShadowDetailTransformation* shadows_trans = NULL;
-	PixelTransformationBundle* _tmp21_;
-	PixelTransformation* _tmp22_;
-	PixelTransformer* _tmp23_;
-	ShadowDetailTransformation* _tmp24_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
-	GtkScale* _tmp26_;
-	ShadowDetailTransformation* _tmp27_;
-	gfloat _tmp28_;
+	PixelTransformationBundle* _tmp17_;
+	PixelTransformation* _tmp18_;
+	PixelTransformer* _tmp19_;
+	ShadowDetailTransformation* _tmp20_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
+	GtkScale* _tmp22_;
+	ShadowDetailTransformation* _tmp23_;
 	HighlightDetailTransformation* highlights_trans = NULL;
-	PixelTransformationBundle* _tmp29_;
-	PixelTransformation* _tmp30_;
-	PixelTransformer* _tmp31_;
-	HighlightDetailTransformation* _tmp32_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
-	GtkScale* _tmp34_;
-	HighlightDetailTransformation* _tmp35_;
-	gfloat _tmp36_;
+	PixelTransformationBundle* _tmp24_;
+	PixelTransformation* _tmp25_;
+	PixelTransformer* _tmp26_;
+	HighlightDetailTransformation* _tmp27_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp28_;
+	GtkScale* _tmp29_;
+	HighlightDetailTransformation* _tmp30_;
 	TemperatureTransformation* temp_trans = NULL;
-	PixelTransformationBundle* _tmp37_;
-	PixelTransformation* _tmp38_;
-	PixelTransformer* _tmp39_;
-	TemperatureTransformation* _tmp40_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp41_;
-	GtkScale* _tmp42_;
-	TemperatureTransformation* _tmp43_;
-	gfloat _tmp44_;
+	PixelTransformationBundle* _tmp31_;
+	PixelTransformation* _tmp32_;
+	PixelTransformer* _tmp33_;
+	TemperatureTransformation* _tmp34_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp35_;
+	GtkScale* _tmp36_;
+	TemperatureTransformation* _tmp37_;
 	TintTransformation* tint_trans = NULL;
+	PixelTransformationBundle* _tmp38_;
+	PixelTransformation* _tmp39_;
+	PixelTransformer* _tmp40_;
+	TintTransformation* _tmp41_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp42_;
+	GtkScale* _tmp43_;
+	TintTransformation* _tmp44_;
+	SaturationTransformation* sat_trans = NULL;
 	PixelTransformationBundle* _tmp45_;
 	PixelTransformation* _tmp46_;
 	PixelTransformer* _tmp47_;
-	TintTransformation* _tmp48_;
+	SaturationTransformation* _tmp48_;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp49_;
 	GtkScale* _tmp50_;
-	TintTransformation* _tmp51_;
-	gfloat _tmp52_;
-	SaturationTransformation* sat_trans = NULL;
-	PixelTransformationBundle* _tmp53_;
-	PixelTransformation* _tmp54_;
-	PixelTransformer* _tmp55_;
-	SaturationTransformation* _tmp56_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp57_;
-	GtkScale* _tmp58_;
-	SaturationTransformation* _tmp59_;
-	gfloat _tmp60_;
+	SaturationTransformation* _tmp51_;
 	ExposureTransformation* exposure_trans = NULL;
-	PixelTransformationBundle* _tmp61_;
-	PixelTransformation* _tmp62_;
-	PixelTransformer* _tmp63_;
-	ExposureTransformation* _tmp64_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp65_;
-	GtkScale* _tmp66_;
-	ExposureTransformation* _tmp67_;
-	gfloat _tmp68_;
+	PixelTransformationBundle* _tmp52_;
+	PixelTransformation* _tmp53_;
+	PixelTransformer* _tmp54_;
+	ExposureTransformation* _tmp55_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp56_;
+	GtkScale* _tmp57_;
+	ExposureTransformation* _tmp58_;
 	ContrastTransformation* contrast_trans = NULL;
-	PixelTransformationBundle* _tmp69_;
-	PixelTransformation* _tmp70_;
-	PixelTransformer* _tmp71_;
-	ContrastTransformation* _tmp72_;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp73_;
-	GtkScale* _tmp74_;
-	ContrastTransformation* _tmp75_;
-	gfloat _tmp76_;
-	EditingToolsPhotoCanvas* _tmp77_;
-	EditingToolsPhotoCanvas* _tmp78_;
-	GdkPixbuf* _tmp79_;
+	PixelTransformationBundle* _tmp59_;
+	PixelTransformation* _tmp60_;
+	PixelTransformer* _tmp61_;
+	ContrastTransformation* _tmp62_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp63_;
+	GtkScale* _tmp64_;
+	ContrastTransformation* _tmp65_;
+	GdkPixbuf* _tmp66_;
+	GdkPixbuf* _tmp67_;
+	GdkPixbuf* _tmp68_;
+	GdkPixbuf* _tmp69_;
+	GdkPixbuf* _tmp70_;
+	gboolean _tmp71_ = FALSE;
+	GdkPixbuf* _tmp72_;
+	gint _tmp73_;
+	gint _tmp74_;
+	gboolean _tmp78_ = FALSE;
+	gboolean _tmp79_ = FALSE;
 	GdkPixbuf* _tmp80_;
-	GdkPixbuf* _tmp81_;
-	EditingToolsPhotoCanvas* _tmp82_;
+	gint _tmp81_;
+	gint _tmp82_;
 	GdkPixbuf* _tmp83_;
-	GdkPixbuf* _tmp84_;
-	gboolean _tmp85_ = FALSE;
-	GdkPixbuf* _tmp86_;
-	gint _tmp87_;
-	gint _tmp88_;
-	gboolean _tmp92_ = FALSE;
-	gboolean _tmp93_ = FALSE;
-	GdkPixbuf* _tmp94_;
-	gint _tmp95_;
-	gint _tmp96_;
-	GdkPixbuf* _tmp97_;
-	gint _tmp98_;
-	gint _tmp99_;
-	GdkPixbuf* _tmp116_;
-	GdkPixbuf* _tmp117_;
+	gint _tmp84_;
+	gint _tmp85_;
+	GdkPixbuf* _tmp102_;
+	GdkPixbuf* _tmp103_;
 	DataCollection* owner = NULL;
-	EditingToolsPhotoCanvas* _tmp118_;
-	Photo* _tmp119_;
-	Photo* _tmp120_;
-	DataCollection* _tmp121_;
-	DataCollection* _tmp122_;
-	DataCollection* _tmp123_;
-	EditingToolsPhotoCanvas* _tmp125_;
+	Photo* _tmp104_;
+	Photo* _tmp105_;
+	DataCollection* _tmp106_;
+	DataCollection* _tmp107_;
+	DataCollection* _tmp108_;
 #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
+	_tmp0_ = editing_tools_photo_canvas_get_container (canvas);
 #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = editing_tools_photo_canvas_get_container (_tmp0_);
-#line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _tmp1_;
+	_tmp1_ = _tmp0_;
 #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp2_);
+	_tmp2_ = editing_tools_adjust_tool_adjust_tool_window_new (_tmp1_);
 #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp3_);
+	g_object_ref_sink (_tmp2_);
 #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->adjust_tool_window);
 #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->adjust_tool_window = _tmp3_;
+	self->priv->adjust_tool_window = _tmp2_;
 #line 2513 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp2_);
-#line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = canvas;
+	_g_object_unref0 (_tmp1_);
 #line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
+	_tmp3_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 2515 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	photo = _tmp5_;
+	photo = _tmp3_;
 #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = photo;
+	_tmp4_ = photo;
 #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = photo_get_color_adjustments (_tmp6_);
+	_tmp5_ = photo_get_color_adjustments (_tmp4_);
 #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->transformations);
 #line 2516 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->transformations = _tmp7_;
+	self->priv->transformations = _tmp5_;
 #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->priv->transformations;
+	_tmp6_ = self->priv->transformations;
 #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = pixel_transformation_bundle_generate_transformer (_tmp8_);
+	_tmp7_ = pixel_transformation_bundle_generate_transformer (_tmp6_);
 #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->transformer);
 #line 2517 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->transformer = _tmp9_;
+	self->priv->transformer = _tmp7_;
 #line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = pixel_transformer_new ();
+	_tmp8_ = pixel_transformer_new ();
 #line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformer_unref0 (self->priv->histogram_transformer);
 #line 2520 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->histogram_transformer = _tmp10_;
+	self->priv->histogram_transformer = _tmp8_;
 #line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->priv->transformations;
+	_tmp9_ = self->priv->transformations;
 #line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = pixel_transformation_bundle_get_transformation (_tmp11_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
+	_tmp10_ = pixel_transformation_bundle_get_transformation (_tmp9_, PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION);
 #line 2523 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
+	expansion_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation);
 #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->priv->adjust_tool_window;
+	_tmp11_ = self->priv->adjust_tool_window;
 #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = _tmp13_->histogram_manipulator;
+	_tmp12_ = _tmp11_->histogram_manipulator;
 #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = expansion_trans;
+	_tmp13_ = expansion_trans;
 #line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = expansion_transformation_get_black_point (_tmp15_);
-#line 2525 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	rgb_histogram_manipulator_set_left_nub_position (_tmp14_, _tmp16_);
-#line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = self->priv->adjust_tool_window;
+	rgb_histogram_manipulator_set_left_nub_position (_tmp12_, expansion_transformation_get_black_point (_tmp13_));
 #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = _tmp17_->histogram_manipulator;
+	_tmp14_ = self->priv->adjust_tool_window;
 #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = expansion_trans;
+	_tmp15_ = _tmp14_->histogram_manipulator;
 #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = expansion_transformation_get_white_point (_tmp19_);
+	_tmp16_ = expansion_trans;
 #line 2527 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	rgb_histogram_manipulator_set_right_nub_position (_tmp18_, _tmp20_);
+	rgb_histogram_manipulator_set_right_nub_position (_tmp15_, expansion_transformation_get_white_point (_tmp16_));
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = self->priv->transformations;
+	_tmp17_ = self->priv->transformations;
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = pixel_transformation_bundle_get_transformation (_tmp21_, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
+	_tmp18_ = pixel_transformation_bundle_get_transformation (_tmp17_, PIXEL_TRANSFORMATION_TYPE_SHADOWS);
 #line 2531 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
+	shadows_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation);
 #line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->priv->histogram_transformer;
+	_tmp19_ = self->priv->histogram_transformer;
 #line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = shadows_trans;
+	_tmp20_ = shadows_trans;
 #line 2533 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_attach_transformation (_tmp23_, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->priv->adjust_tool_window;
+	pixel_transformer_attach_transformation (_tmp19_, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = _tmp25_->shadows_slider;
+	_tmp21_ = self->priv->adjust_tool_window;
 #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = shadows_trans;
+	_tmp22_ = _tmp21_->shadows_slider;
 #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = shadow_detail_transformation_get_parameter (_tmp27_);
+	_tmp23_ = shadows_trans;
 #line 2534 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) shadow_detail_transformation_get_parameter (_tmp23_));
 #line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->priv->transformations;
+	_tmp24_ = self->priv->transformations;
 #line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = pixel_transformation_bundle_get_transformation (_tmp29_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
+	_tmp25_ = pixel_transformation_bundle_get_transformation (_tmp24_, PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS);
 #line 2537 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
+	highlights_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation);
 #line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->priv->histogram_transformer;
+	_tmp26_ = self->priv->histogram_transformer;
 #line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = highlights_trans;
+	_tmp27_ = highlights_trans;
 #line 2539 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_attach_transformation (_tmp31_, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = self->priv->adjust_tool_window;
+	pixel_transformer_attach_transformation (_tmp26_, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = _tmp33_->highlights_slider;
+	_tmp28_ = self->priv->adjust_tool_window;
 #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = highlights_trans;
+	_tmp29_ = _tmp28_->highlights_slider;
 #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = highlight_detail_transformation_get_parameter (_tmp35_);
+	_tmp30_ = highlights_trans;
 #line 2540 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_range_get_type (), GtkRange), (gdouble) highlight_detail_transformation_get_parameter (_tmp30_));
 #line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = self->priv->transformations;
+	_tmp31_ = self->priv->transformations;
 #line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = pixel_transformation_bundle_get_transformation (_tmp37_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
+	_tmp32_ = pixel_transformation_bundle_get_transformation (_tmp31_, PIXEL_TRANSFORMATION_TYPE_TEMPERATURE);
 #line 2543 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
+	temp_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation);
 #line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = self->priv->histogram_transformer;
+	_tmp33_ = self->priv->histogram_transformer;
 #line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = temp_trans;
+	_tmp34_ = temp_trans;
 #line 2545 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_attach_transformation (_tmp39_, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
+	pixel_transformer_attach_transformation (_tmp33_, G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = self->priv->adjust_tool_window;
+	_tmp35_ = self->priv->adjust_tool_window;
 #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp42_ = _tmp41_->temperature_slider;
+	_tmp36_ = _tmp35_->temperature_slider;
 #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = temp_trans;
+	_tmp37_ = temp_trans;
 #line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = temperature_transformation_get_parameter (_tmp43_);
-#line 2546 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_range_get_type (), GtkRange), (gdouble) _tmp44_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_range_get_type (), GtkRange), (gdouble) temperature_transformation_get_parameter (_tmp37_));
 #line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp45_ = self->priv->transformations;
+	_tmp38_ = self->priv->transformations;
 #line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_TINT);
+	_tmp39_ = pixel_transformation_bundle_get_transformation (_tmp38_, PIXEL_TRANSFORMATION_TYPE_TINT);
 #line 2548 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_TINT_TRANSFORMATION, TintTransformation);
+	tint_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TINT_TRANSFORMATION, TintTransformation);
 #line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = self->priv->histogram_transformer;
+	_tmp40_ = self->priv->histogram_transformer;
 #line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp48_ = tint_trans;
+	_tmp41_ = tint_trans;
 #line 2550 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
+	pixel_transformer_attach_transformation (_tmp40_, G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp49_ = self->priv->adjust_tool_window;
-#line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp50_ = _tmp49_->tint_slider;
+	_tmp42_ = self->priv->adjust_tool_window;
 #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp51_ = tint_trans;
+	_tmp43_ = _tmp42_->tint_slider;
 #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp52_ = tint_transformation_get_parameter (_tmp51_);
+	_tmp44_ = tint_trans;
 #line 2551 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) _tmp52_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_range_get_type (), GtkRange), (gdouble) tint_transformation_get_parameter (_tmp44_));
 #line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp53_ = self->priv->transformations;
+	_tmp45_ = self->priv->transformations;
 #line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp54_ = pixel_transformation_bundle_get_transformation (_tmp53_, PIXEL_TRANSFORMATION_TYPE_SATURATION);
+	_tmp46_ = pixel_transformation_bundle_get_transformation (_tmp45_, PIXEL_TRANSFORMATION_TYPE_SATURATION);
 #line 2554 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp54_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
+	sat_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation);
 #line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp55_ = self->priv->histogram_transformer;
+	_tmp47_ = self->priv->histogram_transformer;
 #line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp56_ = sat_trans;
+	_tmp48_ = sat_trans;
 #line 2556 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_attach_transformation (_tmp55_, G_TYPE_CHECK_INSTANCE_CAST (_tmp56_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp57_ = self->priv->adjust_tool_window;
+	pixel_transformer_attach_transformation (_tmp47_, G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp58_ = _tmp57_->saturation_slider;
+	_tmp49_ = self->priv->adjust_tool_window;
 #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp59_ = sat_trans;
+	_tmp50_ = _tmp49_->saturation_slider;
 #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp60_ = saturation_transformation_get_parameter (_tmp59_);
+	_tmp51_ = sat_trans;
 #line 2557 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp58_, gtk_range_get_type (), GtkRange), (gdouble) _tmp60_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp50_, gtk_range_get_type (), GtkRange), (gdouble) saturation_transformation_get_parameter (_tmp51_));
 #line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp61_ = self->priv->transformations;
+	_tmp52_ = self->priv->transformations;
 #line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp62_ = pixel_transformation_bundle_get_transformation (_tmp61_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
+	_tmp53_ = pixel_transformation_bundle_get_transformation (_tmp52_, PIXEL_TRANSFORMATION_TYPE_EXPOSURE);
 #line 2560 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
+	exposure_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp53_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation);
 #line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp63_ = self->priv->histogram_transformer;
+	_tmp54_ = self->priv->histogram_transformer;
 #line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp64_ = exposure_trans;
+	_tmp55_ = exposure_trans;
 #line 2562 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_attach_transformation (_tmp63_, G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
+	pixel_transformer_attach_transformation (_tmp54_, G_TYPE_CHECK_INSTANCE_CAST (_tmp55_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp65_ = self->priv->adjust_tool_window;
+	_tmp56_ = self->priv->adjust_tool_window;
 #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp66_ = _tmp65_->exposure_slider;
+	_tmp57_ = _tmp56_->exposure_slider;
 #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp67_ = exposure_trans;
+	_tmp58_ = exposure_trans;
 #line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp68_ = exposure_transformation_get_parameter (_tmp67_);
-#line 2563 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp66_, gtk_range_get_type (), GtkRange), (gdouble) _tmp68_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp57_, gtk_range_get_type (), GtkRange), (gdouble) exposure_transformation_get_parameter (_tmp58_));
 #line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp69_ = self->priv->transformations;
+	_tmp59_ = self->priv->transformations;
 #line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp70_ = pixel_transformation_bundle_get_transformation (_tmp69_, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
+	_tmp60_ = pixel_transformation_bundle_get_transformation (_tmp59_, PIXEL_TRANSFORMATION_TYPE_CONTRAST);
 #line 2566 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp70_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
+	contrast_trans = G_TYPE_CHECK_INSTANCE_CAST (_tmp60_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation);
 #line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp71_ = self->priv->histogram_transformer;
+	_tmp61_ = self->priv->histogram_transformer;
 #line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp72_ = contrast_trans;
+	_tmp62_ = contrast_trans;
 #line 2568 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_attach_transformation (_tmp71_, G_TYPE_CHECK_INSTANCE_CAST (_tmp72_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
-#line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp73_ = self->priv->adjust_tool_window;
+	pixel_transformer_attach_transformation (_tmp61_, G_TYPE_CHECK_INSTANCE_CAST (_tmp62_, TYPE_PIXEL_TRANSFORMATION, PixelTransformation));
 #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp74_ = _tmp73_->contrast_slider;
+	_tmp63_ = self->priv->adjust_tool_window;
 #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp75_ = contrast_trans;
+	_tmp64_ = _tmp63_->contrast_slider;
 #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp76_ = contrast_transformation_get_parameter (_tmp75_);
+	_tmp65_ = contrast_trans;
 #line 2569 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp74_, gtk_range_get_type (), GtkRange), (gdouble) _tmp76_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp64_, gtk_range_get_type (), GtkRange), (gdouble) contrast_transformation_get_parameter (_tmp65_));
 #line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp77_ = canvas;
-#line 2571 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_bind_canvas_handlers (self, _tmp77_);
+	editing_tools_adjust_tool_bind_canvas_handlers (self, canvas);
 #line 2572 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
 #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp78_ = canvas;
-#line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp79_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp78_);
+	_tmp66_ = editing_tools_photo_canvas_get_scaled_pixbuf (canvas);
 #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp80_ = _tmp79_;
+	_tmp67_ = _tmp66_;
 #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp81_ = gdk_pixbuf_copy (_tmp80_);
+	_tmp68_ = gdk_pixbuf_copy (_tmp67_);
 #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
 #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->draw_to_pixbuf = _tmp81_;
+	self->priv->draw_to_pixbuf = _tmp68_;
 #line 2574 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp80_);
+	_g_object_unref0 (_tmp67_);
 #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp82_ = canvas;
+	_tmp69_ = editing_tools_photo_canvas_get_scaled_pixbuf (canvas);
 #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp83_ = editing_tools_photo_canvas_get_scaled_pixbuf (_tmp82_);
-#line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp84_ = _tmp83_;
+	_tmp70_ = _tmp69_;
 #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp84_);
+	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp70_);
 #line 2575 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp84_);
+	_g_object_unref0 (_tmp70_);
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp86_ = self->priv->draw_to_pixbuf;
+	_tmp72_ = self->priv->draw_to_pixbuf;
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
+	_tmp73_ = gdk_pixbuf_get_width (_tmp72_);
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp88_ = _tmp87_;
+	_tmp74_ = _tmp73_;
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp88_ == 1) {
-#line 15072 "EditingTools.c"
-		GdkPixbuf* _tmp89_;
-		gint _tmp90_;
-		gint _tmp91_;
+	if (_tmp74_ == 1) {
+#line 15466 "EditingTools.c"
+		GdkPixbuf* _tmp75_;
+		gint _tmp76_;
+		gint _tmp77_;
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp89_ = self->priv->draw_to_pixbuf;
+		_tmp75_ = self->priv->draw_to_pixbuf;
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
+		_tmp76_ = gdk_pixbuf_get_height (_tmp75_);
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp91_ = _tmp90_;
+		_tmp77_ = _tmp76_;
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp85_ = _tmp91_ == 1;
-#line 15084 "EditingTools.c"
+		_tmp71_ = _tmp77_ == 1;
+#line 15478 "EditingTools.c"
 	} else {
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp85_ = FALSE;
-#line 15088 "EditingTools.c"
+		_tmp71_ = FALSE;
+#line 15482 "EditingTools.c"
 	}
 #line 2581 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp85_) {
+	if (_tmp71_) {
 #line 2582 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->disable_histogram_refresh = TRUE;
-#line 15094 "EditingTools.c"
+#line 15488 "EditingTools.c"
 	}
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp94_ = self->priv->draw_to_pixbuf;
+	_tmp80_ = self->priv->draw_to_pixbuf;
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp95_ = gdk_pixbuf_get_width (_tmp94_);
+	_tmp81_ = gdk_pixbuf_get_width (_tmp80_);
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp96_ = _tmp95_;
+	_tmp82_ = _tmp81_;
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp97_ = self->priv->draw_to_pixbuf;
+	_tmp83_ = self->priv->draw_to_pixbuf;
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp98_ = gdk_pixbuf_get_height (_tmp97_);
+	_tmp84_ = gdk_pixbuf_get_height (_tmp83_);
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp99_ = _tmp98_;
+	_tmp85_ = _tmp84_;
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if ((_tmp96_ * _tmp99_) > 8192) {
-#line 15110 "EditingTools.c"
-		GdkPixbuf* _tmp100_;
-		gint _tmp101_;
-		gint _tmp102_;
+	if ((_tmp82_ * _tmp85_) > 8192) {
+#line 15504 "EditingTools.c"
+		GdkPixbuf* _tmp86_;
+		gint _tmp87_;
+		gint _tmp88_;
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp100_ = self->priv->draw_to_pixbuf;
+		_tmp86_ = self->priv->draw_to_pixbuf;
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp101_ = gdk_pixbuf_get_width (_tmp100_);
+		_tmp87_ = gdk_pixbuf_get_width (_tmp86_);
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp102_ = _tmp101_;
+		_tmp88_ = _tmp87_;
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp93_ = _tmp102_ > 1;
-#line 15122 "EditingTools.c"
+		_tmp79_ = _tmp88_ > 1;
+#line 15516 "EditingTools.c"
 	} else {
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp93_ = FALSE;
-#line 15126 "EditingTools.c"
+		_tmp79_ = FALSE;
+#line 15520 "EditingTools.c"
 	}
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp93_) {
-#line 15130 "EditingTools.c"
-		GdkPixbuf* _tmp103_;
-		gint _tmp104_;
-		gint _tmp105_;
+	if (_tmp79_) {
+#line 15524 "EditingTools.c"
+		GdkPixbuf* _tmp89_;
+		gint _tmp90_;
+		gint _tmp91_;
 #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp103_ = self->priv->draw_to_pixbuf;
+		_tmp89_ = self->priv->draw_to_pixbuf;
 #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp104_ = gdk_pixbuf_get_height (_tmp103_);
+		_tmp90_ = gdk_pixbuf_get_height (_tmp89_);
 #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp105_ = _tmp104_;
+		_tmp91_ = _tmp90_;
 #line 2588 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp92_ = _tmp105_ > 1;
-#line 15142 "EditingTools.c"
+		_tmp78_ = _tmp91_ > 1;
+#line 15536 "EditingTools.c"
 	} else {
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp92_ = FALSE;
-#line 15146 "EditingTools.c"
+		_tmp78_ = FALSE;
+#line 15540 "EditingTools.c"
 	}
 #line 2587 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp92_) {
-#line 15150 "EditingTools.c"
-		GdkPixbuf* _tmp106_;
-		GdkPixbuf* _tmp107_;
-		gint _tmp108_;
-		gint _tmp109_;
-		GdkPixbuf* _tmp110_;
-		gint _tmp111_;
-		gint _tmp112_;
-		GdkPixbuf* _tmp113_;
+	if (_tmp78_) {
+#line 15544 "EditingTools.c"
+		GdkPixbuf* _tmp92_;
+		GdkPixbuf* _tmp93_;
+		gint _tmp94_;
+		gint _tmp95_;
+		GdkPixbuf* _tmp96_;
+		gint _tmp97_;
+		gint _tmp98_;
+		GdkPixbuf* _tmp99_;
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp106_ = self->priv->draw_to_pixbuf;
+		_tmp92_ = self->priv->draw_to_pixbuf;
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp107_ = self->priv->draw_to_pixbuf;
+		_tmp93_ = self->priv->draw_to_pixbuf;
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp108_ = gdk_pixbuf_get_width (_tmp107_);
+		_tmp94_ = gdk_pixbuf_get_width (_tmp93_);
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp109_ = _tmp108_;
+		_tmp95_ = _tmp94_;
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp110_ = self->priv->draw_to_pixbuf;
+		_tmp96_ = self->priv->draw_to_pixbuf;
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp111_ = gdk_pixbuf_get_height (_tmp110_);
+		_tmp97_ = gdk_pixbuf_get_height (_tmp96_);
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp112_ = _tmp111_;
+		_tmp98_ = _tmp97_;
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp113_ = gdk_pixbuf_scale_simple (_tmp106_, _tmp109_ / 2, _tmp112_ / 2, GDK_INTERP_HYPER);
+		_tmp99_ = gdk_pixbuf_scale_simple (_tmp92_, _tmp95_ / 2, _tmp98_ / 2, GDK_INTERP_HYPER);
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
 #line 2589 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->histogram_pixbuf = _tmp113_;
-#line 15179 "EditingTools.c"
+		self->priv->histogram_pixbuf = _tmp99_;
+#line 15573 "EditingTools.c"
 	} else {
-		GdkPixbuf* _tmp114_;
-		GdkPixbuf* _tmp115_;
+		GdkPixbuf* _tmp100_;
+		GdkPixbuf* _tmp101_;
 #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp114_ = self->priv->draw_to_pixbuf;
+		_tmp100_ = self->priv->draw_to_pixbuf;
 #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp115_ = gdk_pixbuf_copy (_tmp114_);
+		_tmp101_ = gdk_pixbuf_copy (_tmp100_);
 #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (self->priv->histogram_pixbuf);
 #line 2592 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		self->priv->histogram_pixbuf = _tmp115_;
-#line 15191 "EditingTools.c"
+		self->priv->histogram_pixbuf = _tmp101_;
+#line 15585 "EditingTools.c"
 	}
 #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp116_ = self->priv->histogram_pixbuf;
+	_tmp102_ = self->priv->histogram_pixbuf;
 #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp117_ = gdk_pixbuf_copy (_tmp116_);
+	_tmp103_ = gdk_pixbuf_copy (_tmp102_);
 #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->virgin_histogram_pixbuf);
 #line 2594 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->virgin_histogram_pixbuf = _tmp117_;
+	self->priv->virgin_histogram_pixbuf = _tmp103_;
 #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp118_ = canvas;
+	_tmp104_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp119_ = editing_tools_photo_canvas_get_photo (_tmp118_);
+	_tmp105_ = _tmp104_;
 #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp120_ = _tmp119_;
+	_tmp106_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp105_, TYPE_DATA_OBJECT, DataObject));
 #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp121_ = data_object_get_membership (G_TYPE_CHECK_INSTANCE_CAST (_tmp120_, TYPE_DATA_OBJECT, DataObject));
+	_tmp107_ = _tmp106_;
 #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp122_ = _tmp121_;
+	_g_object_unref0 (_tmp105_);
 #line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp120_);
-#line 2596 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	owner = _tmp122_;
+	owner = _tmp107_;
 #line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp123_ = owner;
+	_tmp108_ = owner;
 #line 2597 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp123_ != NULL) {
-#line 15219 "EditingTools.c"
-		DataCollection* _tmp124_;
+	if (_tmp108_ != NULL) {
+#line 15611 "EditingTools.c"
+		DataCollection* _tmp109_;
 #line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp124_ = owner;
+		_tmp109_ = owner;
 #line 2598 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		g_signal_connect (_tmp124_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15225 "EditingTools.c"
+		g_signal_connect (_tmp109_, "items-altered", (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
+#line 15617 "EditingTools.c"
 	}
 #line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp125_ = canvas;
-#line 2600 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp125_);
+	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas);
 #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_data_collection_unref0 (owner);
 #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15247,11 +15637,13 @@ static void editing_tools_adjust_tool_real_activate (EditingToolsEditingTool* ba
 	_pixel_transformation_unref0 (expansion_trans);
 #line 2512 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (photo);
-#line 15251 "EditingTools.c"
+#line 15641 "EditingTools.c"
 }
 
 
-static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base) {
+static EditingToolsEditingToolWindow*
+editing_tools_adjust_tool_real_get_tool_window (EditingToolsEditingTool* base)
+{
 	EditingToolsAdjustTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
@@ -15266,11 +15658,13 @@ static EditingToolsEditingToolWindow* editing_tools_adjust_tool_real_get_tool_wi
 	result = _tmp1_;
 #line 2604 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15270 "EditingTools.c"
+#line 15662 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base) {
+static void
+editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool* base)
+{
 	EditingToolsAdjustTool * self;
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
@@ -15280,7 +15674,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 15284 "EditingTools.c"
+#line 15678 "EditingTools.c"
 		DataCollection* owner = NULL;
 		EditingToolsPhotoCanvas* _tmp1_;
 		Photo* _tmp2_;
@@ -15307,7 +15701,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		_tmp6_ = owner;
 #line 2610 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (_tmp6_ != NULL) {
-#line 15311 "EditingTools.c"
+#line 15705 "EditingTools.c"
 			DataCollection* _tmp7_;
 			guint _tmp8_;
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15316,7 +15710,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 			g_signal_parse_name ("items-altered", TYPE_DATA_COLLECTION, &_tmp8_, NULL, FALSE);
 #line 2611 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			g_signal_handlers_disconnect_matched (_tmp7_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp8_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_photos_altered_data_collection_items_altered, self);
-#line 15320 "EditingTools.c"
+#line 15714 "EditingTools.c"
 		}
 #line 2613 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
@@ -15324,13 +15718,13 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		editing_tools_adjust_tool_unbind_canvas_handlers (self, _tmp9_);
 #line 2608 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_data_collection_unref0 (owner);
-#line 15328 "EditingTools.c"
+#line 15722 "EditingTools.c"
 	}
 #line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp10_ = self->priv->adjust_tool_window;
 #line 2616 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp10_ != NULL) {
-#line 15334 "EditingTools.c"
+#line 15728 "EditingTools.c"
 		EditingToolsAdjustToolAdjustToolWindow* _tmp11_;
 		EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
 #line 2617 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15347,7 +15741,7 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 		_g_object_unref0 (self->priv->adjust_tool_window);
 #line 2620 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->adjust_tool_window = NULL;
-#line 15351 "EditingTools.c"
+#line 15745 "EditingTools.c"
 	}
 #line 2623 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->draw_to_pixbuf);
@@ -15363,11 +15757,14 @@ static void editing_tools_adjust_tool_real_deactivate (EditingToolsEditingTool*
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
 #line 2626 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 15367 "EditingTools.c"
+#line 15761 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
+static void
+editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
+                                      cairo_t* ctx)
+{
 	EditingToolsAdjustTool * self;
 	gboolean _tmp0_;
 	EditingToolsPhotoCanvas* _tmp10_;
@@ -15380,7 +15777,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp0_ = self->priv->suppress_effect_redraw;
 #line 2630 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (!_tmp0_) {
-#line 15384 "EditingTools.c"
+#line 15781 "EditingTools.c"
 		PixelTransformer* _tmp1_;
 		GdkPixbuf* _tmp2_;
 		PixelTransformer* _tmp3_;
@@ -15405,7 +15802,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 		_tmp6_ = self->priv->disable_histogram_refresh;
 #line 2634 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		if (!_tmp6_) {
-#line 15409 "EditingTools.c"
+#line 15806 "EditingTools.c"
 			EditingToolsAdjustToolAdjustToolWindow* _tmp7_;
 			RGBHistogramManipulator* _tmp8_;
 			GdkPixbuf* _tmp9_;
@@ -15417,7 +15814,7 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 			_tmp9_ = self->priv->histogram_pixbuf;
 #line 2635 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			rgb_histogram_manipulator_update_histogram (_tmp8_, _tmp9_);
-#line 15421 "EditingTools.c"
+#line 15818 "EditingTools.c"
 		}
 	}
 #line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15426,23 +15823,25 @@ static void editing_tools_adjust_tool_real_paint (EditingToolsEditingTool* base,
 	_tmp11_ = self->priv->draw_to_pixbuf;
 #line 2638 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_paint_pixbuf (_tmp10_, _tmp11_);
-#line 15430 "EditingTools.c"
+#line 15827 "EditingTools.c"
 }
 
 
-static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base, Scaling* scaling, Photo* photo, Dimensions* max_dim, GError** error) {
+static GdkPixbuf*
+editing_tools_adjust_tool_real_get_display_pixbuf (EditingToolsEditingTool* base,
+                                                   Scaling* scaling,
+                                                   Photo* photo,
+                                                   Dimensions* max_dim,
+                                                   GError** error)
+{
 	EditingToolsAdjustTool * self;
 	Dimensions _vala_max_dim = {0};
 	GdkPixbuf* result = NULL;
-	Photo* _tmp0_;
-	gboolean _tmp1_;
-	Photo* _tmp2_;
-	Dimensions _tmp3_ = {0};
-	GdkPixbuf* _tmp4_ = NULL;
-	Photo* _tmp5_;
-	Scaling _tmp6_;
-	GdkPixbuf* _tmp7_;
-	GdkPixbuf* _tmp8_;
+	Dimensions _tmp0_ = {0};
+	GdkPixbuf* _tmp1_ = NULL;
+	Scaling _tmp2_;
+	GdkPixbuf* _tmp3_;
+	GdkPixbuf* _tmp4_;
 	GError * _inner_error_ = NULL;
 #line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
@@ -15451,11 +15850,7 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 #line 2641 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = photo;
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = photo_has_color_adjustments (_tmp0_);
-#line 2643 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (!_tmp1_) {
+	if (!photo_has_color_adjustments (photo)) {
 #line 2644 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		dimensions_init (&_vala_max_dim, 0, 0);
 #line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15464,55 +15859,53 @@ static GdkPixbuf* editing_tools_adjust_tool_real_get_display_pixbuf (EditingTool
 		if (max_dim) {
 #line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			*max_dim = _vala_max_dim;
-#line 15468 "EditingTools.c"
+#line 15863 "EditingTools.c"
 		}
 #line 2646 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 15472 "EditingTools.c"
+#line 15867 "EditingTools.c"
 	}
 #line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = photo;
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (photo, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp0_);
 #line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_NONE, &_tmp3_);
-#line 2649 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_max_dim = _tmp3_;
-#line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = photo;
+	_vala_max_dim = _tmp0_;
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = *scaling;
+	_tmp2_ = *scaling;
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = photo_get_pixbuf_with_options (_tmp5_, &_tmp6_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
+	_tmp3_ = photo_get_pixbuf_with_options (photo, &_tmp2_, PHOTO_EXCEPTION_ADJUST, BACKING_FETCH_MODE_BASELINE, &_inner_error_);
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp7_;
+	_tmp1_ = _tmp3_;
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (G_UNLIKELY (_inner_error_ != NULL)) {
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_propagate_error (error, _inner_error_);
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return NULL;
-#line 15494 "EditingTools.c"
+#line 15885 "EditingTools.c"
 	}
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _tmp4_;
+	_tmp4_ = _tmp1_;
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = NULL;
+	_tmp1_ = NULL;
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp8_;
+	result = _tmp4_;
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp4_);
+	_g_object_unref0 (_tmp1_);
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (max_dim) {
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		*max_dim = _vala_max_dim;
-#line 15508 "EditingTools.c"
+#line 15899 "EditingTools.c"
 	}
 #line 2651 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 15512 "EditingTools.c"
+#line 15903 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self)
+{
 	EditingToolsAdjustToolAdjustResetCommand* command = NULL;
 	PixelTransformationBundle* _tmp0_;
 	EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
@@ -15536,11 +15929,13 @@ static void editing_tools_adjust_tool_on_reset (EditingToolsAdjustTool* self) {
 	_command_manager_unref0 (_tmp3_);
 #line 2654 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
-#line 15540 "EditingTools.c"
+#line 15933 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self)
+{
 	EditingToolsEditingToolWindow* _tmp0_;
 	EditingToolsEditingToolWindow* _tmp1_;
 	EditingToolsPhotoCanvas* _tmp2_;
@@ -15596,90 +15991,84 @@ static void editing_tools_adjust_tool_on_ok (EditingToolsAdjustTool* self) {
 	_g_object_unref0 (_tmp7_);
 #line 2664 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp4_);
-#line 15600 "EditingTools.c"
+#line 15995 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self, PixelTransformationBundle* new_transformations) {
+static void
+editing_tools_adjust_tool_update_transformations (EditingToolsAdjustTool* self,
+                                                  PixelTransformationBundle* new_transformations)
+{
 #line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2669 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (new_transformations));
-#line 15609 "EditingTools.c"
+#line 16007 "EditingTools.c"
 	{
 		GeeIterator* _transformation_it = NULL;
-		PixelTransformationBundle* _tmp0_;
+		GeeIterable* _tmp0_;
 		GeeIterable* _tmp1_;
-		GeeIterable* _tmp2_;
+		GeeIterator* _tmp2_;
 		GeeIterator* _tmp3_;
-		GeeIterator* _tmp4_;
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp0_ = new_transformations;
+		_tmp0_ = pixel_transformation_bundle_get_transformations (new_transformations);
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = pixel_transformation_bundle_get_transformations (_tmp0_);
+		_tmp1_ = _tmp0_;
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = _tmp1_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = gee_iterable_iterator (_tmp2_);
+		_tmp2_ = gee_iterable_iterator (_tmp1_);
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = _tmp3_;
+		_tmp3_ = _tmp2_;
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp2_);
+		_g_object_unref0 (_tmp1_);
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_transformation_it = _tmp4_;
+		_transformation_it = _tmp3_;
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 15633 "EditingTools.c"
-			GeeIterator* _tmp5_;
-			gboolean _tmp6_;
+#line 16028 "EditingTools.c"
+			GeeIterator* _tmp4_;
 			PixelTransformation* transformation = NULL;
-			GeeIterator* _tmp7_;
-			gpointer _tmp8_;
-			PixelTransformation* _tmp9_;
-#line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp5_ = _transformation_it;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			PixelTransformation* _tmp7_;
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp6_ = gee_iterator_next (_tmp5_);
+			_tmp4_ = _transformation_it;
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (!_tmp6_) {
+			if (!gee_iterator_next (_tmp4_)) {
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 15648 "EditingTools.c"
+#line 16040 "EditingTools.c"
 			}
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp7_ = _transformation_it;
+			_tmp5_ = _transformation_it;
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp8_ = gee_iterator_get (_tmp7_);
+			_tmp6_ = gee_iterator_get (_tmp5_);
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			transformation = (PixelTransformation*) _tmp8_;
+			transformation = (PixelTransformation*) _tmp6_;
 #line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp9_ = transformation;
+			_tmp7_ = transformation;
 #line 2671 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			editing_tools_adjust_tool_update_transformation (self, _tmp9_);
+			editing_tools_adjust_tool_update_transformation (self, _tmp7_);
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (transformation);
-#line 15662 "EditingTools.c"
+#line 16054 "EditingTools.c"
 		}
 #line 2670 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_transformation_it);
-#line 15666 "EditingTools.c"
+#line 16058 "EditingTools.c"
 	}
 }
 
 
-static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self, PixelTransformation* new_transformation) {
+static void
+editing_tools_adjust_tool_update_transformation (EditingToolsAdjustTool* self,
+                                                 PixelTransformation* new_transformation)
+{
 	PixelTransformation* old_transformation = NULL;
 	PixelTransformationBundle* _tmp0_;
 	PixelTransformation* _tmp1_;
-	PixelTransformationType _tmp2_;
+	PixelTransformer* _tmp2_;
 	PixelTransformation* _tmp3_;
-	PixelTransformer* _tmp4_;
-	PixelTransformation* _tmp5_;
-	PixelTransformation* _tmp6_;
-	PixelTransformation* _tmp7_;
-	PixelTransformationType _tmp8_;
-	PixelTransformationBundle* _tmp12_;
-	PixelTransformation* _tmp13_;
+	PixelTransformationBundle* _tmp6_;
 #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15687,65 +16076,50 @@ static void editing_tools_adjust_tool_update_transformation (EditingToolsAdjustT
 #line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
 #line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = new_transformation;
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
-#line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
+	_tmp1_ = pixel_transformation_bundle_get_transformation (_tmp0_, pixel_transformation_get_transformation_type (new_transformation));
 #line 2675 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	old_transformation = _tmp3_;
+	old_transformation = _tmp1_;
 #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->transformer;
+	_tmp2_ = self->priv->transformer;
 #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = old_transformation;
-#line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = new_transformation;
+	_tmp3_ = old_transformation;
 #line 2678 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformer_replace_transformation (_tmp4_, _tmp5_, _tmp6_);
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = new_transformation;
-#line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
+	pixel_transformer_replace_transformation (_tmp2_, _tmp3_, new_transformation);
 #line 2679 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp8_ != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
-#line 15712 "EditingTools.c"
-		PixelTransformer* _tmp9_;
-		PixelTransformation* _tmp10_;
-		PixelTransformation* _tmp11_;
+	if (pixel_transformation_get_transformation_type (new_transformation) != PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION) {
+#line 16091 "EditingTools.c"
+		PixelTransformer* _tmp4_;
+		PixelTransformation* _tmp5_;
 #line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = self->priv->histogram_transformer;
+		_tmp4_ = self->priv->histogram_transformer;
 #line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = old_transformation;
+		_tmp5_ = old_transformation;
 #line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = new_transformation;
-#line 2680 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		pixel_transformer_replace_transformation (_tmp9_, _tmp10_, _tmp11_);
-#line 15724 "EditingTools.c"
+		pixel_transformer_replace_transformation (_tmp4_, _tmp5_, new_transformation);
+#line 16100 "EditingTools.c"
 	}
 #line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = self->priv->transformations;
-#line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = new_transformation;
+	_tmp6_ = self->priv->transformations;
 #line 2682 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformation_bundle_set (_tmp12_, _tmp13_);
+	pixel_transformation_bundle_set (_tmp6_, new_transformation);
 #line 2674 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 15734 "EditingTools.c"
+#line 16108 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self, PixelTransformation* new_transformation, const gchar* name) {
+static void
+editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* self,
+                                          PixelTransformation* new_transformation,
+                                          const gchar* name)
+{
 	PixelTransformation* old_transformation = NULL;
 	PixelTransformationBundle* _tmp0_;
 	PixelTransformation* _tmp1_;
-	PixelTransformationType _tmp2_;
-	PixelTransformation* _tmp3_;
 	EditingToolsAdjustToolSliderAdjustmentCommand* command = NULL;
-	PixelTransformation* _tmp4_;
-	const gchar* _tmp5_;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
-	CommandManager* _tmp7_;
-	CommandManager* _tmp8_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_;
+	CommandManager* _tmp3_;
+	CommandManager* _tmp4_;
 #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15755,45 +16129,41 @@ static void editing_tools_adjust_tool_slider_updated (EditingToolsAdjustTool* se
 #line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp0_ = self->priv->transformations;
 #line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = new_transformation;
-#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = pixel_transformation_get_transformation_type (_tmp1_);
+	_tmp1_ = pixel_transformation_bundle_get_transformation (_tmp0_, pixel_transformation_get_transformation_type (new_transformation));
 #line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = pixel_transformation_bundle_get_transformation (_tmp0_, _tmp2_);
-#line 2686 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	old_transformation = _tmp3_;
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = new_transformation;
-#line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = name;
+	old_transformation = _tmp1_;
 #line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, _tmp4_, _tmp5_);
+	_tmp2_ = editing_tools_adjust_tool_slider_adjustment_command_new (self, old_transformation, new_transformation, name);
 #line 2688 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	command = _tmp6_;
+	command = _tmp2_;
 #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = app_window_get_command_manager ();
+	_tmp3_ = app_window_get_command_manager ();
 #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _tmp7_;
+	_tmp4_ = _tmp3_;
 #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	command_manager_execute (_tmp8_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
+	command_manager_execute (_tmp4_, G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command));
 #line 2690 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_command_manager_unref0 (_tmp8_);
+	_command_manager_unref0 (_tmp4_);
 #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (command);
 #line 2685 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (old_transformation);
-#line 15786 "EditingTools.c"
+#line 16152 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self) {
+static void
+_editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback (gpointer self)
+{
 #line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 15793 "EditingTools.c"
+#line 16161 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdjustTool* self)
+{
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
 #line 2693 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15802,7 +16172,7 @@ static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdj
 	_tmp0_ = self->priv->temperature_scheduler;
 #line 2694 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 15806 "EditingTools.c"
+#line 16176 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
 #line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("temperature", _editing_tools_adjust_tool_on_delayed_temperature_adjustment_one_shot_callback, self);
@@ -15810,22 +16180,23 @@ static void editing_tools_adjust_tool_on_temperature_adjustment (EditingToolsAdj
 		_one_shot_scheduler_unref0 (self->priv->temperature_scheduler);
 #line 2695 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->temperature_scheduler = _tmp1_;
-#line 15814 "EditingTools.c"
+#line 16184 "EditingTools.c"
 	}
 #line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->temperature_scheduler;
 #line 2697 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 15820 "EditingTools.c"
+#line 16190 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_delayed_temperature_adjustment (EditingToolsAdjustTool* self)
+{
 	TemperatureTransformation* new_temp_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	TemperatureTransformation* _tmp3_;
+	TemperatureTransformation* _tmp2_;
 #line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15833,27 +16204,29 @@ static void editing_tools_adjust_tool_on_delayed_temperature_adjustment (Editing
 #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->temperature_slider;
 #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = temperature_transformation_new ((gfloat) _tmp2_);
+	_tmp2_ = temperature_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 2701 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_temp_trans = _tmp3_;
+	new_temp_trans = _tmp2_;
 #line 2703 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_temp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Temperature"));
 #line 2700 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_temp_trans);
-#line 15846 "EditingTools.c"
+#line 16215 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self) {
+static void
+_editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback (gpointer self)
+{
 #line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 15853 "EditingTools.c"
+#line 16224 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool* self)
+{
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
 #line 2706 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15862,7 +16235,7 @@ static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool
 	_tmp0_ = self->priv->tint_scheduler;
 #line 2707 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 15866 "EditingTools.c"
+#line 16239 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
 #line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("tint", _editing_tools_adjust_tool_on_delayed_tint_adjustment_one_shot_callback, self);
@@ -15870,22 +16243,23 @@ static void editing_tools_adjust_tool_on_tint_adjustment (EditingToolsAdjustTool
 		_one_shot_scheduler_unref0 (self->priv->tint_scheduler);
 #line 2708 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->tint_scheduler = _tmp1_;
-#line 15874 "EditingTools.c"
+#line 16247 "EditingTools.c"
 	}
 #line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->tint_scheduler;
 #line 2709 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 15880 "EditingTools.c"
+#line 16253 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAdjustTool* self)
+{
 	TintTransformation* new_tint_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	TintTransformation* _tmp3_;
+	TintTransformation* _tmp2_;
 #line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15893,27 +16267,29 @@ static void editing_tools_adjust_tool_on_delayed_tint_adjustment (EditingToolsAd
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->tint_slider;
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = tint_transformation_new ((gfloat) _tmp2_);
+	_tmp2_ = tint_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 2713 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_tint_trans = _tmp3_;
+	new_tint_trans = _tmp2_;
 #line 2715 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_tint_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Tint"));
 #line 2712 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_tint_trans);
-#line 15906 "EditingTools.c"
+#line 16278 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self) {
+static void
+_editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback (gpointer self)
+{
 #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 15913 "EditingTools.c"
+#line 16287 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjustTool* self)
+{
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
 #line 2718 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15922,7 +16298,7 @@ static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjust
 	_tmp0_ = self->priv->contrast_scheduler;
 #line 2719 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 15926 "EditingTools.c"
+#line 16302 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
 #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("contrast", _editing_tools_adjust_tool_on_delayed_contrast_adjustment_one_shot_callback, self);
@@ -15930,22 +16306,23 @@ static void editing_tools_adjust_tool_on_contrast_adjustment (EditingToolsAdjust
 		_one_shot_scheduler_unref0 (self->priv->contrast_scheduler);
 #line 2720 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->contrast_scheduler = _tmp1_;
-#line 15934 "EditingTools.c"
+#line 16310 "EditingTools.c"
 	}
 #line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->contrast_scheduler;
 #line 2721 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 15940 "EditingTools.c"
+#line 16316 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToolsAdjustTool* self)
+{
 	ContrastTransformation* new_exp_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	ContrastTransformation* _tmp3_;
+	ContrastTransformation* _tmp2_;
 #line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15953,27 +16330,29 @@ static void editing_tools_adjust_tool_on_delayed_contrast_adjustment (EditingToo
 #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->contrast_slider;
 #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = contrast_transformation_new ((gfloat) _tmp2_);
+	_tmp2_ = contrast_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 2725 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_exp_trans = _tmp3_;
+	new_exp_trans = _tmp2_;
 #line 2727 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast"));
 #line 2724 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 15966 "EditingTools.c"
+#line 16341 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self) {
+static void
+_editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback (gpointer self)
+{
 #line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 15973 "EditingTools.c"
+#line 16350 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdjustTool* self)
+{
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
 #line 2731 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -15982,7 +16361,7 @@ static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdju
 	_tmp0_ = self->priv->saturation_scheduler;
 #line 2732 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 15986 "EditingTools.c"
+#line 16365 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
 #line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("saturation", _editing_tools_adjust_tool_on_delayed_saturation_adjustment_one_shot_callback, self);
@@ -15990,22 +16369,23 @@ static void editing_tools_adjust_tool_on_saturation_adjustment (EditingToolsAdju
 		_one_shot_scheduler_unref0 (self->priv->saturation_scheduler);
 #line 2733 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->saturation_scheduler = _tmp1_;
-#line 15994 "EditingTools.c"
+#line 16373 "EditingTools.c"
 	}
 #line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->saturation_scheduler;
 #line 2735 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16000 "EditingTools.c"
+#line 16379 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingToolsAdjustTool* self)
+{
 	SaturationTransformation* new_sat_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	SaturationTransformation* _tmp3_;
+	SaturationTransformation* _tmp2_;
 #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16013,27 +16393,29 @@ static void editing_tools_adjust_tool_on_delayed_saturation_adjustment (EditingT
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->saturation_slider;
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
+	_tmp2_ = saturation_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = saturation_transformation_new ((gfloat) _tmp2_);
-#line 2739 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_sat_trans = _tmp3_;
+	new_sat_trans = _tmp2_;
 #line 2741 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_sat_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Saturation"));
 #line 2738 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_sat_trans);
-#line 16026 "EditingTools.c"
+#line 16404 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self) {
+static void
+_editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback (gpointer self)
+{
 #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16033 "EditingTools.c"
+#line 16413 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjustTool* self)
+{
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
 #line 2744 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16042,7 +16424,7 @@ static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjust
 	_tmp0_ = self->priv->exposure_scheduler;
 #line 2745 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16046 "EditingTools.c"
+#line 16428 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
 #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("exposure", _editing_tools_adjust_tool_on_delayed_exposure_adjustment_one_shot_callback, self);
@@ -16050,22 +16432,23 @@ static void editing_tools_adjust_tool_on_exposure_adjustment (EditingToolsAdjust
 		_one_shot_scheduler_unref0 (self->priv->exposure_scheduler);
 #line 2746 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->exposure_scheduler = _tmp1_;
-#line 16054 "EditingTools.c"
+#line 16436 "EditingTools.c"
 	}
 #line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->exposure_scheduler;
 #line 2748 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16060 "EditingTools.c"
+#line 16442 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToolsAdjustTool* self)
+{
 	ExposureTransformation* new_exp_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	ExposureTransformation* _tmp3_;
+	ExposureTransformation* _tmp2_;
 #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16073,27 +16456,29 @@ static void editing_tools_adjust_tool_on_delayed_exposure_adjustment (EditingToo
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->exposure_slider;
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
+	_tmp2_ = exposure_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = exposure_transformation_new ((gfloat) _tmp2_);
-#line 2752 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_exp_trans = _tmp3_;
+	new_exp_trans = _tmp2_;
 #line 2754 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Exposure"));
 #line 2751 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16086 "EditingTools.c"
+#line 16467 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self) {
+static void
+_editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback (gpointer self)
+{
 #line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16093 "EditingTools.c"
+#line 16476 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustTool* self)
+{
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
 #line 2757 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16102,7 +16487,7 @@ static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustT
 	_tmp0_ = self->priv->shadows_scheduler;
 #line 2758 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16106 "EditingTools.c"
+#line 16491 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
 #line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("shadows", _editing_tools_adjust_tool_on_delayed_shadows_adjustment_one_shot_callback, self);
@@ -16110,22 +16495,23 @@ static void editing_tools_adjust_tool_on_shadows_adjustment (EditingToolsAdjustT
 		_one_shot_scheduler_unref0 (self->priv->shadows_scheduler);
 #line 2759 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->shadows_scheduler = _tmp1_;
-#line 16114 "EditingTools.c"
+#line 16499 "EditingTools.c"
 	}
 #line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->shadows_scheduler;
 #line 2761 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16120 "EditingTools.c"
+#line 16505 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingToolsAdjustTool* self)
+{
 	ShadowDetailTransformation* new_shadows_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	ShadowDetailTransformation* _tmp3_;
+	ShadowDetailTransformation* _tmp2_;
 #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16133,27 +16519,29 @@ static void editing_tools_adjust_tool_on_delayed_shadows_adjustment (EditingTool
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->shadows_slider;
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
+	_tmp2_ = shadow_detail_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = shadow_detail_transformation_new ((gfloat) _tmp2_);
-#line 2765 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_shadows_trans = _tmp3_;
+	new_shadows_trans = _tmp2_;
 #line 2767 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_shadows_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Shadows"));
 #line 2764 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_shadows_trans);
-#line 16146 "EditingTools.c"
+#line 16530 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self) {
+static void
+_editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback (gpointer self)
+{
 #line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_delayed_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16153 "EditingTools.c"
+#line 16539 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdjustTool* self)
+{
 	OneShotScheduler* _tmp0_;
 	OneShotScheduler* _tmp2_;
 #line 2770 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16162,7 +16550,7 @@ static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdju
 	_tmp0_ = self->priv->highlights_scheduler;
 #line 2771 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 16166 "EditingTools.c"
+#line 16554 "EditingTools.c"
 		OneShotScheduler* _tmp1_;
 #line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = one_shot_scheduler_new ("highlights", _editing_tools_adjust_tool_on_delayed_highlights_adjustment_one_shot_callback, self);
@@ -16170,22 +16558,23 @@ static void editing_tools_adjust_tool_on_highlights_adjustment (EditingToolsAdju
 		_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
 #line 2772 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->highlights_scheduler = _tmp1_;
-#line 16174 "EditingTools.c"
+#line 16562 "EditingTools.c"
 	}
 #line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp2_ = self->priv->highlights_scheduler;
 #line 2774 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	one_shot_scheduler_after_timeout (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_SLIDER_DELAY_MSEC, TRUE);
-#line 16180 "EditingTools.c"
+#line 16568 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingToolsAdjustTool* self)
+{
 	HighlightDetailTransformation* new_highlights_trans = NULL;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
-	HighlightDetailTransformation* _tmp3_;
+	HighlightDetailTransformation* _tmp2_;
 #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16193,30 +16582,28 @@ static void editing_tools_adjust_tool_on_delayed_highlights_adjustment (EditingT
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->highlights_slider;
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = highlight_detail_transformation_new ((gfloat) _tmp2_);
+	_tmp2_ = highlight_detail_transformation_new ((gfloat) gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange)));
 #line 2778 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_highlights_trans = _tmp3_;
+	new_highlights_trans = _tmp2_;
 #line 2780 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_highlights_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Highlights"));
 #line 2777 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_highlights_trans);
-#line 16206 "EditingTools.c"
+#line 16593 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjustTool* self)
+{
 	gint expansion_black_point = 0;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	RGBHistogramManipulator* _tmp1_;
-	gint _tmp2_;
 	gint expansion_white_point = 0;
-	EditingToolsAdjustToolAdjustToolWindow* _tmp3_;
-	RGBHistogramManipulator* _tmp4_;
-	gint _tmp5_;
+	EditingToolsAdjustToolAdjustToolWindow* _tmp2_;
+	RGBHistogramManipulator* _tmp3_;
 	ExpansionTransformation* new_exp_trans = NULL;
-	ExpansionTransformation* _tmp6_;
+	ExpansionTransformation* _tmp4_;
 #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16224,30 +16611,28 @@ static void editing_tools_adjust_tool_on_histogram_constraint (EditingToolsAdjus
 #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp1_ = _tmp0_->histogram_manipulator;
 #line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = rgb_histogram_manipulator_get_left_nub_position (_tmp1_);
-#line 2784 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	expansion_black_point = _tmp2_;
-#line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->priv->adjust_tool_window;
+	expansion_black_point = rgb_histogram_manipulator_get_left_nub_position (_tmp1_);
 #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _tmp3_->histogram_manipulator;
+	_tmp2_ = self->priv->adjust_tool_window;
 #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = rgb_histogram_manipulator_get_right_nub_position (_tmp4_);
+	_tmp3_ = _tmp2_->histogram_manipulator;
 #line 2786 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	expansion_white_point = _tmp5_;
+	expansion_white_point = rgb_histogram_manipulator_get_right_nub_position (_tmp3_);
 #line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point);
+	_tmp4_ = expansion_transformation_new_from_extrema (expansion_black_point, expansion_white_point);
 #line 2788 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	new_exp_trans = _tmp6_;
+	new_exp_trans = _tmp4_;
 #line 2790 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_updated (self, G_TYPE_CHECK_INSTANCE_CAST (new_exp_trans, TYPE_PIXEL_TRANSFORMATION, PixelTransformation), _ ("Contrast Expansion"));
 #line 2783 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (new_exp_trans);
-#line 16247 "EditingTools.c"
+#line 16630 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool* self)
+{
 	EditingToolsPhotoCanvas* _tmp0_;
 	GdkPixbuf* _tmp1_;
 	GdkPixbuf* _tmp2_;
@@ -16281,19 +16666,21 @@ static void editing_tools_adjust_tool_on_canvas_resize (EditingToolsAdjustTool*
 	editing_tools_adjust_tool_init_fp_pixel_cache (self, _tmp6_);
 #line 2795 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (_tmp6_);
-#line 16285 "EditingTools.c"
+#line 16670 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self, GtkWidget* widget, GdkEventButton* event) {
+static gboolean
+editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustTool* self,
+                                           GtkWidget* widget,
+                                           GdkEventButton* event)
+{
 	gboolean result = FALSE;
 	GtkScale* source = NULL;
-	GtkWidget* _tmp0_;
-	GtkScale* _tmp1_;
+	GtkScale* _tmp0_;
+	gboolean _tmp1_ = FALSE;
 	gboolean _tmp2_ = FALSE;
-	gboolean _tmp3_ = FALSE;
-	GdkEventButton* _tmp4_;
-	guint _tmp5_;
+	guint _tmp3_;
 #line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self), FALSE);
 #line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16301,67 +16688,54 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 #line 2798 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = widget;
-#line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_scale_get_type (), GtkScale));
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_CAST (widget, gtk_scale_get_type (), GtkScale));
 #line 2799 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	source = _tmp1_;
+	source = _tmp0_;
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = event;
+	_tmp3_ = event->button;
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = _tmp4_->button;
+	if (_tmp3_ == ((guint) 1)) {
+#line 16699 "EditingTools.c"
+		GdkEventType _tmp4_;
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_ == ((guint) 1)) {
-#line 16316 "EditingTools.c"
-		GdkEventButton* _tmp6_;
-		GdkEventType _tmp7_;
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = event;
+		_tmp4_ = event->type;
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = _tmp6_->type;
-#line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp7_ == GDK_BUTTON_PRESS;
-#line 16325 "EditingTools.c"
+		_tmp2_ = _tmp4_ == GDK_BUTTON_PRESS;
+#line 16705 "EditingTools.c"
 	} else {
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = FALSE;
-#line 16329 "EditingTools.c"
+		_tmp2_ = FALSE;
+#line 16709 "EditingTools.c"
 	}
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp3_) {
-#line 16333 "EditingTools.c"
-		GdkEventButton* _tmp8_;
-		GdkModifierType _tmp9_;
-		gboolean _tmp10_;
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = event;
-#line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _tmp8_->state;
+	if (_tmp2_) {
+#line 16713 "EditingTools.c"
+		GdkModifierType _tmp5_;
 #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = has_only_key_modifier (_tmp9_, GDK_CONTROL_MASK);
+		_tmp5_ = event->state;
 #line 2802 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = _tmp10_;
-#line 16345 "EditingTools.c"
+		_tmp1_ = has_only_key_modifier (_tmp5_, GDK_CONTROL_MASK);
+#line 16719 "EditingTools.c"
 	} else {
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = FALSE;
-#line 16349 "EditingTools.c"
+		_tmp1_ = FALSE;
+#line 16723 "EditingTools.c"
 	}
 #line 2801 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp2_) {
-#line 16353 "EditingTools.c"
-		GtkScale* _tmp11_;
+	if (_tmp1_) {
+#line 16727 "EditingTools.c"
+		GtkScale* _tmp6_;
 #line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = source;
+		_tmp6_ = source;
 #line 2804 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) 0);
+		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), (gdouble) 0);
 #line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = TRUE;
 #line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (source);
 #line 2806 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 16365 "EditingTools.c"
+#line 16739 "EditingTools.c"
 	}
 #line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = FALSE;
@@ -16369,128 +16743,170 @@ static gboolean editing_tools_adjust_tool_on_hscale_reset (EditingToolsAdjustToo
 	_g_object_unref0 (source);
 #line 2809 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16373 "EditingTools.c"
+#line 16747 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                              Dimensions* old_dim,
+                                                                                              GdkPixbuf* scaled,
+                                                                                              GdkRectangle* scaled_position,
+                                                                                              gpointer self)
+{
 #line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_canvas_resize ((EditingToolsAdjustTool*) self);
-#line 16380 "EditingTools.c"
+#line 16760 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
+static void
+editing_tools_adjust_tool_bind_canvas_handlers (EditingToolsAdjustTool* self,
+                                                EditingToolsPhotoCanvas* canvas)
+{
 #line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2812 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
-#line 2813 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16394 "EditingTools.c"
+	g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 16774 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
-	guint _tmp1_;
+static void
+editing_tools_adjust_tool_unbind_canvas_handlers (EditingToolsAdjustTool* self,
+                                                  EditingToolsPhotoCanvas* canvas)
+{
+	guint _tmp0_;
 #line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2816 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = canvas;
-#line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE);
 #line 2817 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 16411 "EditingTools.c"
+	g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_canvas_resize_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 16791 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_ok_gtk_button_clicked (GtkButton* _sender,
+                                                     gpointer self)
+{
 #line 2821 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_ok ((EditingToolsAdjustTool*) self);
-#line 16418 "EditingTools.c"
+#line 16801 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_reset_gtk_button_clicked (GtkButton* _sender,
+                                                        gpointer self)
+{
 #line 2822 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_reset ((EditingToolsAdjustTool*) self);
-#line 16425 "EditingTools.c"
+#line 16811 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_exposure_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                           gpointer self)
+{
 #line 2824 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_exposure_adjustment ((EditingToolsAdjustTool*) self);
-#line 16432 "EditingTools.c"
+#line 16821 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_contrast_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                           gpointer self)
+{
 #line 2825 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_contrast_adjustment ((EditingToolsAdjustTool*) self);
-#line 16439 "EditingTools.c"
+#line 16831 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_saturation_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                             gpointer self)
+{
 #line 2826 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_saturation_adjustment ((EditingToolsAdjustTool*) self);
-#line 16446 "EditingTools.c"
+#line 16841 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_tint_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                       gpointer self)
+{
 #line 2827 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_tint_adjustment ((EditingToolsAdjustTool*) self);
-#line 16453 "EditingTools.c"
+#line 16851 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_temperature_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                              gpointer self)
+{
 #line 2828 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_temperature_adjustment ((EditingToolsAdjustTool*) self);
-#line 16460 "EditingTools.c"
+#line 16861 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_shadows_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                          gpointer self)
+{
 #line 2829 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_shadows_adjustment ((EditingToolsAdjustTool*) self);
-#line 16467 "EditingTools.c"
+#line 16871 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_highlights_adjustment_gtk_range_value_changed (GtkRange* _sender,
+                                                                             gpointer self)
+{
 #line 2830 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_highlights_adjustment ((EditingToolsAdjustTool*) self);
-#line 16474 "EditingTools.c"
+#line 16881 "EditingTools.c"
 }
 
 
-static void _editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_on_histogram_constraint_rgb_histogram_manipulator_nub_position_changed (RGBHistogramManipulator* _sender,
+                                                                                                   gpointer self)
+{
 #line 2831 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_on_histogram_constraint ((EditingToolsAdjustTool*) self);
-#line 16481 "EditingTools.c"
+#line 16891 "EditingTools.c"
 }
 
 
-static gboolean _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                          GdkEventButton* event,
+                                                                          gpointer self)
+{
 	gboolean result;
 	result = editing_tools_adjust_tool_on_hscale_reset ((EditingToolsAdjustTool*) self, _sender, event);
 #line 2833 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16490 "EditingTools.c"
+#line 16904 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTool* self)
+{
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkButton* _tmp1_;
 	EditingToolsAdjustToolAdjustToolWindow* _tmp2_;
@@ -16637,11 +17053,13 @@ static void editing_tools_adjust_tool_bind_window_handlers (EditingToolsAdjustTo
 	_tmp35_ = _tmp34_->highlights_slider;
 #line 2839 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), "button-press-event", (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 16641 "EditingTools.c"
+#line 17057 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self) {
+static void
+editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjustTool* self)
+{
 	EditingToolsAdjustToolAdjustToolWindow* _tmp0_;
 	GtkButton* _tmp1_;
 	guint _tmp2_;
@@ -16842,11 +17260,13 @@ static void editing_tools_adjust_tool_unbind_window_handlers (EditingToolsAdjust
 	g_signal_parse_name ("button-press-event", gtk_widget_get_type (), &_tmp53_, NULL, FALSE);
 #line 2861 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp52_, gtk_widget_get_type (), GtkWidget), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp53_, 0, NULL, (GCallback) _editing_tools_adjust_tool_on_hscale_reset_gtk_widget_button_press_event, self);
-#line 16846 "EditingTools.c"
+#line 17264 "EditingTools.c"
 }
 
 
-gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
+gboolean
+editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self)
+{
 	gboolean result = FALSE;
 	EditingToolsAdjustToolAdjustEnhanceCommand* command = NULL;
 	EditingToolsPhotoCanvas* _tmp0_;
@@ -16886,75 +17306,74 @@ gboolean editing_tools_adjust_tool_enhance (EditingToolsAdjustTool* self) {
 	_g_object_unref0 (command);
 #line 2868 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 16890 "EditingTools.c"
+#line 17310 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self, GeeMap* map) {
-	GeeMap* _tmp0_;
-	EditingToolsPhotoCanvas* _tmp1_;
+static void
+editing_tools_adjust_tool_on_photos_altered (EditingToolsAdjustTool* self,
+                                             GeeMap* map)
+{
+	EditingToolsPhotoCanvas* _tmp0_;
+	Photo* _tmp1_;
 	Photo* _tmp2_;
-	Photo* _tmp3_;
-	gboolean _tmp4_;
-	gboolean _tmp5_;
+	gboolean _tmp3_;
 	PixelTransformationBundle* adjustments = NULL;
-	EditingToolsPhotoCanvas* _tmp6_;
-	Photo* _tmp7_;
-	Photo* _tmp8_;
+	EditingToolsPhotoCanvas* _tmp4_;
+	Photo* _tmp5_;
+	Photo* _tmp6_;
+	PixelTransformationBundle* _tmp7_;
+	PixelTransformationBundle* _tmp8_;
 	PixelTransformationBundle* _tmp9_;
-	PixelTransformationBundle* _tmp10_;
-	PixelTransformationBundle* _tmp11_;
 #line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GEE_IS_MAP (map));
 #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = map;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = editing_tools_photo_canvas_get_photo (_tmp1_);
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_;
+	_tmp1_ = editing_tools_photo_canvas_get_photo (_tmp0_);
 #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = gee_map_has_key (_tmp0_, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_DATA_OBJECT, DataObject));
+	_tmp2_ = _tmp1_;
 #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = !_tmp4_;
+	_tmp3_ = !gee_map_has_key (map, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_DATA_OBJECT, DataObject));
 #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp3_);
+	_g_object_unref0 (_tmp2_);
 #line 2872 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp5_) {
+	if (_tmp3_) {
 #line 2873 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return;
-#line 16930 "EditingTools.c"
+#line 17347 "EditingTools.c"
 	}
 #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_);
+	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
 #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = _tmp7_;
+	_tmp6_ = _tmp5_;
 #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = photo_get_color_adjustments (_tmp8_);
+	_tmp7_ = photo_get_color_adjustments (_tmp6_);
 #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = _tmp9_;
+	_tmp8_ = _tmp7_;
 #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_g_object_unref0 (_tmp8_);
+	_g_object_unref0 (_tmp6_);
 #line 2875 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	adjustments = _tmp10_;
+	adjustments = _tmp8_;
 #line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = adjustments;
+	_tmp9_ = adjustments;
 #line 2876 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_set_adjustments (self, _tmp11_);
+	editing_tools_adjust_tool_set_adjustments (self, _tmp9_);
 #line 2871 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (adjustments);
-#line 16952 "EditingTools.c"
+#line 17369 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self, PixelTransformationBundle* new_adjustments) {
-	PixelTransformationBundle* _tmp0_;
-	EditingToolsPhotoCanvas* _tmp11_;
+static void
+editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* self,
+                                           PixelTransformationBundle* new_adjustments)
+{
+	EditingToolsPhotoCanvas* _tmp8_;
 #line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2879 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -16962,594 +17381,504 @@ static void editing_tools_adjust_tool_set_adjustments (EditingToolsAdjustTool* s
 #line 2880 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_unbind_window_handlers (self);
 #line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = new_adjustments;
-#line 2882 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_adjust_tool_update_transformations (self, _tmp0_);
-#line 16969 "EditingTools.c"
+	editing_tools_adjust_tool_update_transformations (self, new_adjustments);
+#line 17386 "EditingTools.c"
 	{
 		GeeIterator* _adjustment_it = NULL;
-		PixelTransformationBundle* _tmp1_;
-		GeeIterable* _tmp2_;
-		GeeIterable* _tmp3_;
-		GeeIterator* _tmp4_;
-		GeeIterator* _tmp5_;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = new_adjustments;
+		GeeIterable* _tmp0_;
+		GeeIterable* _tmp1_;
+		GeeIterator* _tmp2_;
+		GeeIterator* _tmp3_;
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp2_ = pixel_transformation_bundle_get_transformations (_tmp1_);
+		_tmp0_ = pixel_transformation_bundle_get_transformations (new_adjustments);
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = _tmp2_;
+		_tmp1_ = _tmp0_;
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = gee_iterable_iterator (_tmp3_);
+		_tmp2_ = gee_iterable_iterator (_tmp1_);
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = _tmp4_;
+		_tmp3_ = _tmp2_;
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp3_);
+		_g_object_unref0 (_tmp1_);
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_adjustment_it = _tmp5_;
+		_adjustment_it = _tmp3_;
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		while (TRUE) {
-#line 16993 "EditingTools.c"
-			GeeIterator* _tmp6_;
-			gboolean _tmp7_;
+#line 17407 "EditingTools.c"
+			GeeIterator* _tmp4_;
 			PixelTransformation* adjustment = NULL;
-			GeeIterator* _tmp8_;
-			gpointer _tmp9_;
-			PixelTransformation* _tmp10_;
-#line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp6_ = _adjustment_it;
+			GeeIterator* _tmp5_;
+			gpointer _tmp6_;
+			PixelTransformation* _tmp7_;
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp7_ = gee_iterator_next (_tmp6_);
+			_tmp4_ = _adjustment_it;
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (!_tmp7_) {
+			if (!gee_iterator_next (_tmp4_)) {
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 				break;
-#line 17008 "EditingTools.c"
+#line 17419 "EditingTools.c"
 			}
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp8_ = _adjustment_it;
+			_tmp5_ = _adjustment_it;
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp9_ = gee_iterator_get (_tmp8_);
+			_tmp6_ = gee_iterator_get (_tmp5_);
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			adjustment = (PixelTransformation*) _tmp9_;
+			adjustment = (PixelTransformation*) _tmp6_;
 #line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp10_ = adjustment;
+			_tmp7_ = adjustment;
 #line 2885 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			editing_tools_adjust_tool_update_slider (self, _tmp10_);
+			editing_tools_adjust_tool_update_slider (self, _tmp7_);
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (adjustment);
-#line 17022 "EditingTools.c"
+#line 17433 "EditingTools.c"
 		}
 #line 2884 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (_adjustment_it);
-#line 17026 "EditingTools.c"
+#line 17437 "EditingTools.c"
 	}
 #line 2887 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_bind_window_handlers (self);
 #line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2888 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	editing_tools_photo_canvas_repaint (_tmp11_);
-#line 17034 "EditingTools.c"
+	editing_tools_photo_canvas_repaint (_tmp8_);
+#line 17445 "EditingTools.c"
 }
 
 
-static gpointer _pixel_transformation_ref0 (gpointer self) {
+static gpointer
+_pixel_transformation_ref0 (gpointer self)
+{
 #line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self ? pixel_transformation_ref (self) : NULL;
-#line 17041 "EditingTools.c"
+#line 17454 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self, PixelTransformation* transformation) {
-	PixelTransformation* _tmp0_;
-	PixelTransformationType _tmp1_;
+static void
+editing_tools_adjust_tool_update_slider (EditingToolsAdjustTool* self,
+                                         PixelTransformation* transformation)
+{
 #line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2893 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (IS_PIXEL_TRANSFORMATION (transformation));
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = transformation;
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = pixel_transformation_get_transformation_type (_tmp0_);
-#line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	switch (_tmp1_) {
+	switch (pixel_transformation_get_transformation_type (transformation)) {
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TONE_EXPANSION:
-#line 17060 "EditingTools.c"
+#line 17470 "EditingTools.c"
 		{
 			ExpansionTransformation* expansion = NULL;
-			PixelTransformation* _tmp2_;
-			ExpansionTransformation* _tmp3_;
-			gboolean _tmp4_;
+			ExpansionTransformation* _tmp0_;
+			gboolean _tmp1_;
 #line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp2_ = transformation;
+			_tmp0_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation));
 #line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp3_ = _pixel_transformation_ref0 (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_EXPANSION_TRANSFORMATION, ExpansionTransformation));
-#line 2896 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			expansion = _tmp3_;
+			expansion = _tmp0_;
 #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp4_ = self->priv->disable_histogram_refresh;
+			_tmp1_ = self->priv->disable_histogram_refresh;
 #line 2898 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			if (!_tmp4_) {
-#line 17076 "EditingTools.c"
+			if (!_tmp1_) {
+#line 17483 "EditingTools.c"
+				EditingToolsAdjustToolAdjustToolWindow* _tmp2_;
+				RGBHistogramManipulator* _tmp3_;
+				ExpansionTransformation* _tmp4_;
 				EditingToolsAdjustToolAdjustToolWindow* _tmp5_;
 				RGBHistogramManipulator* _tmp6_;
 				ExpansionTransformation* _tmp7_;
-				gint _tmp8_;
-				EditingToolsAdjustToolAdjustToolWindow* _tmp9_;
-				RGBHistogramManipulator* _tmp10_;
-				ExpansionTransformation* _tmp11_;
-				gint _tmp12_;
 #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp5_ = self->priv->adjust_tool_window;
+				_tmp2_ = self->priv->adjust_tool_window;
 #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp6_ = _tmp5_->histogram_manipulator;
-#line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp7_ = expansion;
+				_tmp3_ = _tmp2_->histogram_manipulator;
 #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp8_ = expansion_transformation_get_black_point (_tmp7_);
+				_tmp4_ = expansion;
 #line 2899 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				rgb_histogram_manipulator_set_left_nub_position (_tmp6_, _tmp8_);
-#line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp9_ = self->priv->adjust_tool_window;
+				rgb_histogram_manipulator_set_left_nub_position (_tmp3_, expansion_transformation_get_black_point (_tmp4_));
 #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp10_ = _tmp9_->histogram_manipulator;
+				_tmp5_ = self->priv->adjust_tool_window;
 #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp11_ = expansion;
+				_tmp6_ = _tmp5_->histogram_manipulator;
 #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp12_ = expansion_transformation_get_white_point (_tmp11_);
+				_tmp7_ = expansion;
 #line 2901 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				rgb_histogram_manipulator_set_right_nub_position (_tmp10_, _tmp12_);
-#line 17105 "EditingTools.c"
+				rgb_histogram_manipulator_set_right_nub_position (_tmp6_, expansion_transformation_get_white_point (_tmp7_));
+#line 17506 "EditingTools.c"
 			}
 #line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			_pixel_transformation_unref0 (expansion);
 #line 2904 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17111 "EditingTools.c"
+#line 17512 "EditingTools.c"
 		}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SHADOWS:
-#line 17115 "EditingTools.c"
+#line 17516 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp13_;
-			GtkScale* _tmp14_;
-			PixelTransformation* _tmp15_;
-			gfloat _tmp16_;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp8_;
+			GtkScale* _tmp9_;
 #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp13_ = self->priv->adjust_tool_window;
+			_tmp8_ = self->priv->adjust_tool_window;
 #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp14_ = _tmp13_->shadows_slider;
+			_tmp9_ = _tmp8_->shadows_slider;
 #line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp15_ = transformation;
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp16_ = shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation));
-#line 2907 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_range_get_type (), GtkRange), (gdouble) _tmp16_);
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), (gdouble) shadow_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_SHADOW_DETAIL_TRANSFORMATION, ShadowDetailTransformation)));
 #line 2909 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17133 "EditingTools.c"
+#line 17528 "EditingTools.c"
 		}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_CONTRAST:
-#line 17137 "EditingTools.c"
+#line 17532 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp17_;
-			GtkScale* _tmp18_;
-			PixelTransformation* _tmp19_;
-			gfloat _tmp20_;
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp17_ = self->priv->adjust_tool_window;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp10_;
+			GtkScale* _tmp11_;
 #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp18_ = _tmp17_->contrast_slider;
+			_tmp10_ = self->priv->adjust_tool_window;
 #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp19_ = transformation;
+			_tmp11_ = _tmp10_->contrast_slider;
 #line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp20_ = contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation));
-#line 2912 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_range_get_type (), GtkRange), (gdouble) _tmp20_);
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_range_get_type (), GtkRange), (gdouble) contrast_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_CONTRAST_TRANSFORMATION, ContrastTransformation)));
 #line 2914 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17155 "EditingTools.c"
+#line 17544 "EditingTools.c"
 		}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_HIGHLIGHTS:
-#line 17159 "EditingTools.c"
+#line 17548 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp21_;
-			GtkScale* _tmp22_;
-			PixelTransformation* _tmp23_;
-			gfloat _tmp24_;
-#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp21_ = self->priv->adjust_tool_window;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp12_;
+			GtkScale* _tmp13_;
 #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp22_ = _tmp21_->highlights_slider;
+			_tmp12_ = self->priv->adjust_tool_window;
 #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp23_ = transformation;
+			_tmp13_ = _tmp12_->highlights_slider;
 #line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp24_ = highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation));
-#line 2917 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_range_get_type (), GtkRange), (gdouble) _tmp24_);
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_range_get_type (), GtkRange), (gdouble) highlight_detail_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_HIGHLIGHT_DETAIL_TRANSFORMATION, HighlightDetailTransformation)));
 #line 2919 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17177 "EditingTools.c"
+#line 17560 "EditingTools.c"
 		}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_EXPOSURE:
-#line 17181 "EditingTools.c"
+#line 17564 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp25_;
-			GtkScale* _tmp26_;
-			PixelTransformation* _tmp27_;
-			gfloat _tmp28_;
-#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp25_ = self->priv->adjust_tool_window;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp14_;
+			GtkScale* _tmp15_;
 #line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp26_ = _tmp25_->exposure_slider;
+			_tmp14_ = self->priv->adjust_tool_window;
 #line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp27_ = transformation;
+			_tmp15_ = _tmp14_->exposure_slider;
 #line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp28_ = exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation));
-#line 2922 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_range_get_type (), GtkRange), (gdouble) _tmp28_);
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_range_get_type (), GtkRange), (gdouble) exposure_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_EXPOSURE_TRANSFORMATION, ExposureTransformation)));
 #line 2924 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17199 "EditingTools.c"
+#line 17576 "EditingTools.c"
 		}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_SATURATION:
-#line 17203 "EditingTools.c"
+#line 17580 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp29_;
-			GtkScale* _tmp30_;
-			PixelTransformation* _tmp31_;
-			gfloat _tmp32_;
-#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp29_ = self->priv->adjust_tool_window;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp16_;
+			GtkScale* _tmp17_;
 #line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp30_ = _tmp29_->saturation_slider;
+			_tmp16_ = self->priv->adjust_tool_window;
 #line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp31_ = transformation;
+			_tmp17_ = _tmp16_->saturation_slider;
 #line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp32_ = saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation));
-#line 2927 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_range_get_type (), GtkRange), (gdouble) _tmp32_);
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_range_get_type (), GtkRange), (gdouble) saturation_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_SATURATION_TRANSFORMATION, SaturationTransformation)));
 #line 2929 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17221 "EditingTools.c"
+#line 17592 "EditingTools.c"
 		}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TINT:
-#line 17225 "EditingTools.c"
+#line 17596 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp33_;
-			GtkScale* _tmp34_;
-			PixelTransformation* _tmp35_;
-			gfloat _tmp36_;
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp33_ = self->priv->adjust_tool_window;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp18_;
+			GtkScale* _tmp19_;
 #line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp34_ = _tmp33_->tint_slider;
+			_tmp18_ = self->priv->adjust_tool_window;
 #line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp35_ = transformation;
+			_tmp19_ = _tmp18_->tint_slider;
 #line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp36_ = tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, TYPE_TINT_TRANSFORMATION, TintTransformation));
-#line 2932 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_range_get_type (), GtkRange), (gdouble) _tmp36_);
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_range_get_type (), GtkRange), (gdouble) tint_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_TINT_TRANSFORMATION, TintTransformation)));
 #line 2934 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17243 "EditingTools.c"
+#line 17608 "EditingTools.c"
 		}
 #line 2894 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		case PIXEL_TRANSFORMATION_TYPE_TEMPERATURE:
-#line 17247 "EditingTools.c"
+#line 17612 "EditingTools.c"
 		{
-			EditingToolsAdjustToolAdjustToolWindow* _tmp37_;
-			GtkScale* _tmp38_;
-			PixelTransformation* _tmp39_;
-			gfloat _tmp40_;
-#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp37_ = self->priv->adjust_tool_window;
+			EditingToolsAdjustToolAdjustToolWindow* _tmp20_;
+			GtkScale* _tmp21_;
 #line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp38_ = _tmp37_->temperature_slider;
+			_tmp20_ = self->priv->adjust_tool_window;
 #line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp39_ = transformation;
+			_tmp21_ = _tmp20_->temperature_slider;
 #line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp40_ = temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation));
-#line 2937 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_range_get_type (), GtkRange), (gdouble) _tmp40_);
+			gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_range_get_type (), GtkRange), (gdouble) temperature_transformation_get_parameter (G_TYPE_CHECK_INSTANCE_CAST (transformation, TYPE_TEMPERATURE_TRANSFORMATION, TemperatureTransformation)));
 #line 2939 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			break;
-#line 17265 "EditingTools.c"
+#line 17624 "EditingTools.c"
 		}
 		default:
 		{
-			PixelTransformation* _tmp41_;
-			PixelTransformationType _tmp42_;
-#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp41_ = transformation;
 #line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp42_ = pixel_transformation_get_transformation_type (_tmp41_);
-#line 2942 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			g_error ("EditingTools.vala:2942: Unknown adjustment: %d", (gint) _tmp42_);
-#line 17277 "EditingTools.c"
+			g_error ("EditingTools.vala:2942: Unknown adjustment: %d", (gint) pixel_transformation_get_transformation_type (transformation));
+#line 17630 "EditingTools.c"
 		}
 	}
 }
 
 
-static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self, GdkPixbuf* source) {
+static void
+editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustTool* self,
+                                               GdkPixbuf* source)
+{
 	gint source_width = 0;
-	GdkPixbuf* _tmp0_;
-	gint _tmp1_;
 	gint source_height = 0;
-	GdkPixbuf* _tmp2_;
-	gint _tmp3_;
 	gint source_num_channels = 0;
-	GdkPixbuf* _tmp4_;
-	gint _tmp5_;
 	gint source_rowstride = 0;
-	GdkPixbuf* _tmp6_;
-	gint _tmp7_;
 	guchar* source_pixels = NULL;
-	GdkPixbuf* _tmp8_;
-	guint8* _tmp9_;
+	guint8* _tmp0_;
 	gint source_pixels_length1;
 	gint _source_pixels_size_;
-	gint _tmp10_;
-	gint _tmp11_;
-	gfloat* _tmp12_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gfloat* _tmp3_;
 	gint cache_pixel_index = 0;
 #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (self));
 #line 2946 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (source));
 #line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = source;
-#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = gdk_pixbuf_get_width (_tmp0_);
-#line 2947 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	source_width = _tmp1_;
-#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = source;
+	source_width = gdk_pixbuf_get_width (source);
 #line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = gdk_pixbuf_get_height (_tmp2_);
-#line 2948 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	source_height = _tmp3_;
-#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = source;
+	source_height = gdk_pixbuf_get_height (source);
 #line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = gdk_pixbuf_get_n_channels (_tmp4_);
-#line 2949 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	source_num_channels = _tmp5_;
-#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = source;
-#line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = gdk_pixbuf_get_rowstride (_tmp6_);
+	source_num_channels = gdk_pixbuf_get_n_channels (source);
 #line 2950 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	source_rowstride = _tmp7_;
+	source_rowstride = gdk_pixbuf_get_rowstride (source);
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = source;
+	_tmp0_ = gdk_pixbuf_get_pixels (source);
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = gdk_pixbuf_get_pixels (_tmp8_);
-#line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	source_pixels = _tmp9_;
+	source_pixels = _tmp0_;
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	source_pixels_length1 = -1;
 #line 2951 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_source_pixels_size_ = source_pixels_length1;
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = source_width;
+	_tmp1_ = source_width;
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = source_height;
+	_tmp2_ = source_height;
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = g_new0 (gfloat, (3 * _tmp10_) * _tmp11_);
+	_tmp3_ = g_new0 (gfloat, (3 * _tmp1_) * _tmp2_);
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->fp_pixel_cache = (g_free (self->priv->fp_pixel_cache), NULL);
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->fp_pixel_cache = _tmp12_;
+	self->priv->fp_pixel_cache = _tmp3_;
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->fp_pixel_cache_length1 = (3 * _tmp10_) * _tmp11_;
+	self->priv->fp_pixel_cache_length1 = (3 * _tmp1_) * _tmp2_;
 #line 2953 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->_fp_pixel_cache_size_ = self->priv->fp_pixel_cache_length1;
 #line 2954 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	cache_pixel_index = 0;
-#line 17359 "EditingTools.c"
+#line 17688 "EditingTools.c"
 	{
 		gint j = 0;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		j = 0;
-#line 17364 "EditingTools.c"
+#line 17693 "EditingTools.c"
 		{
-			gboolean _tmp13_ = FALSE;
+			gboolean _tmp4_ = FALSE;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-			_tmp13_ = TRUE;
+			_tmp4_ = TRUE;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 			while (TRUE) {
-#line 17371 "EditingTools.c"
-				gint _tmp15_;
-				gint _tmp16_;
+#line 17700 "EditingTools.c"
+				gint _tmp6_;
+				gint _tmp7_;
 				gint row_start_index = 0;
-				gint _tmp17_;
-				gint _tmp18_;
+				gint _tmp8_;
+				gint _tmp9_;
 				gint row_end_index = 0;
-				gint _tmp19_;
-				gint _tmp20_;
-				gint _tmp21_;
+				gint _tmp10_;
+				gint _tmp11_;
+				gint _tmp12_;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (!_tmp13_) {
-#line 17383 "EditingTools.c"
-					gint _tmp14_;
+				if (!_tmp4_) {
+#line 17712 "EditingTools.c"
+					gint _tmp5_;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp14_ = j;
+					_tmp5_ = j;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					j = _tmp14_ + 1;
-#line 17389 "EditingTools.c"
+					j = _tmp5_ + 1;
+#line 17718 "EditingTools.c"
 				}
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp13_ = FALSE;
+				_tmp4_ = FALSE;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp15_ = j;
+				_tmp6_ = j;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp16_ = source_height;
+				_tmp7_ = source_height;
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				if (!(_tmp15_ < _tmp16_)) {
+				if (!(_tmp6_ < _tmp7_)) {
 #line 2956 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 					break;
-#line 17401 "EditingTools.c"
+#line 17730 "EditingTools.c"
 				}
 #line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp17_ = j;
+				_tmp8_ = j;
 #line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp18_ = source_rowstride;
+				_tmp9_ = source_rowstride;
 #line 2957 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				row_start_index = _tmp17_ * _tmp18_;
+				row_start_index = _tmp8_ * _tmp9_;
 #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp19_ = row_start_index;
+				_tmp10_ = row_start_index;
 #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp20_ = source_width;
+				_tmp11_ = source_width;
 #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				_tmp21_ = source_num_channels;
+				_tmp12_ = source_num_channels;
 #line 2958 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-				row_end_index = _tmp19_ + (_tmp20_ * _tmp21_);
-#line 17417 "EditingTools.c"
+				row_end_index = _tmp10_ + (_tmp11_ * _tmp12_);
+#line 17746 "EditingTools.c"
 				{
 					gint i = 0;
-					gint _tmp22_;
+					gint _tmp13_;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					_tmp22_ = row_start_index;
+					_tmp13_ = row_start_index;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-					i = _tmp22_;
-#line 17425 "EditingTools.c"
+					i = _tmp13_;
+#line 17754 "EditingTools.c"
 					{
-						gboolean _tmp23_ = FALSE;
+						gboolean _tmp14_ = FALSE;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-						_tmp23_ = TRUE;
+						_tmp14_ = TRUE;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 						while (TRUE) {
-#line 17432 "EditingTools.c"
-							gint _tmp26_;
+#line 17761 "EditingTools.c"
+							gint _tmp17_;
+							gint _tmp18_;
+							gfloat* _tmp19_;
+							gint _tmp19__length1;
+							gint _tmp20_;
+							guchar* _tmp21_;
+							gint _tmp21__length1;
+							gint _tmp22_;
+							guchar _tmp23_;
+							gfloat _tmp24_;
+							gfloat _tmp25_;
+							gfloat* _tmp26_;
+							gint _tmp26__length1;
 							gint _tmp27_;
-							gfloat* _tmp28_;
+							guchar* _tmp28_;
 							gint _tmp28__length1;
 							gint _tmp29_;
-							guchar* _tmp30_;
-							gint _tmp30__length1;
-							gint _tmp31_;
-							guchar _tmp32_;
-							gfloat _tmp33_;
-							gfloat _tmp34_;
-							gfloat* _tmp35_;
+							guchar _tmp30_;
+							gfloat _tmp31_;
+							gfloat _tmp32_;
+							gfloat* _tmp33_;
+							gint _tmp33__length1;
+							gint _tmp34_;
+							guchar* _tmp35_;
 							gint _tmp35__length1;
 							gint _tmp36_;
-							guchar* _tmp37_;
-							gint _tmp37__length1;
-							gint _tmp38_;
-							guchar _tmp39_;
-							gfloat _tmp40_;
-							gfloat _tmp41_;
-							gfloat* _tmp42_;
-							gint _tmp42__length1;
-							gint _tmp43_;
-							guchar* _tmp44_;
-							gint _tmp44__length1;
-							gint _tmp45_;
-							guchar _tmp46_;
-							gfloat _tmp47_;
-							gfloat _tmp48_;
+							guchar _tmp37_;
+							gfloat _tmp38_;
+							gfloat _tmp39_;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							if (!_tmp23_) {
-#line 17464 "EditingTools.c"
-								gint _tmp24_;
-								gint _tmp25_;
+							if (!_tmp14_) {
+#line 17793 "EditingTools.c"
+								gint _tmp15_;
+								gint _tmp16_;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-								_tmp24_ = i;
+								_tmp15_ = i;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-								_tmp25_ = source_num_channels;
+								_tmp16_ = source_num_channels;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-								i = _tmp24_ + _tmp25_;
-#line 17473 "EditingTools.c"
+								i = _tmp15_ + _tmp16_;
+#line 17802 "EditingTools.c"
 							}
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp23_ = FALSE;
+							_tmp14_ = FALSE;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp26_ = i;
+							_tmp17_ = i;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp27_ = row_end_index;
+							_tmp18_ = row_end_index;
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							if (!(_tmp26_ < _tmp27_)) {
+							if (!(_tmp17_ < _tmp18_)) {
 #line 2959 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 								break;
-#line 17485 "EditingTools.c"
+#line 17814 "EditingTools.c"
 							}
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp28_ = self->priv->fp_pixel_cache;
+							_tmp19_ = self->priv->fp_pixel_cache;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp28__length1 = self->priv->fp_pixel_cache_length1;
+							_tmp19__length1 = self->priv->fp_pixel_cache_length1;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp29_ = cache_pixel_index;
+							_tmp20_ = cache_pixel_index;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							cache_pixel_index = _tmp29_ + 1;
+							cache_pixel_index = _tmp20_ + 1;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp30_ = source_pixels;
+							_tmp21_ = source_pixels;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp30__length1 = source_pixels_length1;
+							_tmp21__length1 = source_pixels_length1;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp31_ = i;
+							_tmp22_ = i;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp32_ = _tmp30_[_tmp31_];
+							_tmp23_ = _tmp21_[_tmp22_];
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp33_ = rgb_lookup_table[_tmp32_];
+							_tmp24_ = rgb_lookup_table[_tmp23_];
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp28_[_tmp29_] = _tmp33_;
+							_tmp19_[_tmp20_] = _tmp24_;
 #line 2960 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp34_ = _tmp28_[_tmp29_];
+							_tmp25_ = _tmp19_[_tmp20_];
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp35_ = self->priv->fp_pixel_cache;
+							_tmp26_ = self->priv->fp_pixel_cache;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp35__length1 = self->priv->fp_pixel_cache_length1;
+							_tmp26__length1 = self->priv->fp_pixel_cache_length1;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp36_ = cache_pixel_index;
+							_tmp27_ = cache_pixel_index;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							cache_pixel_index = _tmp36_ + 1;
+							cache_pixel_index = _tmp27_ + 1;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp37_ = source_pixels;
+							_tmp28_ = source_pixels;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp37__length1 = source_pixels_length1;
+							_tmp28__length1 = source_pixels_length1;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp38_ = i;
+							_tmp29_ = i;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp39_ = _tmp37_[_tmp38_ + 1];
+							_tmp30_ = _tmp28_[_tmp29_ + 1];
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp40_ = rgb_lookup_table[_tmp39_];
+							_tmp31_ = rgb_lookup_table[_tmp30_];
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp35_[_tmp36_] = _tmp40_;
+							_tmp26_[_tmp27_] = _tmp31_;
 #line 2961 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp41_ = _tmp35_[_tmp36_];
+							_tmp32_ = _tmp26_[_tmp27_];
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp42_ = self->priv->fp_pixel_cache;
+							_tmp33_ = self->priv->fp_pixel_cache;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp42__length1 = self->priv->fp_pixel_cache_length1;
+							_tmp33__length1 = self->priv->fp_pixel_cache_length1;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp43_ = cache_pixel_index;
+							_tmp34_ = cache_pixel_index;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							cache_pixel_index = _tmp43_ + 1;
+							cache_pixel_index = _tmp34_ + 1;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp44_ = source_pixels;
+							_tmp35_ = source_pixels;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp44__length1 = source_pixels_length1;
+							_tmp35__length1 = source_pixels_length1;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp45_ = i;
+							_tmp36_ = i;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp46_ = _tmp44_[_tmp45_ + 2];
+							_tmp37_ = _tmp35_[_tmp36_ + 2];
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp47_ = rgb_lookup_table[_tmp46_];
+							_tmp38_ = rgb_lookup_table[_tmp37_];
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp42_[_tmp43_] = _tmp47_;
+							_tmp33_[_tmp34_] = _tmp38_;
 #line 2962 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-							_tmp48_ = _tmp42_[_tmp43_];
-#line 17553 "EditingTools.c"
+							_tmp39_ = _tmp33_[_tmp34_];
+#line 17882 "EditingTools.c"
 						}
 					}
 				}
@@ -17559,63 +17888,55 @@ static void editing_tools_adjust_tool_init_fp_pixel_cache (EditingToolsAdjustToo
 }
 
 
-static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) {
+static gboolean
+editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                            GdkEventKey* event)
+{
 	EditingToolsAdjustTool * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_;
-	guint _tmp3_;
-	const gchar* _tmp4_;
-	GdkEventKey* _tmp11_;
-	gboolean _tmp12_;
+	guint _tmp2_;
+	const gchar* _tmp3_;
 #line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
 #line 2967 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = event;
+	_tmp2_ = event->keyval;
 #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = _tmp2_->keyval;
+	_tmp3_ = gdk_keyval_name (_tmp2_);
 #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
+	if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) {
 #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp1_ = TRUE;
-#line 17587 "EditingTools.c"
+#line 17914 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp5_;
-		guint _tmp6_;
-		const gchar* _tmp7_;
-#line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = event;
+		guint _tmp4_;
+		const gchar* _tmp5_;
 #line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = _tmp5_->keyval;
+		_tmp4_ = event->keyval;
 #line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = gdk_keyval_name (_tmp6_);
+		_tmp5_ = gdk_keyval_name (_tmp4_);
 #line 2969 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 17600 "EditingTools.c"
+		_tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0;
+#line 17924 "EditingTools.c"
 	}
 #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp1_) {
 #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_tmp0_ = TRUE;
-#line 17606 "EditingTools.c"
+#line 17930 "EditingTools.c"
 	} else {
-		GdkEventKey* _tmp8_;
-		guint _tmp9_;
-		const gchar* _tmp10_;
-#line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = event;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _tmp8_->keyval;
+		_tmp6_ = event->keyval;
 #line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = gdk_keyval_name (_tmp9_);
+		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 2970 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 17619 "EditingTools.c"
+		_tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0;
+#line 17940 "EditingTools.c"
 	}
 #line 2968 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_) {
@@ -17625,92 +17946,88 @@ static gboolean editing_tools_adjust_tool_real_on_keypress (EditingToolsEditingT
 		result = TRUE;
 #line 2972 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 17629 "EditingTools.c"
+#line 17950 "EditingTools.c"
 	}
 #line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = event;
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp11_);
-#line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	result = _tmp12_;
+	result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event);
 #line 2975 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 17639 "EditingTools.c"
+#line 17956 "EditingTools.c"
 }
 
 
-static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type, GtkWindow* container) {
+static EditingToolsAdjustToolAdjustToolWindow*
+editing_tools_adjust_tool_adjust_tool_window_construct (GType object_type,
+                                                        GtkWindow* container)
+{
 	EditingToolsAdjustToolAdjustToolWindow * self = NULL;
-	GtkWindow* _tmp0_;
 	GtkGrid* slider_organizer = NULL;
-	GtkGrid* _tmp1_;
+	GtkGrid* _tmp0_;
 	GtkLabel* exposure_label = NULL;
-	GtkLabel* _tmp2_;
+	GtkLabel* _tmp1_;
+	GtkScale* _tmp2_;
 	GtkScale* _tmp3_;
 	GtkScale* _tmp4_;
 	GtkScale* _tmp5_;
-	GtkScale* _tmp6_;
 	GtkLabel* contrast_label = NULL;
-	GtkLabel* _tmp7_;
+	GtkLabel* _tmp6_;
+	GtkScale* _tmp7_;
 	GtkScale* _tmp8_;
 	GtkScale* _tmp9_;
 	GtkScale* _tmp10_;
-	GtkScale* _tmp11_;
 	GtkLabel* saturation_label = NULL;
-	GtkLabel* _tmp12_;
+	GtkLabel* _tmp11_;
+	GtkScale* _tmp12_;
 	GtkScale* _tmp13_;
 	GtkScale* _tmp14_;
 	GtkScale* _tmp15_;
-	GtkScale* _tmp16_;
 	GtkLabel* tint_label = NULL;
-	GtkLabel* _tmp17_;
+	GtkLabel* _tmp16_;
+	GtkScale* _tmp17_;
 	GtkScale* _tmp18_;
 	GtkScale* _tmp19_;
 	GtkScale* _tmp20_;
-	GtkScale* _tmp21_;
 	GtkLabel* temperature_label = NULL;
-	GtkLabel* _tmp22_;
+	GtkLabel* _tmp21_;
+	GtkScale* _tmp22_;
 	GtkScale* _tmp23_;
 	GtkScale* _tmp24_;
 	GtkScale* _tmp25_;
-	GtkScale* _tmp26_;
 	GtkLabel* shadows_label = NULL;
-	GtkLabel* _tmp27_;
+	GtkLabel* _tmp26_;
+	GtkScale* _tmp27_;
 	GtkScale* _tmp28_;
 	GtkScale* _tmp29_;
 	GtkScale* _tmp30_;
-	GtkScale* _tmp31_;
 	GtkLabel* highlights_label = NULL;
-	GtkLabel* _tmp32_;
+	GtkLabel* _tmp31_;
+	GtkScale* _tmp32_;
 	GtkScale* _tmp33_;
 	GtkScale* _tmp34_;
 	GtkScale* _tmp35_;
-	GtkScale* _tmp36_;
 	GtkBox* button_layouter = NULL;
-	GtkBox* _tmp37_;
+	GtkBox* _tmp36_;
+	GtkButton* _tmp37_;
 	GtkButton* _tmp38_;
 	GtkButton* _tmp39_;
-	GtkButton* _tmp40_;
+	RGBHistogramManipulator* _tmp40_;
 	RGBHistogramManipulator* _tmp41_;
 	RGBHistogramManipulator* _tmp42_;
 	RGBHistogramManipulator* _tmp43_;
-	RGBHistogramManipulator* _tmp44_;
 	GtkBox* pane_layouter = NULL;
-	GtkBox* _tmp45_;
+	GtkBox* _tmp44_;
+	RGBHistogramManipulator* _tmp45_;
 	RGBHistogramManipulator* _tmp46_;
-	RGBHistogramManipulator* _tmp47_;
 #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = container;
-#line 2221 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
+	self = (EditingToolsAdjustToolAdjustToolWindow*) editing_tools_editing_tool_window_construct (object_type, container);
 #line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = (GtkGrid*) gtk_grid_new ();
+	_tmp0_ = (GtkGrid*) gtk_grid_new ();
 #line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp1_);
+	g_object_ref_sink (_tmp0_);
 #line 2223 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	slider_organizer = _tmp1_;
+	slider_organizer = _tmp0_;
 #line 2224 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_set_column_homogeneous (slider_organizer, FALSE);
 #line 2225 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17722,11 +18039,11 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2228 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget), 12);
 #line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:"));
+	_tmp1_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Exposure:"));
 #line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp2_);
+	g_object_ref_sink (_tmp1_);
 #line 2230 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	exposure_label = _tmp2_;
+	exposure_label = _tmp1_;
 #line 2231 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2232 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17734,27 +18051,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2233 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (exposure_label, gtk_widget_get_type (), GtkWidget), 0, 0, 1, 1);
 #line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = self->exposure_slider;
+	_tmp2_ = self->exposure_slider;
 #line 2234 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), 1, 0, 1, 1);
 #line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->exposure_slider;
+	_tmp3_ = self->exposure_slider;
 #line 2235 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = self->exposure_slider;
+	_tmp4_ = self->exposure_slider;
 #line 2236 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_value_pos (_tmp5_, GTK_POS_RIGHT);
+	gtk_scale_set_value_pos (_tmp4_, GTK_POS_RIGHT);
 #line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = self->exposure_slider;
+	_tmp5_ = self->exposure_slider;
 #line 2237 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:"));
+	_tmp6_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Contrast:"));
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp7_);
+	g_object_ref_sink (_tmp6_);
 #line 2239 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	contrast_label = _tmp7_;
+	contrast_label = _tmp6_;
 #line 2240 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2241 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17762,27 +18079,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2242 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (contrast_label, gtk_widget_get_type (), GtkWidget), 0, 1, 1, 1);
 #line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->contrast_slider;
+	_tmp7_ = self->contrast_slider;
 #line 2243 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 1, 1, 1, 1);
 #line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = self->contrast_slider;
+	_tmp8_ = self->contrast_slider;
 #line 2244 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = self->contrast_slider;
+	_tmp9_ = self->contrast_slider;
 #line 2245 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_value_pos (_tmp10_, GTK_POS_RIGHT);
+	gtk_scale_set_value_pos (_tmp9_, GTK_POS_RIGHT);
 #line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->contrast_slider;
+	_tmp10_ = self->contrast_slider;
 #line 2246 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:"));
+	_tmp11_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Saturation:"));
 #line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp12_);
+	g_object_ref_sink (_tmp11_);
 #line 2248 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	saturation_label = _tmp12_;
+	saturation_label = _tmp11_;
 #line 2249 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2250 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17790,27 +18107,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2251 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (saturation_label, gtk_widget_get_type (), GtkWidget), 0, 2, 1, 1);
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = self->saturation_slider;
+	_tmp12_ = self->saturation_slider;
 #line 2252 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 1, 2, 1, 1);
 #line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = self->saturation_slider;
+	_tmp13_ = self->saturation_slider;
 #line 2253 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = self->saturation_slider;
+	_tmp14_ = self->saturation_slider;
 #line 2254 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_value_pos (_tmp15_, GTK_POS_RIGHT);
+	gtk_scale_set_value_pos (_tmp14_, GTK_POS_RIGHT);
 #line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = self->saturation_slider;
+	_tmp15_ = self->saturation_slider;
 #line 2255 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:"));
+	_tmp16_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Tint:"));
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp17_);
+	g_object_ref_sink (_tmp16_);
 #line 2257 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	tint_label = _tmp17_;
+	tint_label = _tmp16_;
 #line 2258 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2259 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17818,27 +18135,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2260 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (tint_label, gtk_widget_get_type (), GtkWidget), 0, 3, 1, 1);
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp18_ = self->tint_slider;
+	_tmp17_ = self->tint_slider;
 #line 2261 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), 1, 3, 1, 1);
 #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp19_ = self->tint_slider;
+	_tmp18_ = self->tint_slider;
 #line 2262 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp20_ = self->tint_slider;
+	_tmp19_ = self->tint_slider;
 #line 2263 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_value_pos (_tmp20_, GTK_POS_RIGHT);
+	gtk_scale_set_value_pos (_tmp19_, GTK_POS_RIGHT);
 #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp21_ = self->tint_slider;
+	_tmp20_ = self->tint_slider;
 #line 2264 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp22_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:"));
+	_tmp21_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Temperature:"));
 #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp22_);
+	g_object_ref_sink (_tmp21_);
 #line 2266 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	temperature_label = _tmp22_;
+	temperature_label = _tmp21_;
 #line 2268 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2269 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17846,27 +18163,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2270 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (temperature_label, gtk_widget_get_type (), GtkWidget), 0, 4, 1, 1);
 #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp23_ = self->temperature_slider;
+	_tmp22_ = self->temperature_slider;
 #line 2271 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), 1, 4, 1, 1);
 #line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp24_ = self->temperature_slider;
+	_tmp23_ = self->temperature_slider;
 #line 2272 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp25_ = self->temperature_slider;
+	_tmp24_ = self->temperature_slider;
 #line 2273 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_value_pos (_tmp25_, GTK_POS_RIGHT);
+	gtk_scale_set_value_pos (_tmp24_, GTK_POS_RIGHT);
 #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp26_ = self->temperature_slider;
+	_tmp25_ = self->temperature_slider;
 #line 2274 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp26_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp27_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:"));
+	_tmp26_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Shadows:"));
 #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp27_);
+	g_object_ref_sink (_tmp26_);
 #line 2276 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	shadows_label = _tmp27_;
+	shadows_label = _tmp26_;
 #line 2277 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2278 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17874,27 +18191,27 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2279 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (shadows_label, gtk_widget_get_type (), GtkWidget), 0, 5, 1, 1);
 #line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp28_ = self->shadows_slider;
+	_tmp27_ = self->shadows_slider;
 #line 2280 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp27_, gtk_widget_get_type (), GtkWidget), 1, 5, 1, 1);
 #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp29_ = self->shadows_slider;
+	_tmp28_ = self->shadows_slider;
 #line 2281 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp29_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp28_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp30_ = self->shadows_slider;
+	_tmp29_ = self->shadows_slider;
 #line 2282 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_value_pos (_tmp30_, GTK_POS_RIGHT);
+	gtk_scale_set_value_pos (_tmp29_, GTK_POS_RIGHT);
 #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp31_ = self->shadows_slider;
+	_tmp30_ = self->shadows_slider;
 #line 2285 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp31_, gtk_widget_get_type (), GtkWidget), 5);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp30_, gtk_widget_get_type (), GtkWidget), 5);
 #line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp32_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:"));
+	_tmp31_ = (GtkLabel*) gtk_label_new_with_mnemonic (_ ("Highlights:"));
 #line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp32_);
+	g_object_ref_sink (_tmp31_);
 #line 2287 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	highlights_label = _tmp32_;
+	highlights_label = _tmp31_;
 #line 2288 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_widget_set_halign (G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), GTK_ALIGN_START);
 #line 2289 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17902,75 +18219,75 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 #line 2290 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (highlights_label, gtk_widget_get_type (), GtkWidget), 0, 6, 1, 1);
 #line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp33_ = self->highlights_slider;
+	_tmp32_ = self->highlights_slider;
 #line 2291 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
+	gtk_grid_attach (slider_organizer, G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_widget_get_type (), GtkWidget), 1, 6, 1, 1);
 #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp34_ = self->highlights_slider;
+	_tmp33_ = self->highlights_slider;
 #line 2292 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp34_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp33_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_ADJUST_TOOL_SLIDER_WIDTH, -1);
 #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp35_ = self->highlights_slider;
+	_tmp34_ = self->highlights_slider;
 #line 2293 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_scale_set_value_pos (_tmp35_, GTK_POS_RIGHT);
+	gtk_scale_set_value_pos (_tmp34_, GTK_POS_RIGHT);
 #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp36_ = self->highlights_slider;
+	_tmp35_ = self->highlights_slider;
 #line 2294 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp36_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp35_, gtk_widget_get_type (), GtkWidget), 0);
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp37_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
+	_tmp36_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp37_);
+	g_object_ref_sink (_tmp36_);
 #line 2296 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	button_layouter = _tmp37_;
+	button_layouter = _tmp36_;
 #line 2297 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_box_set_homogeneous (button_layouter, TRUE);
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp38_ = self->cancel_button;
+	_tmp37_ = self->cancel_button;
 #line 2298 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp37_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp39_ = self->reset_button;
+	_tmp38_ = self->reset_button;
 #line 2299 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp38_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp40_ = self->ok_button;
+	_tmp39_ = self->ok_button;
 #line 2300 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
+	gtk_box_pack_start (button_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 1);
 #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp41_ = self->histogram_manipulator;
+	_tmp40_ = self->histogram_manipulator;
 #line 2302 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp40_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp42_ = self->histogram_manipulator;
+	_tmp41_ = self->histogram_manipulator;
 #line 2303 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp43_ = self->histogram_manipulator;
+	_tmp42_ = self->histogram_manipulator;
 #line 2304 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 12);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp42_, gtk_widget_get_type (), GtkWidget), 12);
 #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp44_ = self->histogram_manipulator;
+	_tmp43_ = self->histogram_manipulator;
 #line 2305 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp44_, gtk_widget_get_type (), GtkWidget), 8);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp43_, gtk_widget_get_type (), GtkWidget), 8);
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp45_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
+	_tmp44_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_object_ref_sink (_tmp45_);
+	g_object_ref_sink (_tmp44_);
 #line 2307 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pane_layouter = _tmp45_;
+	pane_layouter = _tmp44_;
 #line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp46_ = self->histogram_manipulator;
+	_tmp45_ = self->histogram_manipulator;
 #line 2308 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget));
+	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (_tmp45_, gtk_widget_get_type (), GtkWidget));
 #line 2309 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (slider_organizer, gtk_widget_get_type (), GtkWidget));
 #line 2310 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (button_layouter, gtk_widget_get_type (), GtkWidget));
 #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp47_ = self->histogram_manipulator;
+	_tmp46_ = self->histogram_manipulator;
 #line 2311 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp47_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 0, GTK_PACK_START);
+	gtk_box_set_child_packing (pane_layouter, G_TYPE_CHECK_INSTANCE_CAST (_tmp46_, gtk_widget_get_type (), GtkWidget), FALSE, TRUE, (guint) 0, GTK_PACK_START);
 #line 2313 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (pane_layouter, gtk_widget_get_type (), GtkWidget));
 #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -17995,27 +18312,33 @@ static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_
 	_g_object_unref0 (slider_organizer);
 #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 17999 "EditingTools.c"
+#line 18316 "EditingTools.c"
 }
 
 
-static EditingToolsAdjustToolAdjustToolWindow* editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container) {
+static EditingToolsAdjustToolAdjustToolWindow*
+editing_tools_adjust_tool_adjust_tool_window_new (GtkWindow* container)
+{
 #line 2220 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_tool_window_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, container);
-#line 18006 "EditingTools.c"
+#line 18325 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass) {
+static void
+editing_tools_adjust_tool_adjust_tool_window_class_init (EditingToolsAdjustToolAdjustToolWindowClass * klass)
+{
 #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_window_finalize;
-#line 18015 "EditingTools.c"
+#line 18336 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self) {
+static void
+editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingToolsAdjustToolAdjustToolWindow * self)
+{
 	GtkScale* _tmp0_;
 	GtkScale* _tmp1_;
 	GtkScale* _tmp2_;
@@ -18093,11 +18416,13 @@ static void editing_tools_adjust_tool_adjust_tool_window_instance_init (EditingT
 	g_object_ref_sink (_tmp10_);
 #line 2218 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->histogram_manipulator = _tmp10_;
-#line 18097 "EditingTools.c"
+#line 18420 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj) {
+static void
+editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj)
+{
 	EditingToolsAdjustToolAdjustToolWindow * self;
 #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_WINDOW, EditingToolsAdjustToolAdjustToolWindow);
@@ -18125,11 +18450,13 @@ static void editing_tools_adjust_tool_adjust_tool_window_finalize (GObject * obj
 	_g_object_unref0 (self->histogram_manipulator);
 #line 2191 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_window_parent_class)->finalize (obj);
-#line 18129 "EditingTools.c"
+#line 18454 "EditingTools.c"
 }
 
 
-static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
+static GType
+editing_tools_adjust_tool_adjust_tool_window_get_type (void)
+{
 	static volatile gsize editing_tools_adjust_tool_adjust_tool_window_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_adjust_tool_adjust_tool_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustToolWindow), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_tool_window_instance_init, NULL };
@@ -18141,19 +18468,23 @@ static GType editing_tools_adjust_tool_adjust_tool_window_get_type (void) {
 }
 
 
-static void _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender, gpointer self) {
+static void
+_editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated (EditingToolsEditingTool* _sender,
+                                                                                                            gpointer self)
+{
 #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated ((EditingToolsAdjustToolAdjustToolCommand*) self);
-#line 18148 "EditingTools.c"
+#line 18478 "EditingTools.c"
 }
 
 
-static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type, EditingToolsAdjustTool* owner, const gchar* name, const gchar* explanation) {
+static EditingToolsAdjustToolAdjustToolCommand*
+editing_tools_adjust_tool_adjust_tool_command_construct (GType object_type,
+                                                         EditingToolsAdjustTool* owner,
+                                                         const gchar* name,
+                                                         const gchar* explanation)
+{
 	EditingToolsAdjustToolAdjustToolCommand * self = NULL;
-	const gchar* _tmp0_;
-	const gchar* _tmp1_;
-	EditingToolsAdjustTool* _tmp2_;
-	EditingToolsAdjustTool* _tmp3_;
 #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18161,26 +18492,20 @@ static EditingToolsAdjustToolAdjustToolCommand* editing_tools_adjust_tool_adjust
 #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (explanation != NULL, NULL);
 #line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = name;
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = explanation;
-#line 2321 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, _tmp0_, _tmp1_);
+	self = (EditingToolsAdjustToolAdjustToolCommand*) command_construct (object_type, name, explanation);
 #line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = owner;
-#line 2323 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->owner = _tmp2_;
-#line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = owner;
+	self->owner = owner;
 #line 2324 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
+	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (owner, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "deactivated", (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self, 0);
 #line 2320 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18180 "EditingTools.c"
+#line 18503 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self) {
+static void
+editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (EditingToolsAdjustToolAdjustToolCommand* self)
+{
 	CommandManager* _tmp0_;
 	CommandManager* _tmp1_;
 #line 2332 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18193,24 +18518,30 @@ static void editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated (
 	command_manager_reset (_tmp1_);
 #line 2335 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_command_manager_unref0 (_tmp1_);
-#line 18197 "EditingTools.c"
+#line 18522 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass) {
+static void
+editing_tools_adjust_tool_adjust_tool_command_class_init (EditingToolsAdjustToolAdjustToolCommandClass * klass)
+{
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_tool_command_parent_class = g_type_class_peek_parent (klass);
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_tool_command_finalize;
-#line 18206 "EditingTools.c"
+#line 18533 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_command_instance_init (EditingToolsAdjustToolAdjustToolCommand * self) {
+static void
+editing_tools_adjust_tool_adjust_tool_command_instance_init (EditingToolsAdjustToolAdjustToolCommand * self)
+{
 }
 
 
-static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj) {
+static void
+editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * obj)
+{
 	EditingToolsAdjustToolAdjustToolCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18219,7 +18550,7 @@ static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * ob
 	_tmp0_ = self->owner;
 #line 2328 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ != NULL) {
-#line 18223 "EditingTools.c"
+#line 18554 "EditingTools.c"
 		EditingToolsAdjustTool* _tmp1_;
 		guint _tmp2_;
 #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18228,15 +18559,17 @@ static void editing_tools_adjust_tool_adjust_tool_command_finalize (GObject * ob
 		g_signal_parse_name ("deactivated", EDITING_TOOLS_TYPE_EDITING_TOOL, &_tmp2_, NULL, FALSE);
 #line 2329 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp2_, 0, NULL, (GCallback) _editing_tools_adjust_tool_adjust_tool_command_on_owner_deactivated_editing_tools_editing_tool_deactivated, self);
-#line 18232 "EditingTools.c"
+#line 18563 "EditingTools.c"
 	}
 #line 2317 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_tool_command_parent_class)->finalize (obj);
-#line 18236 "EditingTools.c"
+#line 18567 "EditingTools.c"
 }
 
 
-static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) {
+static GType
+editing_tools_adjust_tool_adjust_tool_command_get_type (void)
+{
 	static volatile gsize editing_tools_adjust_tool_adjust_tool_command_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_adjust_tool_adjust_tool_command_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustToolCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_tool_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustToolCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_tool_command_instance_init, NULL };
@@ -18248,53 +18581,56 @@ static GType editing_tools_adjust_tool_adjust_tool_command_get_type (void) {
 }
 
 
-static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
+static EditingToolsAdjustToolAdjustResetCommand*
+editing_tools_adjust_tool_adjust_reset_command_construct (GType object_type,
+                                                          EditingToolsAdjustTool* owner,
+                                                          PixelTransformationBundle* current)
+{
 	EditingToolsAdjustToolAdjustResetCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_;
+	PixelTransformationBundle* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
 	PixelTransformationBundle* _tmp2_;
-	PixelTransformationBundle* _tmp3_;
-	PixelTransformationBundle* _tmp4_;
 #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PIXEL_TRANSFORMATION_BUNDLE (current), NULL);
 #line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = owner;
-#line 2344 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _ ("Reset Colors"), _ ("Reset all color adjustments to original"));
+	self = (EditingToolsAdjustToolAdjustResetCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, owner, _ ("Reset Colors"), _ ("Reset all color adjustments to original"));
 #line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = current;
-#line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = pixel_transformation_bundle_copy (_tmp1_);
+	_tmp0_ = pixel_transformation_bundle_copy (current);
 #line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
 #line 2346 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->original = _tmp2_;
+	self->priv->original = _tmp0_;
 #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = pixel_transformation_bundle_new ();
+	_tmp1_ = pixel_transformation_bundle_new ();
 #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
 #line 2347 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->reset = _tmp3_;
+	self->priv->reset = _tmp1_;
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = self->priv->reset;
+	_tmp2_ = self->priv->reset;
 #line 2348 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	pixel_transformation_bundle_set_to_identity (_tmp4_);
+	pixel_transformation_bundle_set_to_identity (_tmp2_);
 #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18287 "EditingTools.c"
+#line 18618 "EditingTools.c"
 }
 
 
-static EditingToolsAdjustToolAdjustResetCommand* editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner, PixelTransformationBundle* current) {
+static EditingToolsAdjustToolAdjustResetCommand*
+editing_tools_adjust_tool_adjust_reset_command_new (EditingToolsAdjustTool* owner,
+                                                    PixelTransformationBundle* current)
+{
 #line 2343 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_reset_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, owner, current);
-#line 18294 "EditingTools.c"
+#line 18628 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base) {
+static void
+editing_tools_adjust_tool_adjust_reset_command_real_execute (Command* base)
+{
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
@@ -18306,11 +18642,13 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_execute (Command
 	_tmp1_ = self->priv->reset;
 #line 2352 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18310 "EditingTools.c"
+#line 18646 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base) {
+static void
+editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* base)
+{
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
@@ -18322,57 +18660,57 @@ static void editing_tools_adjust_tool_adjust_reset_command_real_undo (Command* b
 	_tmp1_ = self->priv->original;
 #line 2356 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18326 "EditingTools.c"
+#line 18664 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base, Command* command) {
+static gboolean
+editing_tools_adjust_tool_adjust_reset_command_real_compress (Command* base,
+                                                              Command* command)
+{
 	EditingToolsAdjustToolAdjustResetCommand * self;
 	gboolean result = FALSE;
 	EditingToolsAdjustToolAdjustResetCommand* reset_command = NULL;
-	Command* _tmp0_;
+	EditingToolsAdjustToolAdjustResetCommand* _tmp0_;
 	EditingToolsAdjustToolAdjustResetCommand* _tmp1_;
 	EditingToolsAdjustToolAdjustResetCommand* _tmp2_;
-	EditingToolsAdjustToolAdjustResetCommand* _tmp3_;
+	EditingToolsAdjustTool* _tmp3_;
 	EditingToolsAdjustTool* _tmp4_;
-	EditingToolsAdjustTool* _tmp5_;
 #line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
 #line 2359 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
 #line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = command;
-#line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) _tmp0_) : NULL);
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND) ? ((EditingToolsAdjustToolAdjustResetCommand*) command) : NULL);
 #line 2360 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	reset_command = _tmp1_;
+	reset_command = _tmp0_;
 #line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = reset_command;
+	_tmp1_ = reset_command;
 #line 2361 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
 #line 2362 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18360 "EditingTools.c"
+#line 18698 "EditingTools.c"
 	}
 #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = reset_command;
+	_tmp2_ = reset_command;
 #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
 #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
 #line 2364 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp4_ != _tmp5_) {
+	if (_tmp3_ != _tmp4_) {
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (reset_command);
 #line 2365 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18376 "EditingTools.c"
+#line 18714 "EditingTools.c"
 	}
 #line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
@@ -18380,11 +18718,13 @@ static gboolean editing_tools_adjust_tool_adjust_reset_command_real_compress (Co
 	_g_object_unref0 (reset_command);
 #line 2368 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18384 "EditingTools.c"
+#line 18722 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass) {
+static void
+editing_tools_adjust_tool_adjust_reset_command_class_init (EditingToolsAdjustToolAdjustResetCommandClass * klass)
+{
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_reset_command_parent_class = g_type_class_peek_parent (klass);
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18397,18 +18737,22 @@ static void editing_tools_adjust_tool_adjust_reset_command_class_init (EditingTo
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_reset_command_real_compress;
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_reset_command_finalize;
-#line 18401 "EditingTools.c"
+#line 18741 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self) {
+static void
+editing_tools_adjust_tool_adjust_reset_command_instance_init (EditingToolsAdjustToolAdjustResetCommand * self)
+{
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_RESET_COMMAND_GET_PRIVATE (self);
-#line 18408 "EditingTools.c"
+#line 18750 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj) {
+static void
+editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * obj)
+{
 	EditingToolsAdjustToolAdjustResetCommand * self;
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_RESET_COMMAND, EditingToolsAdjustToolAdjustResetCommand);
@@ -18418,11 +18762,13 @@ static void editing_tools_adjust_tool_adjust_reset_command_finalize (GObject * o
 	_pixel_transformation_bundle_unref0 (self->priv->reset);
 #line 2339 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_reset_command_parent_class)->finalize (obj);
-#line 18422 "EditingTools.c"
+#line 18766 "EditingTools.c"
 }
 
 
-static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) {
+static GType
+editing_tools_adjust_tool_adjust_reset_command_get_type (void)
+{
 	static volatile gsize editing_tools_adjust_tool_adjust_reset_command_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_adjust_tool_adjust_reset_command_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustResetCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_reset_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustResetCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_reset_command_instance_init, NULL };
@@ -18434,20 +18780,17 @@ static GType editing_tools_adjust_tool_adjust_reset_command_get_type (void) {
 }
 
 
-static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type, EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
+static EditingToolsAdjustToolSliderAdjustmentCommand*
+editing_tools_adjust_tool_slider_adjustment_command_construct (GType object_type,
+                                                               EditingToolsAdjustTool* owner,
+                                                               PixelTransformation* old_transformation,
+                                                               PixelTransformation* new_transformation,
+                                                               const gchar* name)
+{
 	EditingToolsAdjustToolSliderAdjustmentCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_;
-	const gchar* _tmp1_;
-	const gchar* _tmp2_;
-	PixelTransformation* _tmp3_;
-	PixelTransformation* _tmp4_;
-	PixelTransformation* _tmp5_;
-	PixelTransformation* _tmp6_;
-	PixelTransformation* _tmp7_;
-	PixelTransformationType _tmp8_;
-	PixelTransformation* _tmp9_;
-	PixelTransformationType _tmp10_;
-	PixelTransformationType _tmp11_;
+	PixelTransformation* _tmp0_;
+	PixelTransformation* _tmp1_;
+	PixelTransformationType _tmp2_;
 #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18457,57 +18800,46 @@ static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_
 #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (name != NULL, NULL);
 #line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = owner;
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = name;
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = name;
-#line 2379 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, _tmp1_, _tmp2_);
-#line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = old_transformation;
+	self = (EditingToolsAdjustToolSliderAdjustmentCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, owner, name, name);
 #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = _pixel_transformation_ref0 (_tmp3_);
+	_tmp0_ = _pixel_transformation_ref0 (old_transformation);
 #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->old_transformation);
 #line 2381 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->old_transformation = _tmp4_;
-#line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = new_transformation;
+	self->priv->old_transformation = _tmp0_;
 #line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = _pixel_transformation_ref0 (_tmp5_);
+	_tmp1_ = _pixel_transformation_ref0 (new_transformation);
 #line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
 #line 2382 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->new_transformation = _tmp6_;
+	self->priv->new_transformation = _tmp1_;
 #line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = old_transformation;
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = pixel_transformation_get_transformation_type (_tmp7_);
-#line 2383 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->transformation_type = _tmp8_;
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = new_transformation;
+	self->priv->transformation_type = pixel_transformation_get_transformation_type (old_transformation);
 #line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = pixel_transformation_get_transformation_type (_tmp9_);
+	_tmp2_ = self->priv->transformation_type;
 #line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = self->priv->transformation_type;
-#line 2384 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_vala_assert (_tmp10_ == _tmp11_, "new_transformation.get_transformation_type() == transformation_type");
+	_vala_assert (pixel_transformation_get_transformation_type (new_transformation) == _tmp2_, "new_transformation.get_transformation_type() == transformation_type");
 #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18500 "EditingTools.c"
+#line 18825 "EditingTools.c"
 }
 
 
-static EditingToolsAdjustToolSliderAdjustmentCommand* editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner, PixelTransformation* old_transformation, PixelTransformation* new_transformation, const gchar* name) {
+static EditingToolsAdjustToolSliderAdjustmentCommand*
+editing_tools_adjust_tool_slider_adjustment_command_new (EditingToolsAdjustTool* owner,
+                                                         PixelTransformation* old_transformation,
+                                                         PixelTransformation* new_transformation,
+                                                         const gchar* name)
+{
 #line 2377 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_slider_adjustment_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, owner, old_transformation, new_transformation, name);
-#line 18507 "EditingTools.c"
+#line 18837 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base) {
+static void
+editing_tools_adjust_tool_slider_adjustment_command_real_execute (Command* base)
+{
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformation* _tmp1_;
@@ -18527,11 +18859,13 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_execute (Co
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2390 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp3_);
-#line 18531 "EditingTools.c"
+#line 18863 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base) {
+static void
+editing_tools_adjust_tool_slider_adjustment_command_real_undo (Command* base)
+{
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformation* _tmp1_;
@@ -18569,11 +18903,13 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_undo (Comma
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2400 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 18573 "EditingTools.c"
+#line 18907 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base) {
+static void
+editing_tools_adjust_tool_slider_adjustment_command_real_redo (Command* base)
+{
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformation* _tmp1_;
@@ -18611,106 +18947,108 @@ static void editing_tools_adjust_tool_slider_adjustment_command_real_redo (Comma
 	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2410 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_photo_canvas_repaint (_tmp7_);
-#line 18615 "EditingTools.c"
+#line 18951 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base, Command* command) {
+static gboolean
+editing_tools_adjust_tool_slider_adjustment_command_real_compress (Command* base,
+                                                                   Command* command)
+{
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 	gboolean result = FALSE;
 	EditingToolsAdjustToolSliderAdjustmentCommand* slider_adjustment = NULL;
-	Command* _tmp0_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp0_;
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp1_;
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp2_;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp3_;
+	EditingToolsAdjustTool* _tmp3_;
 	EditingToolsAdjustTool* _tmp4_;
-	EditingToolsAdjustTool* _tmp5_;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp6_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp5_;
+	PixelTransformationType _tmp6_;
 	PixelTransformationType _tmp7_;
-	PixelTransformationType _tmp8_;
+	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp8_;
 	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp9_;
-	EditingToolsAdjustToolSliderAdjustmentCommand* _tmp10_;
+	PixelTransformation* _tmp10_;
 	PixelTransformation* _tmp11_;
-	PixelTransformation* _tmp12_;
 #line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
 #line 2413 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
 #line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = command;
-#line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) _tmp0_) : NULL);
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND) ? ((EditingToolsAdjustToolSliderAdjustmentCommand*) command) : NULL);
 #line 2414 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	slider_adjustment = _tmp1_;
+	slider_adjustment = _tmp0_;
 #line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = slider_adjustment;
+	_tmp1_ = slider_adjustment;
 #line 2415 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp2_ == NULL) {
+	if (_tmp1_ == NULL) {
 #line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
 #line 2416 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18656 "EditingTools.c"
+#line 18992 "EditingTools.c"
 	}
 #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = slider_adjustment;
+	_tmp2_ = slider_adjustment;
 #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
+	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
 #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
 #line 2419 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp4_ != _tmp5_) {
+	if (_tmp3_ != _tmp4_) {
 #line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
 #line 2420 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18672 "EditingTools.c"
+#line 19008 "EditingTools.c"
 	}
 #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp6_ = slider_adjustment;
+	_tmp5_ = slider_adjustment;
 #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp7_ = _tmp6_->priv->transformation_type;
+	_tmp6_ = _tmp5_->priv->transformation_type;
 #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp8_ = self->priv->transformation_type;
+	_tmp7_ = self->priv->transformation_type;
 #line 2423 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp7_ != _tmp8_) {
+	if (_tmp6_ != _tmp7_) {
 #line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (slider_adjustment);
 #line 2424 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18688 "EditingTools.c"
+#line 19024 "EditingTools.c"
 	}
 #line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp9_ = slider_adjustment;
+	_tmp8_ = slider_adjustment;
 #line 2427 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_COMMAND, Command));
+	command_execute (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_COMMAND, Command));
 #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp10_ = slider_adjustment;
+	_tmp9_ = slider_adjustment;
 #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp11_ = _tmp10_->priv->new_transformation;
+	_tmp10_ = _tmp9_->priv->new_transformation;
 #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = _pixel_transformation_ref0 (_tmp11_);
+	_tmp11_ = _pixel_transformation_ref0 (_tmp10_);
 #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_unref0 (self->priv->new_transformation);
 #line 2430 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->new_transformation = _tmp12_;
+	self->priv->new_transformation = _tmp11_;
 #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
 #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (slider_adjustment);
 #line 2432 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18710 "EditingTools.c"
+#line 19046 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass) {
+static void
+editing_tools_adjust_tool_slider_adjustment_command_class_init (EditingToolsAdjustToolSliderAdjustmentCommandClass * klass)
+{
 #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_slider_adjustment_command_parent_class = g_type_class_peek_parent (klass);
 #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18725,18 +19063,22 @@ static void editing_tools_adjust_tool_slider_adjustment_command_class_init (Edit
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_slider_adjustment_command_real_compress;
 #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_slider_adjustment_command_finalize;
-#line 18729 "EditingTools.c"
+#line 19067 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self) {
+static void
+editing_tools_adjust_tool_slider_adjustment_command_instance_init (EditingToolsAdjustToolSliderAdjustmentCommand * self)
+{
 #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_SLIDER_ADJUSTMENT_COMMAND_GET_PRIVATE (self);
-#line 18736 "EditingTools.c"
+#line 19076 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj) {
+static void
+editing_tools_adjust_tool_slider_adjustment_command_finalize (GObject * obj)
+{
 	EditingToolsAdjustToolSliderAdjustmentCommand * self;
 #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_SLIDER_ADJUSTMENT_COMMAND, EditingToolsAdjustToolSliderAdjustmentCommand);
@@ -18746,11 +19088,13 @@ static void editing_tools_adjust_tool_slider_adjustment_command_finalize (GObjec
 	_pixel_transformation_unref0 (self->priv->old_transformation);
 #line 2372 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_slider_adjustment_command_parent_class)->finalize (obj);
-#line 18750 "EditingTools.c"
+#line 19092 "EditingTools.c"
 }
 
 
-static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void) {
+static GType
+editing_tools_adjust_tool_slider_adjustment_command_get_type (void)
+{
 	static volatile gsize editing_tools_adjust_tool_slider_adjustment_command_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_adjust_tool_slider_adjustment_command_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolSliderAdjustmentCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_slider_adjustment_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolSliderAdjustmentCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_slider_adjustment_command_instance_init, NULL };
@@ -18762,51 +19106,51 @@ static GType editing_tools_adjust_tool_slider_adjustment_command_get_type (void)
 }
 
 
-static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type, EditingToolsAdjustTool* owner, Photo* photo) {
+static EditingToolsAdjustToolAdjustEnhanceCommand*
+editing_tools_adjust_tool_adjust_enhance_command_construct (GType object_type,
+                                                            EditingToolsAdjustTool* owner,
+                                                            Photo* photo)
+{
 	EditingToolsAdjustToolAdjustEnhanceCommand * self = NULL;
-	EditingToolsAdjustTool* _tmp0_;
-	Photo* _tmp1_;
-	Photo* _tmp2_;
-	Photo* _tmp3_;
-	PixelTransformationBundle* _tmp4_;
+	Photo* _tmp0_;
+	PixelTransformationBundle* _tmp1_;
 #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (EDITING_TOOLS_IS_ADJUST_TOOL (owner), NULL);
 #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), NULL);
 #line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = owner;
-#line 2442 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, _tmp0_, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
+	self = (EditingToolsAdjustToolAdjustEnhanceCommand*) editing_tools_adjust_tool_adjust_tool_command_construct (object_type, owner, RESOURCES_ENHANCE_LABEL, RESOURCES_ENHANCE_TOOLTIP);
 #line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = photo;
-#line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = _g_object_ref0 (_tmp1_);
+	_tmp0_ = _g_object_ref0 (photo);
 #line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_g_object_unref0 (self->priv->photo);
 #line 2444 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->photo = _tmp2_;
+	self->priv->photo = _tmp0_;
 #line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp3_ = photo;
-#line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp4_ = photo_get_color_adjustments (_tmp3_);
+	_tmp1_ = photo_get_color_adjustments (photo);
 #line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_pixel_transformation_bundle_unref0 (self->priv->original);
 #line 2445 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	self->priv->original = _tmp4_;
+	self->priv->original = _tmp1_;
 #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return self;
-#line 18799 "EditingTools.c"
+#line 19138 "EditingTools.c"
 }
 
 
-static EditingToolsAdjustToolAdjustEnhanceCommand* editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner, Photo* photo) {
+static EditingToolsAdjustToolAdjustEnhanceCommand*
+editing_tools_adjust_tool_adjust_enhance_command_new (EditingToolsAdjustTool* owner,
+                                                      Photo* photo)
+{
 #line 2441 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return editing_tools_adjust_tool_adjust_enhance_command_construct (EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, owner, photo);
-#line 18806 "EditingTools.c"
+#line 19148 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base) {
+static void
+editing_tools_adjust_tool_adjust_enhance_command_real_execute (Command* base)
+{
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	PixelTransformationBundle* _tmp0_;
 	EditingToolsAdjustTool* _tmp3_;
@@ -18817,7 +19161,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	_tmp0_ = self->priv->enhanced;
 #line 2449 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	if (_tmp0_ == NULL) {
-#line 18821 "EditingTools.c"
+#line 19165 "EditingTools.c"
 		Photo* _tmp1_;
 		PixelTransformationBundle* _tmp2_;
 #line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18828,7 +19172,7 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 		_pixel_transformation_bundle_unref0 (self->priv->enhanced);
 #line 2450 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		self->priv->enhanced = _tmp2_;
-#line 18832 "EditingTools.c"
+#line 19176 "EditingTools.c"
 	}
 #line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
@@ -18836,11 +19180,13 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_execute (Comma
 	_tmp4_ = self->priv->enhanced;
 #line 2452 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp3_, _tmp4_);
-#line 18840 "EditingTools.c"
+#line 19184 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base) {
+static void
+editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command* base)
+{
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	EditingToolsAdjustTool* _tmp0_;
 	PixelTransformationBundle* _tmp1_;
@@ -18852,91 +19198,85 @@ static void editing_tools_adjust_tool_adjust_enhance_command_real_undo (Command*
 	_tmp1_ = self->priv->original;
 #line 2456 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_set_adjustments (_tmp0_, _tmp1_);
-#line 18856 "EditingTools.c"
+#line 19202 "EditingTools.c"
 }
 
 
-static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base, Command* command) {
+static gboolean
+editing_tools_adjust_tool_adjust_enhance_command_real_compress (Command* base,
+                                                                Command* command)
+{
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 	gboolean result = FALSE;
 	EnhanceSingleCommand* enhance_single = NULL;
-	Command* _tmp0_;
+	EnhanceSingleCommand* _tmp0_;
 	EnhanceSingleCommand* _tmp1_;
-	EnhanceSingleCommand* _tmp2_;
 	EditingToolsAdjustToolAdjustEnhanceCommand* enhance_command = NULL;
-	Command* _tmp12_;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp13_;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp14_;
-	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp15_;
-	EditingToolsAdjustTool* _tmp16_;
-	EditingToolsAdjustTool* _tmp17_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp10_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp11_;
+	EditingToolsAdjustToolAdjustEnhanceCommand* _tmp12_;
+	EditingToolsAdjustTool* _tmp13_;
+	EditingToolsAdjustTool* _tmp14_;
 #line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
 #line 2459 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	g_return_val_if_fail (IS_COMMAND (command), FALSE);
 #line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp0_ = command;
-#line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp1_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp0_, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) _tmp0_) : NULL);
+	_tmp0_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, TYPE_ENHANCE_SINGLE_COMMAND) ? ((EnhanceSingleCommand*) command) : NULL);
 #line 2461 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	enhance_single = _tmp1_;
+	enhance_single = _tmp0_;
 #line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp2_ = enhance_single;
+	_tmp1_ = enhance_single;
 #line 2462 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp2_ != NULL) {
-#line 18888 "EditingTools.c"
+	if (_tmp1_ != NULL) {
+#line 19233 "EditingTools.c"
 		Photo* photo = NULL;
-		EnhanceSingleCommand* _tmp3_;
-		DataSource* _tmp4_;
-		Photo* _tmp5_;
-		EditingToolsAdjustTool* _tmp6_;
-		EditingToolsPhotoCanvas* _tmp7_;
+		EnhanceSingleCommand* _tmp2_;
+		DataSource* _tmp3_;
+		Photo* _tmp4_;
+		EditingToolsAdjustTool* _tmp5_;
+		EditingToolsPhotoCanvas* _tmp6_;
+		Photo* _tmp7_;
 		Photo* _tmp8_;
-		Photo* _tmp9_;
-		gboolean _tmp10_;
-		gboolean _tmp11_;
+		gboolean _tmp9_;
 #line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp3_ = enhance_single;
+		_tmp2_ = enhance_single;
 #line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp4_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand));
+		_tmp3_ = single_data_source_command_get_source (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, TYPE_SINGLE_DATA_SOURCE_COMMAND, SingleDataSourceCommand));
 #line 2463 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_PHOTO, Photo);
-#line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp5_ = photo;
+		photo = G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_PHOTO, Photo);
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
+		_tmp4_ = photo;
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp8_ = editing_tools_photo_canvas_get_photo (_tmp7_);
+		_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp9_ = _tmp8_;
+		_tmp7_ = editing_tools_photo_canvas_get_photo (_tmp6_);
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp10_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, TYPE_DATA_SOURCE, DataSource));
+		_tmp8_ = _tmp7_;
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_tmp11_ = _tmp10_;
+		_tmp9_ = data_source_equals (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, TYPE_DATA_SOURCE, DataSource), G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, TYPE_DATA_SOURCE, DataSource));
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		_g_object_unref0 (_tmp9_);
+		_g_object_unref0 (_tmp8_);
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-		result = _tmp11_;
+		result = _tmp9_;
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (photo);
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		_g_object_unref0 (enhance_single);
 #line 2467 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18929 "EditingTools.c"
+#line 19271 "EditingTools.c"
 	}
 #line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp12_ = command;
-#line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp13_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) _tmp12_) : NULL);
+	_tmp10_ = _g_object_ref0 (G_TYPE_CHECK_INSTANCE_TYPE (command, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND) ? ((EditingToolsAdjustToolAdjustEnhanceCommand*) command) : NULL);
 #line 2470 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	enhance_command = _tmp13_;
+	enhance_command = _tmp10_;
 #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp14_ = enhance_command;
+	_tmp11_ = enhance_command;
 #line 2471 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp14_ == NULL) {
+	if (_tmp11_ == NULL) {
 #line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18945,16 +19285,16 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2472 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18949 "EditingTools.c"
+#line 19289 "EditingTools.c"
 	}
 #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp15_ = enhance_command;
+	_tmp12_ = enhance_command;
 #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
+	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
 #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
+	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_TOOL_COMMAND, EditingToolsAdjustToolAdjustToolCommand)->owner;
 #line 2474 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
-	if (_tmp16_ != _tmp17_) {
+	if (_tmp13_ != _tmp14_) {
 #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		result = FALSE;
 #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18963,7 +19303,7 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 		_g_object_unref0 (enhance_single);
 #line 2475 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 		return result;
-#line 18967 "EditingTools.c"
+#line 19307 "EditingTools.c"
 	}
 #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	result = TRUE;
@@ -18973,11 +19313,13 @@ static gboolean editing_tools_adjust_tool_adjust_enhance_command_real_compress (
 	_g_object_unref0 (enhance_single);
 #line 2478 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	return result;
-#line 18977 "EditingTools.c"
+#line 19317 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass) {
+static void
+editing_tools_adjust_tool_adjust_enhance_command_class_init (EditingToolsAdjustToolAdjustEnhanceCommandClass * klass)
+{
 #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_adjust_enhance_command_parent_class = g_type_class_peek_parent (klass);
 #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -18990,20 +19332,24 @@ static void editing_tools_adjust_tool_adjust_enhance_command_class_init (Editing
 	((CommandClass *) klass)->compress = (gboolean (*) (Command *, Command*)) editing_tools_adjust_tool_adjust_enhance_command_real_compress;
 #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_adjust_tool_adjust_enhance_command_finalize;
-#line 18994 "EditingTools.c"
+#line 19336 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self) {
+static void
+editing_tools_adjust_tool_adjust_enhance_command_instance_init (EditingToolsAdjustToolAdjustEnhanceCommand * self)
+{
 #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_ADJUST_ENHANCE_COMMAND_GET_PRIVATE (self);
 #line 2439 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->enhanced = NULL;
-#line 19003 "EditingTools.c"
+#line 19347 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj) {
+static void
+editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject * obj)
+{
 	EditingToolsAdjustToolAdjustEnhanceCommand * self;
 #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_ADJUST_TOOL_TYPE_ADJUST_ENHANCE_COMMAND, EditingToolsAdjustToolAdjustEnhanceCommand);
@@ -19015,11 +19361,13 @@ static void editing_tools_adjust_tool_adjust_enhance_command_finalize (GObject *
 	_pixel_transformation_bundle_unref0 (self->priv->enhanced);
 #line 2436 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	G_OBJECT_CLASS (editing_tools_adjust_tool_adjust_enhance_command_parent_class)->finalize (obj);
-#line 19019 "EditingTools.c"
+#line 19365 "EditingTools.c"
 }
 
 
-static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) {
+static GType
+editing_tools_adjust_tool_adjust_enhance_command_get_type (void)
+{
 	static volatile gsize editing_tools_adjust_tool_adjust_enhance_command_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_adjust_tool_adjust_enhance_command_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolAdjustEnhanceCommandClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_adjust_enhance_command_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustToolAdjustEnhanceCommand), 0, (GInstanceInitFunc) editing_tools_adjust_tool_adjust_enhance_command_instance_init, NULL };
@@ -19031,7 +19379,9 @@ static GType editing_tools_adjust_tool_adjust_enhance_command_get_type (void) {
 }
 
 
-static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass) {
+static void
+editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass * klass)
+{
 #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	editing_tools_adjust_tool_parent_class = g_type_class_peek_parent (klass);
 #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19050,11 +19400,13 @@ static void editing_tools_adjust_tool_class_init (EditingToolsAdjustToolClass *
 	((EditingToolsEditingToolClass *) klass)->get_display_pixbuf = (GdkPixbuf* (*) (EditingToolsEditingTool *, Scaling*, Photo*, Dimensions*, GError**)) editing_tools_adjust_tool_real_get_display_pixbuf;
 #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	((EditingToolsEditingToolClass *) klass)->on_keypress = (gboolean (*) (EditingToolsEditingTool *, GdkEventKey*)) editing_tools_adjust_tool_real_on_keypress;
-#line 19054 "EditingTools.c"
+#line 19404 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self) {
+static void
+editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * self)
+{
 #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv = EDITING_TOOLS_ADJUST_TOOL_GET_PRIVATE (self);
 #line 2482 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
@@ -19095,11 +19447,13 @@ static void editing_tools_adjust_tool_instance_init (EditingToolsAdjustTool * se
 	self->priv->shadows_scheduler = NULL;
 #line 2498 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self->priv->highlights_scheduler = NULL;
-#line 19099 "EditingTools.c"
+#line 19451 "EditingTools.c"
 }
 
 
-static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) {
+static void
+editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj)
+{
 	EditingToolsAdjustTool * self;
 #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_ADJUST_TOOL, EditingToolsAdjustTool);
@@ -19135,11 +19489,13 @@ static void editing_tools_adjust_tool_finalize (EditingToolsEditingTool * obj) {
 	_one_shot_scheduler_unref0 (self->priv->highlights_scheduler);
 #line 2187 "/home/jens/Source/shotwell/src/editing_tools/EditingTools.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_adjust_tool_parent_class)->finalize (obj);
-#line 19139 "EditingTools.c"
+#line 19493 "EditingTools.c"
 }
 
 
-GType editing_tools_adjust_tool_get_type (void) {
+GType
+editing_tools_adjust_tool_get_type (void)
+{
 	static volatile gsize editing_tools_adjust_tool_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_adjust_tool_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsAdjustToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_adjust_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsAdjustTool), 0, (GInstanceInitFunc) editing_tools_adjust_tool_instance_init, NULL };
@@ -19151,7 +19507,11 @@ GType editing_tools_adjust_tool_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) {
@@ -19163,7 +19523,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);
 }
diff --git a/src/editing_tools/RGBHistogramManipulator.c b/src/editing_tools/RGBHistogramManipulator.c
index ffbf0b8..bb9a9b0 100644
--- a/src/editing_tools/RGBHistogramManipulator.c
+++ b/src/editing_tools/RGBHistogramManipulator.c
@@ -1,4 +1,4 @@
-/* RGBHistogramManipulator.c generated by valac 0.36.6, the Vala compiler
+/* RGBHistogramManipulator.c generated by valac 0.40.4, the Vala compiler
  * generated from RGBHistogramManipulator.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 <gtk/gtk.h>
@@ -29,15 +30,20 @@
 typedef struct _RGBHistogramManipulator RGBHistogramManipulator;
 typedef struct _RGBHistogramManipulatorClass RGBHistogramManipulatorClass;
 typedef struct _RGBHistogramManipulatorPrivate RGBHistogramManipulatorPrivate;
+enum  {
+	RGB_HISTOGRAM_MANIPULATOR_0_PROPERTY,
+	RGB_HISTOGRAM_MANIPULATOR_NUM_PROPERTIES
+};
+static GParamSpec* rgb_histogram_manipulator_properties[RGB_HISTOGRAM_MANIPULATOR_NUM_PROPERTIES];
 
 #define RGB_HISTOGRAM_MANIPULATOR_TYPE_LOCATION_CODE (rgb_histogram_manipulator_location_code_get_type ())
 #define _rgb_histogram_unref0(var) ((var == NULL) ? NULL : (var = (rgb_histogram_unref (var), NULL)))
 #define _g_object_unref0(var) ((var == NULL) ? NULL : (var = (g_object_unref (var), NULL)))
 enum  {
 	RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL,
-	RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL
+	RGB_HISTOGRAM_MANIPULATOR_NUM_SIGNALS
 };
-static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_LAST_SIGNAL] = {0};
+static guint rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUM_SIGNALS] = {0};
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -84,9 +90,6 @@ static gboolean rgb_histogram_manipulator_paths_setup = FALSE;
 
 GType rgb_histogram_manipulator_get_type (void) G_GNUC_CONST;
 #define RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulatorPrivate))
-enum  {
-	RGB_HISTOGRAM_MANIPULATOR_DUMMY_PROPERTY
-};
 static GType rgb_histogram_manipulator_location_code_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE 13
 #define RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH (RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE / 2)
@@ -99,31 +102,58 @@ static GType rgb_histogram_manipulator_location_code_get_type (void) G_GNUC_CONS
 #define RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION (((((RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) - RGB_HISTOGRAM_MANIPULATOR_TROUGH_BOTTOM_OFFSET) - ((RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE - RGB_HISTOGRAM_MANIPULATOR_TROUGH_HEIGHT) / 2)) - RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) - 2)
 RGBHistogramManipulator* rgb_histogram_manipulator_new (void);
 RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type);
-static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record);
-static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record);
-static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self);
-static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record);
-static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self);
-static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region);
-static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self);
-static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y);
+static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self,
+                                                    GdkEventButton* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                                   GdkEventButton* event,
+                                                                                   gpointer self);
+static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self,
+                                                      GdkEventButton* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender,
+                                                                                       GdkEventButton* event,
+                                                                                       gpointer self);
+static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self,
+                                                     GdkEventMotion* event_record);
+static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender,
+                                                                                     GdkEventMotion* event,
+                                                                                     gpointer self);
+static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self,
+                                                 GtkAllocation* region);
+static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender,
+                                                                           GtkAllocation* allocation,
+                                                                           gpointer self);
+static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self,
+                                                                              gint x,
+                                                                              gint y);
 static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self);
 static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self);
-static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event);
-static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event);
-static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx);
-static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area);
-static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position);
-void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf);
+static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base,
+                                                         GdkEventFocus* event);
+static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base,
+                                                         GdkEventKey* event);
+static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base,
+                                              cairo_t* ctx);
+static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self,
+                                               cairo_t* ctx,
+                                               GdkRectangle* area);
+static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self,
+                                         cairo_t* ctx,
+                                         GdkRectangle* area,
+                                         gint position);
+void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self,
+                                                 GdkPixbuf* source_pixbuf);
 gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self);
 gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self);
-void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
-void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos);
+void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self,
+                                                      gint user_nub_pos);
+void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self,
+                                                       gint user_nub_pos);
 static void rgb_histogram_manipulator_finalize (GObject * obj);
 
 
-static GType rgb_histogram_manipulator_location_code_get_type (void) {
+static GType
+rgb_histogram_manipulator_location_code_get_type (void)
+{
 	static volatile gsize rgb_histogram_manipulator_location_code_type_id__volatile = 0;
 	if (g_once_init_enter (&rgb_histogram_manipulator_location_code_type_id__volatile)) {
 		static const GEnumValue values[] = {{RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB", "left-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB", "right-nub"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH", "left-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH", "right-trough"}, {RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA, "RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA", "insensitive-area"}, {0, NULL, NULL}};
@@ -135,41 +165,59 @@ static GType rgb_histogram_manipulator_location_code_get_type (void) {
 }
 
 
-static gboolean _rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_rgb_histogram_manipulator_on_button_press_gtk_widget_button_press_event (GtkWidget* _sender,
+                                                                          GdkEventButton* event,
+                                                                          gpointer self)
+{
 	gboolean result;
 	result = rgb_histogram_manipulator_on_button_press ((RGBHistogramManipulator*) self, event);
 #line 57 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 144 "RGBHistogramManipulator.c"
+#line 178 "RGBHistogramManipulator.c"
 }
 
 
-static gboolean _rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender, GdkEventButton* event, gpointer self) {
+static gboolean
+_rgb_histogram_manipulator_on_button_release_gtk_widget_button_release_event (GtkWidget* _sender,
+                                                                              GdkEventButton* event,
+                                                                              gpointer self)
+{
 	gboolean result;
 	result = rgb_histogram_manipulator_on_button_release ((RGBHistogramManipulator*) self, event);
 #line 58 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 153 "RGBHistogramManipulator.c"
+#line 191 "RGBHistogramManipulator.c"
 }
 
 
-static gboolean _rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender, GdkEventMotion* event, gpointer self) {
+static gboolean
+_rgb_histogram_manipulator_on_button_motion_gtk_widget_motion_notify_event (GtkWidget* _sender,
+                                                                            GdkEventMotion* event,
+                                                                            gpointer self)
+{
 	gboolean result;
 	result = rgb_histogram_manipulator_on_button_motion ((RGBHistogramManipulator*) self, event);
 #line 59 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 162 "RGBHistogramManipulator.c"
+#line 204 "RGBHistogramManipulator.c"
 }
 
 
-static void _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender, GtkAllocation* allocation, gpointer self) {
+static void
+_rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate (GtkWidget* _sender,
+                                                                      GtkAllocation* allocation,
+                                                                      gpointer self)
+{
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	rgb_histogram_manipulator_on_size_allocate ((RGBHistogramManipulator*) self, allocation);
-#line 169 "RGBHistogramManipulator.c"
+#line 215 "RGBHistogramManipulator.c"
 }
 
 
-RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type) {
+RGBHistogramManipulator*
+rgb_histogram_manipulator_construct (GType object_type)
+{
 	RGBHistogramManipulator * self = NULL;
 	gboolean _tmp0_;
 #line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -177,12 +225,12 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 #line 37 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), RGB_HISTOGRAM_MANIPULATOR_CONTROL_WIDTH, RGB_HISTOGRAM_MANIPULATOR_CONTROL_HEIGHT);
 #line 38 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	g_object_set (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "can-focus", TRUE, NULL);
+	gtk_widget_set_can_focus (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), TRUE);
 #line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	_tmp0_ = rgb_histogram_manipulator_paths_setup;
 #line 40 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	if (!_tmp0_) {
-#line 186 "RGBHistogramManipulator.c"
+#line 234 "RGBHistogramManipulator.c"
 		GtkWidgetPath* _tmp1_;
 		GtkWidgetPath* _tmp2_;
 		GtkWidgetPath* _tmp3_;
@@ -210,7 +258,7 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 		gtk_widget_path_iter_add_class (_tmp5_, 0, "default");
 #line 48 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		rgb_histogram_manipulator_paths_setup = TRUE;
-#line 214 "RGBHistogramManipulator.c"
+#line 262 "RGBHistogramManipulator.c"
 	}
 #line 51 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	gtk_widget_add_events (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), (gint) GDK_BUTTON_PRESS_MASK);
@@ -232,18 +280,23 @@ RGBHistogramManipulator* rgb_histogram_manipulator_construct (GType object_type)
 	g_signal_connect_object (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget), "size-allocate", (GCallback) _rgb_histogram_manipulator_on_size_allocate_gtk_widget_size_allocate, self, 0);
 #line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return self;
-#line 236 "RGBHistogramManipulator.c"
+#line 284 "RGBHistogramManipulator.c"
 }
 
 
-RGBHistogramManipulator* rgb_histogram_manipulator_new (void) {
+RGBHistogramManipulator*
+rgb_histogram_manipulator_new (void)
+{
 #line 36 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return rgb_histogram_manipulator_construct (TYPE_RGB_HISTOGRAM_MANIPULATOR);
-#line 243 "RGBHistogramManipulator.c"
+#line 293 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self, GtkAllocation* region) {
+static void
+rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator* self,
+                                            GtkAllocation* region)
+{
 	GtkAllocation _tmp0_;
 	gint _tmp1_;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -256,260 +309,208 @@ static void rgb_histogram_manipulator_on_size_allocate (RGBHistogramManipulator*
 	_tmp1_ = _tmp0_.width;
 #line 65 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self->priv->offset = ((_tmp1_ - RGB_HISTOGRAM_GRAPHIC_WIDTH) - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) / 2;
-#line 260 "RGBHistogramManipulator.c"
+#line 313 "RGBHistogramManipulator.c"
 }
 
 
-static RGBHistogramManipulatorLocationCode rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self, gint x, gint y) {
+static RGBHistogramManipulatorLocationCode
+rgb_histogram_manipulator_hit_test_point (RGBHistogramManipulator* self,
+                                          gint x,
+                                          gint y)
+{
 	RGBHistogramManipulatorLocationCode result = 0;
-	gint _tmp0_;
-	gboolean _tmp1_ = FALSE;
-	gint _tmp2_;
-	gint _tmp3_;
-	gboolean _tmp6_ = FALSE;
+	gboolean _tmp0_ = FALSE;
+	gint _tmp1_;
+	gboolean _tmp3_ = FALSE;
+	gint _tmp4_;
+	gint _tmp6_;
 	gint _tmp7_;
 	gint _tmp8_;
-	gint _tmp11_;
-	gint _tmp12_;
-	gint _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	gint _tmp16_;
-	gint _tmp17_;
-	gint _tmp18_;
-	gint _tmp19_;
+	gint _tmp9_;
 #line 68 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), 0);
 #line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp0_ = y;
-#line 69 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp0_ < RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) {
+	if (y < RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) {
 #line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
 #line 70 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 292 "RGBHistogramManipulator.c"
+#line 339 "RGBHistogramManipulator.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp2_ = x;
-#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = self->priv->left_nub_position;
+	_tmp1_ = self->priv->left_nub_position;
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp2_ > _tmp3_) {
-#line 300 "RGBHistogramManipulator.c"
-		gint _tmp4_;
-		gint _tmp5_;
-#line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp4_ = x;
+	if (x > _tmp1_) {
+#line 345 "RGBHistogramManipulator.c"
+		gint _tmp2_;
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp5_ = self->priv->left_nub_position;
+		_tmp2_ = self->priv->left_nub_position;
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp1_ = _tmp4_ < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
-#line 309 "RGBHistogramManipulator.c"
+		_tmp0_ = x < (_tmp2_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
+#line 351 "RGBHistogramManipulator.c"
 	} else {
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp1_ = FALSE;
-#line 313 "RGBHistogramManipulator.c"
+		_tmp0_ = FALSE;
+#line 355 "RGBHistogramManipulator.c"
 	}
 #line 72 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp1_) {
+	if (_tmp0_) {
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB;
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 321 "RGBHistogramManipulator.c"
+#line 363 "RGBHistogramManipulator.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp7_ = x;
+	_tmp4_ = self->priv->right_nub_position;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp8_ = self->priv->right_nub_position;
-#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp7_ > _tmp8_) {
-#line 329 "RGBHistogramManipulator.c"
-		gint _tmp9_;
-		gint _tmp10_;
-#line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp9_ = x;
+	if (x > _tmp4_) {
+#line 369 "RGBHistogramManipulator.c"
+		gint _tmp5_;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp10_ = self->priv->right_nub_position;
+		_tmp5_ = self->priv->right_nub_position;
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp6_ = _tmp9_ < (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
-#line 338 "RGBHistogramManipulator.c"
+		_tmp3_ = x < (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE);
+#line 375 "RGBHistogramManipulator.c"
 	} else {
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp6_ = FALSE;
-#line 342 "RGBHistogramManipulator.c"
+		_tmp3_ = FALSE;
+#line 379 "RGBHistogramManipulator.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp6_) {
+	if (_tmp3_) {
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 350 "RGBHistogramManipulator.c"
+#line 387 "RGBHistogramManipulator.c"
 	}
 #line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp11_ = y;
-#line 78 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp11_ < ((RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION + RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) + 1)) {
+	if (y < ((RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION + RGB_HISTOGRAM_MANIPULATOR_NUB_V_NUDGE) + 1)) {
 #line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_INSENSITIVE_AREA;
 #line 79 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 360 "RGBHistogramManipulator.c"
+#line 395 "RGBHistogramManipulator.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp12_ = x;
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp13_ = self->priv->left_nub_position;
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp14_ = x;
+	_tmp6_ = self->priv->left_nub_position;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp15_ = self->priv->left_nub_position;
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp16_ = x;
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp17_ = self->priv->right_nub_position;
+	_tmp7_ = self->priv->left_nub_position;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp18_ = x;
+	_tmp8_ = self->priv->right_nub_position;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp19_ = self->priv->right_nub_position;
+	_tmp9_ = self->priv->right_nub_position;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (((_tmp12_ - _tmp13_) * (_tmp14_ - _tmp15_)) < ((_tmp16_ - _tmp17_) * (_tmp18_ - _tmp19_))) {
+	if (((x - _tmp6_) * (x - _tmp7_)) < ((x - _tmp8_) * (x - _tmp9_))) {
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH;
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 384 "RGBHistogramManipulator.c"
+#line 411 "RGBHistogramManipulator.c"
 	} else {
 #line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH;
 #line 85 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 390 "RGBHistogramManipulator.c"
+#line 417 "RGBHistogramManipulator.c"
 	}
 }
 
 
-static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self, GdkEventButton* event_record) {
+static gboolean
+rgb_histogram_manipulator_on_button_press (RGBHistogramManipulator* self,
+                                           GdkEventButton* event_record)
+{
 	gboolean result = FALSE;
-	GdkEventButton* _tmp0_;
-	GdkEventButton* _tmp1_;
-	gdouble _tmp2_;
-	gint _tmp3_;
+	gdouble _tmp0_;
+	gint _tmp1_;
 	RGBHistogramManipulatorLocationCode loc = 0;
-	GdkEventButton* _tmp4_;
-	gdouble _tmp5_;
-	GdkEventButton* _tmp6_;
-	gdouble _tmp7_;
-	RGBHistogramManipulatorLocationCode _tmp8_;
+	gdouble _tmp2_;
+	gdouble _tmp3_;
 	gboolean retval = FALSE;
-	RGBHistogramManipulatorLocationCode _tmp9_;
-	GdkEventButton* _tmp26_;
-	GdkEventButton* _tmp27_;
-	gdouble _tmp28_;
-	gint _tmp29_;
+	RGBHistogramManipulatorLocationCode _tmp4_;
+	gdouble _tmp15_;
+	gint _tmp16_;
 #line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
 #line 88 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_val_if_fail (event_record != NULL, FALSE);
 #line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp0_ = event_record;
+	_tmp0_ = event_record->x;
 #line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_ = event_record;
+	_tmp1_ = self->priv->offset;
 #line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp2_ = _tmp1_->x;
-#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = self->priv->offset;
-#line 91 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_->x = _tmp2_ - _tmp3_;
-#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_ = event_record;
+	event_record->x = _tmp0_ - _tmp1_;
 #line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp5_ = _tmp4_->x;
+	_tmp2_ = event_record->x;
 #line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp6_ = event_record;
+	_tmp3_ = event_record->y;
 #line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp7_ = _tmp6_->y;
-#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp8_ = rgb_histogram_manipulator_hit_test_point (self, (gint) _tmp5_, (gint) _tmp7_);
-#line 92 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	loc = _tmp8_;
+	loc = rgb_histogram_manipulator_hit_test_point (self, (gint) _tmp2_, (gint) _tmp3_);
 #line 93 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	retval = TRUE;
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp9_ = loc;
+	_tmp4_ = loc;
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	switch (_tmp9_) {
+	switch (_tmp4_) {
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_NUB:
-#line 447 "RGBHistogramManipulator.c"
+#line 460 "RGBHistogramManipulator.c"
 		{
-			GdkEventButton* _tmp10_;
-			gdouble _tmp11_;
-			gint _tmp12_;
-#line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp10_ = event_record;
+			gdouble _tmp5_;
+			gint _tmp6_;
 #line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp11_ = _tmp10_->x;
+			_tmp5_ = event_record->x;
 #line 97 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->track_start_x = (gint) _tmp11_;
+			self->priv->track_start_x = (gint) _tmp5_;
 #line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp12_ = self->priv->left_nub_position;
+			_tmp6_ = self->priv->left_nub_position;
 #line 98 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->track_nub_start_position = _tmp12_;
+			self->priv->track_nub_start_position = _tmp6_;
 #line 99 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			self->priv->is_left_nub_tracking = TRUE;
 #line 100 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			break;
-#line 466 "RGBHistogramManipulator.c"
+#line 476 "RGBHistogramManipulator.c"
 		}
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_NUB:
-#line 470 "RGBHistogramManipulator.c"
+#line 480 "RGBHistogramManipulator.c"
 		{
-			GdkEventButton* _tmp13_;
-			gdouble _tmp14_;
-			gint _tmp15_;
+			gdouble _tmp7_;
+			gint _tmp8_;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp13_ = event_record;
+			_tmp7_ = event_record->x;
 #line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp14_ = _tmp13_->x;
-#line 103 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->track_start_x = (gint) _tmp14_;
+			self->priv->track_start_x = (gint) _tmp7_;
 #line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp15_ = self->priv->right_nub_position;
+			_tmp8_ = self->priv->right_nub_position;
 #line 104 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->track_nub_start_position = _tmp15_;
+			self->priv->track_nub_start_position = _tmp8_;
 #line 105 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			self->priv->is_right_nub_tracking = TRUE;
 #line 106 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			break;
-#line 489 "RGBHistogramManipulator.c"
+#line 496 "RGBHistogramManipulator.c"
 		}
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_LEFT_TROUGH:
-#line 493 "RGBHistogramManipulator.c"
+#line 500 "RGBHistogramManipulator.c"
 		{
-			GdkEventButton* _tmp16_;
-			gdouble _tmp17_;
-			gint _tmp18_;
-			gint _tmp19_;
-			gint _tmp20_;
-#line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp16_ = event_record;
+			gdouble _tmp9_;
+			gint _tmp10_;
+			gint _tmp11_;
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp17_ = _tmp16_->x;
+			_tmp9_ = event_record->x;
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->left_nub_position = ((gint) _tmp17_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
+			self->priv->left_nub_position = ((gint) _tmp9_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp18_ = self->priv->left_nub_position;
+			_tmp10_ = self->priv->left_nub_position;
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp19_ = self->priv->left_nub_max;
+			_tmp11_ = self->priv->left_nub_max;
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp20_ = CLAMP (_tmp18_, 0, _tmp19_);
-#line 110 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->left_nub_position = _tmp20_;
+			self->priv->left_nub_position = CLAMP (_tmp10_, 0, _tmp11_);
 #line 111 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			rgb_histogram_manipulator_force_update (self);
 #line 112 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -518,31 +519,25 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 			rgb_histogram_manipulator_update_nub_extrema (self);
 #line 114 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			break;
-#line 522 "RGBHistogramManipulator.c"
+#line 523 "RGBHistogramManipulator.c"
 		}
 #line 95 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		case RGB_HISTOGRAM_MANIPULATOR_LOCATION_CODE_RIGHT_TROUGH:
-#line 526 "RGBHistogramManipulator.c"
+#line 527 "RGBHistogramManipulator.c"
 		{
-			GdkEventButton* _tmp21_;
-			gdouble _tmp22_;
-			gint _tmp23_;
-			gint _tmp24_;
-			gint _tmp25_;
-#line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp21_ = event_record;
+			gdouble _tmp12_;
+			gint _tmp13_;
+			gint _tmp14_;
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp22_ = _tmp21_->x;
+			_tmp12_ = event_record->x;
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->right_nub_position = ((gint) _tmp22_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
+			self->priv->right_nub_position = ((gint) _tmp12_) - RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH;
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp23_ = self->priv->right_nub_position;
+			_tmp13_ = self->priv->right_nub_position;
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp24_ = self->priv->right_nub_min;
+			_tmp14_ = self->priv->right_nub_min;
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			_tmp25_ = CLAMP (_tmp23_, _tmp24_, 255);
-#line 118 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-			self->priv->right_nub_position = _tmp25_;
+			self->priv->right_nub_position = CLAMP (_tmp13_, _tmp14_, 255);
 #line 119 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			rgb_histogram_manipulator_force_update (self);
 #line 120 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -551,7 +546,7 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 			rgb_histogram_manipulator_update_nub_extrema (self);
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			break;
-#line 555 "RGBHistogramManipulator.c"
+#line 550 "RGBHistogramManipulator.c"
 		}
 		default:
 		{
@@ -559,28 +554,27 @@ static gboolean rgb_histogram_manipulator_on_button_press (RGBHistogramManipulat
 			retval = FALSE;
 #line 126 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 			break;
-#line 563 "RGBHistogramManipulator.c"
+#line 558 "RGBHistogramManipulator.c"
 		}
 	}
 #line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp26_ = event_record;
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp27_ = event_record;
-#line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp28_ = _tmp27_->x;
+	_tmp15_ = event_record->x;
 #line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp29_ = self->priv->offset;
+	_tmp16_ = self->priv->offset;
 #line 130 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp27_->x = _tmp28_ + _tmp29_;
+	event_record->x = _tmp15_ + _tmp16_;
 #line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	result = retval;
 #line 132 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 580 "RGBHistogramManipulator.c"
+#line 571 "RGBHistogramManipulator.c"
 }
 
 
-static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self, GdkEventButton* event_record) {
+static gboolean
+rgb_histogram_manipulator_on_button_release (RGBHistogramManipulator* self,
+                                             GdkEventButton* event_record)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
@@ -594,14 +588,14 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul
 	if (_tmp1_) {
 #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp0_ = TRUE;
-#line 598 "RGBHistogramManipulator.c"
+#line 592 "RGBHistogramManipulator.c"
 	} else {
 		gboolean _tmp2_;
 #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp2_ = self->priv->is_right_nub_tracking;
 #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp0_ = _tmp2_;
-#line 605 "RGBHistogramManipulator.c"
+#line 599 "RGBHistogramManipulator.c"
 	}
 #line 136 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	if (_tmp0_) {
@@ -609,7 +603,7 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul
 		g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
 #line 138 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		rgb_histogram_manipulator_update_nub_extrema (self);
-#line 613 "RGBHistogramManipulator.c"
+#line 607 "RGBHistogramManipulator.c"
 	}
 #line 141 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self->priv->is_left_nub_tracking = FALSE;
@@ -619,23 +613,22 @@ static gboolean rgb_histogram_manipulator_on_button_release (RGBHistogramManipul
 	result = FALSE;
 #line 144 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 623 "RGBHistogramManipulator.c"
+#line 617 "RGBHistogramManipulator.c"
 }
 
 
-static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self, GdkEventMotion* event_record) {
+static gboolean
+rgb_histogram_manipulator_on_button_motion (RGBHistogramManipulator* self,
+                                            GdkEventMotion* event_record)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_;
-	GdkEventMotion* _tmp3_;
-	GdkEventMotion* _tmp4_;
-	gdouble _tmp5_;
-	gint _tmp6_;
-	gboolean _tmp7_;
-	GdkEventMotion* _tmp24_;
-	GdkEventMotion* _tmp25_;
-	gdouble _tmp26_;
-	gint _tmp27_;
+	gdouble _tmp3_;
+	gint _tmp4_;
+	gboolean _tmp5_;
+	gdouble _tmp18_;
+	gint _tmp19_;
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_val_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self), FALSE);
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -644,17 +637,17 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula
 	_tmp1_ = self->priv->is_left_nub_tracking;
 #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	if (!_tmp1_) {
-#line 648 "RGBHistogramManipulator.c"
+#line 641 "RGBHistogramManipulator.c"
 		gboolean _tmp2_;
 #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp2_ = self->priv->is_right_nub_tracking;
 #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp0_ = !_tmp2_;
-#line 654 "RGBHistogramManipulator.c"
+#line 647 "RGBHistogramManipulator.c"
 	} else {
 #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp0_ = FALSE;
-#line 658 "RGBHistogramManipulator.c"
+#line 651 "RGBHistogramManipulator.c"
 	}
 #line 148 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	if (_tmp0_) {
@@ -662,129 +655,106 @@ static gboolean rgb_histogram_manipulator_on_button_motion (RGBHistogramManipula
 		result = FALSE;
 #line 149 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 666 "RGBHistogramManipulator.c"
+#line 659 "RGBHistogramManipulator.c"
 	}
 #line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = event_record;
+	_tmp3_ = event_record->x;
 #line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_ = event_record;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp5_ = _tmp4_->x;
-#line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp6_ = self->priv->offset;
+	_tmp4_ = self->priv->offset;
 #line 151 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_->x = _tmp5_ - _tmp6_;
+	event_record->x = _tmp3_ - _tmp4_;
 #line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp7_ = self->priv->is_left_nub_tracking;
+	_tmp5_ = self->priv->is_left_nub_tracking;
 #line 152 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp7_) {
-#line 682 "RGBHistogramManipulator.c"
+	if (_tmp5_) {
+#line 671 "RGBHistogramManipulator.c"
 		gint track_x_delta = 0;
-		GdkEventMotion* _tmp8_;
-		gdouble _tmp9_;
+		gdouble _tmp6_;
+		gint _tmp7_;
+		gint _tmp8_;
+		gint _tmp9_;
 		gint _tmp10_;
 		gint _tmp11_;
-		gint _tmp12_;
-		gint _tmp13_;
-		gint _tmp14_;
-		gint _tmp15_;
-#line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp8_ = event_record;
 #line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp9_ = _tmp8_->x;
+		_tmp6_ = event_record->x;
 #line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp10_ = self->priv->track_start_x;
+		_tmp7_ = self->priv->track_start_x;
 #line 153 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		track_x_delta = ((gint) _tmp9_) - _tmp10_;
+		track_x_delta = ((gint) _tmp6_) - _tmp7_;
 #line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp11_ = self->priv->track_nub_start_position;
+		_tmp8_ = self->priv->track_nub_start_position;
 #line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp12_ = track_x_delta;
+		_tmp9_ = track_x_delta;
 #line 154 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->left_nub_position = _tmp11_ + _tmp12_;
+		self->priv->left_nub_position = _tmp8_ + _tmp9_;
 #line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp13_ = self->priv->left_nub_position;
+		_tmp10_ = self->priv->left_nub_position;
 #line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp14_ = self->priv->left_nub_max;
+		_tmp11_ = self->priv->left_nub_max;
 #line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp15_ = CLAMP (_tmp13_, 0, _tmp14_);
-#line 155 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->left_nub_position = _tmp15_;
-#line 714 "RGBHistogramManipulator.c"
+		self->priv->left_nub_position = CLAMP (_tmp10_, 0, _tmp11_);
+#line 697 "RGBHistogramManipulator.c"
 	} else {
 		gint track_x_delta = 0;
-		GdkEventMotion* _tmp16_;
-		gdouble _tmp17_;
-		gint _tmp18_;
-		gint _tmp19_;
-		gint _tmp20_;
-		gint _tmp21_;
-		gint _tmp22_;
-		gint _tmp23_;
-#line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp16_ = event_record;
+		gdouble _tmp12_;
+		gint _tmp13_;
+		gint _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
 #line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp17_ = _tmp16_->x;
+		_tmp12_ = event_record->x;
 #line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp18_ = self->priv->track_start_x;
+		_tmp13_ = self->priv->track_start_x;
 #line 157 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		track_x_delta = ((gint) _tmp17_) - _tmp18_;
+		track_x_delta = ((gint) _tmp12_) - _tmp13_;
 #line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp19_ = self->priv->track_nub_start_position;
+		_tmp14_ = self->priv->track_nub_start_position;
 #line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp20_ = track_x_delta;
+		_tmp15_ = track_x_delta;
 #line 158 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->right_nub_position = _tmp19_ + _tmp20_;
+		self->priv->right_nub_position = _tmp14_ + _tmp15_;
 #line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp21_ = self->priv->right_nub_position;
+		_tmp16_ = self->priv->right_nub_position;
 #line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp22_ = self->priv->right_nub_min;
+		_tmp17_ = self->priv->right_nub_min;
 #line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp23_ = CLAMP (_tmp21_, _tmp22_, 255);
-#line 159 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->right_nub_position = _tmp23_;
-#line 747 "RGBHistogramManipulator.c"
+		self->priv->right_nub_position = CLAMP (_tmp16_, _tmp17_, 255);
+#line 724 "RGBHistogramManipulator.c"
 	}
 #line 162 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	rgb_histogram_manipulator_force_update (self);
 #line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp24_ = event_record;
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp25_ = event_record;
-#line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp26_ = _tmp25_->x;
+	_tmp18_ = event_record->x;
 #line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp27_ = self->priv->offset;
+	_tmp19_ = self->priv->offset;
 #line 163 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp25_->x = _tmp26_ + _tmp27_;
+	event_record->x = _tmp18_ + _tmp19_;
 #line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	result = TRUE;
 #line 165 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 765 "RGBHistogramManipulator.c"
+#line 738 "RGBHistogramManipulator.c"
 }
 
 
-static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base, GdkEventFocus* event) {
+static gboolean
+rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base,
+                                                GdkEventFocus* event)
+{
 	RGBHistogramManipulator * self;
 	gboolean result = FALSE;
-	GdkEventFocus* _tmp0_;
-	gboolean _tmp1_;
 #line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
 #line 168 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp0_ = event;
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 169 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp1_) {
+	if (GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->focus_out_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), event)) {
 #line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = TRUE;
 #line 170 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 788 "RGBHistogramManipulator.c"
+#line 758 "RGBHistogramManipulator.c"
 	}
 #line 173 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	gtk_widget_queue_draw (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
@@ -792,169 +762,142 @@ static gboolean rgb_histogram_manipulator_real_focus_out_event (GtkWidget* base,
 	result = FALSE;
 #line 175 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 796 "RGBHistogramManipulator.c"
+#line 766 "RGBHistogramManipulator.c"
 }
 
 
-static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base, GdkEventKey* event) {
+static gboolean
+rgb_histogram_manipulator_real_key_press_event (GtkWidget* base,
+                                                GdkEventKey* event)
+{
 	RGBHistogramManipulator * self;
 	gboolean result = FALSE;
-	GdkEventKey* _tmp0_;
-	gboolean _tmp1_;
 	gint delta = 0;
-	gboolean _tmp2_ = FALSE;
-	GdkEventKey* _tmp3_;
+	gboolean _tmp0_ = FALSE;
+	guint _tmp1_;
+	gboolean _tmp3_ = FALSE;
 	guint _tmp4_;
-	gboolean _tmp7_ = FALSE;
-	GdkEventKey* _tmp8_;
-	guint _tmp9_;
-	GdkEventKey* _tmp12_;
-	GdkModifierType _tmp13_;
-	gint _tmp15_;
-	GdkEventKey* _tmp16_;
-	GdkModifierType _tmp17_;
+	GdkModifierType _tmp6_;
+	gint _tmp8_;
+	GdkModifierType _tmp9_;
 #line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
 #line 178 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp0_ = event;
-#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_ = GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), _tmp0_);
-#line 179 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp1_) {
+	if (GTK_WIDGET_CLASS (rgb_histogram_manipulator_parent_class)->key_press_event (G_TYPE_CHECK_INSTANCE_CAST (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_drawing_area_get_type (), GtkDrawingArea), gtk_widget_get_type (), GtkWidget), event)) {
 #line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = TRUE;
 #line 180 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 831 "RGBHistogramManipulator.c"
+#line 794 "RGBHistogramManipulator.c"
 	}
 #line 183 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	delta = 0;
 #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = event;
-#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_ = _tmp3_->keyval;
+	_tmp1_ = event->keyval;
 #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp4_ == ((guint) GDK_KEY_Left)) {
+	if (_tmp1_ == ((guint) GDK_KEY_Left)) {
 #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp2_ = TRUE;
-#line 843 "RGBHistogramManipulator.c"
+		_tmp0_ = TRUE;
+#line 804 "RGBHistogramManipulator.c"
 	} else {
-		GdkEventKey* _tmp5_;
-		guint _tmp6_;
+		guint _tmp2_;
 #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp5_ = event;
+		_tmp2_ = event->keyval;
 #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp6_ = _tmp5_->keyval;
-#line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp2_ = _tmp6_ == ((guint) GDK_KEY_Up);
-#line 853 "RGBHistogramManipulator.c"
+		_tmp0_ = _tmp2_ == ((guint) GDK_KEY_Up);
+#line 811 "RGBHistogramManipulator.c"
 	}
 #line 185 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp2_) {
+	if (_tmp0_) {
 #line 186 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		delta = -1;
-#line 859 "RGBHistogramManipulator.c"
+#line 817 "RGBHistogramManipulator.c"
 	}
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp8_ = event;
-#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp9_ = _tmp8_->keyval;
+	_tmp4_ = event->keyval;
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp9_ == ((guint) GDK_KEY_Right)) {
+	if (_tmp4_ == ((guint) GDK_KEY_Right)) {
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp7_ = TRUE;
-#line 869 "RGBHistogramManipulator.c"
+		_tmp3_ = TRUE;
+#line 825 "RGBHistogramManipulator.c"
 	} else {
-		GdkEventKey* _tmp10_;
-		guint _tmp11_;
+		guint _tmp5_;
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp10_ = event;
+		_tmp5_ = event->keyval;
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp11_ = _tmp10_->keyval;
-#line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp7_ = _tmp11_ == ((guint) GDK_KEY_Down);
-#line 879 "RGBHistogramManipulator.c"
+		_tmp3_ = _tmp5_ == ((guint) GDK_KEY_Down);
+#line 832 "RGBHistogramManipulator.c"
 	}
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp7_) {
+	if (_tmp3_) {
 #line 190 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		delta = 1;
-#line 885 "RGBHistogramManipulator.c"
+#line 838 "RGBHistogramManipulator.c"
 	}
 #line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp12_ = event;
-#line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp13_ = _tmp12_->state;
+	_tmp6_ = event->state;
 #line 193 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (!((_tmp13_ & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)) {
-#line 893 "RGBHistogramManipulator.c"
-		gint _tmp14_;
+	if (!((_tmp6_ & GDK_CONTROL_MASK) == GDK_CONTROL_MASK)) {
+#line 844 "RGBHistogramManipulator.c"
+		gint _tmp7_;
 #line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp14_ = delta;
+		_tmp7_ = delta;
 #line 194 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		delta = _tmp14_ * 5;
-#line 899 "RGBHistogramManipulator.c"
+		delta = _tmp7_ * 5;
+#line 850 "RGBHistogramManipulator.c"
 	}
 #line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp15_ = delta;
+	_tmp8_ = delta;
 #line 197 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp15_ == 0) {
+	if (_tmp8_ == 0) {
 #line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		result = FALSE;
 #line 198 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return result;
-#line 909 "RGBHistogramManipulator.c"
+#line 860 "RGBHistogramManipulator.c"
 	}
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp16_ = event;
+	_tmp9_ = event->state;
 #line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp17_ = _tmp16_->state;
-#line 201 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if ((_tmp17_ & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) {
-#line 917 "RGBHistogramManipulator.c"
-		gint _tmp18_;
-		gint _tmp19_;
-		gint _tmp20_;
-		gint _tmp21_;
-		gint _tmp22_;
+	if ((_tmp9_ & GDK_SHIFT_MASK) == GDK_SHIFT_MASK) {
+#line 866 "RGBHistogramManipulator.c"
+		gint _tmp10_;
+		gint _tmp11_;
+		gint _tmp12_;
+		gint _tmp13_;
 #line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp18_ = self->priv->right_nub_position;
+		_tmp10_ = self->priv->right_nub_position;
 #line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp19_ = delta;
+		_tmp11_ = delta;
 #line 202 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->right_nub_position = _tmp18_ + _tmp19_;
+		self->priv->right_nub_position = _tmp10_ + _tmp11_;
 #line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp20_ = self->priv->right_nub_position;
-#line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp21_ = self->priv->right_nub_min;
+		_tmp12_ = self->priv->right_nub_position;
 #line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp22_ = CLAMP (_tmp20_, _tmp21_, 255);
+		_tmp13_ = self->priv->right_nub_min;
 #line 203 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->right_nub_position = _tmp22_;
-#line 937 "RGBHistogramManipulator.c"
+		self->priv->right_nub_position = CLAMP (_tmp12_, _tmp13_, 255);
+#line 883 "RGBHistogramManipulator.c"
 	} else {
-		gint _tmp23_;
-		gint _tmp24_;
-		gint _tmp25_;
-		gint _tmp26_;
-		gint _tmp27_;
+		gint _tmp14_;
+		gint _tmp15_;
+		gint _tmp16_;
+		gint _tmp17_;
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp23_ = self->priv->left_nub_position;
+		_tmp14_ = self->priv->left_nub_position;
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp24_ = delta;
+		_tmp15_ = delta;
 #line 205 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->left_nub_position = _tmp23_ + _tmp24_;
-#line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp25_ = self->priv->left_nub_position;
+		self->priv->left_nub_position = _tmp14_ + _tmp15_;
 #line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp26_ = self->priv->left_nub_max;
+		_tmp16_ = self->priv->left_nub_position;
 #line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp27_ = CLAMP (_tmp25_, 0, _tmp26_);
+		_tmp17_ = self->priv->left_nub_max;
 #line 206 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		self->priv->left_nub_position = _tmp27_;
-#line 958 "RGBHistogramManipulator.c"
+		self->priv->left_nub_position = CLAMP (_tmp16_, 0, _tmp17_);
+#line 901 "RGBHistogramManipulator.c"
 	}
 #line 210 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_signal_emit (self, rgb_histogram_manipulator_signals[RGB_HISTOGRAM_MANIPULATOR_NUB_POSITION_CHANGED_SIGNAL], 0);
@@ -966,11 +909,14 @@ static gboolean rgb_histogram_manipulator_real_key_press_event (GtkWidget* base,
 	result = TRUE;
 #line 214 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 970 "RGBHistogramManipulator.c"
+#line 913 "RGBHistogramManipulator.c"
 }
 
 
-static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* ctx) {
+static gboolean
+rgb_histogram_manipulator_real_draw (GtkWidget* base,
+                                     cairo_t* ctx)
+{
 	RGBHistogramManipulator * self;
 	gboolean result = FALSE;
 	GtkBorder padding = {0};
@@ -988,14 +934,11 @@ static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* c
 	gint16 _tmp10_;
 	gboolean _tmp11_;
 	gboolean _tmp12_;
-	cairo_t* _tmp23_;
-	GdkRectangle _tmp24_;
-	cairo_t* _tmp25_;
-	GdkRectangle _tmp26_;
-	gint _tmp27_;
-	cairo_t* _tmp28_;
-	GdkRectangle _tmp29_;
-	gint _tmp30_;
+	GdkRectangle _tmp22_;
+	GdkRectangle _tmp23_;
+	gint _tmp24_;
+	GdkRectangle _tmp25_;
+	gint _tmp26_;
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
 #line 217 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1040,85 +983,78 @@ static gboolean rgb_histogram_manipulator_real_draw (GtkWidget* base, cairo_t* c
 	_tmp12_ = _tmp11_;
 #line 226 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	if (_tmp12_) {
-#line 1044 "RGBHistogramManipulator.c"
+#line 987 "RGBHistogramManipulator.c"
 		GtkStyleContext* _tmp13_;
-		cairo_t* _tmp14_;
-		GdkRectangle _tmp15_;
-		gint _tmp16_;
-		GdkRectangle _tmp17_;
-		gint _tmp18_;
-		GdkRectangle _tmp19_;
-		gint _tmp20_;
-		GdkRectangle _tmp21_;
-		gint _tmp22_;
+		GdkRectangle _tmp14_;
+		gint _tmp15_;
+		GdkRectangle _tmp16_;
+		gint _tmp17_;
+		GdkRectangle _tmp18_;
+		gint _tmp19_;
+		GdkRectangle _tmp20_;
+		gint _tmp21_;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp13_ = gtk_widget_get_style_context (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp14_ = ctx;
+		_tmp14_ = area;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp15_ = area;
+		_tmp15_ = _tmp14_.x;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp16_ = _tmp15_.x;
+		_tmp16_ = area;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp17_ = area;
+		_tmp17_ = _tmp16_.y;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp18_ = _tmp17_.y;
+		_tmp18_ = area;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp19_ = area;
+		_tmp19_ = _tmp18_.width;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp20_ = _tmp19_.width;
+		_tmp20_ = area;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp21_ = area;
+		_tmp21_ = _tmp20_.height;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp22_ = _tmp21_.height;
-#line 227 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		gtk_render_focus (_tmp13_, _tmp14_, (gdouble) _tmp16_, (gdouble) _tmp18_, (gdouble) (_tmp20_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp22_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH));
-#line 1077 "RGBHistogramManipulator.c"
+		gtk_render_focus (_tmp13_, ctx, (gdouble) _tmp15_, (gdouble) _tmp17_, (gdouble) (_tmp19_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp21_ + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH));
+#line 1017 "RGBHistogramManipulator.c"
 	}
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp23_ = ctx;
-#line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp24_ = area;
+	_tmp22_ = area;
 #line 232 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	rgb_histogram_manipulator_draw_histogram (self, _tmp23_, &_tmp24_);
+	rgb_histogram_manipulator_draw_histogram (self, ctx, &_tmp22_);
 #line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp25_ = ctx;
+	_tmp23_ = area;
 #line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp26_ = area;
+	_tmp24_ = self->priv->left_nub_position;
 #line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp27_ = self->priv->left_nub_position;
-#line 233 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	rgb_histogram_manipulator_draw_nub (self, _tmp25_, &_tmp26_, _tmp27_);
-#line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp28_ = ctx;
+	rgb_histogram_manipulator_draw_nub (self, ctx, &_tmp23_, _tmp24_);
 #line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp29_ = area;
+	_tmp25_ = area;
 #line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp30_ = self->priv->right_nub_position;
+	_tmp26_ = self->priv->right_nub_position;
 #line 234 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	rgb_histogram_manipulator_draw_nub (self, _tmp28_, &_tmp29_, _tmp30_);
+	rgb_histogram_manipulator_draw_nub (self, ctx, &_tmp25_, _tmp26_);
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	result = TRUE;
 #line 236 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 1105 "RGBHistogramManipulator.c"
+#line 1039 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area) {
+static void
+rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* self,
+                                          cairo_t* ctx,
+                                          GdkRectangle* area)
+{
 	RGBHistogram* _tmp0_;
 	GdkPixbuf* histogram_graphic = NULL;
 	RGBHistogram* _tmp1_;
 	GdkPixbuf* _tmp2_;
-	cairo_t* _tmp3_;
-	GdkPixbuf* _tmp4_;
-	GdkRectangle _tmp5_;
-	gint _tmp6_;
-	GdkRectangle _tmp7_;
+	GdkPixbuf* _tmp3_;
+	GdkRectangle _tmp4_;
+	gint _tmp5_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
 	gint _tmp8_;
-	cairo_t* _tmp9_;
-	gint _tmp10_;
-	gint _tmp22_;
+	gint _tmp17_;
 #line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1131,7 +1067,7 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 	if (_tmp0_ == NULL) {
 #line 241 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		return;
-#line 1135 "RGBHistogramManipulator.c"
+#line 1071 "RGBHistogramManipulator.c"
 	}
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	_tmp1_ = self->priv->histogram;
@@ -1140,155 +1076,129 @@ static void rgb_histogram_manipulator_draw_histogram (RGBHistogramManipulator* s
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	histogram_graphic = _tmp2_;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = ctx;
-#line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_ = histogram_graphic;
+	_tmp3_ = histogram_graphic;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp5_ = *area;
+	_tmp4_ = *area;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp6_ = _tmp5_.x;
+	_tmp5_ = _tmp4_.x;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp7_ = *area;
+	_tmp6_ = *area;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp8_ = _tmp7_.y;
+	_tmp7_ = _tmp6_.y;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	gdk_cairo_set_source_pixbuf (_tmp3_, _tmp4_, (gdouble) (_tmp6_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp8_ + 2));
+	gdk_cairo_set_source_pixbuf (ctx, _tmp3_, (gdouble) (_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp7_ + 2));
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp9_ = ctx;
-#line 246 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	cairo_paint (_tmp9_);
+	cairo_paint (ctx);
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp10_ = self->priv->left_nub_position;
+	_tmp8_ = self->priv->left_nub_position;
 #line 248 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp10_ > 0) {
-#line 1165 "RGBHistogramManipulator.c"
-		cairo_t* _tmp11_;
-		GdkRectangle _tmp12_;
+	if (_tmp8_ > 0) {
+#line 1097 "RGBHistogramManipulator.c"
+		GdkRectangle _tmp9_;
+		gint _tmp10_;
+		GdkRectangle _tmp11_;
+		gint _tmp12_;
 		gint _tmp13_;
-		GdkRectangle _tmp14_;
+		GdkPixbuf* _tmp14_;
 		gint _tmp15_;
 		gint _tmp16_;
-		GdkPixbuf* _tmp17_;
-		gint _tmp18_;
-		gint _tmp19_;
-		cairo_t* _tmp20_;
-		cairo_t* _tmp21_;
-#line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp11_ = ctx;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp12_ = *area;
+		_tmp9_ = *area;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp13_ = _tmp12_.x;
+		_tmp10_ = _tmp9_.x;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp14_ = *area;
+		_tmp11_ = *area;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp15_ = _tmp14_.y;
+		_tmp12_ = _tmp11_.y;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp16_ = self->priv->left_nub_position;
+		_tmp13_ = self->priv->left_nub_position;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp17_ = histogram_graphic;
+		_tmp14_ = histogram_graphic;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp18_ = gdk_pixbuf_get_height (_tmp17_);
+		_tmp15_ = gdk_pixbuf_get_height (_tmp14_);
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp19_ = _tmp18_;
+		_tmp16_ = _tmp15_;
 #line 249 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		cairo_rectangle (_tmp11_, (gdouble) (_tmp13_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp15_ + 2), (gdouble) _tmp16_, (gdouble) _tmp19_);
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp20_ = ctx;
+		cairo_rectangle (ctx, (gdouble) (_tmp10_ + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp12_ + 2), (gdouble) _tmp13_, (gdouble) _tmp16_);
 #line 252 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		cairo_set_source_rgba (_tmp20_, 0.0, 0.0, 0.0, 0.45);
+		cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, 0.45);
 #line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp21_ = ctx;
-#line 253 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		cairo_fill (_tmp21_);
-#line 1205 "RGBHistogramManipulator.c"
+		cairo_fill (ctx);
+#line 1128 "RGBHistogramManipulator.c"
 	}
 #line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp22_ = self->priv->right_nub_position;
+	_tmp17_ = self->priv->right_nub_position;
 #line 256 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp22_ < 255) {
-#line 1211 "RGBHistogramManipulator.c"
-		cairo_t* _tmp23_;
-		GdkRectangle _tmp24_;
+	if (_tmp17_ < 255) {
+#line 1134 "RGBHistogramManipulator.c"
+		GdkRectangle _tmp18_;
+		gint _tmp19_;
+		gint _tmp20_;
+		GdkRectangle _tmp21_;
+		gint _tmp22_;
+		GdkPixbuf* _tmp23_;
+		gint _tmp24_;
 		gint _tmp25_;
 		gint _tmp26_;
-		GdkRectangle _tmp27_;
+		GdkPixbuf* _tmp27_;
 		gint _tmp28_;
-		GdkPixbuf* _tmp29_;
-		gint _tmp30_;
-		gint _tmp31_;
-		gint _tmp32_;
-		GdkPixbuf* _tmp33_;
-		gint _tmp34_;
-		gint _tmp35_;
-		cairo_t* _tmp36_;
-		cairo_t* _tmp37_;
+		gint _tmp29_;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp23_ = ctx;
+		_tmp18_ = *area;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp24_ = *area;
+		_tmp19_ = _tmp18_.x;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp25_ = _tmp24_.x;
-#line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp26_ = self->priv->right_nub_position;
+		_tmp20_ = self->priv->right_nub_position;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp27_ = *area;
+		_tmp21_ = *area;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp28_ = _tmp27_.y;
+		_tmp22_ = _tmp21_.y;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp29_ = histogram_graphic;
+		_tmp23_ = histogram_graphic;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp30_ = gdk_pixbuf_get_width (_tmp29_);
+		_tmp24_ = gdk_pixbuf_get_width (_tmp23_);
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp31_ = _tmp30_;
+		_tmp25_ = _tmp24_;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp32_ = self->priv->right_nub_position;
+		_tmp26_ = self->priv->right_nub_position;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp33_ = histogram_graphic;
+		_tmp27_ = histogram_graphic;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp34_ = gdk_pixbuf_get_height (_tmp33_);
+		_tmp28_ = gdk_pixbuf_get_height (_tmp27_);
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp35_ = _tmp34_;
+		_tmp29_ = _tmp28_;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		cairo_rectangle (_tmp23_, (gdouble) ((_tmp25_ + _tmp26_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp28_ + 2), (gdouble) (_tmp31_ - _tmp32_), (gdouble) _tmp35_);
-#line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp36_ = ctx;
+		cairo_rectangle (ctx, (gdouble) ((_tmp19_ + _tmp20_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp22_ + 2), (gdouble) (_tmp25_ - _tmp26_), (gdouble) _tmp29_);
 #line 261 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		cairo_set_source_rgba (_tmp36_, 1.0, 1.0, 1.0, 0.45);
-#line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp37_ = ctx;
+		cairo_set_source_rgba (ctx, 1.0, 1.0, 1.0, 0.45);
 #line 262 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		cairo_fill (_tmp37_);
-#line 1263 "RGBHistogramManipulator.c"
+		cairo_fill (ctx);
+#line 1177 "RGBHistogramManipulator.c"
 	}
 #line 239 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	_g_object_unref0 (histogram_graphic);
-#line 1267 "RGBHistogramManipulator.c"
+#line 1181 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, cairo_t* ctx, GdkRectangle* area, gint position) {
-	cairo_t* _tmp0_;
-	GdkRectangle _tmp1_;
-	gint _tmp2_;
+static void
+rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self,
+                                    cairo_t* ctx,
+                                    GdkRectangle* area,
+                                    gint position)
+{
+	GdkRectangle _tmp0_;
+	gint _tmp1_;
+	GdkRectangle _tmp2_;
 	gint _tmp3_;
 	GdkRectangle _tmp4_;
 	gint _tmp5_;
-	cairo_t* _tmp6_;
-	GdkRectangle _tmp7_;
-	gint _tmp8_;
+	GdkRectangle _tmp6_;
+	gint _tmp7_;
+	GdkRectangle _tmp8_;
 	gint _tmp9_;
 	GdkRectangle _tmp10_;
 	gint _tmp11_;
-	cairo_t* _tmp12_;
-	GdkRectangle _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	GdkRectangle _tmp16_;
-	gint _tmp17_;
-	cairo_t* _tmp18_;
-	cairo_t* _tmp19_;
-	cairo_t* _tmp20_;
 #line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1296,64 +1206,48 @@ static void rgb_histogram_manipulator_draw_nub (RGBHistogramManipulator* self, c
 #line 266 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (area != NULL);
 #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp0_ = ctx;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_ = *area;
-#line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp2_ = _tmp1_.x;
+	_tmp0_ = *area;
 #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = position;
+	_tmp1_ = _tmp0_.x;
 #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_ = *area;
+	_tmp2_ = *area;
 #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp5_ = _tmp4_.y;
+	_tmp3_ = _tmp2_.y;
 #line 267 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	cairo_move_to (_tmp0_, (gdouble) (_tmp2_ + _tmp3_), (gdouble) ((_tmp5_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp6_ = ctx;
-#line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp7_ = *area;
+	cairo_move_to (ctx, (gdouble) (_tmp1_ + position), (gdouble) ((_tmp3_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp8_ = _tmp7_.x;
+	_tmp4_ = *area;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp9_ = position;
+	_tmp5_ = _tmp4_.x;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp10_ = *area;
+	_tmp6_ = *area;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp11_ = _tmp10_.y;
+	_tmp7_ = _tmp6_.y;
 #line 268 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	cairo_line_to (_tmp6_, (gdouble) ((_tmp8_ + _tmp9_) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp11_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION));
+	cairo_line_to (ctx, (gdouble) ((_tmp5_ + position) + RGB_HISTOGRAM_MANIPULATOR_NUB_HALF_WIDTH), (gdouble) (_tmp7_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION));
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp12_ = ctx;
+	_tmp8_ = *area;
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp13_ = *area;
+	_tmp9_ = _tmp8_.x;
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp14_ = _tmp13_.x;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp15_ = position;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp16_ = *area;
+	_tmp10_ = *area;
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp17_ = _tmp16_.y;
+	_tmp11_ = _tmp10_.y;
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	cairo_line_to (_tmp12_, (gdouble) ((_tmp14_ + _tmp15_) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp17_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
-#line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp18_ = ctx;
+	cairo_line_to (ctx, (gdouble) ((_tmp9_ + position) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE), (gdouble) ((_tmp11_ + RGB_HISTOGRAM_MANIPULATOR_NUB_V_POSITION) + RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE));
 #line 270 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	cairo_close_path (_tmp18_);
+	cairo_close_path (ctx);
 #line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp19_ = ctx;
-#line 271 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	cairo_set_source_rgb (_tmp19_, 0.333, 0.333, 0.333);
-#line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp20_ = ctx;
+	cairo_set_source_rgb (ctx, 0.333, 0.333, 0.333);
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	cairo_fill (_tmp20_);
-#line 1353 "RGBHistogramManipulator.c"
+	cairo_fill (ctx);
+#line 1245 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self) {
+static void
+rgb_histogram_manipulator_force_update (RGBHistogramManipulator* self)
+{
 	GdkWindow* _tmp0_;
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
@@ -1361,11 +1255,13 @@ static void rgb_histogram_manipulator_force_update (RGBHistogramManipulator* sel
 	_tmp0_ = gtk_widget_get_window (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_widget_get_type (), GtkWidget));
 #line 276 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	gdk_window_invalidate_rect (_tmp0_, NULL, TRUE);
-#line 1365 "RGBHistogramManipulator.c"
+#line 1259 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self) {
+static void
+rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulator* self)
+{
 	gint _tmp0_;
 	gint _tmp1_;
 #line 279 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1378,32 +1274,34 @@ static void rgb_histogram_manipulator_update_nub_extrema (RGBHistogramManipulato
 	_tmp1_ = self->priv->right_nub_position;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self->priv->left_nub_max = (_tmp1_ - RGB_HISTOGRAM_MANIPULATOR_NUB_SIZE) - 1;
-#line 1382 "RGBHistogramManipulator.c"
+#line 1278 "RGBHistogramManipulator.c"
 }
 
 
-void rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self, GdkPixbuf* source_pixbuf) {
-	GdkPixbuf* _tmp0_;
-	RGBHistogram* _tmp1_;
+void
+rgb_histogram_manipulator_update_histogram (RGBHistogramManipulator* self,
+                                            GdkPixbuf* source_pixbuf)
+{
+	RGBHistogram* _tmp0_;
 #line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 286 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (GDK_IS_PIXBUF (source_pixbuf));
 #line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp0_ = source_pixbuf;
-#line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_ = rgb_histogram_new (_tmp0_);
+	_tmp0_ = rgb_histogram_new (source_pixbuf);
 #line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	_rgb_histogram_unref0 (self->priv->histogram);
 #line 287 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	self->priv->histogram = _tmp1_;
+	self->priv->histogram = _tmp0_;
 #line 288 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	rgb_histogram_manipulator_force_update (self);
-#line 1403 "RGBHistogramManipulator.c"
+#line 1299 "RGBHistogramManipulator.c"
 }
 
 
-gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self) {
+gint
+rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* self)
+{
 	gint result = 0;
 	gint _tmp0_;
 #line 291 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1414,11 +1312,13 @@ gint rgb_histogram_manipulator_get_left_nub_position (RGBHistogramManipulator* s
 	result = _tmp0_;
 #line 292 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 1418 "RGBHistogramManipulator.c"
+#line 1316 "RGBHistogramManipulator.c"
 }
 
 
-gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self) {
+gint
+rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator* self)
+{
 	gint result = 0;
 	gint _tmp0_;
 #line 295 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1429,91 +1329,73 @@ gint rgb_histogram_manipulator_get_right_nub_position (RGBHistogramManipulator*
 	result = _tmp0_;
 #line 296 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	return result;
-#line 1433 "RGBHistogramManipulator.c"
+#line 1333 "RGBHistogramManipulator.c"
 }
 
 
-void rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
+void
+rgb_histogram_manipulator_set_left_nub_position (RGBHistogramManipulator* self,
+                                                 gint user_nub_pos)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
-	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
 #line 299 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_ = user_nub_pos;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp1_ >= 0) {
-#line 1449 "RGBHistogramManipulator.c"
-		gint _tmp2_;
+	if (user_nub_pos >= 0) {
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp2_ = user_nub_pos;
-#line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp0_ = _tmp2_ <= 255;
-#line 1455 "RGBHistogramManipulator.c"
+		_tmp0_ = user_nub_pos <= 255;
+#line 1349 "RGBHistogramManipulator.c"
 	} else {
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp0_ = FALSE;
-#line 1459 "RGBHistogramManipulator.c"
+#line 1353 "RGBHistogramManipulator.c"
 	}
 #line 300 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = user_nub_pos;
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_ = self->priv->left_nub_max;
+	_tmp1_ = self->priv->left_nub_max;
 #line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp5_ = CLAMP (_tmp3_, 0, _tmp4_);
-#line 301 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	self->priv->left_nub_position = _tmp5_;
+	self->priv->left_nub_position = CLAMP (user_nub_pos, 0, _tmp1_);
 #line 302 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	rgb_histogram_manipulator_update_nub_extrema (self);
-#line 1473 "RGBHistogramManipulator.c"
+#line 1363 "RGBHistogramManipulator.c"
 }
 
 
-void rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self, gint user_nub_pos) {
+void
+rgb_histogram_manipulator_set_right_nub_position (RGBHistogramManipulator* self,
+                                                  gint user_nub_pos)
+{
 	gboolean _tmp0_ = FALSE;
 	gint _tmp1_;
-	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_;
 #line 305 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	g_return_if_fail (IS_RGB_HISTOGRAM_MANIPULATOR (self));
 #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp1_ = user_nub_pos;
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	if (_tmp1_ >= 0) {
-#line 1489 "RGBHistogramManipulator.c"
-		gint _tmp2_;
-#line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp2_ = user_nub_pos;
+	if (user_nub_pos >= 0) {
 #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-		_tmp0_ = _tmp2_ <= 255;
-#line 1495 "RGBHistogramManipulator.c"
+		_tmp0_ = user_nub_pos <= 255;
+#line 1379 "RGBHistogramManipulator.c"
 	} else {
 #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 		_tmp0_ = FALSE;
-#line 1499 "RGBHistogramManipulator.c"
+#line 1383 "RGBHistogramManipulator.c"
 	}
 #line 306 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	_vala_assert (_tmp0_, "(user_nub_pos >= 0) && (user_nub_pos <= 255)");
 #line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp3_ = user_nub_pos;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp4_ = self->priv->right_nub_min;
-#line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	_tmp5_ = CLAMP (_tmp3_, _tmp4_, 255);
+	_tmp1_ = self->priv->right_nub_min;
 #line 307 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
-	self->priv->right_nub_position = _tmp5_;
+	self->priv->right_nub_position = CLAMP (user_nub_pos, _tmp1_, 255);
 #line 308 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	rgb_histogram_manipulator_update_nub_extrema (self);
-#line 1513 "RGBHistogramManipulator.c"
+#line 1393 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass) {
+static void
+rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass * klass)
+{
 	GtkWidgetPath* _tmp0_;
 	GtkWidgetPath* _tmp1_;
 #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1538,11 +1420,13 @@ static void rgb_histogram_manipulator_class_init (RGBHistogramManipulatorClass *
 	_tmp1_ = gtk_widget_path_new ();
 #line 24 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	rgb_histogram_manipulator_frame_draw_path = _tmp1_;
-#line 1542 "RGBHistogramManipulator.c"
+#line 1424 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self) {
+static void
+rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * self)
+{
 #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self->priv = RGB_HISTOGRAM_MANIPULATOR_GET_PRIVATE (self);
 #line 20 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
@@ -1565,11 +1449,13 @@ static void rgb_histogram_manipulator_instance_init (RGBHistogramManipulator * s
 	self->priv->track_nub_start_position = 0;
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self->priv->offset = 0;
-#line 1569 "RGBHistogramManipulator.c"
+#line 1453 "RGBHistogramManipulator.c"
 }
 
 
-static void rgb_histogram_manipulator_finalize (GObject * obj) {
+static void
+rgb_histogram_manipulator_finalize (GObject * obj)
+{
 	RGBHistogramManipulator * self;
 #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, TYPE_RGB_HISTOGRAM_MANIPULATOR, RGBHistogramManipulator);
@@ -1577,11 +1463,13 @@ static void rgb_histogram_manipulator_finalize (GObject * obj) {
 	_rgb_histogram_unref0 (self->priv->histogram);
 #line 7 "/home/jens/Source/shotwell/src/editing_tools/RGBHistogramManipulator.vala"
 	G_OBJECT_CLASS (rgb_histogram_manipulator_parent_class)->finalize (obj);
-#line 1581 "RGBHistogramManipulator.c"
+#line 1467 "RGBHistogramManipulator.c"
 }
 
 
-GType rgb_histogram_manipulator_get_type (void) {
+GType
+rgb_histogram_manipulator_get_type (void)
+{
 	static volatile gsize rgb_histogram_manipulator_type_id__volatile = 0;
 	if (g_once_init_enter (&rgb_histogram_manipulator_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (RGBHistogramManipulatorClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) rgb_histogram_manipulator_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (RGBHistogramManipulator), 0, (GInstanceInitFunc) rgb_histogram_manipulator_instance_init, NULL };
diff --git a/src/editing_tools/StraightenTool.c b/src/editing_tools/StraightenTool.c
index 11bf36a..9d00c58 100644
--- a/src/editing_tools/StraightenTool.c
+++ b/src/editing_tools/StraightenTool.c
@@ -1,4 +1,4 @@
-/* StraightenTool.c generated by valac 0.36.6, the Vala compiler
+/* StraightenTool.c generated by valac 0.40.4, the Vala compiler
  * generated from StraightenTool.vala, do not modify */
 
 /* Copyright 2016 Software Freedom Conservancy Inc.
@@ -7,6 +7,7 @@
  * (version 2.1 or later).  See the COPYING file in this distribution.
  */
 
+
 #include <glib.h>
 #include <glib-object.h>
 #include <gtk/gtk.h>
@@ -229,6 +230,11 @@ typedef struct _Box Box;
 #define _editing_tools_photo_canvas_unref0(var) ((var == NULL) ? NULL : (var = (editing_tools_photo_canvas_unref (var), NULL)))
 typedef struct _EditingToolsStraightenToolStraightenGuidePrivate EditingToolsStraightenToolStraightenGuidePrivate;
 typedef struct _EditingToolsStraightenToolParamSpecStraightenGuide EditingToolsStraightenToolParamSpecStraightenGuide;
+enum  {
+	EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_0_PROPERTY,
+	EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_NUM_PROPERTIES
+};
+static GParamSpec* editing_tools_straighten_tool_straighten_tool_window_properties[EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_NUM_PROPERTIES];
 #define _vala_assert(expr, msg) if G_LIKELY (expr) ; else g_assertion_message_expr (G_LOG_DOMAIN, __FILE__, __LINE__, G_STRFUNC, msg);
 #define _vala_return_if_fail(expr, msg) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return; }
 #define _vala_return_val_if_fail(expr, msg, val) if G_LIKELY (expr) ; else { g_return_if_fail_warning (G_LOG_DOMAIN, G_STRFUNC, msg); return val; }
@@ -386,16 +392,28 @@ static gpointer editing_tools_straighten_tool_straighten_tool_window_parent_clas
 
 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;
 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;
 GType editing_tools_editing_tool_window_get_type (void) G_GNUC_CONST;
@@ -416,22 +434,31 @@ GType editing_tools_straighten_tool_get_type (void) G_GNUC_CONST;
 static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 gpointer one_shot_scheduler_ref (gpointer instance);
 void one_shot_scheduler_unref (gpointer instance);
-GParamSpec* param_spec_one_shot_scheduler (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags);
-void value_set_one_shot_scheduler (GValue* value, gpointer v_object);
-void value_take_one_shot_scheduler (GValue* value, gpointer v_object);
+GParamSpec* param_spec_one_shot_scheduler (const gchar* name,
+                                           const gchar* nick,
+                                           const gchar* blurb,
+                                           GType object_type,
+                                           GParamFlags flags);
+void value_set_one_shot_scheduler (GValue* value,
+                                   gpointer v_object);
+void value_take_one_shot_scheduler (GValue* value,
+                                    gpointer v_object);
 gpointer value_get_one_shot_scheduler (const GValue* value);
 GType one_shot_scheduler_get_type (void) G_GNUC_CONST;
 static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance);
 static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance);
-static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) G_GNUC_UNUSED;
-static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) G_GNUC_UNUSED;
-static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) G_GNUC_UNUSED;
+static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name,
+                                                                       const gchar* nick,
+                                                                       const gchar* blurb,
+                                                                       GType object_type,
+                                                                       GParamFlags flags) G_GNUC_UNUSED;
+static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value,
+                                                               gpointer v_object) G_GNUC_UNUSED;
+static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value,
+                                                                gpointer v_object) G_GNUC_UNUSED;
 static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) G_GNUC_UNUSED;
 static GType editing_tools_straighten_tool_straighten_guide_get_type (void) G_GNUC_CONST G_GNUC_UNUSED;
 #define EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenToolPrivate))
-enum  {
-	EDITING_TOOLS_STRAIGHTEN_TOOL_DUMMY_PROPERTY
-};
 static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void);
 static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_construct (GType object_type);
 #define EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE (-15.0)
@@ -444,12 +471,19 @@ static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_
 #define EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC 100
 static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void);
 static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type);
-EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type, const gchar* name);
+EditingToolsEditingTool* editing_tools_editing_tool_construct (GType object_type,
+                                                               const gchar* name);
 EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void);
-gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling);
+gboolean editing_tools_straighten_tool_is_available (Photo* photo,
+                                                     Scaling* scaling);
 static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self);
 Photo* editing_tools_photo_canvas_get_photo (EditingToolsPhotoCanvas* self);
-void rotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, gboolean invert, GdkPoint* result);
+void rotate_point_arb (GdkPoint* source_point,
+                       gint img_w,
+                       gint img_h,
+                       gdouble angle,
+                       gboolean invert,
+                       GdkPoint* result);
 GType command_get_type (void) G_GNUC_CONST;
 GType page_command_get_type (void) G_GNUC_CONST;
 GType single_data_source_command_get_type (void) G_GNUC_CONST;
@@ -458,113 +492,213 @@ GType straighten_command_get_type (void) G_GNUC_CONST;
 GType box_get_type (void) G_GNUC_CONST;
 Box* box_dup (const Box* self);
 void box_free (Box* self);
-void box_from_center (GdkPoint* center, gint width, gint height, Box* result);
+void box_from_center (GdkPoint* center,
+                      gint width,
+                      gint height,
+                      Box* result);
 #define RESOURCES_STRAIGHTEN_LABEL _ ("Straighten")
 #define RESOURCES_STRAIGHTEN_TOOLTIP _ ("Straighten the photo")
-StraightenCommand* straighten_command_new (Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation);
-StraightenCommand* straighten_command_construct (GType object_type, Photo* photo, gdouble theta, Box* crop, const gchar* name, const gchar* explanation);
+StraightenCommand* straighten_command_new (Photo* photo,
+                                           gdouble theta,
+                                           Box* crop,
+                                           const gchar* name,
+                                           const gchar* explanation);
+StraightenCommand* straighten_command_construct (GType object_type,
+                                                 Photo* photo,
+                                                 gdouble theta,
+                                                 Box* crop,
+                                                 const gchar* name,
+                                                 const gchar* explanation);
 static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self);
 static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self);
 void editing_tools_photo_canvas_repaint (EditingToolsPhotoCanvas* self);
 static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self);
-static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y);
-static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle);
-static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y);
-static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y);
+static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base,
+                                                       gint x,
+                                                       gint y);
+static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self,
+                                                           gint x,
+                                                           gint y,
+                                                           gdouble angle);
+static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base,
+                                                          gint x,
+                                                          gint y);
+static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self,
+                                                                gint x,
+                                                                gint y);
 static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self);
 static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self);
-static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask);
-static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event);
+static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base,
+                                                   gint x,
+                                                   gint y,
+                                                   GdkModifierType mask);
+static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                                         GdkEventKey* event);
 void editing_tools_editing_tool_notify_cancel (EditingToolsEditingTool* self);
-gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self, GdkEventKey* event);
+gboolean editing_tools_editing_tool_on_keypress (EditingToolsEditingTool* self,
+                                                 GdkEventKey* event);
 static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self);
-void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self, Dimensions* result);
-void dimensions_with_max (Dimensions *self, gint max_width, gint max_height, Dimensions* result);
-static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2);
+void editing_tools_photo_canvas_get_surface_dim (EditingToolsPhotoCanvas* self,
+                                                 Dimensions* result);
+void dimensions_with_max (Dimensions *self,
+                          gint max_width,
+                          gint max_height,
+                          Dimensions* result);
+static gboolean _dimensions_equal (const Dimensions * s1,
+                            const Dimensions * s2);
 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);
-void scaling_for_viewport (Dimensions* viewport, gboolean scale_up, Scaling* result);
+GdkPixbuf* photo_get_pixbuf_with_options (Photo* self,
+                                          Scaling* scaling,
+                                          PhotoException exceptions,
+                                          BackingFetchMode fetch_mode,
+                                          GError** error);
+void scaling_for_viewport (Dimensions* viewport,
+                           gboolean scale_up,
+                           Scaling* result);
 gchar* data_object_to_string (DataObject* self);
-void paint_pixmap_with_background (cairo_t* ctx, GdkPixbuf* pixbuf, gint x, gint y);
+void paint_pixmap_with_background (cairo_t* ctx,
+                                   GdkPixbuf* pixbuf,
+                                   gint x,
+                                   gint y);
 static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self);
-void compute_arb_rotated_size (gdouble src_width, gdouble src_height, gdouble angle, gdouble* dest_width, gdouble* dest_height);
-static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas);
-void editing_tools_editing_tool_activate (EditingToolsEditingTool* self, EditingToolsPhotoCanvas* canvas);
-static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas);
-void media_source_get_dimensions (MediaSource* self, PhotoException disallowed_steps, Dimensions* result);
-gboolean photo_get_crop (Photo* self, Box* crop, PhotoException exceptions);
-gboolean photo_get_straighten (Photo* self, gdouble* theta);
-void derotate_point_arb (GdkPoint* source_point, gint img_w, gint img_h, gdouble angle, GdkPoint* result);
-void box_get_center (Box *self, GdkPoint* result);
+void compute_arb_rotated_size (gdouble src_width,
+                               gdouble src_height,
+                               gdouble angle,
+                               gdouble* dest_width,
+                               gdouble* dest_height);
+static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base,
+                                                  EditingToolsPhotoCanvas* canvas);
+void editing_tools_editing_tool_activate (EditingToolsEditingTool* self,
+                                          EditingToolsPhotoCanvas* canvas);
+static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self,
+                                                         EditingToolsPhotoCanvas* canvas);
+void media_source_get_dimensions (MediaSource* self,
+                                  PhotoException disallowed_steps,
+                                  Dimensions* result);
+gboolean photo_get_crop (Photo* self,
+                         Box* crop,
+                         PhotoException exceptions);
+gboolean photo_get_straighten (Photo* self,
+                               gdouble* theta);
+void derotate_point_arb (GdkPoint* source_point,
+                         gint img_w,
+                         gint img_h,
+                         gdouble angle,
+                         GdkPoint* result);
+void box_get_center (Box *self,
+                     GdkPoint* result);
 gint box_get_width (Box *self);
 gint box_get_height (Box *self);
 GdkWindow* editing_tools_photo_canvas_get_drawing_window (EditingToolsPhotoCanvas* self);
 GtkWindow* editing_tools_photo_canvas_get_container (EditingToolsPhotoCanvas* self);
 static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container);
-static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container);
+static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type,
+                                                                                                                GtkWindow* container);
 static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self);
 static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base);
 static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self);
-static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas);
+static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self,
+                                                           EditingToolsPhotoCanvas* canvas);
 void editing_tools_editing_tool_deactivate (EditingToolsEditingTool* self);
-static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position);
-static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self);
-static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self);
-static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
-static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self,
+                                                      Dimensions* old_dim,
+                                                      GdkPixbuf* scaled,
+                                                      GdkRectangle* scaled_position);
+static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                                        Dimensions* old_dim,
+                                                                                                        GdkPixbuf* scaled,
+                                                                                                        GdkRectangle* scaled_position,
+                                                                                                        gpointer self);
+static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender,
+                                                                             GdkEventKey* event,
+                                                                             gpointer self);
+static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                      gpointer self);
+static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender,
+                                                                   gpointer self);
 static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self);
-static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self);
+static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender,
+                                                                              gpointer self);
 static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self);
-OneShotScheduler* one_shot_scheduler_new (const gchar* name, OneShotCallback callback, void* callback_target);
-OneShotScheduler* one_shot_scheduler_construct (GType object_type, const gchar* name, OneShotCallback callback, void* callback_target);
-void one_shot_scheduler_after_timeout (OneShotScheduler* self, guint msec, gboolean reschedule);
+OneShotScheduler* one_shot_scheduler_new (const gchar* name,
+                                          OneShotCallback callback,
+                                          void* callback_target);
+OneShotScheduler* one_shot_scheduler_construct (GType object_type,
+                                                const gchar* name,
+                                                OneShotCallback callback,
+                                                void* callback_target);
+void one_shot_scheduler_after_timeout (OneShotScheduler* self,
+                                       guint msec,
+                                       gboolean reschedule);
 static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base);
-static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, cairo_surface_t* src_surf, cairo_t* dest_ctx, gint src_width, gint src_height, gdouble angle);
-static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height);
-static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx);
+static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self,
+                                                        cairo_surface_t* src_surf,
+                                                        cairo_t* dest_ctx,
+                                                        gint src_width,
+                                                        gint src_height,
+                                                        gdouble angle);
+static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self,
+                                                           cairo_t* dest_ctx,
+                                                           gint width,
+                                                           gint height);
+static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base,
+                                               cairo_t* ctx);
 cairo_t* editing_tools_photo_canvas_get_default_ctx (EditingToolsPhotoCanvas* self);
-static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx);
+static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self,
+                                                          cairo_t* ctx);
 gdouble degrees_to_radians (gdouble theta);
-void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint width, gboolean use_scaled_pos);
-void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self, cairo_t* ctx, gint x, gint y, gint height, gboolean use_scaled_pos);
+void editing_tools_photo_canvas_draw_horizontal_line (EditingToolsPhotoCanvas* self,
+                                                      cairo_t* ctx,
+                                                      gint x,
+                                                      gint y,
+                                                      gint width,
+                                                      gboolean use_scaled_pos);
+void editing_tools_photo_canvas_draw_vertical_line (EditingToolsPhotoCanvas* self,
+                                                    cairo_t* ctx,
+                                                    gint x,
+                                                    gint y,
+                                                    gint height,
+                                                    gboolean use_scaled_pos);
 #define EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuidePrivate))
-enum  {
-	EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_DUMMY_PROPERTY
-};
 static gdouble* _double_dup (gdouble* self);
 static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj);
-enum  {
-	EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_DUMMY_PROPERTY
-};
 #define RESOURCES_CANCEL_LABEL _ ("_Cancel")
 #define EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING 8
-EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type, GtkWindow* container);
+EditingToolsEditingToolWindow* editing_tools_editing_tool_window_construct (GType object_type,
+                                                                            GtkWindow* container);
 static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self);
-static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self);
+static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                                gpointer self);
 static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj);
 static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj);
 
 static const gdouble EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[2] = {(gdouble) 10, (gdouble) 10};
 
-static EditingToolsStraightenTool* editing_tools_straighten_tool_construct (GType object_type) {
+static EditingToolsStraightenTool*
+editing_tools_straighten_tool_construct (GType object_type)
+{
 	EditingToolsStraightenTool* self = NULL;
 #line 190 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = (EditingToolsStraightenTool*) editing_tools_editing_tool_construct (object_type, "StraightenTool");
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 557 "StraightenTool.c"
+#line 687 "StraightenTool.c"
 }
 
 
-static EditingToolsStraightenTool* editing_tools_straighten_tool_new (void) {
+static EditingToolsStraightenTool*
+editing_tools_straighten_tool_new (void)
+{
 #line 189 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_construct (EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL);
-#line 564 "StraightenTool.c"
+#line 696 "StraightenTool.c"
 }
 
 
-EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) {
+EditingToolsStraightenTool*
+editing_tools_straighten_tool_factory (void)
+{
 	EditingToolsStraightenTool* result = NULL;
 	EditingToolsStraightenTool* _tmp0_;
 #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -573,11 +707,14 @@ EditingToolsStraightenTool* editing_tools_straighten_tool_factory (void) {
 	result = _tmp0_;
 #line 194 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 577 "StraightenTool.c"
+#line 711 "StraightenTool.c"
 }
 
 
-gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scaling) {
+gboolean
+editing_tools_straighten_tool_is_available (Photo* photo,
+                                            Scaling* scaling)
+{
 	gboolean result = FALSE;
 #line 197 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (IS_PHOTO (photo), FALSE);
@@ -587,7 +724,7 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal
 	result = TRUE;
 #line 198 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 591 "StraightenTool.c"
+#line 728 "StraightenTool.c"
 }
 
 
@@ -599,34 +736,35 @@ gboolean editing_tools_straighten_tool_is_available (Photo* photo, Scaling* scal
      * case of a previously-uncropped Photo, the crop region will be set to the original dimensions
      * of the photo and centered at the Photo's center.
      */
-static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenTool* self)
+{
 	EditingToolsPhotoCanvas* _tmp0_;
 	Photo* _tmp1_;
 	Photo* _tmp2_;
 	gdouble slider_val = 0.0;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp3_;
 	GtkScale* _tmp4_;
-	gdouble _tmp5_;
 	GdkPoint new_crop_center = {0};
-	GdkPoint _tmp6_;
-	Dimensions _tmp7_;
-	gint _tmp8_;
-	Dimensions _tmp9_;
-	gint _tmp10_;
-	GdkPoint _tmp11_ = {0};
+	GdkPoint _tmp5_;
+	Dimensions _tmp6_;
+	gint _tmp7_;
+	Dimensions _tmp8_;
+	gint _tmp9_;
+	GdkPoint _tmp10_ = {0};
 	StraightenCommand* command = NULL;
-	EditingToolsPhotoCanvas* _tmp12_;
+	EditingToolsPhotoCanvas* _tmp11_;
+	Photo* _tmp12_;
 	Photo* _tmp13_;
-	Photo* _tmp14_;
-	GdkPoint _tmp15_;
-	gdouble _tmp16_;
-	gint _tmp17_;
-	gdouble _tmp18_;
-	gint _tmp19_;
-	Box _tmp20_ = {0};
+	GdkPoint _tmp14_;
+	gdouble _tmp15_;
+	gint _tmp16_;
+	gdouble _tmp17_;
+	gint _tmp18_;
+	Box _tmp19_ = {0};
+	StraightenCommand* _tmp20_;
 	StraightenCommand* _tmp21_;
-	StraightenCommand* _tmp22_;
-	Dimensions _tmp23_;
+	Dimensions _tmp22_;
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 210 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -644,60 +782,60 @@ static void editing_tools_straighten_tool_on_ok_clicked (EditingToolsStraightenT
 #line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp4_ = _tmp3_->angle_slider;
 #line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange));
-#line 214 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	slider_val = _tmp5_;
+	slider_val = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange));
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = self->priv->rotated_center;
+	_tmp5_ = self->priv->rotated_center;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = self->priv->image_dims;
+	_tmp6_ = self->priv->image_dims;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = _tmp7_.width;
+	_tmp7_ = _tmp6_.width;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = self->priv->image_dims;
+	_tmp8_ = self->priv->image_dims;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = _tmp9_.height;
+	_tmp9_ = _tmp8_.height;
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	rotate_point_arb (&_tmp6_, _tmp8_, _tmp10_, slider_val, FALSE, &_tmp11_);
+	rotate_point_arb (&_tmp5_, _tmp7_, _tmp9_, slider_val, FALSE, &_tmp10_);
 #line 216 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	new_crop_center = _tmp11_;
+	new_crop_center = _tmp10_;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = editing_tools_photo_canvas_get_photo (_tmp12_);
+	_tmp12_ = editing_tools_photo_canvas_get_photo (_tmp11_);
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = _tmp13_;
+	_tmp13_ = _tmp12_;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = new_crop_center;
+	_tmp14_ = new_crop_center;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = self->priv->rotate_scale;
+	_tmp15_ = self->priv->rotate_scale;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = self->priv->crop_width;
+	_tmp16_ = self->priv->crop_width;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = self->priv->rotate_scale;
+	_tmp17_ = self->priv->rotate_scale;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = self->priv->crop_height;
+	_tmp18_ = self->priv->crop_height;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	box_from_center (&_tmp15_, (gint) (_tmp16_ * _tmp17_), (gint) (_tmp18_ * _tmp19_), &_tmp20_);
+	box_from_center (&_tmp14_, (gint) (_tmp15_ * _tmp16_), (gint) (_tmp17_ * _tmp18_), &_tmp19_);
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp21_ = straighten_command_new (_tmp14_, slider_val, &_tmp20_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP);
+	_tmp20_ = straighten_command_new (_tmp13_, slider_val, &_tmp19_, RESOURCES_STRAIGHTEN_LABEL, RESOURCES_STRAIGHTEN_TOOLTIP);
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp22_ = _tmp21_;
+	_tmp21_ = _tmp20_;
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp14_);
+	_g_object_unref0 (_tmp13_);
 #line 219 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	command = _tmp22_;
+	command = _tmp21_;
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = self->priv->image_dims;
+	_tmp22_ = self->priv->image_dims;
 #line 224 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp23_, TRUE);
+	g_signal_emit_by_name (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), "applied", G_TYPE_CHECK_INSTANCE_CAST (command, TYPE_COMMAND, Command), NULL, &_tmp22_, TRUE);
 #line 209 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (command);
-#line 697 "StraightenTool.c"
+#line 833 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraightenTool* self)
+{
 	EditingToolsPhotoCanvas* _tmp0_;
 #line 227 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
@@ -709,186 +847,171 @@ static void editing_tools_straighten_tool_high_qual_repaint (EditingToolsStraigh
 	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 230 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_photo_canvas_repaint (_tmp0_);
-#line 713 "StraightenTool.c"
+#line 851 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_on_slider_stopped_delayed (EditingToolsStraightenTool* self)
+{
 #line 233 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 234 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_high_qual_repaint (self);
-#line 722 "StraightenTool.c"
+#line 862 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base, gint x, gint y) {
+static void
+editing_tools_straighten_tool_real_on_left_click (EditingToolsEditingTool* base,
+                                                  gint x,
+                                                  gint y)
+{
 	EditingToolsStraightenTool * self;
 	EditingToolsStraightenToolStraightenGuide* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gdouble _tmp3_;
+	gdouble _tmp1_;
 #line 237 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->guide;
 #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = x;
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = y;
-#line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = self->priv->photo_angle;
+	_tmp1_ = self->priv->photo_angle;
 #line 238 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, _tmp1_, _tmp2_, _tmp3_);
-#line 744 "StraightenTool.c"
+	editing_tools_straighten_tool_straighten_guide_reset (_tmp0_, x, y, _tmp1_);
+#line 882 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base, gint x, gint y) {
+static void
+editing_tools_straighten_tool_real_on_left_released (EditingToolsEditingTool* base,
+                                                     gint x,
+                                                     gint y)
+{
 	EditingToolsStraightenTool * self;
 	EditingToolsStraightenToolStraightenGuide* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
 	gdouble* a = NULL;
+	EditingToolsStraightenToolStraightenGuide* _tmp1_;
+	gdouble* _tmp2_;
 	EditingToolsStraightenToolStraightenGuide* _tmp3_;
 	gdouble* _tmp4_;
-	EditingToolsStraightenToolStraightenGuide* _tmp5_;
-	gdouble* _tmp6_;
 #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->guide;
 #line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = x;
-#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = y;
-#line 242 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_);
+	editing_tools_straighten_tool_straighten_guide_update (_tmp0_, x, y);
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = self->priv->guide;
+	_tmp1_ = self->priv->guide;
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp3_);
+	_tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (_tmp1_);
 #line 243 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	a = _tmp4_;
+	a = _tmp2_;
 #line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = self->priv->guide;
+	_tmp3_ = self->priv->guide;
 #line 244 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_straighten_tool_straighten_guide_clear (_tmp5_);
+	editing_tools_straighten_tool_straighten_guide_clear (_tmp3_);
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = a;
+	_tmp4_ = a;
 #line 245 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (_tmp6_ != NULL) {
-#line 782 "StraightenTool.c"
-		EditingToolsStraightenToolStraightenToolWindow* _tmp7_;
-		GtkScale* _tmp8_;
-		gdouble* _tmp9_;
+	if (_tmp4_ != NULL) {
+#line 918 "StraightenTool.c"
+		EditingToolsStraightenToolStraightenToolWindow* _tmp5_;
+		GtkScale* _tmp6_;
+		gdouble* _tmp7_;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp7_ = self->priv->window;
+		_tmp5_ = self->priv->window;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp8_ = _tmp7_->angle_slider;
+		_tmp6_ = _tmp5_->angle_slider;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp9_ = a;
+		_tmp7_ = a;
 #line 246 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_range_get_type (), GtkRange), *_tmp9_);
+		gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), *_tmp7_);
 #line 247 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_high_qual_repaint (self);
-#line 796 "StraightenTool.c"
+#line 932 "StraightenTool.c"
 	}
 #line 241 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (a);
-#line 800 "StraightenTool.c"
+#line 936 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base, gint x, gint y, GdkModifierType mask) {
+static void
+editing_tools_straighten_tool_real_on_motion (EditingToolsEditingTool* base,
+                                              gint x,
+                                              gint y,
+                                              GdkModifierType mask)
+{
 	EditingToolsStraightenTool * self;
 	EditingToolsStraightenToolStraightenGuide* _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_;
-	gboolean _tmp3_;
 #line 251 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp0_ = self->priv->guide;
 #line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = x;
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = y;
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = editing_tools_straighten_tool_straighten_guide_update (_tmp0_, _tmp1_, _tmp2_);
-#line 252 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (_tmp3_) {
-#line 822 "StraightenTool.c"
-		EditingToolsPhotoCanvas* _tmp4_;
+	if (editing_tools_straighten_tool_straighten_guide_update (_tmp0_, x, y)) {
+#line 954 "StraightenTool.c"
+		EditingToolsPhotoCanvas* _tmp1_;
 #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+		_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 253 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		editing_tools_photo_canvas_repaint (_tmp4_);
-#line 828 "StraightenTool.c"
+		editing_tools_photo_canvas_repaint (_tmp1_);
+#line 960 "StraightenTool.c"
 	}
 }
 
 
-static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base, GdkEventKey* event) {
+static gboolean
+editing_tools_straighten_tool_real_on_keypress (EditingToolsEditingTool* base,
+                                                GdkEventKey* event)
+{
 	EditingToolsStraightenTool * self;
 	gboolean result = FALSE;
 	gboolean _tmp0_ = FALSE;
 	gboolean _tmp1_ = FALSE;
-	GdkEventKey* _tmp2_;
-	guint _tmp3_;
-	const gchar* _tmp4_;
-	GdkEventKey* _tmp11_;
-	guint _tmp12_;
-	const gchar* _tmp13_;
-	GdkEventKey* _tmp14_;
-	gboolean _tmp15_;
+	guint _tmp2_;
+	const gchar* _tmp3_;
+	guint _tmp8_;
+	const gchar* _tmp9_;
 #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 256 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (event != NULL, FALSE);
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = event;
+	_tmp2_ = event->keyval;
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = _tmp2_->keyval;
+	_tmp3_ = gdk_keyval_name (_tmp2_);
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = gdk_keyval_name (_tmp3_);
-#line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (g_strcmp0 (_tmp4_, "KP_Enter") == 0) {
+	if (g_strcmp0 (_tmp3_, "KP_Enter") == 0) {
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = TRUE;
-#line 860 "StraightenTool.c"
+#line 989 "StraightenTool.c"
 	} else {
-		GdkEventKey* _tmp5_;
-		guint _tmp6_;
-		const gchar* _tmp7_;
+		guint _tmp4_;
+		const gchar* _tmp5_;
 #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp5_ = event;
+		_tmp4_ = event->keyval;
 #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp6_ = _tmp5_->keyval;
+		_tmp5_ = gdk_keyval_name (_tmp4_);
 #line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp7_ = gdk_keyval_name (_tmp6_);
-#line 258 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp1_ = g_strcmp0 (_tmp7_, "Enter") == 0;
-#line 873 "StraightenTool.c"
+		_tmp1_ = g_strcmp0 (_tmp5_, "Enter") == 0;
+#line 999 "StraightenTool.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp1_) {
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp0_ = TRUE;
-#line 879 "StraightenTool.c"
+#line 1005 "StraightenTool.c"
 	} else {
-		GdkEventKey* _tmp8_;
-		guint _tmp9_;
-		const gchar* _tmp10_;
-#line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp8_ = event;
+		guint _tmp6_;
+		const gchar* _tmp7_;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp9_ = _tmp8_->keyval;
+		_tmp6_ = event->keyval;
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp10_ = gdk_keyval_name (_tmp9_);
+		_tmp7_ = gdk_keyval_name (_tmp6_);
 #line 259 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp0_ = g_strcmp0 (_tmp10_, "Return") == 0;
-#line 892 "StraightenTool.c"
+		_tmp0_ = g_strcmp0 (_tmp7_, "Return") == 0;
+#line 1015 "StraightenTool.c"
 	}
 #line 257 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_) {
@@ -898,74 +1021,73 @@ static gboolean editing_tools_straighten_tool_real_on_keypress (EditingToolsEdit
 		result = TRUE;
 #line 261 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 902 "StraightenTool.c"
+#line 1025 "StraightenTool.c"
 	}
 #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = event;
+	_tmp8_ = event->keyval;
 #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = _tmp11_->keyval;
+	_tmp9_ = gdk_keyval_name (_tmp8_);
 #line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = gdk_keyval_name (_tmp12_);
-#line 264 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (g_strcmp0 (_tmp13_, "Escape") == 0) {
+	if (g_strcmp0 (_tmp9_, "Escape") == 0) {
 #line 265 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_editing_tool_notify_cancel (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
 #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		result = TRUE;
 #line 266 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 918 "StraightenTool.c"
+#line 1039 "StraightenTool.c"
 	}
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = event;
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp14_);
-#line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	result = _tmp15_;
+	result = EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->on_keypress (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), event);
 #line 269 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 928 "StraightenTool.c"
+#line 1045 "StraightenTool.c"
 }
 
 
-static gboolean _dimensions_equal (const Dimensions * s1, const Dimensions * s2) {
+static gboolean
+_dimensions_equal (const Dimensions * s1,
+                   const Dimensions * s2)
+{
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1 == s2) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return TRUE;
-#line 937 "StraightenTool.c"
+#line 1057 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1 == NULL) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 943 "StraightenTool.c"
+#line 1063 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s2 == NULL) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 949 "StraightenTool.c"
+#line 1069 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1->width != s2->width) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 955 "StraightenTool.c"
+#line 1075 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (s1->height != s2->height) {
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return FALSE;
-#line 961 "StraightenTool.c"
+#line 1081 "StraightenTool.c"
 	}
 #line 275 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return TRUE;
-#line 965 "StraightenTool.c"
+#line 1085 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_prepare_image (EditingToolsStraightenTool* self)
+{
 	Dimensions canvas_dims = {0};
 	EditingToolsPhotoCanvas* _tmp0_;
 	Dimensions _tmp1_ = {0};
@@ -1022,7 +1144,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	if (_dimensions_equal (&_tmp3_, &_tmp4_) == TRUE) {
 #line 276 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 1026 "StraightenTool.c"
+#line 1148 "StraightenTool.c"
 	}
 #line 278 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = viewport;
@@ -1030,7 +1152,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	self->priv->last_viewport = _tmp5_;
 #line 280 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	low_res_tmp = NULL;
-#line 1034 "StraightenTool.c"
+#line 1156 "StraightenTool.c"
 	{
 		GdkPixbuf* _tmp6_ = NULL;
 		EditingToolsPhotoCanvas* _tmp7_;
@@ -1061,7 +1183,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		_tmp6_ = _tmp13_;
 #line 283 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		if (G_UNLIKELY (_inner_error_ != NULL)) {
-#line 1065 "StraightenTool.c"
+#line 1187 "StraightenTool.c"
 			goto __catch27_g_error;
 		}
 #line 282 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1074,7 +1196,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		low_res_tmp = _tmp14_;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1078 "StraightenTool.c"
+#line 1200 "StraightenTool.c"
 	}
 	goto __finally27;
 	__catch27_g_error:
@@ -1114,7 +1236,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		low_res_tmp = _tmp20_;
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_error_free0 (e);
-#line 1118 "StraightenTool.c"
+#line 1240 "StraightenTool.c"
 	}
 	__finally27:
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1127,7 +1249,7 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 		g_clear_error (&_inner_error_);
 #line 281 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 1131 "StraightenTool.c"
+#line 1253 "StraightenTool.c"
 	}
 #line 290 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp21_ = low_res_tmp;
@@ -1205,11 +1327,13 @@ static void editing_tools_straighten_tool_prepare_image (EditingToolsStraightenT
 	_cairo_destroy0 (ctx);
 #line 272 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (low_res_tmp);
-#line 1209 "StraightenTool.c"
+#line 1331 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStraightenTool* self)
+{
 	gdouble width = 0.0;
 	gdouble height = 0.0;
 	gint _tmp0_;
@@ -1222,23 +1346,19 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
 	Dimensions _tmp7_;
 	gint _tmp8_;
 	gdouble _tmp9_;
-	gdouble _tmp10_;
-	gdouble _tmp11_;
-	GdkPoint _tmp12_;
+	GdkPoint _tmp10_;
 	gint radius_x = 0;
-	gdouble _tmp13_;
+	gdouble _tmp11_;
 	gint radius_y = 0;
-	gdouble _tmp14_;
-	GdkPoint _tmp15_;
+	gdouble _tmp12_;
+	GdkPoint _tmp13_;
+	gint _tmp14_;
+	Dimensions _tmp15_;
 	gint _tmp16_;
-	Dimensions _tmp17_;
+	GdkPoint _tmp17_;
 	gint _tmp18_;
-	gint _tmp19_;
-	GdkPoint _tmp20_;
-	gint _tmp21_;
-	Dimensions _tmp22_;
-	gint _tmp23_;
-	gint _tmp24_;
+	Dimensions _tmp19_;
+	gint _tmp20_;
 #line 306 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 308 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1262,52 +1382,44 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = _tmp7_.height;
 #line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = MIN (_tmp6_ / width, _tmp8_ / height);
-#line 311 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->rotate_scale = _tmp9_;
-#line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = self->priv->rotate_scale;
+	self->priv->rotate_scale = MIN (_tmp6_ / width, _tmp8_ / height);
 #line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = MIN (_tmp10_, 1.0);
+	_tmp9_ = self->priv->rotate_scale;
 #line 312 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->rotate_scale = _tmp11_;
+	self->priv->rotate_scale = MIN (_tmp9_, 1.0);
 #line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = self->priv->crop_center;
+	_tmp10_ = self->priv->crop_center;
 #line 315 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->rotated_center = _tmp12_;
+	self->priv->rotated_center = _tmp10_;
 #line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = self->priv->rotate_scale;
+	_tmp11_ = self->priv->rotate_scale;
 #line 316 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	radius_x = (gint) ((_tmp13_ * width) / 2);
+	radius_x = (gint) ((_tmp11_ * width) / 2);
 #line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = self->priv->rotate_scale;
+	_tmp12_ = self->priv->rotate_scale;
 #line 317 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	radius_y = (gint) ((_tmp14_ * height) / 2);
+	radius_y = (gint) ((_tmp12_ * height) / 2);
 #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = self->priv->rotated_center;
+	_tmp13_ = self->priv->rotated_center;
 #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = _tmp15_.x;
+	_tmp14_ = _tmp13_.x;
 #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = self->priv->image_dims;
+	_tmp15_ = self->priv->image_dims;
 #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = _tmp17_.width;
+	_tmp16_ = _tmp15_.width;
 #line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = CLAMP (_tmp16_, radius_x, _tmp18_ - radius_x);
-#line 318 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->rotated_center.x = _tmp19_;
-#line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = self->priv->rotated_center;
+	self->priv->rotated_center.x = CLAMP (_tmp14_, radius_x, _tmp16_ - radius_x);
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp21_ = _tmp20_.y;
+	_tmp17_ = self->priv->rotated_center;
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp22_ = self->priv->image_dims;
+	_tmp18_ = _tmp17_.y;
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = _tmp22_.height;
+	_tmp19_ = self->priv->image_dims;
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp24_ = CLAMP (_tmp21_, radius_y, _tmp23_ - radius_y);
+	_tmp20_ = _tmp19_.height;
 #line 319 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->rotated_center.y = _tmp24_;
-#line 1311 "StraightenTool.c"
+	self->priv->rotated_center.y = CLAMP (_tmp18_, radius_y, _tmp20_ - radius_y);
+#line 1423 "StraightenTool.c"
 }
 
 
@@ -1318,252 +1430,232 @@ static void editing_tools_straighten_tool_adjust_for_rotation (EditingToolsStrai
      *
      * @param canvas The PhotoCanvas the tool's output should be painted to.
      */
-static gpointer _editing_tools_photo_canvas_ref0 (gpointer self) {
+static gpointer
+_editing_tools_photo_canvas_ref0 (gpointer self)
+{
 #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? editing_tools_photo_canvas_ref (self) : NULL;
-#line 1325 "StraightenTool.c"
+#line 1439 "StraightenTool.c"
 }
 
 
-static gpointer _g_object_ref0 (gpointer self) {
+static gpointer
+_g_object_ref0 (gpointer self)
+{
 #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? g_object_ref (self) : NULL;
-#line 1332 "StraightenTool.c"
+#line 1448 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base, EditingToolsPhotoCanvas* canvas) {
+static void
+editing_tools_straighten_tool_real_activate (EditingToolsEditingTool* base,
+                                             EditingToolsPhotoCanvas* canvas)
+{
 	EditingToolsStraightenTool * self;
 	EditingToolsPhotoCanvas* _tmp0_;
 	EditingToolsPhotoCanvas* _tmp1_;
-	EditingToolsPhotoCanvas* _tmp2_;
-	EditingToolsPhotoCanvas* _tmp3_;
-	EditingToolsPhotoCanvas* _tmp4_;
+	Photo* _tmp2_;
+	Photo* _tmp3_;
+	Dimensions _tmp4_ = {0};
+	Box crop_region = {0};
 	Photo* _tmp5_;
 	Photo* _tmp6_;
-	Dimensions _tmp7_ = {0};
-	Box crop_region = {0};
-	EditingToolsPhotoCanvas* _tmp8_;
-	Photo* _tmp9_;
-	Photo* _tmp10_;
-	Box _tmp11_ = {0};
-	gboolean _tmp12_;
-	gboolean _tmp13_;
+	Box _tmp7_ = {0};
+	gboolean _tmp8_;
+	gboolean _tmp9_;
 	gdouble incoming_angle = 0.0;
-	EditingToolsPhotoCanvas* _tmp18_;
-	Photo* _tmp19_;
-	Photo* _tmp20_;
-	gdouble _tmp21_ = 0.0;
-	GdkPoint _tmp22_ = {0};
-	Dimensions _tmp23_;
-	gint _tmp24_;
-	Dimensions _tmp25_;
-	gint _tmp26_;
-	gdouble _tmp27_;
-	GdkPoint _tmp28_ = {0};
-	gint _tmp29_;
-	gint _tmp30_;
+	Photo* _tmp14_;
+	Photo* _tmp15_;
+	gdouble _tmp16_ = 0.0;
+	GdkPoint _tmp17_ = {0};
+	Dimensions _tmp18_;
+	gint _tmp19_;
+	Dimensions _tmp20_;
+	gint _tmp21_;
+	gdouble _tmp22_;
+	GdkPoint _tmp23_ = {0};
 	GdkWindow* drawing_window = NULL;
-	EditingToolsPhotoCanvas* _tmp31_;
-	GdkWindow* _tmp32_;
+	GdkWindow* _tmp24_;
 	GdkDisplay* display = NULL;
-	GdkDisplay* _tmp33_;
-	GdkDisplay* _tmp34_;
+	GdkDisplay* _tmp25_;
+	GdkDisplay* _tmp26_;
 	GdkCursor* cursor = NULL;
-	GdkCursor* _tmp35_;
-	EditingToolsPhotoCanvas* _tmp36_;
-	GtkWindow* _tmp37_;
-	GtkWindow* _tmp38_;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp39_;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp40_;
-	GtkScale* _tmp41_;
-	gdouble _tmp42_;
-	gdouble _tmp43_;
+	GdkCursor* _tmp27_;
+	GtkWindow* _tmp28_;
+	GtkWindow* _tmp29_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp30_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp31_;
+	GtkScale* _tmp32_;
+	gdouble _tmp33_;
+	gdouble _tmp34_;
 	gchar* tmp = NULL;
-	gdouble _tmp44_;
-	gchar* _tmp45_;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp46_;
-	GtkLabel* _tmp47_;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp48_;
+	gdouble _tmp35_;
+	gchar* _tmp36_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp37_;
+	GtkLabel* _tmp38_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp39_;
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp0_ = canvas;
-#line 330 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), _tmp0_);
-#line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = canvas;
+	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->activate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool), canvas);
 #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = _editing_tools_photo_canvas_ref0 (_tmp1_);
+	_tmp0_ = _editing_tools_photo_canvas_ref0 (canvas);
 #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_editing_tools_photo_canvas_unref0 (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas);
 #line 331 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp2_;
+	G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas = _tmp0_;
 #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 332 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp3_);
-#line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = canvas;
+	editing_tools_straighten_tool_bind_canvas_handlers (self, _tmp1_);
 #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = editing_tools_photo_canvas_get_photo (_tmp4_);
+	_tmp2_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = _tmp5_;
+	_tmp3_ = _tmp2_;
 #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp7_);
+	media_source_get_dimensions (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, TYPE_MEDIA_SOURCE, MediaSource), PHOTO_EXCEPTION_STRAIGHTEN | PHOTO_EXCEPTION_CROP, &_tmp4_);
 #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->image_dims = _tmp7_;
+	self->priv->image_dims = _tmp4_;
 #line 334 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp6_);
-#line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = canvas;
+	_g_object_unref0 (_tmp3_);
 #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = editing_tools_photo_canvas_get_photo (_tmp8_);
+	_tmp5_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = _tmp9_;
+	_tmp6_ = _tmp5_;
 #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = photo_get_crop (_tmp10_, &_tmp11_, PHOTO_EXCEPTION_NONE);
+	_tmp8_ = photo_get_crop (_tmp6_, &_tmp7_, PHOTO_EXCEPTION_NONE);
 #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	crop_region = _tmp11_;
+	crop_region = _tmp7_;
 #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = !_tmp12_;
+	_tmp9_ = !_tmp8_;
 #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp10_);
+	_g_object_unref0 (_tmp6_);
 #line 338 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (_tmp13_) {
-#line 1437 "StraightenTool.c"
-		Dimensions _tmp14_;
-		gint _tmp15_;
-		Dimensions _tmp16_;
-		gint _tmp17_;
+	if (_tmp9_) {
+#line 1539 "StraightenTool.c"
+		Dimensions _tmp10_;
+		gint _tmp11_;
+		Dimensions _tmp12_;
+		gint _tmp13_;
 #line 339 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.left = 0;
 #line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp14_ = self->priv->image_dims;
+		_tmp10_ = self->priv->image_dims;
 #line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp15_ = _tmp14_.width;
+		_tmp11_ = _tmp10_.width;
 #line 340 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		crop_region.right = _tmp15_;
+		crop_region.right = _tmp11_;
 #line 342 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		crop_region.top = 0;
 #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp16_ = self->priv->image_dims;
+		_tmp12_ = self->priv->image_dims;
 #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp17_ = _tmp16_.height;
+		_tmp13_ = _tmp12_.height;
 #line 343 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		crop_region.bottom = _tmp17_;
-#line 1458 "StraightenTool.c"
+		crop_region.bottom = _tmp13_;
+#line 1560 "StraightenTool.c"
 	}
 #line 348 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	incoming_angle = 0.0;
 #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = canvas;
-#line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = editing_tools_photo_canvas_get_photo (_tmp18_);
+	_tmp14_ = editing_tools_photo_canvas_get_photo (canvas);
 #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = _tmp19_;
+	_tmp15_ = _tmp14_;
 #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	photo_get_straighten (_tmp20_, &_tmp21_);
+	photo_get_straighten (_tmp15_, &_tmp16_);
 #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	incoming_angle = _tmp21_;
+	incoming_angle = _tmp16_;
 #line 349 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp20_);
+	_g_object_unref0 (_tmp15_);
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	box_get_center (&crop_region, &_tmp22_);
+	box_get_center (&crop_region, &_tmp17_);
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = self->priv->image_dims;
+	_tmp18_ = self->priv->image_dims;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp24_ = _tmp23_.width;
+	_tmp19_ = _tmp18_.width;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp25_ = self->priv->image_dims;
+	_tmp20_ = self->priv->image_dims;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp26_ = _tmp25_.height;
+	_tmp21_ = _tmp20_.height;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp27_ = incoming_angle;
+	_tmp22_ = incoming_angle;
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	derotate_point_arb (&_tmp22_, _tmp24_, _tmp26_, _tmp27_, &_tmp28_);
+	derotate_point_arb (&_tmp17_, _tmp19_, _tmp21_, _tmp22_, &_tmp23_);
 #line 352 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->crop_center = _tmp28_;
-#line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp29_ = box_get_width (&crop_region);
+	self->priv->crop_center = _tmp23_;
 #line 354 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->crop_width = _tmp29_;
-#line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp30_ = box_get_height (&crop_region);
+	self->priv->crop_width = box_get_width (&crop_region);
 #line 355 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->crop_height = _tmp30_;
+	self->priv->crop_height = box_get_height (&crop_region);
 #line 357 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_adjust_for_rotation (self);
 #line 359 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_prepare_image (self);
 #line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp31_ = canvas;
+	_tmp24_ = editing_tools_photo_canvas_get_drawing_window (canvas);
 #line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp32_ = editing_tools_photo_canvas_get_drawing_window (_tmp31_);
-#line 362 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	drawing_window = _tmp32_;
+	drawing_window = _tmp24_;
 #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp33_ = gdk_window_get_display (drawing_window);
+	_tmp25_ = gdk_window_get_display (drawing_window);
 #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp34_ = _g_object_ref0 (_tmp33_);
+	_tmp26_ = _g_object_ref0 (_tmp25_);
 #line 363 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	display = _tmp34_;
+	display = _tmp26_;
 #line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp35_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
+	_tmp27_ = gdk_cursor_new_for_display (display, GDK_CROSSHAIR);
 #line 364 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cursor = _tmp35_;
+	cursor = _tmp27_;
 #line 366 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gdk_window_set_cursor (drawing_window, cursor);
 #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp36_ = canvas;
-#line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp37_ = editing_tools_photo_canvas_get_container (_tmp36_);
+	_tmp28_ = editing_tools_photo_canvas_get_container (canvas);
 #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp38_ = _tmp37_;
+	_tmp29_ = _tmp28_;
 #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp39_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp38_);
+	_tmp30_ = editing_tools_straighten_tool_straighten_tool_window_new (_tmp29_);
 #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp39_);
+	g_object_ref_sink (_tmp30_);
 #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (self->priv->window);
 #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->window = _tmp39_;
+	self->priv->window = _tmp30_;
 #line 368 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp38_);
+	_g_object_unref0 (_tmp29_);
 #line 369 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_bind_window_handlers (self);
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp40_ = self->priv->window;
+	_tmp31_ = self->priv->window;
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp41_ = _tmp40_->angle_slider;
+	_tmp32_ = _tmp31_->angle_slider;
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp42_ = incoming_angle;
+	_tmp33_ = incoming_angle;
 #line 372 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp41_, gtk_range_get_type (), GtkRange), _tmp42_);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp32_, gtk_range_get_type (), GtkRange), _tmp33_);
 #line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp43_ = incoming_angle;
+	_tmp34_ = incoming_angle;
 #line 373 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->photo_angle = _tmp43_;
+	self->priv->photo_angle = _tmp34_;
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp44_ = incoming_angle;
+	_tmp35_ = incoming_angle;
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp45_ = g_strdup_printf ("%2.1f°", _tmp44_);
+	_tmp36_ = g_strdup_printf ("%2.1f°", _tmp35_);
 #line 375 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	tmp = _tmp45_;
+	tmp = _tmp36_;
 #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp46_ = self->priv->window;
+	_tmp37_ = self->priv->window;
 #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp47_ = _tmp46_->angle_label;
+	_tmp38_ = _tmp37_->angle_label;
 #line 376 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_label_set_text (_tmp47_, tmp);
+	gtk_label_set_text (_tmp38_, tmp);
 #line 378 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_high_qual_repaint (self);
 #line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp48_ = self->priv->window;
+	_tmp39_ = self->priv->window;
 #line 379 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp48_, gtk_widget_get_type (), GtkWidget));
+	gtk_widget_show_all (G_TYPE_CHECK_INSTANCE_CAST (_tmp39_, gtk_widget_get_type (), GtkWidget));
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (tmp);
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1572,14 +1664,16 @@ static void editing_tools_straighten_tool_real_activate (EditingToolsEditingTool
 	_g_object_unref0 (display);
 #line 329 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (drawing_window);
-#line 1576 "StraightenTool.c"
+#line 1668 "StraightenTool.c"
 }
 
 
 /**
      * Tears down the tool window and frees resources.
      */
-static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base) {
+static void
+editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTool* base)
+{
 	EditingToolsStraightenTool * self;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
 	EditingToolsPhotoCanvas* _tmp2_;
@@ -1589,7 +1683,7 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
 	_tmp0_ = self->priv->window;
 #line 386 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_ != NULL) {
-#line 1593 "StraightenTool.c"
+#line 1687 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenToolWindow* _tmp1_;
 #line 388 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_unbind_window_handlers (self);
@@ -1601,13 +1695,13 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
 		_g_object_unref0 (self->priv->window);
 #line 391 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		self->priv->window = NULL;
-#line 1605 "StraightenTool.c"
+#line 1699 "StraightenTool.c"
 	}
 #line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 394 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp2_ != NULL) {
-#line 1611 "StraightenTool.c"
+#line 1705 "StraightenTool.c"
 		EditingToolsPhotoCanvas* _tmp3_;
 		EditingToolsPhotoCanvas* _tmp4_;
 		GdkWindow* _tmp5_;
@@ -1626,83 +1720,104 @@ static void editing_tools_straighten_tool_real_deactivate (EditingToolsEditingTo
 		gdk_window_set_cursor (_tmp6_, NULL);
 #line 396 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_g_object_unref0 (_tmp6_);
-#line 1630 "StraightenTool.c"
+#line 1724 "StraightenTool.c"
 	}
 #line 399 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->deactivate (G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool));
-#line 1634 "StraightenTool.c"
+#line 1728 "StraightenTool.c"
 }
 
 
-static void _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position, gpointer self) {
+static void
+_editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf (EditingToolsPhotoCanvas* _sender,
+                                                                                                   Dimensions* old_dim,
+                                                                                                   GdkPixbuf* scaled,
+                                                                                                   GdkRectangle* scaled_position,
+                                                                                                   gpointer self)
+{
 #line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_resized_pixbuf ((EditingToolsStraightenTool*) self, old_dim, scaled, scaled_position);
-#line 1641 "StraightenTool.c"
+#line 1741 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
+static void
+editing_tools_straighten_tool_bind_canvas_handlers (EditingToolsStraightenTool* self,
+                                                    EditingToolsPhotoCanvas* canvas)
+{
 #line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 402 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp0_ = canvas;
-#line 403 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_signal_connect (_tmp0_, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1655 "StraightenTool.c"
+	g_signal_connect (canvas, "resized-scaled-pixbuf", (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 1755 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self, EditingToolsPhotoCanvas* canvas) {
-	EditingToolsPhotoCanvas* _tmp0_;
-	guint _tmp1_;
+static void
+editing_tools_straighten_tool_unbind_canvas_handlers (EditingToolsStraightenTool* self,
+                                                      EditingToolsPhotoCanvas* canvas)
+{
+	guint _tmp0_;
 #line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 406 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_PHOTO_CANVAS (canvas));
 #line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp0_ = canvas;
-#line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp1_, NULL, FALSE);
+	g_signal_parse_name ("resized-scaled-pixbuf", EDITING_TOOLS_TYPE_PHOTO_CANVAS, &_tmp0_, NULL, FALSE);
 #line 407 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_signal_handlers_disconnect_matched (_tmp0_, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp1_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
-#line 1672 "StraightenTool.c"
+	g_signal_handlers_disconnect_matched (canvas, G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp0_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_resized_pixbuf_editing_tools_photo_canvas_resized_scaled_pixbuf, self);
+#line 1772 "StraightenTool.c"
 }
 
 
-static gboolean _editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender, GdkEventKey* event, gpointer self) {
+static gboolean
+_editing_tools_editing_tool_on_keypress_gtk_widget_key_press_event (GtkWidget* _sender,
+                                                                    GdkEventKey* event,
+                                                                    gpointer self)
+{
 	gboolean result;
 	result = editing_tools_editing_tool_on_keypress ((EditingToolsEditingTool*) self, event);
 #line 411 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 1681 "StraightenTool.c"
+#line 1785 "StraightenTool.c"
 }
 
 
-static void _editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_straighten_tool_on_ok_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                 gpointer self)
+{
 #line 412 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_ok_clicked ((EditingToolsStraightenTool*) self);
-#line 1688 "StraightenTool.c"
+#line 1795 "StraightenTool.c"
 }
 
 
-static void _editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_editing_tool_notify_cancel_gtk_button_clicked (GtkButton* _sender,
+                                                              gpointer self)
+{
 #line 413 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_editing_tool_notify_cancel ((EditingToolsEditingTool*) self);
-#line 1695 "StraightenTool.c"
+#line 1805 "StraightenTool.c"
 }
 
 
-static void _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender, gpointer self) {
+static void
+_editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed (GtkRange* _sender,
+                                                                         gpointer self)
+{
 #line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_angle_changed ((EditingToolsStraightenTool*) self);
-#line 1702 "StraightenTool.c"
+#line 1815 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_bind_window_handlers (EditingToolsStraightenTool* self)
+{
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp1_;
 	GtkButton* _tmp2_;
@@ -1734,11 +1849,13 @@ static void editing_tools_straighten_tool_bind_window_handlers (EditingToolsStra
 	_tmp6_ = _tmp5_->angle_slider;
 #line 414 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_connect (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_range_get_type (), GtkRange), "value-changed", (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1738 "StraightenTool.c"
+#line 1853 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_unbind_window_handlers (EditingToolsStraightenTool* self)
+{
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
 	guint _tmp1_;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp2_;
@@ -1782,32 +1899,34 @@ static void editing_tools_straighten_tool_unbind_window_handlers (EditingToolsSt
 	g_signal_parse_name ("value-changed", gtk_range_get_type (), &_tmp10_, NULL, FALSE);
 #line 421 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_disconnect_matched (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_range_get_type (), GtkRange), G_SIGNAL_MATCH_ID | G_SIGNAL_MATCH_FUNC | G_SIGNAL_MATCH_DATA, _tmp10_, 0, NULL, (GCallback) _editing_tools_straighten_tool_on_angle_changed_gtk_range_value_changed, self);
-#line 1786 "StraightenTool.c"
+#line 1903 "StraightenTool.c"
 }
 
 
-static void _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self) {
+static void
+_editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback (gpointer self)
+{
 #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_on_slider_stopped_delayed ((EditingToolsStraightenTool*) self);
-#line 1793 "StraightenTool.c"
+#line 1912 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_on_angle_changed (EditingToolsStraightenTool* self)
+{
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
 	GtkScale* _tmp1_;
-	gdouble _tmp2_;
 	gchar* tmp = NULL;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp3_;
-	GtkScale* _tmp4_;
-	gdouble _tmp5_;
-	gchar* _tmp6_;
-	EditingToolsStraightenToolStraightenToolWindow* _tmp7_;
-	GtkLabel* _tmp8_;
-	const gchar* _tmp9_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp2_;
+	GtkScale* _tmp3_;
+	gchar* _tmp4_;
+	EditingToolsStraightenToolStraightenToolWindow* _tmp5_;
+	GtkLabel* _tmp6_;
+	const gchar* _tmp7_;
+	OneShotScheduler* _tmp8_;
 	OneShotScheduler* _tmp10_;
-	OneShotScheduler* _tmp12_;
-	EditingToolsPhotoCanvas* _tmp13_;
+	EditingToolsPhotoCanvas* _tmp11_;
 #line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1815,45 +1934,41 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp1_ = _tmp0_->angle_slider;
 #line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
-#line 425 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->photo_angle = _tmp2_;
+	self->priv->photo_angle = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange));
 #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = self->priv->window;
-#line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = _tmp3_->angle_slider;
+	_tmp2_ = self->priv->window;
 #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_range_get_type (), GtkRange));
+	_tmp3_ = _tmp2_->angle_slider;
 #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = g_strdup_printf ("%2.1f°", _tmp5_);
+	_tmp4_ = g_strdup_printf ("%2.1f°", gtk_range_get_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange)));
 #line 426 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	tmp = _tmp6_;
+	tmp = _tmp4_;
 #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = self->priv->window;
+	_tmp5_ = self->priv->window;
 #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = _tmp7_->angle_label;
+	_tmp6_ = _tmp5_->angle_label;
 #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = tmp;
+	_tmp7_ = tmp;
 #line 427 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_label_set_text (_tmp8_, _tmp9_);
+	gtk_label_set_text (_tmp6_, _tmp7_);
 #line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = self->priv->slider_sched;
+	_tmp8_ = self->priv->slider_sched;
 #line 429 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (_tmp10_ == NULL) {
-#line 1844 "StraightenTool.c"
-		OneShotScheduler* _tmp11_;
+	if (_tmp8_ == NULL) {
+#line 1959 "StraightenTool.c"
+		OneShotScheduler* _tmp9_;
 #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp11_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self);
+		_tmp9_ = one_shot_scheduler_new ("straighten", _editing_tools_straighten_tool_on_slider_stopped_delayed_one_shot_callback, self);
 #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_one_shot_scheduler_unref0 (self->priv->slider_sched);
 #line 430 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		self->priv->slider_sched = _tmp11_;
-#line 1852 "StraightenTool.c"
+		self->priv->slider_sched = _tmp9_;
+#line 1967 "StraightenTool.c"
 	}
 #line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = self->priv->slider_sched;
+	_tmp10_ = self->priv->slider_sched;
 #line 431 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	one_shot_scheduler_after_timeout (_tmp12_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE);
+	one_shot_scheduler_after_timeout (_tmp10_, (guint) EDITING_TOOLS_STRAIGHTEN_TOOL_REPAINT_ON_STOP_DELAY_MSEC, TRUE);
 #line 433 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->use_high_qual = FALSE;
 #line 435 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1861,19 +1976,24 @@ static void editing_tools_straighten_tool_on_angle_changed (EditingToolsStraight
 #line 436 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_update_rotated_surface (self);
 #line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 437 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_repaint (_tmp13_);
+	editing_tools_photo_canvas_repaint (_tmp11_);
 #line 424 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (tmp);
-#line 1870 "StraightenTool.c"
+#line 1985 "StraightenTool.c"
 }
 
 
 /**
      * @brief Called by the EditingHostPage when a resize event occurs.
      */
-static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self, Dimensions* old_dim, GdkPixbuf* scaled, GdkRectangle* scaled_position) {
+static void
+editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraightenTool* self,
+                                                 Dimensions* old_dim,
+                                                 GdkPixbuf* scaled,
+                                                 GdkRectangle* scaled_position)
+{
 #line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 443 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -1884,7 +2004,7 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh
 	g_return_if_fail (scaled_position != NULL);
 #line 444 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_prepare_image (self);
-#line 1888 "StraightenTool.c"
+#line 2008 "StraightenTool.c"
 }
 
 
@@ -1892,7 +2012,9 @@ static void editing_tools_straighten_tool_on_resized_pixbuf (EditingToolsStraigh
      * Returns a reference to the current StraightenTool instance's tool window;
      * the PhotoPage uses this to control the tool window's positioning, etc.
      */
-static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base) {
+static EditingToolsEditingToolWindow*
+editing_tools_straighten_tool_real_get_tool_window (EditingToolsEditingTool* base)
+{
 	EditingToolsStraightenTool * self;
 	EditingToolsEditingToolWindow* result = NULL;
 	EditingToolsStraightenToolStraightenToolWindow* _tmp0_;
@@ -1907,14 +2029,16 @@ static EditingToolsEditingToolWindow* editing_tools_straighten_tool_real_get_too
 	result = _tmp1_;
 #line 452 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 1911 "StraightenTool.c"
+#line 2033 "StraightenTool.c"
 }
 
 
 /**
      * Draw the rotated photo and grid.
      */
-static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self) {
+static void
+editing_tools_straighten_tool_update_rotated_surface (EditingToolsStraightenTool* self)
+{
 	cairo_surface_t* _tmp0_;
 	cairo_t* _tmp1_;
 	gint _tmp2_;
@@ -1950,7 +2074,7 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt
 	_tmp8_ = self->priv->view_height;
 #line 461 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_draw_superimposed_grid (self, _tmp6_, _tmp7_, _tmp8_);
-#line 1954 "StraightenTool.c"
+#line 2078 "StraightenTool.c"
 }
 
 
@@ -1961,59 +2085,60 @@ static void editing_tools_straighten_tool_update_rotated_surface (EditingToolsSt
      *      surfaces and contexts so it can have things set up exactly like it wants them, so
      *      it's not used.
      */
-static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base, cairo_t* ctx) {
+static void
+editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* base,
+                                          cairo_t* ctx)
+{
 	EditingToolsStraightenTool * self;
 	gint w = 0;
 	EditingToolsPhotoCanvas* _tmp0_;
 	GdkWindow* _tmp1_;
 	GdkWindow* _tmp2_;
 	gint _tmp3_;
-	gint _tmp4_;
 	gint h = 0;
-	EditingToolsPhotoCanvas* _tmp5_;
+	EditingToolsPhotoCanvas* _tmp4_;
+	GdkWindow* _tmp5_;
 	GdkWindow* _tmp6_;
-	GdkWindow* _tmp7_;
-	gint _tmp8_;
-	gint _tmp9_;
-	EditingToolsPhotoCanvas* _tmp10_;
-	cairo_t* _tmp11_;
+	gint _tmp7_;
+	EditingToolsPhotoCanvas* _tmp8_;
+	cairo_t* _tmp9_;
+	cairo_t* _tmp10_;
+	EditingToolsPhotoCanvas* _tmp11_;
 	cairo_t* _tmp12_;
-	EditingToolsPhotoCanvas* _tmp13_;
-	cairo_t* _tmp14_;
+	cairo_t* _tmp13_;
+	EditingToolsPhotoCanvas* _tmp14_;
 	cairo_t* _tmp15_;
-	EditingToolsPhotoCanvas* _tmp16_;
-	cairo_t* _tmp17_;
+	cairo_t* _tmp16_;
+	EditingToolsPhotoCanvas* _tmp17_;
 	cairo_t* _tmp18_;
-	EditingToolsPhotoCanvas* _tmp19_;
-	cairo_t* _tmp20_;
+	cairo_t* _tmp19_;
+	EditingToolsPhotoCanvas* _tmp20_;
 	cairo_t* _tmp21_;
-	EditingToolsPhotoCanvas* _tmp22_;
-	cairo_t* _tmp23_;
-	cairo_t* _tmp24_;
-	gint _tmp25_;
-	gint _tmp26_;
-	EditingToolsPhotoCanvas* _tmp27_;
-	cairo_t* _tmp28_;
-	cairo_t* _tmp29_;
-	cairo_surface_t* _tmp30_;
-	EditingToolsPhotoCanvas* _tmp31_;
-	cairo_t* _tmp32_;
-	cairo_t* _tmp33_;
-	gint _tmp34_;
-	gint _tmp35_;
-	EditingToolsPhotoCanvas* _tmp36_;
-	cairo_t* _tmp37_;
+	cairo_t* _tmp22_;
+	gint _tmp23_;
+	gint _tmp24_;
+	EditingToolsPhotoCanvas* _tmp25_;
+	cairo_t* _tmp26_;
+	cairo_t* _tmp27_;
+	cairo_surface_t* _tmp28_;
+	EditingToolsPhotoCanvas* _tmp29_;
+	cairo_t* _tmp30_;
+	cairo_t* _tmp31_;
+	gint _tmp32_;
+	gint _tmp33_;
+	EditingToolsPhotoCanvas* _tmp34_;
+	cairo_t* _tmp35_;
+	cairo_t* _tmp36_;
+	EditingToolsPhotoCanvas* _tmp37_;
 	cairo_t* _tmp38_;
-	EditingToolsPhotoCanvas* _tmp39_;
-	cairo_t* _tmp40_;
+	cairo_t* _tmp39_;
+	EditingToolsPhotoCanvas* _tmp40_;
 	cairo_t* _tmp41_;
-	EditingToolsPhotoCanvas* _tmp42_;
-	cairo_t* _tmp43_;
-	cairo_t* _tmp44_;
-	EditingToolsStraightenToolStraightenGuide* _tmp45_;
-	EditingToolsPhotoCanvas* _tmp46_;
-	cairo_t* _tmp47_;
-	cairo_t* _tmp48_;
+	cairo_t* _tmp42_;
+	EditingToolsStraightenToolStraightenGuide* _tmp43_;
+	EditingToolsPhotoCanvas* _tmp44_;
+	cairo_t* _tmp45_;
+	cairo_t* _tmp46_;
 #line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (base, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
 #line 471 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2027,148 +2152,144 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b
 #line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp3_ = gdk_window_get_width (_tmp2_);
 #line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = _tmp3_;
-#line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_object_unref0 (_tmp2_);
 #line 472 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	w = _tmp4_;
+	w = _tmp3_;
 #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = editing_tools_photo_canvas_get_drawing_window (_tmp5_);
+	_tmp5_ = editing_tools_photo_canvas_get_drawing_window (_tmp4_);
 #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = _tmp6_;
-#line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = gdk_window_get_height (_tmp7_);
+	_tmp6_ = _tmp5_;
 #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = _tmp8_;
+	_tmp7_ = gdk_window_get_height (_tmp6_);
 #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_g_object_unref0 (_tmp7_);
+	_g_object_unref0 (_tmp6_);
 #line 473 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	h = _tmp9_;
+	h = _tmp7_;
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = editing_tools_photo_canvas_get_default_ctx (_tmp10_);
+	_tmp9_ = editing_tools_photo_canvas_get_default_ctx (_tmp8_);
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = _tmp11_;
+	_tmp10_ = _tmp9_;
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_identity_matrix (_tmp12_);
+	cairo_identity_matrix (_tmp10_);
 #line 476 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp12_);
+	_cairo_destroy0 (_tmp10_);
 #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp11_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = editing_tools_photo_canvas_get_default_ctx (_tmp13_);
+	_tmp12_ = editing_tools_photo_canvas_get_default_ctx (_tmp11_);
 #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = _tmp14_;
+	_tmp13_ = _tmp12_;
 #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_rgba (_tmp15_, 0.0, 0.0, 0.0, 1.0);
+	cairo_set_source_rgba (_tmp13_, 0.0, 0.0, 0.0, 1.0);
 #line 477 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp15_);
+	_cairo_destroy0 (_tmp13_);
 #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp14_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = editing_tools_photo_canvas_get_default_ctx (_tmp16_);
+	_tmp15_ = editing_tools_photo_canvas_get_default_ctx (_tmp14_);
 #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = _tmp17_;
+	_tmp16_ = _tmp15_;
 #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_rectangle (_tmp18_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
+	cairo_rectangle (_tmp16_, (gdouble) 0, (gdouble) 0, (gdouble) w, (gdouble) h);
 #line 478 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp18_);
+	_cairo_destroy0 (_tmp16_);
 #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp17_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = editing_tools_photo_canvas_get_default_ctx (_tmp19_);
+	_tmp18_ = editing_tools_photo_canvas_get_default_ctx (_tmp17_);
 #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp21_ = _tmp20_;
+	_tmp19_ = _tmp18_;
 #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_fill (_tmp21_);
+	cairo_fill (_tmp19_);
 #line 479 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp21_);
+	_cairo_destroy0 (_tmp19_);
 #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp20_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = editing_tools_photo_canvas_get_default_ctx (_tmp22_);
+	_tmp21_ = editing_tools_photo_canvas_get_default_ctx (_tmp20_);
 #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp24_ = _tmp23_;
+	_tmp22_ = _tmp21_;
 #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp25_ = self->priv->view_width;
+	_tmp23_ = self->priv->view_width;
 #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp26_ = self->priv->view_height;
+	_tmp24_ = self->priv->view_height;
 #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_translate (_tmp24_, (w - _tmp25_) / 2.0, (h - _tmp26_) / 2.0);
+	cairo_translate (_tmp22_, (w - _tmp23_) / 2.0, (h - _tmp24_) / 2.0);
 #line 482 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp24_);
+	_cairo_destroy0 (_tmp22_);
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp25_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp28_ = editing_tools_photo_canvas_get_default_ctx (_tmp27_);
+	_tmp26_ = editing_tools_photo_canvas_get_default_ctx (_tmp25_);
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp29_ = _tmp28_;
+	_tmp27_ = _tmp26_;
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp30_ = self->priv->rotate_surf;
+	_tmp28_ = self->priv->rotate_surf;
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_surface (_tmp29_, _tmp30_, (gdouble) 0, (gdouble) 0);
+	cairo_set_source_surface (_tmp27_, _tmp28_, (gdouble) 0, (gdouble) 0);
 #line 483 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp29_);
+	_cairo_destroy0 (_tmp27_);
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp31_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp29_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp32_ = editing_tools_photo_canvas_get_default_ctx (_tmp31_);
+	_tmp30_ = editing_tools_photo_canvas_get_default_ctx (_tmp29_);
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp33_ = _tmp32_;
+	_tmp31_ = _tmp30_;
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp34_ = self->priv->view_width;
+	_tmp32_ = self->priv->view_width;
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp35_ = self->priv->view_height;
+	_tmp33_ = self->priv->view_height;
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_rectangle (_tmp33_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp34_, (gdouble) _tmp35_);
+	cairo_rectangle (_tmp31_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp32_, (gdouble) _tmp33_);
 #line 484 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp33_);
+	_cairo_destroy0 (_tmp31_);
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp34_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp37_ = editing_tools_photo_canvas_get_default_ctx (_tmp36_);
+	_tmp35_ = editing_tools_photo_canvas_get_default_ctx (_tmp34_);
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp38_ = _tmp37_;
+	_tmp36_ = _tmp35_;
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_fill (_tmp38_);
+	cairo_fill (_tmp36_);
 #line 485 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp38_);
+	_cairo_destroy0 (_tmp36_);
 #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp39_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp37_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp40_ = editing_tools_photo_canvas_get_default_ctx (_tmp39_);
+	_tmp38_ = editing_tools_photo_canvas_get_default_ctx (_tmp37_);
 #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp41_ = _tmp40_;
+	_tmp39_ = _tmp38_;
 #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_paint (_tmp41_);
+	cairo_paint (_tmp39_);
 #line 486 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp41_);
+	_cairo_destroy0 (_tmp39_);
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp42_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp40_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp43_ = editing_tools_photo_canvas_get_default_ctx (_tmp42_);
+	_tmp41_ = editing_tools_photo_canvas_get_default_ctx (_tmp40_);
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp44_ = _tmp43_;
+	_tmp42_ = _tmp41_;
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_identity_matrix (_tmp44_);
+	cairo_identity_matrix (_tmp42_);
 #line 490 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp44_);
+	_cairo_destroy0 (_tmp42_);
 #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp45_ = self->priv->guide;
+	_tmp43_ = self->priv->guide;
 #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp46_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp44_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp47_ = editing_tools_photo_canvas_get_default_ctx (_tmp46_);
+	_tmp45_ = editing_tools_photo_canvas_get_default_ctx (_tmp44_);
 #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp48_ = _tmp47_;
+	_tmp46_ = _tmp45_;
 #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_straighten_tool_straighten_guide_draw (_tmp45_, _tmp48_);
+	editing_tools_straighten_tool_straighten_guide_draw (_tmp43_, _tmp46_);
 #line 492 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_cairo_destroy0 (_tmp48_);
-#line 2172 "StraightenTool.c"
+	_cairo_destroy0 (_tmp46_);
+#line 2293 "StraightenTool.c"
 }
 
 
@@ -2182,43 +2303,31 @@ static void editing_tools_straighten_tool_real_paint (EditingToolsEditingTool* b
      * @param src_height The height of the image data in src_surf in pixels.
      * @param angle The angle the source image should be rotated by, in degrees.
      */
-static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self, cairo_surface_t* src_surf, cairo_t* dest_ctx, gint src_width, gint src_height, gdouble angle) {
+static void
+editing_tools_straighten_tool_draw_rotated_source (EditingToolsStraightenTool* self,
+                                                   cairo_surface_t* src_surf,
+                                                   cairo_t* dest_ctx,
+                                                   gint src_width,
+                                                   gint src_height,
+                                                   gdouble angle)
+{
 	gdouble angle_internal = 0.0;
-	gdouble _tmp0_;
-	gdouble _tmp1_;
-	cairo_t* _tmp2_;
-	cairo_t* _tmp3_;
-	cairo_t* _tmp4_;
-	gint _tmp5_;
-	gint _tmp6_;
-	cairo_t* _tmp7_;
-	cairo_t* _tmp8_;
-	cairo_t* _tmp9_;
-	gint _tmp10_;
+	gint _tmp0_;
+	gint _tmp1_;
+	gint _tmp2_;
+	gint _tmp3_;
+	gdouble _tmp4_;
+	gdouble _tmp5_;
+	gdouble _tmp6_;
+	GdkPoint _tmp7_;
+	gint _tmp8_;
+	gdouble _tmp9_;
+	GdkPoint _tmp10_;
 	gint _tmp11_;
-	cairo_t* _tmp12_;
-	gdouble _tmp13_;
-	gdouble _tmp14_;
-	cairo_t* _tmp15_;
-	gdouble _tmp16_;
-	cairo_t* _tmp17_;
-	GdkPoint _tmp18_;
-	gint _tmp19_;
-	gdouble _tmp20_;
-	GdkPoint _tmp21_;
-	gint _tmp22_;
-	gdouble _tmp23_;
-	cairo_t* _tmp24_;
-	cairo_surface_t* _tmp25_;
-	cairo_filter_t _tmp26_ = 0;
-	gboolean _tmp27_;
-	cairo_t* _tmp28_;
-	cairo_pattern_t* _tmp29_;
-	cairo_t* _tmp30_;
-	gint _tmp31_;
-	gint _tmp32_;
-	cairo_t* _tmp33_;
-	cairo_t* _tmp34_;
+	gdouble _tmp12_;
+	cairo_filter_t _tmp13_ = 0;
+	gboolean _tmp14_;
+	cairo_pattern_t* _tmp15_;
 #line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2226,114 +2335,76 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai
 #line 505 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (dest_ctx != NULL);
 #line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp0_ = angle;
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = degrees_to_radians (_tmp0_);
-#line 507 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	angle_internal = _tmp1_;
+	angle_internal = degrees_to_radians (angle);
 #line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = dest_ctx;
-#line 511 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_identity_matrix (_tmp2_);
-#line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = dest_ctx;
+	cairo_identity_matrix (dest_ctx);
 #line 512 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_rgba (_tmp3_, 0.0, 0.0, 0.0, 1.0);
-#line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = dest_ctx;
+	cairo_set_source_rgba (dest_ctx, 0.0, 0.0, 0.0, 1.0);
 #line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = self->priv->view_width;
+	_tmp0_ = self->priv->view_width;
 #line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = self->priv->view_height;
+	_tmp1_ = self->priv->view_height;
 #line 513 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_rectangle (_tmp4_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp5_, (gdouble) _tmp6_);
+	cairo_rectangle (dest_ctx, (gdouble) 0, (gdouble) 0, (gdouble) _tmp0_, (gdouble) _tmp1_);
 #line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = dest_ctx;
-#line 514 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_fill (_tmp7_);
-#line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = dest_ctx;
+	cairo_fill (dest_ctx);
 #line 519 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_identity_matrix (_tmp8_);
-#line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = dest_ctx;
+	cairo_identity_matrix (dest_ctx);
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = self->priv->view_width;
+	_tmp2_ = self->priv->view_width;
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = self->priv->view_height;
+	_tmp3_ = self->priv->view_height;
 #line 521 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_translate (_tmp9_, (gdouble) (_tmp10_ / 2), (gdouble) (_tmp11_ / 2));
-#line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = dest_ctx;
+	cairo_translate (dest_ctx, (gdouble) (_tmp2_ / 2), (gdouble) (_tmp3_ / 2));
 #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = self->priv->rotate_scale;
+	_tmp4_ = self->priv->rotate_scale;
 #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = self->priv->rotate_scale;
+	_tmp5_ = self->priv->rotate_scale;
 #line 522 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_scale (_tmp12_, 1.0 / _tmp13_, 1.0 / _tmp14_);
+	cairo_scale (dest_ctx, 1.0 / _tmp4_, 1.0 / _tmp5_);
 #line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = dest_ctx;
+	_tmp6_ = angle_internal;
 #line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = angle_internal;
-#line 523 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_rotate (_tmp15_, _tmp16_);
-#line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = dest_ctx;
+	cairo_rotate (dest_ctx, _tmp6_);
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = self->priv->rotated_center;
+	_tmp7_ = self->priv->rotated_center;
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = _tmp18_.x;
+	_tmp8_ = _tmp7_.x;
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = self->priv->preview_scale;
+	_tmp9_ = self->priv->preview_scale;
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp21_ = self->priv->rotated_center;
+	_tmp10_ = self->priv->rotated_center;
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp22_ = _tmp21_.y;
+	_tmp11_ = _tmp10_.y;
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = self->priv->preview_scale;
+	_tmp12_ = self->priv->preview_scale;
 #line 524 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_translate (_tmp17_, (-_tmp19_) * _tmp20_, (-_tmp22_) * _tmp23_);
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp24_ = dest_ctx;
+	cairo_translate (dest_ctx, (-_tmp8_) * _tmp9_, (-_tmp11_) * _tmp12_);
 #line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp25_ = src_surf;
-#line 526 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_surface (_tmp24_, _tmp25_, (gdouble) 0, (gdouble) 0);
+	cairo_set_source_surface (dest_ctx, src_surf, (gdouble) 0, (gdouble) 0);
 #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp27_ = self->priv->use_high_qual;
+	_tmp14_ = self->priv->use_high_qual;
 #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (_tmp27_) {
+	if (_tmp14_) {
 #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp26_ = CAIRO_FILTER_BEST;
-#line 2309 "StraightenTool.c"
+		_tmp13_ = CAIRO_FILTER_BEST;
+#line 2392 "StraightenTool.c"
 	} else {
 #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp26_ = CAIRO_FILTER_NEAREST;
-#line 2313 "StraightenTool.c"
+		_tmp13_ = CAIRO_FILTER_NEAREST;
+#line 2396 "StraightenTool.c"
 	}
 #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp28_ = dest_ctx;
-#line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp29_ = cairo_get_source (_tmp28_);
+	_tmp15_ = cairo_get_source (dest_ctx);
 #line 527 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_pattern_set_filter (_tmp29_, _tmp26_);
+	cairo_pattern_set_filter (_tmp15_, _tmp13_);
 #line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp30_ = dest_ctx;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp31_ = src_width;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp32_ = src_height;
-#line 528 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_rectangle (_tmp30_, (gdouble) 0, (gdouble) 0, (gdouble) _tmp31_, (gdouble) _tmp32_);
+	cairo_rectangle (dest_ctx, (gdouble) 0, (gdouble) 0, (gdouble) src_width, (gdouble) src_height);
 #line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp33_ = dest_ctx;
-#line 529 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_fill (_tmp33_);
-#line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp34_ = dest_ctx;
+	cairo_fill (dest_ctx);
 #line 530 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_paint (_tmp34_);
-#line 2337 "StraightenTool.c"
+	cairo_paint (dest_ctx);
+#line 2408 "StraightenTool.c"
 }
 
 
@@ -2344,211 +2415,126 @@ static void editing_tools_straighten_tool_draw_rotated_source (EditingToolsStrai
      * @param height The total height the grid should be drawn to.
      * @param dest_ctx The rendering context of the destination image.
      */
-static void editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self, cairo_t* dest_ctx, gint width, gint height) {
+static void
+editing_tools_straighten_tool_draw_superimposed_grid (EditingToolsStraightenTool* self,
+                                                      cairo_t* dest_ctx,
+                                                      gint width,
+                                                      gint height)
+{
 	gint half_width = 0;
-	gint _tmp0_;
 	gint quarter_width = 0;
-	gint _tmp1_;
 	gint half_height = 0;
-	gint _tmp2_;
 	gint quarter_height = 0;
+	EditingToolsPhotoCanvas* _tmp0_;
+	EditingToolsPhotoCanvas* _tmp1_;
+	EditingToolsPhotoCanvas* _tmp2_;
 	gint _tmp3_;
-	cairo_t* _tmp4_;
-	cairo_t* _tmp5_;
+	EditingToolsPhotoCanvas* _tmp4_;
+	EditingToolsPhotoCanvas* _tmp5_;
 	EditingToolsPhotoCanvas* _tmp6_;
-	cairo_t* _tmp7_;
-	gint _tmp8_;
+	EditingToolsPhotoCanvas* _tmp7_;
+	EditingToolsPhotoCanvas* _tmp8_;
 	EditingToolsPhotoCanvas* _tmp9_;
-	cairo_t* _tmp10_;
-	gint _tmp11_;
-	EditingToolsPhotoCanvas* _tmp12_;
-	cairo_t* _tmp13_;
-	gint _tmp14_;
-	gint _tmp15_;
-	EditingToolsPhotoCanvas* _tmp16_;
-	cairo_t* _tmp17_;
-	gint _tmp18_;
-	EditingToolsPhotoCanvas* _tmp19_;
-	cairo_t* _tmp20_;
-	gint _tmp21_;
-	EditingToolsPhotoCanvas* _tmp22_;
-	cairo_t* _tmp23_;
-	gint _tmp24_;
-	gint _tmp25_;
-	cairo_t* _tmp26_;
-	EditingToolsPhotoCanvas* _tmp27_;
-	cairo_t* _tmp28_;
-	gint _tmp29_;
-	EditingToolsPhotoCanvas* _tmp30_;
-	cairo_t* _tmp31_;
-	gint _tmp32_;
-	EditingToolsPhotoCanvas* _tmp33_;
-	cairo_t* _tmp34_;
-	gint _tmp35_;
-	EditingToolsPhotoCanvas* _tmp36_;
-	cairo_t* _tmp37_;
-	gint _tmp38_;
+	EditingToolsPhotoCanvas* _tmp10_;
 #line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_IS_STRAIGHTEN_TOOL (self));
 #line 540 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (dest_ctx != NULL);
 #line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp0_ = width;
-#line 541 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	half_width = _tmp0_ / 2;
-#line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = width;
+	half_width = width / 2;
 #line 542 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	quarter_width = _tmp1_ / 4;
+	quarter_width = width / 4;
 #line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = height;
-#line 544 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	half_height = _tmp2_ / 2;
-#line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = height;
+	half_height = height / 2;
 #line 545 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	quarter_height = _tmp3_ / 4;
-#line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = dest_ctx;
+	quarter_height = height / 4;
 #line 547 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_identity_matrix (_tmp4_);
+	cairo_identity_matrix (dest_ctx);
 #line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = dest_ctx;
-#line 548 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_rgba (_tmp5_, 1.0, 1.0, 1.0, 1.0);
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	cairo_set_source_rgba (dest_ctx, 1.0, 1.0, 1.0, 1.0);
 #line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = dest_ctx;
-#line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = width;
+	_tmp0_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 550 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_horizontal_line (_tmp6_, _tmp7_, 0, 0, _tmp8_, FALSE);
+	editing_tools_photo_canvas_draw_horizontal_line (_tmp0_, dest_ctx, 0, 0, width, FALSE);
 #line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp1_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = dest_ctx;
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = width;
-#line 551 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_horizontal_line (_tmp9_, _tmp10_, 0, half_height, _tmp11_, FALSE);
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	editing_tools_photo_canvas_draw_horizontal_line (_tmp1_, dest_ctx, 0, half_height, width, FALSE);
 #line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = dest_ctx;
-#line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = self->priv->view_height;
+	_tmp2_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = width;
+	_tmp3_ = self->priv->view_height;
 #line 552 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_horizontal_line (_tmp12_, _tmp13_, 0, _tmp14_ - 1, _tmp15_, FALSE);
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = dest_ctx;
+	editing_tools_photo_canvas_draw_horizontal_line (_tmp2_, dest_ctx, 0, _tmp3_ - 1, width, FALSE);
 #line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = height;
+	_tmp4_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 554 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_vertical_line (_tmp16_, _tmp17_, 0, 0, _tmp18_ + 1, FALSE);
+	editing_tools_photo_canvas_draw_vertical_line (_tmp4_, dest_ctx, 0, 0, height + 1, FALSE);
 #line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = dest_ctx;
-#line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp21_ = height;
+	_tmp5_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 555 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_vertical_line (_tmp19_, _tmp20_, half_width, 0, _tmp21_ + 1, FALSE);
+	editing_tools_photo_canvas_draw_vertical_line (_tmp5_, dest_ctx, half_width, 0, height + 1, FALSE);
 #line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp22_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = dest_ctx;
-#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp24_ = width;
-#line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp25_ = height;
+	_tmp6_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 556 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_vertical_line (_tmp22_, _tmp23_, _tmp24_ - 1, 0, _tmp25_ + 1, FALSE);
-#line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp26_ = dest_ctx;
+	editing_tools_photo_canvas_draw_vertical_line (_tmp6_, dest_ctx, width - 1, 0, height + 1, FALSE);
 #line 558 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_rgba (_tmp26_, 1.0, 1.0, 1.0, 0.33);
+	cairo_set_source_rgba (dest_ctx, 1.0, 1.0, 1.0, 0.33);
 #line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp27_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	_tmp7_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp28_ = dest_ctx;
-#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp29_ = width;
-#line 560 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_horizontal_line (_tmp27_, _tmp28_, 0, quarter_height, _tmp29_, FALSE);
-#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp30_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
+	editing_tools_photo_canvas_draw_horizontal_line (_tmp7_, dest_ctx, 0, quarter_height, width, FALSE);
 #line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp31_ = dest_ctx;
+	_tmp8_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp32_ = width;
-#line 561 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_horizontal_line (_tmp30_, _tmp31_, 0, half_height + quarter_height, _tmp32_, FALSE);
-#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp33_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp34_ = dest_ctx;
+	editing_tools_photo_canvas_draw_horizontal_line (_tmp8_, dest_ctx, 0, half_height + quarter_height, width, FALSE);
 #line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp35_ = height;
+	_tmp9_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 562 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_vertical_line (_tmp33_, _tmp34_, quarter_width, 0, _tmp35_, FALSE);
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp36_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
-#line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp37_ = dest_ctx;
+	editing_tools_photo_canvas_draw_vertical_line (_tmp9_, dest_ctx, quarter_width, 0, height, FALSE);
 #line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp38_ = height;
+	_tmp10_ = G_TYPE_CHECK_INSTANCE_CAST (self, EDITING_TOOLS_TYPE_EDITING_TOOL, EditingToolsEditingTool)->canvas;
 #line 563 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	editing_tools_photo_canvas_draw_vertical_line (_tmp36_, _tmp37_, half_width + quarter_width, 0, _tmp38_, FALSE);
-#line 2508 "StraightenTool.c"
+	editing_tools_photo_canvas_draw_vertical_line (_tmp10_, dest_ctx, half_width + quarter_width, 0, height, FALSE);
+#line 2500 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y, gdouble angle) {
-	gint _tmp0_;
-	gint _tmp1_;
-	gint _tmp2_[2] = {0};
-	gint _tmp3_;
-	gint _tmp4_;
-	gint _tmp5_[2] = {0};
-	gdouble _tmp6_;
+static void
+editing_tools_straighten_tool_straighten_guide_reset (EditingToolsStraightenToolStraightenGuide* self,
+                                                      gint x,
+                                                      gint y,
+                                                      gdouble angle)
+{
+	gint _tmp0_[2] = {0};
+	gint _tmp1_[2] = {0};
 #line 31 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp0_ = x;
+	_tmp0_[0] = x;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = x;
+	_tmp0_[1] = x;
 #line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_[0] = _tmp0_;
-#line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_[1] = _tmp1_;
-#line 32 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	memcpy (self->priv->x, _tmp2_, 2 * sizeof (gint));
-#line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = y;
+	memcpy (self->priv->x, _tmp0_, 2 * sizeof (gint));
 #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = y;
+	_tmp1_[0] = y;
 #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_[0] = _tmp3_;
+	_tmp1_[1] = y;
 #line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_[1] = _tmp4_;
-#line 33 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	memcpy (self->priv->y, _tmp5_, 2 * sizeof (gint));
+	memcpy (self->priv->y, _tmp1_, 2 * sizeof (gint));
 #line 34 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->is_active = TRUE;
 #line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = angle;
-#line 35 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self->priv->angle0 = _tmp6_;
-#line 2548 "StraightenTool.c"
+	self->priv->angle0 = angle;
+#line 2530 "StraightenTool.c"
 }
 
 
-static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self, gint x, gint y) {
+static gboolean
+editing_tools_straighten_tool_straighten_guide_update (EditingToolsStraightenToolStraightenGuide* self,
+                                                       gint x,
+                                                       gint y)
+{
 	gboolean result = FALSE;
 	gboolean _tmp0_;
 #line 38 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2557,47 +2543,45 @@ static gboolean editing_tools_straighten_tool_straighten_guide_update (EditingTo
 	_tmp0_ = self->priv->is_active;
 #line 39 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp0_) {
-#line 2561 "StraightenTool.c"
+#line 2547 "StraightenTool.c"
 		gint _tmp1_;
 		gint _tmp2_;
-		gint _tmp3_;
-		gint _tmp4_;
-#line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp1_ = x;
 #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		self->priv->x[1] = _tmp1_;
+		self->priv->x[1] = x;
 #line 40 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp2_ = self->priv->x[1];
+		_tmp1_ = self->priv->x[1];
 #line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp3_ = y;
+		self->priv->y[1] = y;
 #line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		self->priv->y[1] = _tmp3_;
-#line 41 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp4_ = self->priv->y[1];
+		_tmp2_ = self->priv->y[1];
 #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		result = TRUE;
 #line 42 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2582 "StraightenTool.c"
+#line 2562 "StraightenTool.c"
 	}
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	result = FALSE;
 #line 45 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return result;
-#line 2588 "StraightenTool.c"
+#line 2568 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self) {
+static void
+editing_tools_straighten_tool_straighten_guide_clear (EditingToolsStraightenToolStraightenGuide* self)
+{
 #line 48 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
 #line 49 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->is_active = FALSE;
-#line 2597 "StraightenTool.c"
+#line 2579 "StraightenTool.c"
 }
 
 
-static gdouble* _double_dup (gdouble* self) {
+static gdouble*
+_double_dup (gdouble* self)
+{
 	gdouble* dup;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	dup = g_new0 (gdouble, 1);
@@ -2605,18 +2589,22 @@ static gdouble* _double_dup (gdouble* self) {
 	memcpy (dup, self, sizeof (gdouble));
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return dup;
-#line 2609 "StraightenTool.c"
+#line 2593 "StraightenTool.c"
 }
 
 
-static gpointer __double_dup0 (gpointer self) {
+static gpointer
+__double_dup0 (gpointer self)
+{
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self ? _double_dup (self) : NULL;
-#line 2616 "StraightenTool.c"
+#line 2602 "StraightenTool.c"
 }
 
 
-static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self) {
+static gdouble*
+editing_tools_straighten_tool_straighten_guide_get_angle (EditingToolsStraightenToolStraightenGuide* self)
+{
 	gdouble* result = NULL;
 	gdouble dx = 0.0;
 	gint _tmp0_;
@@ -2630,8 +2618,6 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 	gdouble _tmp7_;
 	gdouble _tmp8_;
 	gdouble _tmp9_;
-	gdouble _tmp10_;
-	gdouble _tmp11_;
 #line 52 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self), NULL);
 #line 53 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2660,71 +2646,64 @@ static gdouble* editing_tools_straighten_tool_straighten_guide_get_angle (Editin
 		result = NULL;
 #line 58 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2664 "StraightenTool.c"
+#line 2650 "StraightenTool.c"
 	}
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp8_ = dy;
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = fabs (_tmp8_);
+	_tmp9_ = dx;
 #line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = dx;
-#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = fabs (_tmp10_);
-#line 61 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	if (_tmp9_ > _tmp11_) {
-#line 2676 "StraightenTool.c"
+	if (fabs (_tmp8_) > fabs (_tmp9_)) {
+#line 2658 "StraightenTool.c"
+		gdouble _tmp10_;
+		gdouble _tmp11_;
 		gdouble _tmp12_;
 		gdouble _tmp13_;
-		gdouble _tmp14_;
-		gdouble _tmp15_;
-		gdouble _tmp16_;
-		gdouble* _tmp17_;
-#line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp12_ = self->priv->angle0;
+		gdouble* _tmp14_;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp13_ = dx;
+		_tmp10_ = self->priv->angle0;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp14_ = dy;
+		_tmp11_ = dx;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp15_ = atan (_tmp13_ / _tmp14_);
+		_tmp12_ = dy;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp16_ = _tmp12_ + ((_tmp15_ / G_PI) * 180);
+		_tmp13_ = _tmp10_ + ((atan (_tmp11_ / _tmp12_) / G_PI) * 180);
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp17_ = __double_dup0 (&_tmp16_);
+		_tmp14_ = __double_dup0 (&_tmp13_);
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		result = _tmp17_;
+		result = _tmp14_;
 #line 62 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2699 "StraightenTool.c"
+#line 2678 "StraightenTool.c"
 	} else {
+		gdouble _tmp15_;
+		gdouble _tmp16_;
+		gdouble _tmp17_;
 		gdouble _tmp18_;
-		gdouble _tmp19_;
-		gdouble _tmp20_;
-		gdouble _tmp21_;
-		gdouble _tmp22_;
-		gdouble* _tmp23_;
+		gdouble* _tmp19_;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp18_ = self->priv->angle0;
+		_tmp15_ = self->priv->angle0;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp19_ = dy;
+		_tmp16_ = dy;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp20_ = dx;
+		_tmp17_ = dx;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp21_ = atan (_tmp19_ / _tmp20_);
+		_tmp18_ = _tmp15_ - ((atan (_tmp16_ / _tmp17_) / G_PI) * 180);
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp22_ = _tmp18_ - ((_tmp21_ / G_PI) * 180);
+		_tmp19_ = __double_dup0 (&_tmp18_);
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		_tmp23_ = __double_dup0 (&_tmp22_);
-#line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-		result = _tmp23_;
+		result = _tmp19_;
 #line 64 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return result;
-#line 2723 "StraightenTool.c"
+#line 2699 "StraightenTool.c"
 	}
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self, cairo_t* ctx) {
+static void
+editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStraightenToolStraightenGuide* self,
+                                                     cairo_t* ctx)
+{
 	gboolean _tmp0_;
 	gdouble* _tmp1_ = NULL;
 	gdouble* _tmp2_;
@@ -2736,28 +2715,18 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	gdouble alpha = 0.0;
 	gboolean _tmp9_ = FALSE;
 	gdouble _tmp10_;
-	cairo_t* _tmp12_;
+	gdouble _tmp12_;
 	gdouble _tmp13_;
-	cairo_t* _tmp14_;
-	gdouble _tmp15_;
-	cairo_t* _tmp16_;
+	gint _tmp14_;
+	gint _tmp15_;
+	gint _tmp16_;
 	gint _tmp17_;
-	gint _tmp18_;
-	cairo_t* _tmp19_;
+	gdouble _tmp18_;
+	gdouble _tmp19_;
 	gint _tmp20_;
 	gint _tmp21_;
-	cairo_t* _tmp22_;
-	cairo_t* _tmp23_;
-	gdouble _tmp24_;
-	cairo_t* _tmp25_;
-	gdouble _tmp26_;
-	cairo_t* _tmp27_;
-	gint _tmp28_;
-	gint _tmp29_;
-	cairo_t* _tmp30_;
-	gint _tmp31_;
-	gint _tmp32_;
-	cairo_t* _tmp33_;
+	gint _tmp22_;
+	gint _tmp23_;
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_GUIDE (self));
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2768,7 +2737,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	if (!_tmp0_) {
 #line 69 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 2772 "StraightenTool.c"
+#line 2741 "StraightenTool.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp2_ = editing_tools_straighten_tool_straighten_guide_get_angle (self);
@@ -2776,7 +2745,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	_tmp1_ = _tmp2_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp1_ == NULL) {
-#line 2780 "StraightenTool.c"
+#line 2749 "StraightenTool.c"
 		gdouble _tmp3_;
 		gdouble* _tmp4_;
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -2787,7 +2756,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 		_g_free0 (_tmp1_);
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp1_ = _tmp4_;
-#line 2791 "StraightenTool.c"
+#line 2760 "StraightenTool.c"
 	}
 #line 71 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_tmp5_ = _tmp1_;
@@ -2809,7 +2778,7 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 		_g_free0 (_tmp1_);
 #line 73 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return;
-#line 2813 "StraightenTool.c"
+#line 2782 "StraightenTool.c"
 	}
 #line 75 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	alpha = 1.0;
@@ -2819,206 +2788,215 @@ static void editing_tools_straighten_tool_straighten_guide_draw (EditingToolsStr
 	if (_tmp10_ < EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_ANGLE) {
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = TRUE;
-#line 2823 "StraightenTool.c"
+#line 2792 "StraightenTool.c"
 	} else {
 		gdouble _tmp11_;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp11_ = angle;
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		_tmp9_ = _tmp11_ > EDITING_TOOLS_STRAIGHTEN_TOOL_MAX_ANGLE;
-#line 2830 "StraightenTool.c"
+#line 2799 "StraightenTool.c"
 	}
 #line 76 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (_tmp9_) {
 #line 77 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		alpha = 0.35;
-#line 2836 "StraightenTool.c"
+#line 2805 "StraightenTool.c"
 	}
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = ctx;
+	_tmp12_ = alpha;
 #line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = alpha;
-#line 81 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_rgba (_tmp12_, 0.0, 0.0, 0.0, _tmp13_);
-#line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = ctx;
+	cairo_set_source_rgba (ctx, 0.0, 0.0, 0.0, _tmp12_);
 #line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0];
+	_tmp13_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0];
 #line 82 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_dash (_tmp14_, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), _tmp15_ / 2);
-#line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = ctx;
+	cairo_set_dash (ctx, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), _tmp13_ / 2);
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = self->priv->x[0];
+	_tmp14_ = self->priv->x[0];
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = self->priv->y[0];
+	_tmp15_ = self->priv->y[0];
 #line 83 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_move_to (_tmp16_, _tmp17_ + 0.5, _tmp18_ + 0.5);
+	cairo_move_to (ctx, _tmp14_ + 0.5, _tmp15_ + 0.5);
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = ctx;
+	_tmp16_ = self->priv->x[1];
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = self->priv->x[1];
+	_tmp17_ = self->priv->y[1];
 #line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp21_ = self->priv->y[1];
-#line 84 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_line_to (_tmp19_, _tmp20_ + 0.5, _tmp21_ + 0.5);
-#line 85 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp22_ = ctx;
+	cairo_line_to (ctx, _tmp16_ + 0.5, _tmp17_ + 0.5);
 #line 85 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_stroke (_tmp22_);
+	cairo_stroke (ctx);
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = ctx;
+	_tmp18_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0];
 #line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp24_ = EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH[0];
-#line 86 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_dash (_tmp23_, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), (-_tmp24_) / 2);
-#line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp25_ = ctx;
+	cairo_set_dash (ctx, EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH, G_N_ELEMENTS (EDITING_TOOLS_STRAIGHTEN_TOOL_GUIDE_DASH), (-_tmp18_) / 2);
 #line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp26_ = alpha;
+	_tmp19_ = alpha;
 #line 87 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_set_source_rgba (_tmp25_, 1.0, 1.0, 1.0, _tmp26_);
-#line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp27_ = ctx;
+	cairo_set_source_rgba (ctx, 1.0, 1.0, 1.0, _tmp19_);
 #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp28_ = self->priv->x[0];
+	_tmp20_ = self->priv->x[0];
 #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp29_ = self->priv->y[0];
+	_tmp21_ = self->priv->y[0];
 #line 88 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_move_to (_tmp27_, _tmp28_ + 0.5, _tmp29_ + 0.5);
+	cairo_move_to (ctx, _tmp20_ + 0.5, _tmp21_ + 0.5);
 #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp30_ = ctx;
+	_tmp22_ = self->priv->x[1];
 #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp31_ = self->priv->x[1];
+	_tmp23_ = self->priv->y[1];
 #line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp32_ = self->priv->y[1];
-#line 89 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_line_to (_tmp30_, _tmp31_ + 0.5, _tmp32_ + 0.5);
-#line 90 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp33_ = ctx;
+	cairo_line_to (ctx, _tmp22_ + 0.5, _tmp23_ + 0.5);
 #line 90 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	cairo_stroke (_tmp33_);
+	cairo_stroke (ctx);
 #line 67 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	_g_free0 (_tmp1_);
-#line 2904 "StraightenTool.c"
+#line 2853 "StraightenTool.c"
 }
 
 
-static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_construct (GType object_type) {
+static EditingToolsStraightenToolStraightenGuide*
+editing_tools_straighten_tool_straighten_guide_construct (GType object_type)
+{
 	EditingToolsStraightenToolStraightenGuide* self = NULL;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = (EditingToolsStraightenToolStraightenGuide*) g_type_create_instance (object_type);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 2914 "StraightenTool.c"
+#line 2865 "StraightenTool.c"
 }
 
 
-static EditingToolsStraightenToolStraightenGuide* editing_tools_straighten_tool_straighten_guide_new (void) {
+static EditingToolsStraightenToolStraightenGuide*
+editing_tools_straighten_tool_straighten_guide_new (void)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_straighten_guide_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE);
-#line 2921 "StraightenTool.c"
+#line 2874 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_value_straighten_guide_init (GValue* value) {
+static void
+editing_tools_straighten_tool_value_straighten_guide_init (GValue* value)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	value->data[0].v_pointer = NULL;
-#line 2928 "StraightenTool.c"
+#line 2883 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_value_straighten_guide_free_value (GValue* value) {
+static void
+editing_tools_straighten_tool_value_straighten_guide_free_value (GValue* value)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (value->data[0].v_pointer);
-#line 2937 "StraightenTool.c"
+#line 2894 "StraightenTool.c"
 	}
 }
 
 
-static void editing_tools_straighten_tool_value_straighten_guide_copy_value (const GValue* src_value, GValue* dest_value) {
+static void
+editing_tools_straighten_tool_value_straighten_guide_copy_value (const GValue* src_value,
+                                                                 GValue* dest_value)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (src_value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		dest_value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (src_value->data[0].v_pointer);
-#line 2947 "StraightenTool.c"
+#line 2907 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		dest_value->data[0].v_pointer = NULL;
-#line 2951 "StraightenTool.c"
+#line 2911 "StraightenTool.c"
 	}
 }
 
 
-static gpointer editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value) {
+static gpointer
+editing_tools_straighten_tool_value_straighten_guide_peek_pointer (const GValue* value)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return value->data[0].v_pointer;
-#line 2959 "StraightenTool.c"
+#line 2921 "StraightenTool.c"
 }
 
 
-static gchar* editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_straighten_tool_value_straighten_guide_collect_value (GValue* value,
+                                                                    guint n_collect_values,
+                                                                    GTypeCValue* collect_values,
+                                                                    guint collect_flags)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (collect_values[0].v_pointer) {
-#line 2966 "StraightenTool.c"
+#line 2933 "StraightenTool.c"
 		EditingToolsStraightenToolStraightenGuide * object;
 		object = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		if (object->parent_instance.g_class == NULL) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 			return g_strconcat ("invalid unclassed object pointer for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2973 "StraightenTool.c"
+#line 2940 "StraightenTool.c"
 		} else if (!g_value_type_compatible (G_TYPE_FROM_INSTANCE (object), G_VALUE_TYPE (value))) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 			return g_strconcat ("invalid object type `", g_type_name (G_TYPE_FROM_INSTANCE (object)), "' for value type `", G_VALUE_TYPE_NAME (value), "'", NULL);
-#line 2977 "StraightenTool.c"
+#line 2944 "StraightenTool.c"
 		}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = editing_tools_straighten_tool_straighten_guide_ref (object);
-#line 2981 "StraightenTool.c"
+#line 2948 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 2985 "StraightenTool.c"
+#line 2952 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return NULL;
-#line 2989 "StraightenTool.c"
+#line 2956 "StraightenTool.c"
 }
 
 
-static gchar* editing_tools_straighten_tool_value_straighten_guide_lcopy_value (const GValue* value, guint n_collect_values, GTypeCValue* collect_values, guint collect_flags) {
+static gchar*
+editing_tools_straighten_tool_value_straighten_guide_lcopy_value (const GValue* value,
+                                                                  guint n_collect_values,
+                                                                  GTypeCValue* collect_values,
+                                                                  guint collect_flags)
+{
 	EditingToolsStraightenToolStraightenGuide ** object_p;
 	object_p = collect_values[0].v_pointer;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (!object_p) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		return g_strdup_printf ("value location for `%s' passed as NULL", G_VALUE_TYPE_NAME (value));
-#line 3000 "StraightenTool.c"
+#line 2972 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (!value->data[0].v_pointer) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = NULL;
-#line 3006 "StraightenTool.c"
+#line 2978 "StraightenTool.c"
 	} else if (collect_flags & G_VALUE_NOCOPY_CONTENTS) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = value->data[0].v_pointer;
-#line 3010 "StraightenTool.c"
+#line 2982 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		*object_p = editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3014 "StraightenTool.c"
+#line 2986 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return NULL;
-#line 3018 "StraightenTool.c"
+#line 2990 "StraightenTool.c"
 }
 
 
-static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name, const gchar* nick, const gchar* blurb, GType object_type, GParamFlags flags) {
+static GParamSpec*
+editing_tools_straighten_tool_param_spec_straighten_guide (const gchar* name,
+                                                           const gchar* nick,
+                                                           const gchar* blurb,
+                                                           GType object_type,
+                                                           GParamFlags flags)
+{
 	EditingToolsStraightenToolParamSpecStraightenGuide* spec;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (g_type_is_a (object_type, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL);
@@ -3028,20 +3006,25 @@ static GParamSpec* editing_tools_straighten_tool_param_spec_straighten_guide (co
 	G_PARAM_SPEC (spec)->value_type = object_type;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return G_PARAM_SPEC (spec);
-#line 3032 "StraightenTool.c"
+#line 3010 "StraightenTool.c"
 }
 
 
-static gpointer editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value) {
+static gpointer
+editing_tools_straighten_tool_value_get_straighten_guide (const GValue* value)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE), NULL);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return value->data[0].v_pointer;
-#line 3041 "StraightenTool.c"
+#line 3021 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* value, gpointer v_object) {
+static void
+editing_tools_straighten_tool_value_set_straighten_guide (GValue* value,
+                                                          gpointer v_object)
+{
 	EditingToolsStraightenToolStraightenGuide * old;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE));
@@ -3057,22 +3040,25 @@ static void editing_tools_straighten_tool_value_set_straighten_guide (GValue* va
 		value->data[0].v_pointer = v_object;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_ref (value->data[0].v_pointer);
-#line 3061 "StraightenTool.c"
+#line 3044 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3065 "StraightenTool.c"
+#line 3048 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3071 "StraightenTool.c"
+#line 3054 "StraightenTool.c"
 	}
 }
 
 
-static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* value, gpointer v_object) {
+static void
+editing_tools_straighten_tool_value_take_straighten_guide (GValue* value,
+                                                           gpointer v_object)
+{
 	EditingToolsStraightenToolStraightenGuide * old;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (G_TYPE_CHECK_VALUE_TYPE (value, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE));
@@ -3086,54 +3072,62 @@ static void editing_tools_straighten_tool_value_take_straighten_guide (GValue* v
 		g_return_if_fail (g_value_type_compatible (G_TYPE_FROM_INSTANCE (v_object), G_VALUE_TYPE (value)));
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = v_object;
-#line 3090 "StraightenTool.c"
+#line 3076 "StraightenTool.c"
 	} else {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		value->data[0].v_pointer = NULL;
-#line 3094 "StraightenTool.c"
+#line 3080 "StraightenTool.c"
 	}
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	if (old) {
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		editing_tools_straighten_tool_straighten_guide_unref (old);
-#line 3100 "StraightenTool.c"
+#line 3086 "StraightenTool.c"
 	}
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_class_init (EditingToolsStraightenToolStraightenGuideClass * klass) {
+static void
+editing_tools_straighten_tool_straighten_guide_class_init (EditingToolsStraightenToolStraightenGuideClass * klass)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_guide_parent_class = g_type_class_peek_parent (klass);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	((EditingToolsStraightenToolStraightenGuideClass *) klass)->finalize = editing_tools_straighten_tool_straighten_guide_finalize;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_type_class_add_private (klass, sizeof (EditingToolsStraightenToolStraightenGuidePrivate));
-#line 3112 "StraightenTool.c"
+#line 3100 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_instance_init (EditingToolsStraightenToolStraightenGuide * self) {
+static void
+editing_tools_straighten_tool_straighten_guide_instance_init (EditingToolsStraightenToolStraightenGuide * self)
+{
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_PRIVATE (self);
 #line 26 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->is_active = FALSE;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->ref_count = 1;
-#line 3123 "StraightenTool.c"
+#line 3113 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj) {
+static void
+editing_tools_straighten_tool_straighten_guide_finalize (EditingToolsStraightenToolStraightenGuide * obj)
+{
 	EditingToolsStraightenToolStraightenGuide * self;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_GUIDE, EditingToolsStraightenToolStraightenGuide);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_signal_handlers_destroy (self);
-#line 3133 "StraightenTool.c"
+#line 3125 "StraightenTool.c"
 }
 
 
-static GType editing_tools_straighten_tool_straighten_guide_get_type (void) {
+static GType
+editing_tools_straighten_tool_straighten_guide_get_type (void)
+{
 	static volatile gsize editing_tools_straighten_tool_straighten_guide_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_straighten_tool_straighten_guide_type_id__volatile)) {
 		static const GTypeValueTable g_define_type_value_table = { editing_tools_straighten_tool_value_straighten_guide_init, editing_tools_straighten_tool_value_straighten_guide_free_value, editing_tools_straighten_tool_value_straighten_guide_copy_value, editing_tools_straighten_tool_value_straighten_guide_peek_pointer, "p", editing_tools_straighten_tool_value_straighten_guide_collect_value, "p", editing_tools_straighten_tool_value_straighten_guide_lcopy_value };
@@ -3147,18 +3141,22 @@ static GType editing_tools_straighten_tool_straighten_guide_get_type (void) {
 }
 
 
-static gpointer editing_tools_straighten_tool_straighten_guide_ref (gpointer instance) {
+static gpointer
+editing_tools_straighten_tool_straighten_guide_ref (gpointer instance)
+{
 	EditingToolsStraightenToolStraightenGuide * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_atomic_int_inc (&self->ref_count);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return instance;
-#line 3158 "StraightenTool.c"
+#line 3154 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_guide_unref (gpointer instance) {
+static void
+editing_tools_straighten_tool_straighten_guide_unref (gpointer instance)
+{
 	EditingToolsStraightenToolStraightenGuide * self;
 	self = instance;
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3167,7 +3165,7 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
 		EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_GUIDE_GET_CLASS (self)->finalize (self);
 #line 25 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 		g_type_free_instance ((GTypeInstance *) self);
-#line 3171 "StraightenTool.c"
+#line 3169 "StraightenTool.c"
 	}
 }
 
@@ -3177,20 +3175,26 @@ static void editing_tools_straighten_tool_straighten_guide_unref (gpointer insta
          *
          * @param container The application's main window.
          */
-static void _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender, gpointer self) {
+static void
+_editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked (GtkButton* _sender,
+                                                                                           gpointer self)
+{
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked ((EditingToolsStraightenToolStraightenToolWindow*) self);
-#line 3184 "StraightenTool.c"
+#line 3185 "StraightenTool.c"
 }
 
 
-static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type, GtkWindow* container) {
+static EditingToolsStraightenToolStraightenToolWindow*
+editing_tools_straighten_tool_straighten_tool_window_construct (GType object_type,
+                                                                GtkWindow* container)
+{
 	EditingToolsStraightenToolStraightenToolWindow * self = NULL;
-	GtkWindow* _tmp0_;
+	GtkScale* _tmp0_;
 	GtkScale* _tmp1_;
 	GtkScale* _tmp2_;
 	GtkScale* _tmp3_;
-	GtkScale* _tmp4_;
+	GtkLabel* _tmp4_;
 	GtkLabel* _tmp5_;
 	GtkLabel* _tmp6_;
 	GtkLabel* _tmp7_;
@@ -3199,145 +3203,142 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
 	GtkLabel* _tmp10_;
 	GtkLabel* _tmp11_;
 	GtkLabel* _tmp12_;
-	GtkLabel* _tmp13_;
 	GtkBox* slider_layout = NULL;
-	GtkBox* _tmp14_;
-	GtkScale* _tmp15_;
+	GtkBox* _tmp13_;
+	GtkScale* _tmp14_;
 	GtkBox* button_layout = NULL;
-	GtkBox* _tmp16_;
+	GtkBox* _tmp15_;
+	GtkButton* _tmp16_;
 	GtkButton* _tmp17_;
 	GtkButton* _tmp18_;
 	GtkButton* _tmp19_;
 	GtkButton* _tmp20_;
 	GtkButton* _tmp21_;
-	GtkButton* _tmp22_;
 	GtkBox* main_layout = NULL;
-	GtkBox* _tmp23_;
+	GtkBox* _tmp22_;
+	GtkLabel* _tmp23_;
 	GtkLabel* _tmp24_;
-	GtkLabel* _tmp25_;
-	GtkButton* _tmp26_;
+	GtkButton* _tmp25_;
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_val_if_fail (GTK_IS_WINDOW (container), NULL);
 #line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp0_ = container;
-#line 110 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	self = (EditingToolsStraightenToolStraightenToolWindow*) editing_tools_editing_tool_window_construct (object_type, _tmp0_);
+	self = (EditingToolsStraightenToolStraightenToolWindow*) editing_tools_editing_tool_window_construct (object_type, container);
 #line 112 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp1_ = self->angle_slider;
+	_tmp0_ = self->angle_slider;
 #line 112 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_range_set_min_slider_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_range_get_type (), GtkRange), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE);
+	gtk_range_set_min_slider_size (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE);
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp2_ = self->angle_slider;
+	_tmp1_ = self->angle_slider;
 #line 113 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp1_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_SLIDER_SIZE, -1);
 #line 114 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp3_ = self->angle_slider;
+	_tmp2_ = self->angle_slider;
 #line 114 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp3_, gtk_range_get_type (), GtkRange), 0.0);
+	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp2_, gtk_range_get_type (), GtkRange), 0.0);
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp4_ = self->angle_slider;
+	_tmp3_ = self->angle_slider;
 #line 115 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_scale_set_draw_value (_tmp4_, FALSE);
+	gtk_scale_set_draw_value (_tmp3_, FALSE);
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp5_ = self->description_label;
+	_tmp4_ = self->description_label;
 #line 117 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp4_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp6_ = self->description_label;
+	_tmp5_ = self->description_label;
 #line 118 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp5_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
 #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp7_ = self->description_label;
+	_tmp6_ = self->description_label;
 #line 119 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp6_, gtk_widget_get_type (), GtkWidget), 0);
 #line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp8_ = self->description_label;
+	_tmp7_ = self->description_label;
 #line 120 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp7_, gtk_widget_get_type (), GtkWidget), 0);
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp9_ = self->angle_label;
+	_tmp8_ = self->angle_label;
 #line 122 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_start (G_TYPE_CHECK_INSTANCE_CAST (_tmp8_, gtk_widget_get_type (), GtkWidget), 0);
 #line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp10_ = self->angle_label;
+	_tmp9_ = self->angle_label;
 #line 123 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_end (G_TYPE_CHECK_INSTANCE_CAST (_tmp9_, gtk_widget_get_type (), GtkWidget), 0);
 #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp11_ = self->angle_label;
+	_tmp10_ = self->angle_label;
 #line 124 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_top (G_TYPE_CHECK_INSTANCE_CAST (_tmp10_, gtk_widget_get_type (), GtkWidget), 0);
 #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp12_ = self->angle_label;
+	_tmp11_ = self->angle_label;
 #line 125 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), 0);
+	gtk_widget_set_margin_bottom (G_TYPE_CHECK_INSTANCE_CAST (_tmp11_, gtk_widget_get_type (), GtkWidget), 0);
 #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp13_ = self->angle_label;
+	_tmp12_ = self->angle_label;
 #line 126 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp13_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp12_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_LABEL_SIZE, -1);
 #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp14_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp13_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
 #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp14_);
+	g_object_ref_sink (_tmp13_);
 #line 128 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	slider_layout = _tmp14_;
+	slider_layout = _tmp13_;
 #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp15_ = self->angle_slider;
+	_tmp14_ = self->angle_slider;
 #line 129 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp15_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (slider_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp14_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp16_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
+	_tmp15_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, EDITING_TOOLS_STRAIGHTEN_TOOL_STRAIGHTEN_TOOL_WINDOW_CONTROL_SPACING);
 #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp16_);
+	g_object_ref_sink (_tmp15_);
 #line 131 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	button_layout = _tmp16_;
+	button_layout = _tmp15_;
 #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp17_ = self->cancel_button;
+	_tmp16_ = self->cancel_button;
 #line 132 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp16_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
 #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp18_ = self->reset_button;
+	_tmp17_ = self->reset_button;
 #line 133 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp17_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
 #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp19_ = self->ok_button;
+	_tmp18_ = self->ok_button;
 #line 134 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
+	gtk_widget_set_size_request (G_TYPE_CHECK_INSTANCE_CAST (_tmp18_, gtk_widget_get_type (), GtkWidget), EDITING_TOOLS_STRAIGHTEN_TOOL_MIN_BUTTON_SIZE, -1);
 #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp20_ = self->cancel_button;
+	_tmp19_ = self->cancel_button;
 #line 135 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp19_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp21_ = self->reset_button;
+	_tmp20_ = self->reset_button;
 #line 136 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp20_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp22_ = self->ok_button;
+	_tmp21_ = self->ok_button;
 #line 137 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp22_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (button_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp21_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp23_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
+	_tmp22_ = (GtkBox*) gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_object_ref_sink (_tmp23_);
+	g_object_ref_sink (_tmp22_);
 #line 139 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	main_layout = _tmp23_;
+	main_layout = _tmp22_;
 #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp24_ = self->description_label;
+	_tmp23_ = self->description_label;
 #line 140 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp23_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 141 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (slider_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp25_ = self->angle_label;
+	_tmp24_ = self->angle_label;
 #line 142 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp25_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
+	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (_tmp24_, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 143 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_box_pack_start (main_layout, G_TYPE_CHECK_INSTANCE_CAST (button_layout, gtk_widget_get_type (), GtkWidget), TRUE, TRUE, (guint) 0);
 #line 145 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_container_add (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_container_get_type (), GtkContainer), G_TYPE_CHECK_INSTANCE_CAST (main_layout, gtk_widget_get_type (), GtkWidget));
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	_tmp26_ = self->reset_button;
+	_tmp25_ = self->reset_button;
 #line 147 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
-	g_signal_connect_object (_tmp26_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0);
+	g_signal_connect_object (_tmp25_, "clicked", (GCallback) _editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked_gtk_button_clicked, self, 0);
 #line 149 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_window_set_position (G_TYPE_CHECK_INSTANCE_CAST (self, gtk_window_get_type (), GtkWindow), GTK_WIN_POS_CENTER_ON_PARENT);
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3348,18 +3349,22 @@ static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_
 	_g_object_unref0 (slider_layout);
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return self;
-#line 3352 "StraightenTool.c"
+#line 3353 "StraightenTool.c"
 }
 
 
-static EditingToolsStraightenToolStraightenToolWindow* editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container) {
+static EditingToolsStraightenToolStraightenToolWindow*
+editing_tools_straighten_tool_straighten_tool_window_new (GtkWindow* container)
+{
 #line 109 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	return editing_tools_straighten_tool_straighten_tool_window_construct (EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, container);
-#line 3359 "StraightenTool.c"
+#line 3362 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self) {
+static void
+editing_tools_straighten_tool_straighten_tool_window_on_reset_clicked (EditingToolsStraightenToolStraightenToolWindow* self)
+{
 	GtkScale* _tmp0_;
 #line 152 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	g_return_if_fail (EDITING_TOOLS_STRAIGHTEN_TOOL_IS_STRAIGHTEN_TOOL_WINDOW (self));
@@ -3367,20 +3372,24 @@ static void editing_tools_straighten_tool_straighten_tool_window_on_reset_clicke
 	_tmp0_ = self->angle_slider;
 #line 153 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	gtk_range_set_value (G_TYPE_CHECK_INSTANCE_CAST (_tmp0_, gtk_range_get_type (), GtkRange), 0.0);
-#line 3371 "StraightenTool.c"
+#line 3376 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_tool_window_class_init (EditingToolsStraightenToolStraightenToolWindowClass * klass) {
+static void
+editing_tools_straighten_tool_straighten_tool_window_class_init (EditingToolsStraightenToolStraightenToolWindowClass * klass)
+{
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_straighten_tool_window_parent_class = g_type_class_peek_parent (klass);
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_OBJECT_CLASS (klass)->finalize = editing_tools_straighten_tool_straighten_tool_window_finalize;
-#line 3380 "StraightenTool.c"
+#line 3387 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self) {
+static void
+editing_tools_straighten_tool_straighten_tool_window_instance_init (EditingToolsStraightenToolStraightenToolWindow * self)
+{
 	GtkScale* _tmp0_;
 	GtkLabel* _tmp1_;
 	GtkLabel* _tmp2_;
@@ -3423,11 +3432,13 @@ static void editing_tools_straighten_tool_straighten_tool_window_instance_init (
 	g_object_ref_sink (_tmp5_);
 #line 102 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->reset_button = _tmp5_;
-#line 3427 "StraightenTool.c"
+#line 3436 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj) {
+static void
+editing_tools_straighten_tool_straighten_tool_window_finalize (GObject * obj)
+{
 	EditingToolsStraightenToolStraightenToolWindow * self;
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_STRAIGHTEN_TOOL_TYPE_STRAIGHTEN_TOOL_WINDOW, EditingToolsStraightenToolStraightenToolWindow);
@@ -3445,11 +3456,13 @@ static void editing_tools_straighten_tool_straighten_tool_window_finalize (GObje
 	_g_object_unref0 (self->reset_button);
 #line 94 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	G_OBJECT_CLASS (editing_tools_straighten_tool_straighten_tool_window_parent_class)->finalize (obj);
-#line 3449 "StraightenTool.c"
+#line 3460 "StraightenTool.c"
 }
 
 
-static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void) {
+static GType
+editing_tools_straighten_tool_straighten_tool_window_get_type (void)
+{
 	static volatile gsize editing_tools_straighten_tool_straighten_tool_window_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_straighten_tool_straighten_tool_window_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsStraightenToolStraightenToolWindowClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_straighten_tool_straighten_tool_window_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsStraightenToolStraightenToolWindow), 0, (GInstanceInitFunc) editing_tools_straighten_tool_straighten_tool_window_instance_init, NULL };
@@ -3461,7 +3474,9 @@ static GType editing_tools_straighten_tool_straighten_tool_window_get_type (void
 }
 
 
-static void editing_tools_straighten_tool_class_init (EditingToolsStraightenToolClass * klass) {
+static void
+editing_tools_straighten_tool_class_init (EditingToolsStraightenToolClass * klass)
+{
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	editing_tools_straighten_tool_parent_class = g_type_class_peek_parent (klass);
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
@@ -3484,11 +3499,13 @@ static void editing_tools_straighten_tool_class_init (EditingToolsStraightenTool
 	((EditingToolsEditingToolClass *) klass)->get_tool_window = (EditingToolsEditingToolWindow* (*) (EditingToolsEditingTool *)) editing_tools_straighten_tool_real_get_tool_window;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	((EditingToolsEditingToolClass *) klass)->paint = (void (*) (EditingToolsEditingTool *, cairo_t*)) editing_tools_straighten_tool_real_paint;
-#line 3488 "StraightenTool.c"
+#line 3503 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self) {
+static void
+editing_tools_straighten_tool_instance_init (EditingToolsStraightenTool * self)
+{
 	EditingToolsStraightenToolStraightenGuide* _tmp0_;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv = EDITING_TOOLS_STRAIGHTEN_TOOL_GET_PRIVATE (self);
@@ -3502,11 +3519,13 @@ static void editing_tools_straighten_tool_instance_init (EditingToolsStraightenT
 	_tmp0_ = editing_tools_straighten_tool_straighten_guide_new ();
 #line 181 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self->priv->guide = _tmp0_;
-#line 3506 "StraightenTool.c"
+#line 3523 "StraightenTool.c"
 }
 
 
-static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj) {
+static void
+editing_tools_straighten_tool_finalize (EditingToolsEditingTool * obj)
+{
 	EditingToolsStraightenTool * self;
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	self = G_TYPE_CHECK_INSTANCE_CAST (obj, EDITING_TOOLS_TYPE_STRAIGHTEN_TOOL, EditingToolsStraightenTool);
@@ -3524,7 +3543,7 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob
 	_editing_tools_straighten_tool_straighten_guide_unref0 (self->priv->guide);
 #line 14 "/home/jens/Source/shotwell/src/editing_tools/StraightenTool.vala"
 	EDITING_TOOLS_EDITING_TOOL_CLASS (editing_tools_straighten_tool_parent_class)->finalize (obj);
-#line 3528 "StraightenTool.c"
+#line 3547 "StraightenTool.c"
 }
 
 
@@ -3532,7 +3551,9 @@ static void editing_tools_straighten_tool_finalize (EditingToolsEditingTool * ob
  * An editing tool that allows one to introduce or remove a Dutch angle from
  * a photograph.
  */
-GType editing_tools_straighten_tool_get_type (void) {
+GType
+editing_tools_straighten_tool_get_type (void)
+{
 	static volatile gsize editing_tools_straighten_tool_type_id__volatile = 0;
 	if (g_once_init_enter (&editing_tools_straighten_tool_type_id__volatile)) {
 		static const GTypeInfo g_define_type_info = { sizeof (EditingToolsStraightenToolClass), (GBaseInitFunc) NULL, (GBaseFinalizeFunc) NULL, (GClassInitFunc) editing_tools_straighten_tool_class_init, (GClassFinalizeFunc) NULL, NULL, sizeof (EditingToolsStraightenTool), 0, (GInstanceInitFunc) editing_tools_straighten_tool_instance_init, NULL };