diff --git a/ChangeLog b/ChangeLog
index 6ba3ece7b1..2fa735e30c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2006-08-28  Michael Natterer  <mitch@gimp.org>
+
+	* app/tools/gimpairbrushtool.c
+	* app/tools/gimpalignoptions.c
+	* app/tools/gimpblendoptions.c
+	* app/tools/gimpbucketfilloptions.c
+	* app/tools/gimpclonetool.c
+	* app/tools/gimpcolorpickeroptions.c
+	* app/tools/gimpconvolvetool.c
+	* app/tools/gimpcropoptions.c
+	* app/tools/gimpdodgeburntool.c
+	* app/tools/gimperasertool.c
+	* app/tools/gimpflipoptions.c
+	* app/tools/gimphistogramoptions.c
+	* app/tools/gimpinkoptions-gui.c
+	* app/tools/gimpmagnifyoptions.c
+	* app/tools/gimpmeasureoptions.c
+	* app/tools/gimpmoveoptions.c
+	* app/tools/gimppaintoptions-gui.c
+	* app/tools/gimprectangleoptions.c
+	* app/tools/gimprectangleselectoptions.c
+	* app/tools/gimpsmudgetool.c
+	* app/tools/gimptextoptions.c
+	* app/tools/gimptransformoptions.c
+	* app/tools/gimpvectoroptions.c: code cleanup.
+
 2006-08-27  Michael Natterer  <mitch@gimp.org>
 
 	* app/tools/gimpcolortool.c (gimp_color_tool_real_picked): applied
diff --git a/app/tools/gimpairbrushtool.c b/app/tools/gimpairbrushtool.c
index f43e1d36bb..6c200494f2 100644
--- a/app/tools/gimpairbrushtool.c
+++ b/app/tools/gimpairbrushtool.c
@@ -83,14 +83,10 @@ gimp_airbrush_tool_init (GimpAirbrushTool *airbrush)
 static GtkWidget *
 gimp_airbrush_options_gui (GimpToolOptions *tool_options)
 {
-  GObject   *config;
-  GtkWidget *vbox;
+  GObject   *config = G_OBJECT (tool_options);
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *table;
 
-  config = G_OBJECT (tool_options);
-
-  vbox = gimp_paint_options_gui (tool_options);
-
   table = gtk_table_new (2, 3, FALSE);
   gtk_table_set_col_spacing (GTK_TABLE (table), 0, 2);
   gtk_box_pack_start (GTK_BOX (vbox), table, FALSE, FALSE, 0);
diff --git a/app/tools/gimpalignoptions.c b/app/tools/gimpalignoptions.c
index 74f1dba026..093ec4f057 100644
--- a/app/tools/gimpalignoptions.c
+++ b/app/tools/gimpalignoptions.c
@@ -42,11 +42,9 @@ gimp_align_options_init (GimpAlignOptions *options)
 GtkWidget *
 gimp_align_options_gui (GimpToolOptions *tool_options)
 {
-  GtkWidget *vbox;
+  GtkWidget *vbox = gimp_tool_options_gui (tool_options);
   GtkWidget *container;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   container = gtk_vbox_new (FALSE, 0);
   gtk_box_pack_start (GTK_BOX (vbox), container, FALSE, FALSE, 0);
   gtk_widget_show (container);
diff --git a/app/tools/gimpblendoptions.c b/app/tools/gimpblendoptions.c
index a04ac166b9..a40d0f3d07 100644
--- a/app/tools/gimpblendoptions.c
+++ b/app/tools/gimpblendoptions.c
@@ -200,14 +200,12 @@ GtkWidget *
 gimp_blend_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *table;
   GtkWidget *frame;
   GtkWidget *combo;
   GtkWidget *button;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   table = g_object_get_data (G_OBJECT (vbox), GIMP_PAINT_OPTIONS_TABLE_KEY);
 
   /*  the offset scale  */
diff --git a/app/tools/gimpbucketfilloptions.c b/app/tools/gimpbucketfilloptions.c
index 3bc7ace8e1..07f21b3b32 100644
--- a/app/tools/gimpbucketfilloptions.c
+++ b/app/tools/gimpbucketfilloptions.c
@@ -213,7 +213,7 @@ GtkWidget *
 gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *vbox2;
   GtkWidget *table;
   GtkWidget *frame;
@@ -222,8 +222,6 @@ gimp_bucket_fill_options_gui (GimpToolOptions *tool_options)
   GtkWidget *combo;
   gchar     *str;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   /*  fill type  */
   str = g_strdup_printf (_("Fill Type  (%s)"),
                          gimp_get_mod_string (GDK_CONTROL_MASK)),
diff --git a/app/tools/gimpclonetool.c b/app/tools/gimpclonetool.c
index e341aac435..a6b5a00a76 100644
--- a/app/tools/gimpclonetool.c
+++ b/app/tools/gimpclonetool.c
@@ -283,8 +283,7 @@ gimp_clone_tool_modifier_key (GimpTool        *tool,
 
   if (! (state & GDK_BUTTON1_MASK))
     {
-      if (options->clone_type == GIMP_IMAGE_CLONE
-          && key == GDK_CONTROL_MASK)
+      if (options->clone_type == GIMP_IMAGE_CLONE && key == GDK_CONTROL_MASK)
         {
           if (press)
             paint_tool->status = _("Click to set the clone source.");
@@ -447,15 +446,13 @@ static GtkWidget *
 gimp_clone_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *frame;
   GtkWidget *button;
   GtkWidget *hbox;
   GtkWidget *table;
   GtkWidget *combo;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   frame = gimp_prop_enum_radio_frame_new (config, "clone-type",
                                           _("Source"), 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
diff --git a/app/tools/gimpcolorpickeroptions.c b/app/tools/gimpcolorpickeroptions.c
index 595a50a9a1..c8fde13e1f 100644
--- a/app/tools/gimpcolorpickeroptions.c
+++ b/app/tools/gimpcolorpickeroptions.c
@@ -150,13 +150,11 @@ GtkWidget *
 gimp_color_picker_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_color_options_gui (tool_options);
   GtkWidget *button;
   GtkWidget *frame;
   gchar     *str;
 
-  vbox = gimp_color_options_gui (tool_options);
-
   /*  the sample merged toggle button  */
   button = gimp_prop_check_button_new (config, "sample-merged",
                                        _("Sample merged"));
diff --git a/app/tools/gimpconvolvetool.c b/app/tools/gimpconvolvetool.c
index 1e3931ce9e..cf595dfbca 100644
--- a/app/tools/gimpconvolvetool.c
+++ b/app/tools/gimpconvolvetool.c
@@ -159,6 +159,7 @@ gimp_convolve_tool_oper_update (GimpTool        *tool,
   GimpConvolveOptions *options;
 
   options = GIMP_CONVOLVE_OPTIONS (tool->tool_info->tool_options);
+
   gimp_convolve_tool_status_update (tool, options->type);
 
   GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
@@ -190,19 +191,18 @@ gimp_convolve_tool_status_update (GimpTool         *tool,
     }
 }
 
+
 /*  tool options stuff  */
 
 static GtkWidget *
 gimp_convolve_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *table;
   GtkWidget *frame;
   gchar     *str;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   /*  the type radio box  */
   str = g_strdup_printf (_("Convolve Type  (%s)"),
                          gimp_get_mod_string (GDK_CONTROL_MASK));
diff --git a/app/tools/gimpcropoptions.c b/app/tools/gimpcropoptions.c
index 1f59cf5374..83830de20f 100644
--- a/app/tools/gimpcropoptions.c
+++ b/app/tools/gimpcropoptions.c
@@ -143,14 +143,12 @@ GtkWidget *
 gimp_crop_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *vbox_rectangle;
   GtkWidget *frame;
   GtkWidget *button;
   gchar     *str;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   /*  tool toggle  */
   str = g_strdup_printf (_("Tool Toggle  (%s)"),
                          gimp_get_mod_string (GDK_CONTROL_MASK));
diff --git a/app/tools/gimpdodgeburntool.c b/app/tools/gimpdodgeburntool.c
index c49ea5ad8a..0b8bcfe750 100644
--- a/app/tools/gimpdodgeburntool.c
+++ b/app/tools/gimpdodgeburntool.c
@@ -83,7 +83,7 @@ gimp_dodge_burn_tool_register (GimpToolRegisterCallback  callback,
 static void
 gimp_dodge_burn_tool_class_init (GimpDodgeBurnToolClass *klass)
 {
-  GimpToolClass        *tool_class = GIMP_TOOL_CLASS (klass);
+  GimpToolClass *tool_class = GIMP_TOOL_CLASS (klass);
 
   tool_class->modifier_key  = gimp_dodge_burn_tool_modifier_key;
   tool_class->cursor_update = gimp_dodge_burn_tool_cursor_update;
@@ -132,7 +132,8 @@ gimp_dodge_burn_tool_modifier_key (GimpTool        *tool,
         }
     }
 
-  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state, display);
+  GIMP_TOOL_CLASS (parent_class)->modifier_key (tool, key, press, state,
+                                                display);
 }
 
 static void
@@ -147,19 +148,21 @@ gimp_dodge_burn_tool_cursor_update (GimpTool        *tool,
 
   gimp_tool_control_set_toggled (tool->control, (options->type == GIMP_BURN));
 
-  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state, display);
+  GIMP_TOOL_CLASS (parent_class)->cursor_update (tool, coords, state,
+                                                 display);
 }
 
 static void
 gimp_dodge_burn_tool_oper_update (GimpTool        *tool,
-                                GimpCoords      *coords,
-                                GdkModifierType  state,
-                                gboolean         proximity,
-                                GimpDisplay     *display)
+                                  GimpCoords      *coords,
+                                  GdkModifierType  state,
+                                  gboolean         proximity,
+                                  GimpDisplay     *display)
 {
   GimpDodgeBurnOptions *options;
 
   options = GIMP_DODGE_BURN_OPTIONS (tool->tool_info->tool_options);
+
   gimp_dodge_burn_tool_status_update (tool, options->type);
 
   GIMP_TOOL_CLASS (parent_class)->oper_update (tool, coords, state, proximity,
@@ -198,13 +201,11 @@ static GtkWidget *
 gimp_dodge_burn_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *table;
   GtkWidget *frame;
   gchar     *str;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   /* the type (dodge or burn) */
   str = g_strdup_printf (_("Type  (%s)"),
                          gimp_get_mod_string (GDK_CONTROL_MASK));
diff --git a/app/tools/gimperasertool.c b/app/tools/gimperasertool.c
index 23c993b069..1f4a4c7d59 100644
--- a/app/tools/gimperasertool.c
+++ b/app/tools/gimperasertool.c
@@ -144,12 +144,10 @@ static GtkWidget *
 gimp_eraser_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *button;
   gchar     *str;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   /* the anti_erase toggle */
   str = g_strdup_printf (_("Anti erase  (%s)"),
                          gimp_get_mod_string (GDK_MOD1_MASK));
diff --git a/app/tools/gimpflipoptions.c b/app/tools/gimpflipoptions.c
index c7d6183ceb..f54d9ddd67 100644
--- a/app/tools/gimpflipoptions.c
+++ b/app/tools/gimpflipoptions.c
@@ -118,14 +118,12 @@ GtkWidget *
 gimp_flip_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *frame;
   gchar     *str;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   hbox = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
diff --git a/app/tools/gimphistogramoptions.c b/app/tools/gimphistogramoptions.c
index 84be7c6cb0..29335c922f 100644
--- a/app/tools/gimphistogramoptions.c
+++ b/app/tools/gimphistogramoptions.c
@@ -117,11 +117,9 @@ GtkWidget *
 gimp_histogram_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *frame;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   frame = gimp_prop_enum_radio_frame_new (config, "histogram-scale",
                                           _("Histogram Scale"), 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE, 0);
diff --git a/app/tools/gimpinkoptions-gui.c b/app/tools/gimpinkoptions-gui.c
index 36891071c6..101a28e8de 100644
--- a/app/tools/gimpinkoptions-gui.c
+++ b/app/tools/gimpinkoptions-gui.c
@@ -36,7 +36,7 @@
 #include "gimp-intl.h"
 
 
-static GtkWidget * blob_image_new  (GimpInkBlobType  blob_type);
+static GtkWidget * blob_image_new (GimpInkBlobType blob_type);
 
 
 GtkWidget *
@@ -44,16 +44,14 @@ gimp_ink_options_gui (GimpToolOptions *tool_options)
 {
   GObject        *config      = G_OBJECT (tool_options);
   GimpInkOptions *ink_options = GIMP_INK_OPTIONS (tool_options);
+  GtkWidget      *vbox        = gimp_paint_options_gui (tool_options);
+  GtkWidget      *frame;
   GtkWidget      *table;
-  GtkWidget      *vbox;
   GtkWidget      *blob_vbox;
   GtkWidget      *hbox;
-  GtkWidget      *frame;
   GtkWidget      *editor;
   GtkObject      *adj;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   /* adjust sliders */
   frame = gimp_frame_new (_("Adjustment"));
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE, 0);
diff --git a/app/tools/gimpmagnifyoptions.c b/app/tools/gimpmagnifyoptions.c
index 3907dea156..988511306f 100644
--- a/app/tools/gimpmagnifyoptions.c
+++ b/app/tools/gimpmagnifyoptions.c
@@ -165,13 +165,11 @@ GtkWidget *
 gimp_magnify_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *frame;
   GtkWidget *button;
   gchar     *str;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   /*  the auto_resize toggle button  */
   button = gimp_prop_check_button_new (config, "auto-resize",
                                        _("Auto-resize window"));
diff --git a/app/tools/gimpmeasureoptions.c b/app/tools/gimpmeasureoptions.c
index 12a768a37e..51adc7ffbc 100644
--- a/app/tools/gimpmeasureoptions.c
+++ b/app/tools/gimpmeasureoptions.c
@@ -118,11 +118,9 @@ GtkWidget *
 gimp_measure_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *button;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   /*  the use_info_window toggle button  */
   button = gimp_prop_check_button_new (config, "use-info-window",
                                        _("Use info window"));
diff --git a/app/tools/gimpmoveoptions.c b/app/tools/gimpmoveoptions.c
index 1d216431a1..c2fd9f2bcb 100644
--- a/app/tools/gimpmoveoptions.c
+++ b/app/tools/gimpmoveoptions.c
@@ -167,14 +167,12 @@ GtkWidget *
 gimp_move_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_tool_options_gui (tool_options);
   GtkWidget *hbox;
   GtkWidget *label;
   GtkWidget *frame;
   gchar     *title;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   hbox = gimp_prop_enum_stock_box_new (config, "move-type", "gimp", 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
diff --git a/app/tools/gimppaintoptions-gui.c b/app/tools/gimppaintoptions-gui.c
index 9868b5ca4c..7aa09ccc71 100644
--- a/app/tools/gimppaintoptions-gui.c
+++ b/app/tools/gimppaintoptions-gui.c
@@ -75,7 +75,7 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
 {
   GObject          *config  = G_OBJECT (tool_options);
   GimpPaintOptions *options = GIMP_PAINT_OPTIONS (tool_options);
-  GtkWidget        *vbox;
+  GtkWidget        *vbox    = gimp_tool_options_gui (tool_options);
   GtkWidget        *frame;
   GtkWidget        *table;
   GtkWidget        *menu;
@@ -85,8 +85,6 @@ gimp_paint_options_gui (GimpToolOptions *tool_options)
   gint              table_row          = 0;
   GType             tool_type;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   tool_type = tool_options->tool_info->tool_type;
 
   /*  the main table  */
@@ -218,12 +216,7 @@ pressure_options_gui (GimpPressureOptions *pressure,
   GtkWidget *wbox   = NULL;
   GtkWidget *button;
 
-  if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
-      tool_type == GIMP_TYPE_CLONE_TOOL                  ||
-      tool_type == GIMP_TYPE_CONVOLVE_TOOL               ||
-      tool_type == GIMP_TYPE_DODGE_BURN_TOOL             ||
-      tool_type == GIMP_TYPE_ERASER_TOOL                 ||
-      tool_type == GIMP_TYPE_SMUDGE_TOOL)
+  if (g_type_is_a (tool_type, GIMP_TYPE_BRUSH_TOOL))
     {
       GtkWidget *inner_frame;
 
@@ -321,12 +314,7 @@ fade_options_gui (GimpFadeOptions  *fade,
   GObject   *config = G_OBJECT (paint_options);
   GtkWidget *frame  = NULL;
 
-  if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
-      tool_type == GIMP_TYPE_CLONE_TOOL                  ||
-      tool_type == GIMP_TYPE_CONVOLVE_TOOL               ||
-      tool_type == GIMP_TYPE_DODGE_BURN_TOOL             ||
-      tool_type == GIMP_TYPE_ERASER_TOOL                 ||
-      tool_type == GIMP_TYPE_SMUDGE_TOOL)
+  if (g_type_is_a (tool_type, GIMP_TYPE_BRUSH_TOOL))
     {
       GtkWidget *table;
       GtkWidget *spinbutton;
@@ -380,12 +368,7 @@ jitter_options_gui (GimpJitterOptions  *jitter,
   GObject   *config = G_OBJECT (paint_options);
   GtkWidget *frame  = NULL;
 
-  if (g_type_is_a (tool_type, GIMP_TYPE_PAINTBRUSH_TOOL) ||
-      tool_type == GIMP_TYPE_CLONE_TOOL                  ||
-      tool_type == GIMP_TYPE_CONVOLVE_TOOL               ||
-      tool_type == GIMP_TYPE_DODGE_BURN_TOOL             ||
-      tool_type == GIMP_TYPE_ERASER_TOOL                 ||
-      tool_type == GIMP_TYPE_SMUDGE_TOOL)
+  if (g_type_is_a (tool_type, GIMP_TYPE_BRUSH_TOOL))
     {
       GtkWidget *table;
       GtkWidget *button;
diff --git a/app/tools/gimprectangleoptions.c b/app/tools/gimprectangleoptions.c
index d5c413a6b9..390e1379e7 100644
--- a/app/tools/gimprectangleoptions.c
+++ b/app/tools/gimprectangleoptions.c
@@ -889,7 +889,7 @@ GtkWidget *
 gimp_rectangle_options_gui (GimpToolOptions *tool_options)
 {
   GObject     *config  = G_OBJECT (tool_options);
-  GtkWidget   *vbox;
+  GtkWidget   *vbox    = gimp_tool_options_gui (tool_options);
   GtkWidget   *button;
   GtkWidget   *combo;
   GtkWidget   *table;
@@ -901,8 +901,6 @@ gimp_rectangle_options_gui (GimpToolOptions *tool_options)
   GtkWidget   *expander;
   GtkObject   *adjustment;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   button = gimp_prop_check_button_new (config, "fixed-center",
                                        _("Expand from center"));
   gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE, 0);
diff --git a/app/tools/gimprectangleselectoptions.c b/app/tools/gimprectangleselectoptions.c
index e767ad8483..161fb0385c 100644
--- a/app/tools/gimprectangleselectoptions.c
+++ b/app/tools/gimprectangleselectoptions.c
@@ -68,11 +68,9 @@ gimp_rect_select_options_rectangle_options_iface_init (GimpRectangleOptionsInter
 GtkWidget *
 gimp_rect_select_options_gui (GimpToolOptions *tool_options)
 {
-  GtkWidget *vbox;
+  GtkWidget *vbox = gimp_selection_options_gui (tool_options);
   GtkWidget *vbox_rectangle;
 
-  vbox = gimp_selection_options_gui (tool_options);
-
   /*  rectangle options  */
   vbox_rectangle = gimp_rectangle_options_gui (tool_options);
   gtk_box_pack_start (GTK_BOX (vbox), vbox_rectangle, FALSE, FALSE, 0);
@@ -80,5 +78,6 @@ gimp_rect_select_options_gui (GimpToolOptions *tool_options)
 
   gimp_rectangle_options_set_highlight (GIMP_RECTANGLE_OPTIONS (tool_options),
                                         FALSE);
+
   return vbox;
 }
diff --git a/app/tools/gimpsmudgetool.c b/app/tools/gimpsmudgetool.c
index c82cde357f..863f2e2f51 100644
--- a/app/tools/gimpsmudgetool.c
+++ b/app/tools/gimpsmudgetool.c
@@ -89,11 +89,9 @@ static GtkWidget *
 gimp_smudge_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *table;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   /*  the rate scale  */
   table = gtk_table_new (1, 3, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (table), 2);
diff --git a/app/tools/gimpsourcetool.c b/app/tools/gimpsourcetool.c
index e341aac435..a6b5a00a76 100644
--- a/app/tools/gimpsourcetool.c
+++ b/app/tools/gimpsourcetool.c
@@ -283,8 +283,7 @@ gimp_clone_tool_modifier_key (GimpTool        *tool,
 
   if (! (state & GDK_BUTTON1_MASK))
     {
-      if (options->clone_type == GIMP_IMAGE_CLONE
-          && key == GDK_CONTROL_MASK)
+      if (options->clone_type == GIMP_IMAGE_CLONE && key == GDK_CONTROL_MASK)
         {
           if (press)
             paint_tool->status = _("Click to set the clone source.");
@@ -447,15 +446,13 @@ static GtkWidget *
 gimp_clone_options_gui (GimpToolOptions *tool_options)
 {
   GObject   *config = G_OBJECT (tool_options);
-  GtkWidget *vbox;
+  GtkWidget *vbox   = gimp_paint_options_gui (tool_options);
   GtkWidget *frame;
   GtkWidget *button;
   GtkWidget *hbox;
   GtkWidget *table;
   GtkWidget *combo;
 
-  vbox = gimp_paint_options_gui (tool_options);
-
   frame = gimp_prop_enum_radio_frame_new (config, "clone-type",
                                           _("Source"), 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE, 0);
diff --git a/app/tools/gimptextoptions.c b/app/tools/gimptextoptions.c
index e4b488d553..4a8aeea31c 100644
--- a/app/tools/gimptextoptions.c
+++ b/app/tools/gimptextoptions.c
@@ -408,7 +408,7 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
 {
   GObject         *config  = G_OBJECT (tool_options);
   GimpTextOptions *options = GIMP_TEXT_OPTIONS (tool_options);
-  GtkWidget       *vbox;
+  GtkWidget       *vbox    = gimp_tool_options_gui (tool_options);
   GtkWidget       *table;
   GtkWidget       *hbox;
   GtkWidget       *button;
@@ -418,8 +418,6 @@ gimp_text_options_gui (GimpToolOptions *tool_options)
   GtkWidget       *spinbutton;
   gint             row = 0;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   table = gtk_table_new (10, 3, FALSE);
   gtk_table_set_col_spacings (GTK_TABLE (table), 2);
   gtk_table_set_row_spacings (GTK_TABLE (table), 2);
diff --git a/app/tools/gimptransformoptions.c b/app/tools/gimptransformoptions.c
index 237cd7fb4e..0c4791a318 100644
--- a/app/tools/gimptransformoptions.c
+++ b/app/tools/gimptransformoptions.c
@@ -265,7 +265,7 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
 {
   GObject              *config  = G_OBJECT (tool_options);
   GimpTransformOptions *options = GIMP_TRANSFORM_OPTIONS (tool_options);
-  GtkWidget            *vbox;
+  GtkWidget            *vbox    = gimp_tool_options_gui (tool_options);
   GtkWidget            *hbox;
   GtkWidget            *label;
   GtkWidget            *frame;
@@ -274,8 +274,6 @@ gimp_transform_options_gui (GimpToolOptions *tool_options)
   GtkWidget            *button;
   const gchar          *constrain = NULL;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   hbox = gimp_prop_enum_stock_box_new (config, "type", "gimp", 0, 0);
   gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0);
   gtk_widget_show (hbox);
diff --git a/app/tools/gimpvectoroptions.c b/app/tools/gimpvectoroptions.c
index 18608305fe..334b59f204 100644
--- a/app/tools/gimpvectoroptions.c
+++ b/app/tools/gimpvectoroptions.c
@@ -137,13 +137,11 @@ gimp_vector_options_gui (GimpToolOptions *tool_options)
 {
   GObject           *config  = G_OBJECT (tool_options);
   GimpVectorOptions *options = GIMP_VECTOR_OPTIONS (tool_options);
-  GtkWidget         *vbox;
+  GtkWidget         *vbox    = gimp_tool_options_gui (tool_options);
   GtkWidget         *frame;
   GtkWidget         *button;
   gchar             *str;
 
-  vbox = gimp_tool_options_gui (tool_options);
-
   /*  tool toggle  */
   frame = gimp_prop_enum_radio_frame_new (config, "vectors-edit-mode",
                                           _("Edit Mode"), 0, 0);