[gtk+/wip/baedert/progressbar: 1/6] box: Remove expand child property



commit efa647cd8e8b4c594bb3da12c6894f0cbd48340c
Author: Timm Bäder <mail baedert org>
Date:   Fri Apr 21 18:59:59 2017 +0200

    box: Remove expand child property
    
    GtkWidget already has hexpand/vexpand properties.

 demos/gtk-demo/assistant.c             |    6 +-
 demos/gtk-demo/button_box.c            |   28 +-
 demos/gtk-demo/changedisplay.c         |   12 +-
 demos/gtk-demo/clipboard.c             |   20 +-
 demos/gtk-demo/colorsel.c              |    4 +-
 demos/gtk-demo/combobox.c              |    8 +-
 demos/gtk-demo/cursors.c               |    4 +-
 demos/gtk-demo/demo.ui                 |    7 +-
 demos/gtk-demo/dialog.c                |   20 +-
 demos/gtk-demo/drawingarea.c           |    8 +-
 demos/gtk-demo/editable_cells.c        |   10 +-
 demos/gtk-demo/entry_buffer.c          |    6 +-
 demos/gtk-demo/entry_completion.c      |    4 +-
 demos/gtk-demo/expander.c              |    6 +-
 demos/gtk-demo/iconview.c              |    5 +-
 demos/gtk-demo/images.c                |   18 +-
 demos/gtk-demo/infobar.c               |   26 +-
 demos/gtk-demo/list_store.c            |    4 +-
 demos/gtk-demo/listbox.c               |    5 +-
 demos/gtk-demo/main.ui                 |    2 +-
 demos/gtk-demo/menus.c                 |    8 +-
 demos/gtk-demo/overlay.c               |    4 +-
 demos/gtk-demo/panes.c                 |    6 +-
 demos/gtk-demo/search_entry.c          |    8 +-
 demos/gtk-demo/search_entry2.c         |   20 +-
 demos/gtk-demo/sidebar.c               |    6 +-
 demos/gtk-demo/sizegroup.c             |    6 +-
 demos/gtk-demo/spinner.c               |    2 +-
 demos/gtk-demo/textscroll.c            |    2 +-
 demos/gtk-demo/toolpalette.c           |    9 +-
 demos/gtk-demo/tree_store.c            |    4 +-
 demos/widget-factory/widget-factory.c  |   10 +-
 demos/widget-factory/widget-factory.ui |   72 +---
 docs/tools/widgets.c                   |  138 +++----
 examples/search-bar.c                  |    8 +-
 gtk/gtkactionbar.c                     |    4 +-
 gtk/gtkappchooserdialog.c              |    8 +-
 gtk/gtkassistant.c                     |    8 +-
 gtk/gtkbbox.c                          |    2 +-
 gtk/gtkbox.c                           |   86 +----
 gtk/gtkbox.h                           |    4 -
 gtk/gtkcolorchooserwidget.c            |    4 +-
 gtk/gtkcombobox.c                      |    3 +-
 gtk/gtkcustompaperunixdialog.c         |   24 +-
 gtk/gtkentrycompletion.c               |    7 +-
 gtk/gtkfilechooserwidget.c             |   10 +-
 gtk/gtkheaderbar.c                     |   12 +-
 gtk/gtkinfobar.c                       |    2 +-
 gtk/gtkmenusectionbox.c                |   14 +-
 gtk/gtkmenutoolbutton.c                |    4 +-
 gtk/gtkmodelmenuitem.c                 |    4 +-
 gtk/gtkmountoperation.c                |   28 +-
 gtk/gtkpathbar.c                       |    4 +-
 gtk/gtkprintbackend.c                  |   16 +-
 gtk/gtkprinteroptionwidget.c           |   18 +-
 gtk/gtkprintunixdialog.c               |   14 +-
 gtk/gtkrecentchooserdialog.c           |    2 +-
 gtk/gtkshortcutssection.c              |    2 +-
 gtk/gtktoolbutton.c                    |   12 +-
 gtk/gtktreeviewcolumn.c                |    8 +-
 gtk/inspector/general.c                |    8 +-
 gtk/inspector/general.ui               |   57 +--
 gtk/inspector/misc-info.ui             |   89 +---
 gtk/inspector/prop-editor.c            |    6 +-
 gtk/inspector/recorder.c               |    8 +-
 gtk/inspector/size-groups.c            |    4 +-
 gtk/inspector/strv-editor.c            |   10 +-
 gtk/inspector/visual.ui                |   89 +---
 gtk/ui/gtkaboutdialog.ui               |   16 +-
 gtk/ui/gtkappchooserdialog.ui          |    5 +-
 gtk/ui/gtkassistant.ui                 |    6 +-
 gtk/ui/gtkcolorchooserdialog.ui        |    2 +-
 gtk/ui/gtkcoloreditor.ui               |    1 -
 gtk/ui/gtkcombobox.ui                  |    1 +
 gtk/ui/gtkfilechooserdialog.ui         |    2 +-
 gtk/ui/gtkfilechooserwidget.ui         |   20 +-
 gtk/ui/gtkfontchooserdialog.ui         |    2 +-
 gtk/ui/gtkinfobar.ui                   |    3 -
 gtk/ui/gtkmessagedialog.ui             |    4 +-
 gtk/ui/gtkpagesetupunixdialog.ui       |    4 +-
 gtk/ui/gtkplacesview.ui                |    2 -
 gtk/ui/gtkprintunixdialog.ui           |   32 +--
 gtk/ui/gtkrecentchooserdefault.ui      |    4 +-
 gtk/ui/gtksearchbar.ui                 |    6 -
 gtk/ui/gtkstatusbar.ui                 |    5 +-
 tests/flicker.c                        |   42 +-
 tests/gdkgears.c                       |   10 +-
 tests/motion-compression.c             |    7 +-
 tests/overlayscroll.c                  |    2 +-
 tests/print-editor.c                   |    6 +-
 tests/syncscroll.c                     |    6 +-
 tests/testaccel.c                      |    3 +-
 tests/testactionbar.c                  |    4 +-
 tests/testadjustsize.c                 |    4 +-
 tests/testanimation.c                  |    8 +-
 tests/testappchooserbutton.c           |   10 +-
 tests/testassistant.c                  |    7 +-
 tests/testbaseline.c                   |   14 +-
 tests/testbbox.c                       |   12 +-
 tests/testbox.c                        |   44 +--
 tests/testboxcss.c                     |   16 +-
 tests/testcalendar.c                   |   64 ++--
 tests/testcellarea.c                   |   72 ++--
 tests/testcellrenderertext.c           |   10 +-
 tests/testclipboard.c                  |    4 +-
 tests/testcombo.c                      |   26 +-
 tests/testcombochange.c                |   25 +-
 tests/testellipsise.c                  |    7 +-
 tests/testentrycompletion.c            |    4 +-
 tests/testexpand.c                     |   20 +-
 tests/testexpander.c                   |    4 +-
 tests/testfilechooserbutton.c          |   28 +-
 tests/testflowbox.c                    |   49 ++--
 tests/testframe.c                      |    5 +-
 tests/testgiconpixbuf.c                |   12 +-
 tests/testgrid.c                       |   10 +-
 tests/testgtk.c                        |  705 ++++++++++++++++----------------
 tests/testheaderbar.c                  |    9 +-
 tests/testheightforwidth.c             |    2 +-
 tests/testiconview.c                   |   23 +-
 tests/testinput.c                      |    5 +-
 tests/testmultidisplay.c               |    4 +-
 tests/testorientable.c                 |   12 +-
 tests/testoverlay.c                    |    4 +-
 tests/testpixbuf-scale.c               |   12 +-
 tests/testrecentchoosermenu.c          |    6 +-
 tests/testscale.c                      |   16 +-
 tests/testscrolledwindow.c             |  116 +++---
 tests/testselection.c                  |    7 +-
 tests/testsensitive.c                  |    8 +-
 tests/testspinbutton.c                 |    2 +-
 tests/teststack.c                      |    7 +-
 tests/testswitch.c                     |   20 +-
 tests/testtoolbar.c                    |   20 +-
 tests/testtooltips.c                   |   22 +-
 tests/testtoplevelembed.c              |    5 +-
 tests/testtreecolumns.c                |   30 +-
 tests/testtreecolumnsizing.c           |    7 +-
 tests/testtreeedit.c                   |   13 +-
 tests/testtreeflow.c                   |    9 +-
 tests/testtreefocus.c                  |   10 +-
 tests/testtreesort.c                   |   19 +-
 tests/testwindowsize.c                 |    3 +-
 tests/treestoretest.c                  |   31 +-
 testsuite/a11y/placeholder-text.ui     |    3 -
 testsuite/gtk/builder.c                |    6 -
 testsuite/gtk/ui/container1.ui         |    2 +-
 testsuite/gtk/ui/container8.ui         |    2 +-
 148 files changed, 1287 insertions(+), 1580 deletions(-)
---
diff --git a/demos/gtk-demo/assistant.c b/demos/gtk-demo/assistant.c
index cdceb4c..4dd76da 100644
--- a/demos/gtk-demo/assistant.c
+++ b/demos/gtk-demo/assistant.c
@@ -96,12 +96,12 @@ create_page1 (GtkWidget *assistant)
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
 
   label = gtk_label_new ("You must fill out this entry to continue:");
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE);
 
   entry = gtk_entry_new ();
   gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
   gtk_widget_set_valign (entry, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), entry, TRUE);
   g_signal_connect (G_OBJECT (entry), "changed",
                     G_CALLBACK (on_entry_changed), assistant);
 
@@ -119,7 +119,7 @@ create_page2 (GtkWidget *assistant)
 
   checkbutton = gtk_check_button_new_with_label ("This is optional data, you may continue "
                                                  "even if you do not check this");
-  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE);
 
   gtk_assistant_append_page (GTK_ASSISTANT (assistant), box);
   gtk_assistant_set_page_complete (GTK_ASSISTANT (assistant), box, TRUE);
diff --git a/demos/gtk-demo/button_box.c b/demos/gtk-demo/button_box.c
index a5d2257..b9a17ec 100644
--- a/demos/gtk-demo/button_box.c
+++ b/demos/gtk-demo/button_box.c
@@ -70,7 +70,7 @@ do_button_box (GtkWidget *do_widget)
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
     gtk_widget_set_margin_top (frame_horz, 10);
     gtk_widget_set_margin_bottom (frame_horz, 10);
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
     g_object_set (vbox, "margin", 10, NULL);
@@ -78,30 +78,30 @@ do_button_box (GtkWidget *do_widget)
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Spread", 40, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE);
+                        TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Edge", 40, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE);
+                        TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Start", 40, GTK_BUTTONBOX_START),
-                        TRUE, TRUE);
+                         TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "End", 40, GTK_BUTTONBOX_END),
-                        TRUE, TRUE);
+                        TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Center", 40, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE);
+                        TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
-                        TRUE, TRUE);
+                        TRUE);
 
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE);
 
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
     g_object_set (hbox, "margin", 10, NULL);
@@ -109,25 +109,25 @@ do_button_box (GtkWidget *do_widget)
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Spread", 10, GTK_BUTTONBOX_SPREAD),
-                        TRUE, TRUE);
+                        TRUE);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Edge", 10, GTK_BUTTONBOX_EDGE),
-                        TRUE, TRUE);
+                         TRUE);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Start", 10, GTK_BUTTONBOX_START),
-                        TRUE, TRUE);
+                        TRUE);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "End", 10, GTK_BUTTONBOX_END),
-                        TRUE, TRUE);
+                        TRUE);
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Center", 10, GTK_BUTTONBOX_CENTER),
-                        TRUE, TRUE);
+                        TRUE);
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Expand", 0, GTK_BUTTONBOX_EXPAND),
-                        TRUE, TRUE);
+                        TRUE);
   }
 
   if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/changedisplay.c b/demos/gtk-demo/changedisplay.c
index 8f7d164..3694eb0 100644
--- a/demos/gtk-demo/changedisplay.c
+++ b/demos/gtk-demo/changedisplay.c
@@ -312,7 +312,7 @@ create_frame (ChangeDisplayInfo *info,
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrollwin),
                                        GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), scrollwin, TRUE);
 
   *tree_view = gtk_tree_view_new ();
   gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (*tree_view), FALSE);
@@ -322,7 +322,7 @@ create_frame (ChangeDisplayInfo *info,
   gtk_tree_selection_set_mode (selection, GTK_SELECTION_BROWSE);
 
   *button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), *button_vbox, FALSE);
 
   if (!info->size_group)
     info->size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
@@ -362,11 +362,11 @@ create_display_frame (ChangeDisplayInfo *info)
 
   button = left_align_button_new ("_Open...");
   g_signal_connect (button, "clicked",  G_CALLBACK (open_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE);
 
   button = left_align_button_new ("_Close");
   g_signal_connect (button, "clicked",  G_CALLBACK (close_display_cb), info);
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE);
 
   info->display_model = (GtkTreeModel *)gtk_list_store_new (DISPLAY_NUM_COLUMNS,
                                                             G_TYPE_STRING,
@@ -539,10 +539,10 @@ do_changedisplay (GtkWidget *do_widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       g_object_set (vbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE);
 
       frame = create_display_frame (info);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE);
 
       initialize_displays (info);
 
diff --git a/demos/gtk-demo/clipboard.c b/demos/gtk-demo/clipboard.c
index 444ac89..8c6f8c3 100644
--- a/demos/gtk-demo/clipboard.c
+++ b/demos/gtk-demo/clipboard.c
@@ -225,45 +225,45 @@ do_clipboard (GtkWidget *do_widget)
 
       label = gtk_label_new ("\"Copy\" will copy the text\nin the entry to the clipboard");
 
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
       /* Create the first entry */
       entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Copy"));
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (copy_button_clicked), entry);
 
       label = gtk_label_new ("\"Paste\" will paste the text from the clipboard to the entry");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
       /* Create the second entry */
       entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE);
 
       /* Create the button */
       button = gtk_button_new_with_mnemonic (_("_Paste"));
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
       g_signal_connect (button, "clicked",
                         G_CALLBACK (paste_button_clicked), entry);
 
       label = gtk_label_new ("Images can be transferred via the clipboard, too");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       g_object_set (hbox, "margin", 8, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
       /* Create the first image */
       image = gtk_image_new_from_icon_name ("dialog-warning",
diff --git a/demos/gtk-demo/colorsel.c b/demos/gtk-demo/colorsel.c
index 7f85c4e..8f6a1c5 100644
--- a/demos/gtk-demo/colorsel.c
+++ b/demos/gtk-demo/colorsel.c
@@ -87,7 +87,7 @@ do_colorsel (GtkWidget *do_widget)
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 200);
@@ -100,7 +100,7 @@ do_colorsel (GtkWidget *do_widget)
       gtk_widget_set_halign (button, GTK_ALIGN_END);
       gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
 
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
       g_signal_connect (button, "clicked",
                         G_CALLBACK (change_color_callback), NULL);
diff --git a/demos/gtk-demo/combobox.c b/demos/gtk-demo/combobox.c
index 0607866..cbff3b1 100644
--- a/demos/gtk-demo/combobox.c
+++ b/demos/gtk-demo/combobox.c
@@ -326,7 +326,7 @@ do_combobox (GtkWidget *do_widget)
      *  insensitive rows
      */
     frame = gtk_frame_new ("Items with icons");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);
@@ -367,7 +367,7 @@ do_combobox (GtkWidget *do_widget)
     /* A combobox demonstrating trees.
      */
     frame = gtk_frame_new ("Where are we ?");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);
@@ -395,7 +395,7 @@ do_combobox (GtkWidget *do_widget)
 
     /* A GtkComboBoxEntry with validation */
     frame = gtk_frame_new ("Editable");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);
@@ -413,7 +413,7 @@ do_combobox (GtkWidget *do_widget)
 
     /* A combobox with string IDs */
     frame = gtk_frame_new ("String IDs");
-    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
     box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     g_object_set (box, "margin", 5, NULL);
diff --git a/demos/gtk-demo/cursors.c b/demos/gtk-demo/cursors.c
index 580342e..019cd63 100644
--- a/demos/gtk-demo/cursors.c
+++ b/demos/gtk-demo/cursors.c
@@ -27,13 +27,13 @@ add_section (GtkWidget   *box,
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
   gtk_widget_set_margin_top (label, 10);
   gtk_widget_set_margin_bottom (label, 10);
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), label, TRUE);
   section = gtk_flow_box_new ();
   gtk_widget_set_halign (section, GTK_ALIGN_START);
   gtk_flow_box_set_selection_mode (GTK_FLOW_BOX (section), GTK_SELECTION_NONE);
   gtk_flow_box_set_min_children_per_line (GTK_FLOW_BOX (section), 2);
   gtk_flow_box_set_max_children_per_line (GTK_FLOW_BOX (section), 20);
-  gtk_box_pack_start (GTK_BOX (box), section, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), section, TRUE);
 
   return section;
 }
diff --git a/demos/gtk-demo/demo.ui b/demos/gtk-demo/demo.ui
index cfd0650..fd08164 100644
--- a/demos/gtk-demo/demo.ui
+++ b/demos/gtk-demo/demo.ui
@@ -159,9 +159,6 @@
               </object>
             </child>
           </object>
-          <packing>
-            <property name="expand">0</property>
-          </packing>
         </child>
         <child>
           <object class="GtkToolbar" id="toolbar1">
@@ -227,7 +224,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">0</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -235,6 +231,7 @@
           <object class="GtkScrolledWindow" id="scrolledwindow1">
             <property name="shadow_type">in</property>
             <property name="visible">1</property>
+            <property name="expand">1</property>
             <child>
               <object class="GtkTreeView" id="treeview1">
                 <property name="visible">1</property>
@@ -286,7 +283,6 @@
           </object>
           <packing>
             <property name="position">2</property>
-            <property name="expand">1</property>
           </packing>
         </child>
         <child>
@@ -295,7 +291,6 @@
           </object>
           <packing>
             <property name="position">3</property>
-            <property name="expand">0</property>
           </packing>
         </child>
       </object>
diff --git a/demos/gtk-demo/dialog.c b/demos/gtk-demo/dialog.c
index 983e455..5b982f5 100644
--- a/demos/gtk-demo/dialog.c
+++ b/demos/gtk-demo/dialog.c
@@ -56,15 +56,15 @@ interactive_dialog_clicked (GtkButton *button,
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE);
 
   image = gtk_image_new_from_icon_name ("dialog-question", GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), image, FALSE);
 
   table = gtk_grid_new ();
   gtk_grid_set_row_spacing (GTK_GRID (table), 4);
   gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), table, TRUE);
   label = gtk_label_new_with_mnemonic ("_Entry 1");
   gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
   local_entry1 = gtk_entry_new ();
@@ -122,30 +122,30 @@ do_dialog (GtkWidget *do_widget)
 
       /* Standard message dialog */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
       button = gtk_button_new_with_mnemonic ("_Message Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (message_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
 
       gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                          FALSE, FALSE);
+                          FALSE);
 
       /* Interactive dialog*/
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       button = gtk_button_new_with_mnemonic ("_Interactive Dialog");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (interactive_dialog_clicked), NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE);
 
       table = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (table), 4);
       gtk_grid_set_column_spacing (GTK_GRID (table), 4);
-      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), table, FALSE);
 
       label = gtk_label_new_with_mnemonic ("_Entry 1");
       gtk_grid_attach (GTK_GRID (table), label, 0, 0, 1, 1);
diff --git a/demos/gtk-demo/drawingarea.c b/demos/gtk-demo/drawingarea.c
index 6908a84..b613e3e 100644
--- a/demos/gtk-demo/drawingarea.c
+++ b/demos/gtk-demo/drawingarea.c
@@ -221,11 +221,11 @@ do_drawingarea (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Checkerboard pattern</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
@@ -240,11 +240,11 @@ do_drawingarea (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Scribble area</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE);
 
       da = gtk_drawing_area_new ();
       gtk_drawing_area_set_content_width (GTK_DRAWING_AREA (da), 100);
diff --git a/demos/gtk-demo/editable_cells.c b/demos/gtk-demo/editable_cells.c
index c890e64..63ee416 100644
--- a/demos/gtk-demo/editable_cells.c
+++ b/demos/gtk-demo/editable_cells.c
@@ -358,7 +358,7 @@ do_editable_cells (GtkWidget *do_widget)
 
       gtk_box_pack_start (GTK_BOX (vbox),
                           gtk_label_new ("Shopping list (you can edit the cells!)"),
-                          FALSE, FALSE);
+                          FALSE);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -366,7 +366,7 @@ do_editable_cells (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE);
 
       /* create models */
       items_model = create_items_model ();
@@ -387,17 +387,17 @@ do_editable_cells (GtkWidget *do_widget)
       /* some buttons */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
       gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
       button = gtk_button_new_with_label ("Add item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (add_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
 
       button = gtk_button_new_with_label ("Remove item");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (remove_item), treeview);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
 
       gtk_window_set_default_size (GTK_WINDOW (window), 320, 200);
     }
diff --git a/demos/gtk-demo/entry_buffer.c b/demos/gtk-demo/entry_buffer.c
index 5bae1a6..ad9cb80 100644
--- a/demos/gtk-demo/entry_buffer.c
+++ b/demos/gtk-demo/entry_buffer.c
@@ -34,19 +34,19 @@ do_entry_buffer (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "Entries share a buffer. Typing in one is reflected in the other.");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       /* Create a buffer */
       buffer = gtk_entry_buffer_new (NULL, 0);
 
       /* Create our first entry */
       entry = gtk_entry_new_with_buffer (buffer);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE);
 
       /* Create the second entry */
       entry = gtk_entry_new_with_buffer (buffer);
       gtk_entry_set_visibility (GTK_ENTRY (entry), FALSE);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE);
 
       g_object_unref (buffer);
     }
diff --git a/demos/gtk-demo/entry_completion.c b/demos/gtk-demo/entry_completion.c
index 306d590..7c078cd 100644
--- a/demos/gtk-demo/entry_completion.c
+++ b/demos/gtk-demo/entry_completion.c
@@ -60,11 +60,11 @@ do_entry_completion (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> 
for example.");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       /* Create our entry */
       entry = gtk_entry_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE);
 
       /* Create the completion object */
       completion = gtk_entry_completion_new ();
diff --git a/demos/gtk-demo/expander.c b/demos/gtk-demo/expander.c
index d4f1858..a4523eb 100644
--- a/demos/gtk-demo/expander.c
+++ b/demos/gtk-demo/expander.c
@@ -29,7 +29,7 @@ static void
 do_not_expand (GtkWidget *child, gpointer data)
 {
   gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (child)), child,
-                           "expand", FALSE, "fill", FALSE, NULL);
+                           "fill", FALSE, NULL);
 }
 
 GtkWidget *
@@ -59,7 +59,7 @@ do_expander (GtkWidget *do_widget)
       area = gtk_message_dialog_get_message_area (GTK_MESSAGE_DIALOG (window));
       box = gtk_widget_get_parent (area);
       gtk_container_child_set (GTK_CONTAINER (gtk_widget_get_parent (box)), box,
-                               "expand", TRUE, "fill", TRUE, NULL);
+                               "fill", TRUE, NULL);
       gtk_container_foreach (GTK_CONTAINER (area), do_not_expand, NULL);
 
       expander = gtk_expander_new ("Details:");
@@ -85,7 +85,7 @@ do_expander (GtkWidget *do_widget)
                                 "resize the window. Do it already !", -1);
       gtk_container_add (GTK_CONTAINER (sw), tv);
       gtk_container_add (GTK_CONTAINER (expander), sw);
-      gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE);
+      gtk_box_pack_end (GTK_BOX (area), expander, TRUE);
       g_signal_connect (expander, "notify::expanded",
                         G_CALLBACK (expander_cb), window);
 
diff --git a/demos/gtk-demo/iconview.c b/demos/gtk-demo/iconview.c
index bf65f4e..30537eb 100644
--- a/demos/gtk-demo/iconview.c
+++ b/demos/gtk-demo/iconview.c
@@ -266,7 +266,7 @@ do_iconview (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       tool_bar = gtk_toolbar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), tool_bar, FALSE);
 
       up_button = gtk_tool_button_new (NULL, NULL);
       gtk_tool_button_set_label (GTK_TOOL_BUTTON (up_button), _("_Up"));
@@ -290,8 +290,9 @@ do_iconview (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
+      gtk_widget_set_vexpand (sw, TRUE);
 
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE);
 
       /* Create the store and fill it with the contents of '/' */
       parent = g_strdup ("/");
diff --git a/demos/gtk-demo/images.c b/demos/gtk-demo/images.c
index 1b2c166..12a312d 100644
--- a/demos/gtk-demo/images.c
+++ b/demos/gtk-demo/images.c
@@ -354,13 +354,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Image loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       image = gtk_image_new_from_icon_name ("gtk3-demo", GTK_ICON_SIZE_DIALOG);
 
@@ -372,13 +372,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Animation loaded from a file</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       image = gtk_image_new_from_resource ("/images/floppybuddy.gif");
 
@@ -389,13 +389,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Symbolic themed icon</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       gicon = g_themed_icon_new_with_default_fallbacks ("battery-caution-charging-symbolic");
       image = gtk_image_new_from_gicon (gicon, GTK_ICON_SIZE_DIALOG);
@@ -408,13 +408,13 @@ do_images (GtkWidget *do_widget)
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label),
                             "<u>Progressive image loading</u>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       frame = gtk_frame_new (NULL);
       gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
       gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       /* Create an empty image for now; the progressive loader
        * will create the pixbuf and fill it in.
@@ -426,7 +426,7 @@ do_images (GtkWidget *do_widget)
 
       /* Sensitivity control */
       button = gtk_toggle_button_new_with_mnemonic ("_Insensitive");
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
       g_signal_connect (button, "toggled",
                         G_CALLBACK (toggle_sensitivity_callback),
diff --git a/demos/gtk-demo/infobar.c b/demos/gtk-demo/infobar.c
index 9b71794..d261bd6 100644
--- a/demos/gtk-demo/infobar.c
+++ b/demos/gtk-demo/infobar.c
@@ -65,24 +65,24 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_INFO);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_INFO");
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE);
 
       button = gtk_toggle_button_new_with_label ("Message");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | 
G_BINDING_SYNC_CREATE);
       gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_WARNING);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_WARNING");
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE);
 
       button = gtk_toggle_button_new_with_label ("Warning");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | 
G_BINDING_SYNC_CREATE);
@@ -91,24 +91,24 @@ do_infobar (GtkWidget *do_widget)
       bar = gtk_info_bar_new_with_buttons (_("_OK"), GTK_RESPONSE_OK, NULL);
       gtk_info_bar_set_show_close_button (GTK_INFO_BAR (bar), TRUE);
       g_signal_connect (bar, "response", G_CALLBACK (on_bar_response), window);
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_QUESTION);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_QUESTION");
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE);
 
       button = gtk_toggle_button_new_with_label ("Question");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | 
G_BINDING_SYNC_CREATE);
       gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_ERROR);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_ERROR");
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE);
 
       button = gtk_toggle_button_new_with_label ("Error");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | 
G_BINDING_SYNC_CREATE);
@@ -116,12 +116,12 @@ do_infobar (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (actions), button);
 
       bar = gtk_info_bar_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE);
       gtk_info_bar_set_message_type (GTK_INFO_BAR (bar), GTK_MESSAGE_OTHER);
       label = gtk_label_new ("This is an info bar with message type GTK_MESSAGE_OTHER");
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_label_set_xalign (GTK_LABEL (label), 0);
-      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (gtk_info_bar_get_content_area (GTK_INFO_BAR (bar))), label, FALSE);
 
       button = gtk_toggle_button_new_with_label ("Other");
       g_object_bind_property (bar, "revealed", button, "active", G_BINDING_BIDIRECTIONAL | 
G_BINDING_SYNC_CREATE);
@@ -130,7 +130,7 @@ do_infobar (GtkWidget *do_widget)
       frame = gtk_frame_new ("Info bars");
       gtk_widget_set_margin_top (frame, 8);
       gtk_widget_set_margin_bottom (frame, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       g_object_set (vbox2, "margin", 8, NULL);
@@ -138,9 +138,9 @@ do_infobar (GtkWidget *do_widget)
 
       /* Standard message dialog */
       label = gtk_label_new ("An example of different info bars");
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE);
 
-      gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), actions, FALSE);
     }
 
   if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/list_store.c b/demos/gtk-demo/list_store.c
index c0c37ae..b7e70b7 100644
--- a/demos/gtk-demo/list_store.c
+++ b/demos/gtk-demo/list_store.c
@@ -268,7 +268,7 @@ do_list_store (GtkWidget *do_widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       label = gtk_label_new ("This is the bug list (note: not based on real data, it would be nice to have a 
nice ODBC interface to bugzilla or so, though).");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -276,7 +276,7 @@ do_list_store (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE);
 
       /* create tree model */
       model = create_model ();
diff --git a/demos/gtk-demo/listbox.c b/demos/gtk-demo/listbox.c
index 24b679c..3d95bca 100644
--- a/demos/gtk-demo/listbox.c
+++ b/demos/gtk-demo/listbox.c
@@ -359,10 +359,11 @@ do_listbox (GtkWidget *do_widget)
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
       gtk_container_add (GTK_CONTAINER (window), vbox);
       label = gtk_label_new ("Messages from Gtk+ and friends");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
       scrolled = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled), GTK_POLICY_NEVER, 
GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE);
+      gtk_widget_set_vexpand (scrolled, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE);
       listbox = gtk_list_box_new ();
       gtk_container_add (GTK_CONTAINER (scrolled), listbox);
 
diff --git a/demos/gtk-demo/main.ui b/demos/gtk-demo/main.ui
index d3f10e1..99b4957 100644
--- a/demos/gtk-demo/main.ui
+++ b/demos/gtk-demo/main.ui
@@ -97,6 +97,7 @@
             <property name="scrollable">1</property>
             <property name="enable_popup">1</property>
             <property name="show_border">0</property>
+            <property name="expand">1</property>
             <child>
               <object class="GtkScrolledWindow">
                 <property name="visible">1</property>
@@ -166,7 +167,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/demos/gtk-demo/menus.c b/demos/gtk-demo/menus.c
index 9fdd353..107a6db 100644
--- a/demos/gtk-demo/menus.c
+++ b/demos/gtk-demo/menus.c
@@ -115,7 +115,7 @@ do_menus (GtkWidget *do_widget)
 
       menubar = gtk_menu_bar_new ();
       gtk_widget_set_hexpand (menubar, TRUE);
-      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), menubar, TRUE);
       gtk_widget_show (menubar);
 
       menu = create_menu (2);
@@ -136,19 +136,19 @@ do_menus (GtkWidget *do_widget)
       gtk_widget_show (menuitem);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
       gtk_widget_show (box2);
 
       button = gtk_button_new_with_label ("Flip");
       g_signal_connect (button, "clicked",
                         G_CALLBACK (change_orientation), menubar);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
                                 G_CALLBACK(gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
diff --git a/demos/gtk-demo/overlay.c b/demos/gtk-demo/overlay.c
index f3b836d..c6d7e90 100644
--- a/demos/gtk-demo/overlay.c
+++ b/demos/gtk-demo/overlay.c
@@ -65,12 +65,12 @@ do_overlay (GtkWidget *do_widget)
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       gtk_widget_set_margin_top (label, 8);
       gtk_widget_set_margin_bottom (label, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       gtk_entry_set_placeholder_text (GTK_ENTRY (entry), "Your Lucky Number");
       gtk_widget_set_margin_top (entry, 8);
       gtk_widget_set_margin_bottom (entry, 8);
-      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE);
 
       gtk_container_add (GTK_CONTAINER (window), overlay);
 
diff --git a/demos/gtk-demo/panes.c b/demos/gtk-demo/panes.c
index cdfb5a9..40c67f0 100644
--- a/demos/gtk-demo/panes.c
+++ b/demos/gtk-demo/panes.c
@@ -148,7 +148,7 @@ do_panes (GtkWidget *do_widget)
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
       g_object_set (vpaned, "margin", 5, NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE);
 
       hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
@@ -178,14 +178,14 @@ do_panes (GtkWidget *do_widget)
                                                "Horizontal",
                                                "Left",
                                                "Right"),
-                          FALSE, FALSE);
+                          FALSE);
 
       gtk_box_pack_start (GTK_BOX (vbox),
                           create_pane_options (GTK_PANED (vpaned),
                                                "Vertical",
                                                "Top",
                                                "Bottom"),
-                          FALSE, FALSE);
+                          FALSE);
     }
 
   if (!gtk_widget_get_visible (window))
diff --git a/demos/gtk-demo/search_entry.c b/demos/gtk-demo/search_entry.c
index 62045ed..5655108 100644
--- a/demos/gtk-demo/search_entry.c
+++ b/demos/gtk-demo/search_entry.c
@@ -241,20 +241,20 @@ do_search_entry (GtkWidget *do_widget)
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Search entry demo");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       /* Create our entry */
       entry = gtk_search_entry_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE);
 
       /* Create the find and cancel buttons */
       notebook = gtk_notebook_new ();
       gtk_notebook_set_show_tabs (GTK_NOTEBOOK (notebook), FALSE);
       gtk_notebook_set_show_border (GTK_NOTEBOOK (notebook), FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), notebook, FALSE);
 
       find_button = gtk_button_new_with_label ("Find");
       g_signal_connect (find_button, "clicked",
diff --git a/demos/gtk-demo/search_entry2.c b/demos/gtk-demo/search_entry2.c
index 376c34e..650c256 100644
--- a/demos/gtk-demo/search_entry2.c
+++ b/demos/gtk-demo/search_entry2.c
@@ -91,12 +91,12 @@ do_search_entry2 (GtkWidget *do_widget)
       entry = gtk_search_entry_new ();
       container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_widget_set_halign (container, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (container), entry, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (container), entry, FALSE);
       searchbar = gtk_search_bar_new ();
       gtk_search_bar_connect_entry (GTK_SEARCH_BAR (searchbar), GTK_ENTRY (entry));
       gtk_search_bar_set_show_close_button (GTK_SEARCH_BAR (searchbar), FALSE);
       gtk_container_add (GTK_CONTAINER (searchbar), container);
-      gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), searchbar, FALSE);
 
       /* Hook the search bar to key presses */
       g_signal_connect (window, "key-press-event",
@@ -104,26 +104,26 @@ do_search_entry2 (GtkWidget *do_widget)
 
       /* Help */
       label = gtk_label_new ("Start Typing to search");
-      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE);
 
       /* Toggle button */
       button = gtk_toggle_button_new_with_label ("Search");
       g_object_bind_property (button, "active",
                               searchbar, "search-mode-enabled",
                               G_BINDING_BIDIRECTIONAL);
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE);
 
       /* Result */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       label = gtk_label_new ("Result:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed_cb), label);
@@ -131,15 +131,15 @@ do_search_entry2 (GtkWidget *do_widget)
                         G_CALLBACK (changed_cb), label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       label = gtk_label_new ("Signal:");
       gtk_label_set_xalign (GTK_LABEL (label), 0.0);
       gtk_widget_set_margin_start (label, 6);
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       g_signal_connect (entry, "search-changed",
                         G_CALLBACK (search_changed), label);
diff --git a/demos/gtk-demo/sidebar.c b/demos/gtk-demo/sidebar.c
index 14b5851..4d6e9ab 100644
--- a/demos/gtk-demo/sidebar.c
+++ b/demos/gtk-demo/sidebar.c
@@ -49,7 +49,7 @@ do_sidebar (GtkWidget *do_widget)
 
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       sidebar = gtk_stack_sidebar_new ();
-      gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), sidebar, FALSE);
 
       stack = gtk_stack_new ();
       gtk_stack_set_transition_type (GTK_STACK (stack), GTK_STACK_TRANSITION_TYPE_SLIDE_UP_DOWN);
@@ -57,9 +57,9 @@ do_sidebar (GtkWidget *do_widget)
 
       /* Separator between sidebar and stack */
       widget = gtk_separator_new (GTK_ORIENTATION_VERTICAL);
-      gtk_box_pack_start (GTK_BOX(box), widget, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX(box), widget, FALSE);
 
-      gtk_box_pack_start (GTK_BOX (box), stack, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), stack, TRUE);
 
       for (i=0; (c = *(pages+i)) != NULL; i++ )
         {
diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index c32fcb9..4fd1cf6 100644
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -116,7 +116,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* Create one frame holding color options */
       frame = gtk_frame_new ("Color Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE);
 
       table = gtk_grid_new ();
       g_object_set (table, "margin", 5, NULL);
@@ -129,7 +129,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And another frame holding line style options */
       frame = gtk_frame_new ("Line Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       table = gtk_grid_new ();
       g_object_set (table, "margin", 5, NULL);
@@ -142,7 +142,7 @@ do_sizegroup (GtkWidget *do_widget)
 
       /* And a check button to turn grouping on and off */
       check_button = gtk_check_button_new_with_mnemonic ("_Enable grouping");
-      gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), check_button, FALSE);
 
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
       g_signal_connect (check_button, "toggled",
diff --git a/demos/gtk-demo/spinner.c b/demos/gtk-demo/spinner.c
index e9232e8..d1beb5a 100644
--- a/demos/gtk-demo/spinner.c
+++ b/demos/gtk-demo/spinner.c
@@ -53,7 +53,7 @@ do_spinner (GtkWidget *do_widget)
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
     g_object_set (vbox, "margin", 5, NULL);
-    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE);
 
     /* Sensitive */
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
diff --git a/demos/gtk-demo/textscroll.c b/demos/gtk-demo/textscroll.c
index 07d33b8..0a1b27e 100644
--- a/demos/gtk-demo/textscroll.c
+++ b/demos/gtk-demo/textscroll.c
@@ -157,7 +157,7 @@ create_text_view (GtkWidget *hbox,
   guint timeout;
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE);
   textview = gtk_text_view_new ();
   gtk_container_add (GTK_CONTAINER (swindow), textview);
 
diff --git a/demos/gtk-demo/toolpalette.c b/demos/gtk-demo/toolpalette.c
index 4dfacd3..6a5cfed 100644
--- a/demos/gtk-demo/toolpalette.c
+++ b/demos/gtk-demo/toolpalette.c
@@ -473,7 +473,7 @@ do_toolpalette (GtkWidget *do_widget)
                                       "text", 0,
                                       NULL);
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_orientation), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo_orientation, FALSE);
 
       /* Style combo box: */
       style_model = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_INT);
@@ -512,11 +512,11 @@ do_toolpalette (GtkWidget *do_widget)
                                       "text", 0,
                                       NULL);
       gtk_combo_box_set_active_iter (GTK_COMBO_BOX (combo_style), &iter);
-      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo_style, FALSE);
 
       /* Add hbox */
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), hbox, TRUE);
 
       /* Add and fill the ToolPalette: */
       palette = gtk_tool_palette_new ();
@@ -526,6 +526,7 @@ do_toolpalette (GtkWidget *do_widget)
       load_special_items (GTK_TOOL_PALETTE (palette));
 
       palette_scroller = gtk_scrolled_window_new (NULL, NULL);
+      gtk_widget_set_vexpand (palette_scroller, TRUE);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (palette_scroller),
                                       GTK_POLICY_NEVER,
                                       GTK_POLICY_AUTOMATIC);
@@ -548,7 +549,7 @@ do_toolpalette (GtkWidget *do_widget)
 
       notebook = gtk_notebook_new ();
       g_object_set (notebook, "margin", 6, NULL);
-      gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE, FALSE);
+      gtk_box_pack_end (GTK_BOX(hbox), notebook, FALSE);
 
       /* ===== DnD for tool items ===== */
 
diff --git a/demos/gtk-demo/tree_store.c b/demos/gtk-demo/tree_store.c
index 70c6968..d4737b8 100644
--- a/demos/gtk-demo/tree_store.c
+++ b/demos/gtk-demo/tree_store.c
@@ -403,7 +403,7 @@ do_tree_store (GtkWidget *do_widget)
 
       gtk_box_pack_start (GTK_BOX (vbox),
                           gtk_label_new ("Jonathan's Holiday Card Planning Sheet"),
-                          FALSE, FALSE);
+                          FALSE);
 
       sw = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw),
@@ -411,7 +411,7 @@ do_tree_store (GtkWidget *do_widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                       GTK_POLICY_AUTOMATIC,
                                       GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE);
 
       /* create model */
       model = create_model ();
diff --git a/demos/widget-factory/widget-factory.c b/demos/widget-factory/widget-factory.c
index 1f2ab2e..76c9cc9 100644
--- a/demos/widget-factory/widget-factory.c
+++ b/demos/widget-factory/widget-factory.c
@@ -800,10 +800,11 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                 "use-markup", TRUE,
                 "halign", GTK_ALIGN_START,
                 "valign", GTK_ALIGN_CENTER,
+                "hexpand", TRUE,
                 "margin", 6,
                 "xalign", 0.0,
                 NULL);
-  gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (row), label, TRUE);
   gdk_rgba_parse (&rgba, color);
   swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                          "rgba", &rgba,
@@ -815,7 +816,7 @@ overshot (GtkScrolledWindow *sw, GtkPositionType pos, GtkWidget *widget)
                          NULL);
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (box), swatch);
-  gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (row), box, FALSE);
   gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
   row = gtk_widget_get_parent (row);
   gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
@@ -911,9 +912,10 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                     "halign", GTK_ALIGN_START,
                     "valign", GTK_ALIGN_CENTER,
                     "margin", 6,
+                    "hexpand", TRUE,
                     "xalign", 0.0,
                     NULL);
-      gtk_box_pack_start (GTK_BOX (row), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (row), label, TRUE);
       gdk_rgba_parse (&rgba, colors[i].color);
       swatch = g_object_new (g_type_from_name ("GtkColorSwatch"),
                              "rgba", &rgba,
@@ -925,7 +927,7 @@ populate_colors (GtkWidget *widget, GtkWidget *chooser)
                              NULL);
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (box), swatch);
-      gtk_box_pack_start (GTK_BOX (row), box, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (row), box, FALSE);
       gtk_list_box_insert (GTK_LIST_BOX (widget), row, -1);
       row = gtk_widget_get_parent (row);
       gtk_list_box_row_set_activatable (GTK_LIST_BOX_ROW (row), FALSE);
diff --git a/demos/widget-factory/widget-factory.ui b/demos/widget-factory/widget-factory.ui
index ec0a394..9d11516 100644
--- a/demos/widget-factory/widget-factory.ui
+++ b/demos/widget-factory/widget-factory.ui
@@ -497,6 +497,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox" id="box223">
+                            <property name="hexpand">0</property>
                             <style>
                               <class name="linked"/>
                             </style>
@@ -505,10 +506,8 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                 <property name="can_focus">1</property>
                                 <property name="invisible_char">•</property>
                                 <property name="text" translatable="yes">entry</property>
+                                <property name="hexpand">1</property>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="button224">
@@ -527,6 +526,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         </child>
                         <child>
                           <object class="GtkBox">
+                            <property name="hexpand">0</property>
                             <style>
                               <class name="linked"/>
                             </style>
@@ -534,6 +534,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               <object class="GtkComboBox">
                                 <property name="model">lrmodel</property>
                                 <property name="active">0</property>
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -541,14 +542,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox">
                                 <property name="model">lrmodel</property>
                                 <property name="active">1</property>
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -556,14 +555,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkComboBox">
                                 <property name="model">lrmodel</property>
                                 <property name="active">2</property>
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkCellRendererText"/>
                                   <attributes>
@@ -571,9 +568,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </attributes>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                           </object>
                         </child>
@@ -986,8 +980,9 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                       <object class="GtkBox" id="box20">
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
+                        <property name="hexpand">1</property>
                         <child>
-                          <object class="GtkBox" id="box21">
+                            <object class="GtkBox" id="box21">
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
                             <child>
@@ -1076,9 +1071,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                                   </packing>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                           </object>
                           <packing>
@@ -1176,7 +1168,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
@@ -1198,6 +1189,7 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                         <property name="orientation">vertical</property>
                         <property name="homogeneous">1</property>
                         <property name="spacing">6</property>
+                        <property name="hexpand">1</property>
                         <child>
                           <object class="GtkFrame" id="frame1">
                             <property name="shadow_type">in</property>
@@ -1208,9 +1200,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkFrame" id="frame2">
@@ -1223,7 +1212,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1237,7 +1225,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
@@ -1252,13 +1239,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">3</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">1</property>
                         <property name="position">6</property>
                       </packing>
                     </child>
@@ -1274,12 +1259,14 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                       <object class="GtkBox" id="box4">
                         <property name="orientation">vertical</property>
                         <property name="spacing">6</property>
+                        <property name="hexpand">1</property>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow1">
                             <property name="width_request">150</property>
                             <property name="can_focus">1</property>
                             <property name="vscrollbar_policy">always</property>
                             <property name="shadow_type">in</property>
+                            <property name="vexpand">1</property>
                             <child>
                               <object class="GtkTreeView" id="treeview1">
                                 <property name="can_focus">1</property>
@@ -1350,14 +1337,12 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkScrolledWindow" id="scrolledwindow2">
                             <property name="can_focus">1</property>
                             <property name="shadow_type">in</property>
+                            <property name="vexpand">1</property>
                             <child>
                               <object class="GtkTextView" id="textview1">
                                 <property name="can_focus">1</property>
@@ -1370,13 +1355,11 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">1</property>
                         <property name="position">8</property>
                       </packing>
                     </child>
@@ -1618,7 +1601,6 @@ Suspendisse feugiat quam quis dolor accumsan cursus.</property>
                     </child>
                   </object>
                   <packing>
-                    <property name="expand">1</property>
                     <property name="position">4</property>
                   </packing>
                 </child>
@@ -1831,9 +1813,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkSwitch" id="listboxrow1switch">
@@ -1861,9 +1840,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkScale">
@@ -1893,9 +1869,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkImage" id="listboxrow3image">
@@ -1925,9 +1898,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkImage">
@@ -1958,9 +1928,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkButton" id="listboxrow5button">
@@ -1989,9 +1956,6 @@ microphone-sensitivity-medium-symbolic</property>
                                             <property name="valign">center</property>
                                             <property name="margin">6</property>
                                           </object>
-                                          <packing>
-                                            <property name="expand">1</property>
-                                          </packing>
                                         </child>
                                         <child>
                                           <object class="GtkCheckButton">
@@ -2416,9 +2380,6 @@ microphone-sensitivity-medium-symbolic</property>
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -2632,6 +2593,7 @@ microphone-sensitivity-medium-symbolic</property>
                           <object class="GtkListBox" id="munsell">
                             <property name="selection-mode">multiple</property>
                             <property name="activate-on-single-click">0</property>
+                            <property name="hexpand">0</property>
                           </object>
                         </child>
                       </object>
@@ -2951,6 +2913,7 @@ microphone-sensitivity-medium-symbolic</property>
                       <object class="GtkFrame">
                         <child>
                           <object class="GtkBox">
+                            <property name="hexpand">0</property>
                             <child>
                               <object class="GtkToolbar">
                                 <property name="orientation">vertical</property>
@@ -2980,14 +2943,12 @@ microphone-sensitivity-medium-symbolic</property>
                             </child>
                             <child>
                               <object class="GtkScrolledWindow">
+                                <property name="hexpand">1</property>
                                 <child>
                                   <object class="GtkTextView" id="tooltextview">
                                   </object>
                                 </child>
                               </object>
-                              <packing>
-                                <property name="expand">1</property>
-                              </packing>
                             </child>
                             <child>
                               <object class="GtkBox">
@@ -3025,9 +2986,6 @@ microphone-sensitivity-medium-symbolic</property>
                                     <property name="valign">end</property>
                                     <property name="icon-name">edit-delete-symbolic</property>
                                   </object>
-                                  <packing>
-                                    <property name="expand">1</property>
-                                  </packing>
                                 </child>
                               </object>
                             </child>
diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c
index 8ec4e2d..dbc8296 100644
--- a/docs/tools/widgets.c
+++ b/docs/tools/widgets.c
@@ -86,9 +86,9 @@ create_switch (void)
   widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   sw = gtk_switch_new ();
   gtk_switch_set_active (GTK_SWITCH (sw), TRUE);
-  gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE);
+  gtk_container_add (GTK_CONTAINER (widget), sw);
   sw = gtk_switch_new ();
-  gtk_box_pack_start (GTK_BOX (widget), sw, TRUE, TRUE);
+  gtk_container_add (GTK_CONTAINER (widget), sw);
 
   gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
@@ -150,11 +150,11 @@ create_menu_button (void)
   gtk_menu_button_set_popup (GTK_MENU_BUTTON (widget), menu);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_container_add (GTK_CONTAINER (vbox), widget);
   gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Menu Button"), TRUE);
 
   return new_widget_info ("menu-button", vbox, SMALL);
 }
@@ -203,10 +203,10 @@ create_lockbutton (void)
   widget = gtk_lock_button_new (g_object_new (G_TYPE_TEST_PERMISSION, NULL));
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Lock Button"),
-                     FALSE, FALSE);
+                     FALSE);
   gtk_widget_set_halign (vbox, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (vbox, GTK_ALIGN_CENTER);
 
@@ -248,11 +248,11 @@ create_radio (void)
 
   widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   radio = gtk_radio_button_new_with_mnemonic (NULL, "Radio Button _One");
-  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE);
   radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button _Two");
-  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE);
   radio = gtk_radio_button_new_with_mnemonic_from_widget (GTK_RADIO_BUTTON (radio), "Radio Button T_hree");
-  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (widget), radio, FALSE);
   gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
@@ -404,8 +404,7 @@ create_search_bar (void)
   gtk_container_add (GTK_CONTAINER (box), widget);
 
   view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), view, TRUE);
 
   info = new_widget_info ("search-bar", box, SMALL);
 
@@ -423,8 +422,7 @@ create_action_bar (void)
 
   box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   view = gtk_text_view_new ();
-  gtk_widget_show (view);
-  gtk_box_pack_start (GTK_BOX (box), view, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), view, TRUE);
 
   widget = gtk_action_bar_new ();
 
@@ -554,10 +552,10 @@ create_icon_view (void)
   gtk_container_add (GTK_CONTAINER (widget), icon_view);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Icon View"),
-                     FALSE, FALSE);
+                     FALSE);
 
   info = new_widget_info ("icon-view", vbox, MEDIUM);
   info->no_focus = FALSE;
@@ -579,10 +577,10 @@ create_color_button (void)
   picker = gtk_color_button_new_with_rgba (&color);
   gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Color Button"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("color-button", vbox, SMALL);
 }
@@ -597,10 +595,10 @@ create_font_button (void)
   picker = gtk_font_button_new_with_font ("Sans Serif 10");
   gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Font Button"),
-                     FALSE, FALSE);
+                      FALSE);
 
   return new_widget_info ("font-button", vbox, SMALL);
 }
@@ -620,16 +618,16 @@ create_file_button (void)
   gtk_widget_set_size_request (picker, 150, -1);
   gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox2),
                      gtk_label_new ("File Button (Files)"),
-                     FALSE, FALSE);
+                     FALSE);
 
   gtk_box_pack_start (GTK_BOX (vbox),
-                     vbox2, TRUE, TRUE);
+                     vbox2, TRUE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                     FALSE, FALSE);
+                     FALSE);
 
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   picker = gtk_file_chooser_button_new ("File Chooser Button",
@@ -640,12 +638,12 @@ create_file_button (void)
   g_free (path);
   gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), picker, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox2),
                      gtk_label_new ("File Button (Select Folder)"),
-                     FALSE, FALSE);
+                     FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
-                     vbox2, TRUE, TRUE);
+                     vbox2, TRUE);
 
   return new_widget_info ("file-button", vbox, MEDIUM);
 }
@@ -661,17 +659,17 @@ create_separator (void)
   gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
   gtk_box_pack_start (GTK_BOX (hbox),
                      gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                     TRUE, TRUE);
+                     TRUE);
   gtk_box_pack_start (GTK_BOX (hbox),
                      gtk_separator_new (GTK_ORIENTATION_VERTICAL),
-                     TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+                     TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      g_object_new (GTK_TYPE_LABEL,
                                    "label", "Horizontal and Vertical\nSeparators",
                                    "justify", GTK_JUSTIFY_CENTER,
                                    NULL),
-                     FALSE, FALSE);
+                     FALSE);
   return new_widget_info ("separator", vbox, MEDIUM);
 }
 
@@ -698,7 +696,7 @@ create_panes (void)
                   FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (hbox),
                      pane,
-                     TRUE, TRUE);
+                     TRUE);
   pane = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack1 (GTK_PANED (pane),
                   g_object_new (GTK_TYPE_FRAME,
@@ -712,14 +710,14 @@ create_panes (void)
                   FALSE, FALSE);
   gtk_box_pack_start (GTK_BOX (hbox),
                      pane,
-                     TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+                     TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      g_object_new (GTK_TYPE_LABEL,
                                    "label", "Horizontal and Vertical\nPanes",
                                    "justify", GTK_JUSTIFY_CENTER,
                                    NULL),
-                     FALSE, FALSE);
+                     FALSE);
   return new_widget_info ("panes", vbox, MEDIUM);
 }
 
@@ -881,10 +879,10 @@ create_menubar (void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Menu Bar"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("menubar", vbox, SMALL);
 }
@@ -960,10 +958,10 @@ create_progressbar (void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Progress Bar"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("progressbar", vbox, SMALL);
 }
@@ -978,10 +976,10 @@ create_level_bar (void)
   gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.333);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, TRUE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Level Bar"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("levelbar", vbox, SMALL);
 }
@@ -1013,10 +1011,10 @@ create_scrollbar (void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Scrollbar"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("scrollbar", vbox, SMALL);
 }
@@ -1032,10 +1030,10 @@ create_spinbutton (void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Spin Button"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("spinbutton", vbox, SMALL);
 }
@@ -1050,12 +1048,12 @@ create_statusbar (void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_box_pack_start (GTK_BOX (vbox),
                       gtk_label_new ("Status Bar"),
-                      FALSE, FALSE);
+                      FALSE);
   widget = gtk_statusbar_new ();
   gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   gtk_statusbar_push (GTK_STATUSBAR (widget), 0, "Hold on...");
 
-  gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), widget, FALSE);
 
   info = new_widget_info ("statusbar", vbox, SMALL);
 
@@ -1074,18 +1072,18 @@ create_scales (void)
   gtk_box_pack_start (GTK_BOX (hbox),
                      gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
                                                 0.0, 100.0, 1.0),
-                     TRUE, TRUE);
+                     TRUE);
   gtk_box_pack_start (GTK_BOX (hbox),
                      gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
                                                 0.0, 100.0, 1.0),
-                     TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+                     TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      g_object_new (GTK_TYPE_LABEL,
                                    "label", "Horizontal and Vertical\nScales",
                                    "justify", GTK_JUSTIFY_CENTER,
                                    NULL),
-                     FALSE, FALSE);
+                     FALSE);
   return new_widget_info ("scales", vbox, MEDIUM);}
 
 static WidgetInfo *
@@ -1100,10 +1098,10 @@ create_image (void)
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Image"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("image", vbox, SMALL);
 }
@@ -1121,10 +1119,10 @@ create_spinner (void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 3);
   gtk_widget_set_halign (widget, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (widget, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                      gtk_label_new ("Spinner"),
-                     FALSE, FALSE);
+                     FALSE);
 
   return new_widget_info ("spinner", vbox, SMALL);
 }
@@ -1143,7 +1141,7 @@ create_volume_button (void)
   gtk_container_add (GTK_CONTAINER (widget), box);
 
   button = gtk_volume_button_new ();
-  gtk_box_pack_end (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (box), button, FALSE);
 
   gtk_scale_button_set_value (GTK_SCALE_BUTTON (button), 33);
   popup = gtk_scale_button_get_popup (GTK_SCALE_BUTTON (button));
@@ -1192,10 +1190,10 @@ create_appchooserbutton (void)
   picker = gtk_app_chooser_button_new ("text/plain");
   gtk_widget_set_halign (picker, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (picker, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), picker, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                       gtk_label_new ("Application Button"),
-                      FALSE, FALSE);
+                      FALSE);
 
   return new_widget_info ("appchooserbutton", vbox, SMALL);
 }
@@ -1278,10 +1276,10 @@ create_placessidebar (void)
   gtk_widget_set_halign (bar, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (bar, GTK_ALIGN_CENTER);
 
-  gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), bar, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                       gtk_label_new ("Places Sidebar"),
-                      FALSE, FALSE);
+                      FALSE);
 
   return new_widget_info ("placessidebar", vbox, ASIS);
 }
@@ -1311,11 +1309,11 @@ create_stack (void)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                       gtk_label_new ("Stack"),
-                      FALSE, FALSE);
+                      FALSE);
 
   return new_widget_info ("stack", vbox, ASIS);
 }
@@ -1345,11 +1343,11 @@ create_stack_switcher (void)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), switcher, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), stack, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox),
                       gtk_label_new ("Stack Switcher"),
-                      FALSE, FALSE);
+                      FALSE);
 
   return new_widget_info ("stackswitcher", vbox, ASIS);
 }
@@ -1381,9 +1379,9 @@ create_sidebar (void)
   frame = gtk_frame_new (NULL);
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
 
-  gtk_box_pack_start (GTK_BOX (hbox), sidebar, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), stack, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), sidebar, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), gtk_separator_new (GTK_ORIENTATION_VERTICAL), FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), stack, TRUE);
   gtk_container_add (GTK_CONTAINER (frame), hbox);
 
   return new_widget_info ("sidebar", frame, ASIS);
@@ -1475,9 +1473,9 @@ create_flow_box (void)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Flow Box"),
-                      FALSE, FALSE);
+                      FALSE);
   info = new_widget_info ("flow-box", vbox, ASIS);
   info->no_focus = FALSE;
 
diff --git a/examples/search-bar.c b/examples/search-bar.c
index 8617ed6..3d3a1ad 100644
--- a/examples/search-bar.c
+++ b/examples/search-bar.c
@@ -27,15 +27,13 @@ activate_cb (GtkApplication *app,
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (search_bar), box);
-  gtk_widget_show (box);
 
   entry = gtk_search_entry_new ();
-  gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
-  gtk_widget_show (entry);
+  gtk_widget_set_hexpand (entry, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), entry, TRUE);
 
   menu_button = gtk_menu_button_new ();
-  gtk_box_pack_start (GTK_BOX (box), menu_button, FALSE, FALSE);
-  gtk_widget_show (menu_button);
+  gtk_box_pack_start (GTK_BOX (box), menu_button, FALSE);
 
   gtk_search_bar_connect_entry (GTK_SEARCH_BAR (search_bar), GTK_ENTRY (entry));
 
diff --git a/gtk/gtkactionbar.c b/gtk/gtkactionbar.c
index db76a66..a6aa7c7 100644
--- a/gtk/gtkactionbar.c
+++ b/gtk/gtkactionbar.c
@@ -412,7 +412,7 @@ gtk_action_bar_pack_start (GtkActionBar *action_bar,
 {
   GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
 
-  gtk_box_pack_start (GTK_BOX (priv->box), child, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (priv->box), child, TRUE);
 }
 
 /**
@@ -431,7 +431,7 @@ gtk_action_bar_pack_end (GtkActionBar *action_bar,
 {
   GtkActionBarPrivate *priv = gtk_action_bar_get_instance_private (action_bar);
 
-  gtk_box_pack_end (GTK_BOX (priv->box), child, FALSE, TRUE);
+  gtk_box_pack_end (GTK_BOX (priv->box), child, TRUE);
 }
 
 /**
diff --git a/gtk/gtkappchooserdialog.c b/gtk/gtkappchooserdialog.c
index c9077fd..11d844f 100644
--- a/gtk/gtkappchooserdialog.c
+++ b/gtk/gtkappchooserdialog.c
@@ -347,7 +347,9 @@ construct_appchooser_widget (GtkAppChooserDialog *self)
 
   /* Need to build the appchooser widget after, because of the content-type construct-only property */
   self->priv->app_chooser_widget = gtk_app_chooser_widget_new (self->priv->content_type);
-  gtk_box_pack_start (GTK_BOX (self->priv->inner_box), self->priv->app_chooser_widget, TRUE, TRUE);
+  gtk_widget_set_vexpand (self->priv->app_chooser_widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (self->priv->inner_box), self->priv->app_chooser_widget, TRUE);
+
 
   g_signal_connect (self->priv->app_chooser_widget, "application-selected",
                     G_CALLBACK (widget_application_selected_cb), self);
@@ -360,10 +362,10 @@ construct_appchooser_widget (GtkAppChooserDialog *self)
 
   /* Add the custom button to the new appchooser */
   gtk_box_pack_start (GTK_BOX (self->priv->inner_box),
-                      self->priv->show_more_button, FALSE, FALSE);
+                      self->priv->show_more_button, FALSE);
 
   gtk_box_pack_start (GTK_BOX (self->priv->inner_box),
-                      self->priv->software_button, FALSE, FALSE);
+                      self->priv->software_button, FALSE);
 
   info = gtk_app_chooser_get_app_info (GTK_APP_CHOOSER (self->priv->app_chooser_widget));
   gtk_dialog_set_response_sensitive (GTK_DIALOG (self), GTK_RESPONSE_OK, info != NULL);
diff --git a/gtk/gtkassistant.c b/gtk/gtkassistant.c
index 205a943..184aa49 100644
--- a/gtk/gtkassistant.c
+++ b/gtk/gtkassistant.c
@@ -1727,14 +1727,14 @@ gtk_assistant_insert_page (GtkAssistant *assistant,
 
   priv->pages = g_list_insert (priv->pages, page_info, position);
 
-  gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->regular_title, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->current_title, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->regular_title, FALSE);
+  gtk_box_pack_start (GTK_BOX (priv->sidebar), page_info->current_title, FALSE);
   gtk_box_reorder_child (GTK_BOX (priv->sidebar), page_info->regular_title, 2 * position);
   gtk_box_reorder_child (GTK_BOX (priv->sidebar), page_info->current_title, 2 * position + 1);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_widget_show (box);
-  gtk_box_pack_start (GTK_BOX (box), page, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), page, TRUE);
   g_object_set (box, "margin", 12, NULL);
   g_signal_connect (box, "remove", G_CALLBACK (assistant_remove_page_cb), assistant);
 
@@ -1837,7 +1837,7 @@ add_to_action_area (GtkAssistant *assistant,
 
   gtk_widget_set_valign (child, GTK_ALIGN_BASELINE);
 
-  gtk_box_pack_end (GTK_BOX (priv->action_area), child, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (priv->action_area), child, FALSE);
 }
 
 /**
diff --git a/gtk/gtkbbox.c b/gtk/gtkbbox.c
index 0928956..cb849fd 100644
--- a/gtk/gtkbbox.c
+++ b/gtk/gtkbbox.c
@@ -145,7 +145,7 @@ static void
 gtk_button_box_add (GtkContainer *container,
                     GtkWidget    *widget)
 {
-  gtk_box_pack_start (GTK_BOX (container), widget, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (container), widget, TRUE);
 }
 
 static void
diff --git a/gtk/gtkbox.c b/gtk/gtkbox.c
index 71bac69..34f57eb 100644
--- a/gtk/gtkbox.c
+++ b/gtk/gtkbox.c
@@ -112,7 +112,6 @@ enum {
 
 enum {
   CHILD_PROP_0,
-  CHILD_PROP_EXPAND,
   CHILD_PROP_FILL,
   CHILD_PROP_PACK_TYPE,
   CHILD_PROP_POSITION,
@@ -141,9 +140,6 @@ static GParamSpec *child_props[LAST_CHILD_PROP] = { NULL, };
  * GtkBoxChild:
  * @widget: the child widget, packed into the GtkBox.
  *  neighbors, set when packed, zero by default.
- * @expand: flag indicates whether extra space should be given to this child.
- *  Any extra space given to the parent GtkBox is divided up among all children
- *  with this attribute set to %TRUE; set when packed, %TRUE by default.
  * @fill: flag indicates whether any extra space given to this child due to its
  *  @expand attribute being set is actually allocated to the child, rather than
  *  being used as padding around the widget; set when packed, %TRUE by default.
@@ -154,7 +150,6 @@ struct _GtkBoxChild
 {
   GtkWidget *widget;
 
-  guint      expand : 1;
   guint      fill   : 1;
   guint      pack   : 1;
 };
@@ -276,25 +271,6 @@ gtk_box_class_init (GtkBoxClass *class)
   g_object_class_install_properties (object_class, LAST_PROP, props);
 
   /**
-   * GtkBox:expand:
-   *
-   * Whether the child should receive extra space when the parent grows.
-   *
-   * Note that the #GtkWidget:halign, #GtkWidget:valign, #GtkWidget:hexpand
-   * and #GtkWidget:vexpand properties are the preferred way to influence
-   * child size allocation in containers.
-   *
-   * In contrast to #GtkWidget:hexpand, the expand child property does
-   * not cause the box to expand itself.
-   */
-  child_props[CHILD_PROP_EXPAND] =
-      g_param_spec_boolean ("expand",
-                            P_("Expand"),
-                            P_("Whether the child should receive extra space when the parent grows"),
-                            FALSE,
-                            GTK_PARAM_READWRITE);
-
-  /**
    * GtkBox:fill:
    *
    * Whether the child should receive extra space when the parent grows.
@@ -437,7 +413,7 @@ count_expand_children (GtkBox *box,
       if (_gtk_widget_get_visible (child->widget))
        {
          *visible_children += 1;
-         if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
+          if (gtk_widget_compute_expand (child->widget, private->orientation))
            *expand_children += 1;
        }
     }
@@ -616,7 +592,7 @@ gtk_box_size_allocate_no_center (GtkWidget           *widget,
            {
               child_size = sizes[i].minimum_size;
 
-             if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
+              if (gtk_widget_compute_expand (child->widget, private->orientation))
                {
                   child_size += size_given_to_child;
 
@@ -832,7 +808,7 @@ gtk_box_size_allocate_with_center (GtkWidget           *widget,
           _gtk_widget_get_visible (child->widget))
         {
           nvis[child->pack] += 1;
-          if (child->expand || gtk_widget_compute_expand (child->widget, priv->orientation))
+          if (gtk_widget_compute_expand (child->widget, priv->orientation))
             nexp[child->pack] += 1;
         }
     }
@@ -889,7 +865,7 @@ gtk_box_size_allocate_with_center (GtkWidget           *widget,
     }
 
   /* Determine size of center */
-  if (priv->center->expand)
+  if (gtk_widget_compute_expand (priv->center->widget, priv->orientation))
     center_size = MAX (box_size - 2 * MAX (nat_size[0], nat_size[1]), center_req.minimum_size);
   else
     center_size = MAX (MIN (center_req.natural_size, box_size - min_size[0] - min_size[1]), 
center_req.minimum_size);
@@ -961,7 +937,7 @@ gtk_box_size_allocate_with_center (GtkWidget           *widget,
             {
               child_size = sizes[packing][i].minimum_size;
 
-              if (child->expand || gtk_widget_compute_expand (child->widget, priv->orientation))
+              if (gtk_widget_compute_expand (child->widget, priv->orientation))
                 {
                   child_size += size_given_to_child[packing];
 
@@ -1211,36 +1187,25 @@ gtk_box_set_child_property (GtkContainer *container,
                             const GValue *value,
                             GParamSpec   *pspec)
 {
-  gboolean expand = 0;
   gboolean fill = 0;
   GtkPackType pack_type = 0;
 
   if (property_id != CHILD_PROP_POSITION)
     gtk_box_query_child_packing (GTK_BOX (container),
                                 child,
-                                &expand,
                                 &fill,
                                 &pack_type);
   switch (property_id)
     {
-    case CHILD_PROP_EXPAND:
-      gtk_box_set_child_packing (GTK_BOX (container),
-                                child,
-                                g_value_get_boolean (value),
-                                fill,
-                                pack_type);
-      break;
     case CHILD_PROP_FILL:
       gtk_box_set_child_packing (GTK_BOX (container),
                                 child,
-                                expand,
                                 g_value_get_boolean (value),
                                 pack_type);
       break;
     case CHILD_PROP_PACK_TYPE:
       gtk_box_set_child_packing (GTK_BOX (container),
                                 child,
-                                expand,
                                 fill,
                                 g_value_get_enum (value));
       break;
@@ -1262,7 +1227,6 @@ gtk_box_get_child_property (GtkContainer *container,
                            GValue       *value,
                            GParamSpec   *pspec)
 {
-  gboolean expand = FALSE;
   gboolean fill = FALSE;
   GtkPackType pack_type = 0;
   GList *list;
@@ -1270,15 +1234,11 @@ gtk_box_get_child_property (GtkContainer *container,
   if (property_id != CHILD_PROP_POSITION)
     gtk_box_query_child_packing (GTK_BOX (container),
                                 child,
-                                &expand,
                                 &fill,
                                 &pack_type);
   switch (property_id)
     {
       guint i;
-    case CHILD_PROP_EXPAND:
-      g_value_set_boolean (value, expand);
-      break;
     case CHILD_PROP_FILL:
       g_value_set_boolean (value, fill);
       break;
@@ -1471,7 +1431,6 @@ gtk_box_direction_changed (GtkWidget        *widget,
 static GtkBoxChild *
 gtk_box_pack (GtkBox      *box,
               GtkWidget   *child,
-              gboolean     expand,
               gboolean     fill,
               GtkPackType  pack_type)
 {
@@ -1485,7 +1444,6 @@ gtk_box_pack (GtkBox      *box,
 
   child_info = g_new (GtkBoxChild, 1);
   child_info->widget = child;
-  child_info->expand = expand ? TRUE : FALSE;
   child_info->fill = fill ? TRUE : FALSE;
   child_info->pack = pack_type;
 
@@ -1496,8 +1454,6 @@ gtk_box_pack (GtkBox      *box,
 
   gtk_widget_set_parent (child, GTK_WIDGET (box));
 
-  if (expand)
-    gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_EXPAND]);
   if (!fill)
     gtk_container_child_notify_by_pspec (container, child, child_props[CHILD_PROP_FILL]);
   if (pack_type != GTK_PACK_START)
@@ -1817,7 +1773,7 @@ gtk_box_compute_size_for_opposing_orientation (GtkBox *box,
                {
                  child_size = sizes[i].minimum_size;
 
-                 if (child->expand || gtk_widget_compute_expand (child->widget, private->orientation))
+                  if (gtk_widget_compute_expand (child->widget, private->orientation))
                    {
                       child_size += size_given_to_child;
 
@@ -2043,9 +1999,6 @@ gtk_box_new (GtkOrientation orientation,
  * gtk_box_pack_start:
  * @box: a #GtkBox
  * @child: the #GtkWidget to be added to @box
- * @expand: %TRUE if the new child is to be given extra space allocated
- *     to @box. The extra space will be divided evenly between all children
- *     that use this option
  * @fill: %TRUE if space given to @child by the @expand option is
  *     actually allocated to @child, rather than just padding it.  This
  *     parameter has no effect if @expand is set to %FALSE.  A child is
@@ -2059,19 +2012,15 @@ gtk_box_new (GtkOrientation orientation,
 void
 gtk_box_pack_start (GtkBox    *box,
                    GtkWidget *child,
-                   gboolean   expand,
                    gboolean   fill)
 {
-  gtk_box_pack (box, child, expand, fill, GTK_PACK_START);
+  gtk_box_pack (box, child, fill, GTK_PACK_START);
 }
 
 /**
  * gtk_box_pack_end:
  * @box: a #GtkBox
  * @child: the #GtkWidget to be added to @box
- * @expand: %TRUE if the new child is to be given extra space allocated
- *   to @box. The extra space will be divided evenly between all children
- *   of @box that use this option
  * @fill: %TRUE if space given to @child by the @expand option is
  *   actually allocated to @child, rather than just padding it.  This
  *   parameter has no effect if @expand is set to %FALSE.  A child is
@@ -2085,10 +2034,9 @@ gtk_box_pack_start (GtkBox    *box,
 void
 gtk_box_pack_end (GtkBox    *box,
                  GtkWidget *child,
-                 gboolean   expand,
                  gboolean   fill)
 {
-  gtk_box_pack (box, child, expand, fill, GTK_PACK_END);
+  gtk_box_pack (box, child, fill, GTK_PACK_END);
 }
 
 /**
@@ -2307,8 +2255,6 @@ gtk_box_reorder_child (GtkBox    *box,
  * gtk_box_query_child_packing:
  * @box: a #GtkBox
  * @child: the #GtkWidget of the child to query
- * @expand: (out) (optional): pointer to return location for expand child
- *     property
  * @fill: (out) (optional): pointer to return location for fill child
  *     property
  * @pack_type: (out) (optional): pointer to return location for pack-type
@@ -2319,7 +2265,6 @@ gtk_box_reorder_child (GtkBox    *box,
 void
 gtk_box_query_child_packing (GtkBox      *box,
                             GtkWidget   *child,
-                            gboolean    *expand,
                             gboolean    *fill,
                             GtkPackType *pack_type)
 {
@@ -2344,8 +2289,6 @@ gtk_box_query_child_packing (GtkBox      *box,
 
   if (list)
     {
-      if (expand)
-       *expand = child_info->expand;
       if (fill)
        *fill = child_info->fill;
       if (pack_type)
@@ -2357,7 +2300,6 @@ gtk_box_query_child_packing (GtkBox      *box,
  * gtk_box_set_child_packing:
  * @box: a #GtkBox
  * @child: the #GtkWidget of the child to set
- * @expand: the new value of the expand child property
  * @fill: the new value of the fill child property
  * @pack_type: the new value of the pack-type child property
  *
@@ -2366,7 +2308,6 @@ gtk_box_query_child_packing (GtkBox      *box,
 void
 gtk_box_set_child_packing (GtkBox      *box,
                           GtkWidget   *child,
-                          gboolean     expand,
                           gboolean     fill,
                           GtkPackType  pack_type)
 {
@@ -2392,14 +2333,6 @@ gtk_box_set_child_packing (GtkBox      *box,
   gtk_widget_freeze_child_notify (child);
   if (list)
     {
-      expand = expand != FALSE;
-
-      if (child_info->expand != expand)
-        {
-          child_info->expand = expand;
-          gtk_container_child_notify_by_pspec (GTK_CONTAINER (box), child, child_props[CHILD_PROP_EXPAND]);
-        }
-
       fill = fill != FALSE;
 
       if (child_info->fill != fill)
@@ -2429,7 +2362,6 @@ gtk_box_add (GtkContainer *container,
             GtkWidget    *widget)
 {
   gtk_box_pack_start (GTK_BOX (container), widget,
-                      FALSE,
                       TRUE);
 }
 
@@ -2570,7 +2502,7 @@ gtk_box_set_center_widget (GtkBox    *box,
     }
 
   if (widget)
-    priv->center = gtk_box_pack (box, widget, FALSE, TRUE, GTK_PACK_START);
+    priv->center = gtk_box_pack (box, widget, TRUE, GTK_PACK_START);
 
   if (old_center)
     g_object_unref (old_center);
diff --git a/gtk/gtkbox.h b/gtk/gtkbox.h
index b89812a..af99839 100644
--- a/gtk/gtkbox.h
+++ b/gtk/gtkbox.h
@@ -83,12 +83,10 @@ GtkWidget*  gtk_box_new                 (GtkOrientation  orientation,
 GDK_AVAILABLE_IN_ALL
 void        gtk_box_pack_start          (GtkBox         *box,
                                          GtkWidget      *child,
-                                         gboolean        expand,
                                          gboolean        fill);
 GDK_AVAILABLE_IN_ALL
 void        gtk_box_pack_end            (GtkBox         *box,
                                          GtkWidget      *child,
-                                         gboolean        expand,
                                          gboolean        fill);
 
 GDK_AVAILABLE_IN_ALL
@@ -115,13 +113,11 @@ void        gtk_box_reorder_child       (GtkBox         *box,
 GDK_AVAILABLE_IN_ALL
 void        gtk_box_query_child_packing (GtkBox         *box,
                                          GtkWidget      *child,
-                                         gboolean       *expand,
                                          gboolean       *fill,
                                          GtkPackType    *pack_type);
 GDK_AVAILABLE_IN_ALL
 void        gtk_box_set_child_packing   (GtkBox         *box,
                                          GtkWidget      *child,
-                                         gboolean        expand,
                                          gboolean        fill,
                                          GtkPackType     pack_type);
 
diff --git a/gtk/gtkcolorchooserwidget.c b/gtk/gtkcolorchooserwidget.c
index 712e8fe..259a6ae 100644
--- a/gtk/gtkcolorchooserwidget.c
+++ b/gtk/gtkcolorchooserwidget.c
@@ -535,12 +535,12 @@ gtk_color_chooser_widget_init (GtkColorChooserWidget *cc)
 
   cc->priv->custom = box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   g_object_set (box, "margin-top", 12, NULL);
-  gtk_box_pack_end (GTK_BOX (cc->priv->palette), box, FALSE, TRUE);
+  gtk_box_pack_end (GTK_BOX (cc->priv->palette), box, FALSE);
 
   /* translators: label for the custom section in the color chooser */
   cc->priv->custom_label = label = gtk_label_new (_("Custom"));
   gtk_widget_set_halign (label, GTK_ALIGN_START);
-  gtk_box_pack_end (GTK_BOX (cc->priv->palette), label, FALSE, TRUE);
+  gtk_box_pack_end (GTK_BOX (cc->priv->palette), label, FALSE);
 
   cc->priv->button = button = gtk_color_swatch_new ();
   gtk_widget_set_name (button, "add-color-button");
diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index 54c25b2..a64d5cf 100644
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1315,7 +1315,8 @@ gtk_combo_box_add (GtkContainer *container,
       priv->cell_view = NULL;
     }
 
-  gtk_box_pack_start (GTK_BOX (priv->box), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_container_add (GTK_CONTAINER (priv->box), widget);
   _gtk_bin_set_child (GTK_BIN (container), widget);
 
   if (priv->has_entry)
diff --git a/gtk/gtkcustompaperunixdialog.c b/gtk/gtkcustompaperunixdialog.c
index 9bfa7be..cc9e42f 100644
--- a/gtk/gtkcustompaperunixdialog.c
+++ b/gtk/gtkcustompaperunixdialog.c
@@ -555,7 +555,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog,
   else
     gtk_spin_button_set_digits (GTK_SPIN_BUTTON (button), 1);
 
-  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
   gtk_widget_show (button);
 
   data->spin_button = button;
@@ -569,7 +569,7 @@ new_unit_widget (GtkCustomPaperUnixDialog *dialog,
     label = gtk_label_new (_("mm"));
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
 
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
   gtk_widget_show (label);
   gtk_label_set_mnemonic_widget (GTK_LABEL (mnemonic_label), button);
 
@@ -979,13 +979,13 @@ wrap_in_frame (const gchar *label,
   g_free (bold_text);
 
   frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE);
 
   gtk_widget_set_margin_start (child, 12);
   gtk_widget_set_halign (child, GTK_ALIGN_FILL);
   gtk_widget_set_valign (child, GTK_ALIGN_FILL);
 
-  gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (frame), child, FALSE);
 
   gtk_widget_show (frame);
 
@@ -1036,11 +1036,11 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
   gtk_box_set_spacing (GTK_BOX (content_area), 2); /* 2 * 5 + 2 = 12 */
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 18);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE);
   gtk_widget_show (hbox);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE);
   gtk_widget_show (vbox);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
@@ -1048,7 +1048,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
                                   GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled),
                                        GTK_SHADOW_IN);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled, TRUE);
   gtk_widget_show (scrolled);
 
   treeview = gtk_tree_view_new_with_model (GTK_TREE_MODEL (priv->custom_paper_list));
@@ -1079,7 +1079,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
   context = gtk_widget_get_style_context (toolbar);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_INLINE_TOOLBAR);
 
-  gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), toolbar, FALSE);
   gtk_widget_show (toolbar);
 
   icon = g_themed_icon_new_with_default_fallbacks ("list-add-symbolic");
@@ -1098,7 +1098,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
   priv->values_box = vbox;
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, TRUE);
   gtk_widget_show (vbox);
 
   grid = gtk_grid_new ();
@@ -1130,7 +1130,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 
   frame = wrap_in_frame (_("Paper Size"), grid);
   gtk_widget_show (grid);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
   gtk_widget_show (frame);
 
   grid = gtk_grid_new ();
@@ -1203,7 +1203,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
                                      NULL, NULL);
 
   gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
-  gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), combo, FALSE);
   gtk_widget_show (combo);
 
   g_signal_connect_swapped (combo, "changed",
@@ -1211,7 +1211,7 @@ populate_dialog (GtkCustomPaperUnixDialog *dialog)
 
   frame = wrap_in_frame (_("Paper Margins"), grid);
   gtk_widget_show (grid);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
   gtk_widget_show (frame);
 
   update_custom_widgets_from_list (dialog);
diff --git a/gtk/gtkentrycompletion.c b/gtk/gtkentrycompletion.c
index 15b0976..803fc53 100644
--- a/gtk/gtkentrycompletion.c
+++ b/gtk/gtkentrycompletion.c
@@ -629,8 +629,9 @@ gtk_entry_completion_constructed (GObject *object)
   gtk_container_add (GTK_CONTAINER (popup_frame), priv->vbox);
 
   gtk_container_add (GTK_CONTAINER (priv->scrolled_window), priv->tree_view);
-  gtk_box_pack_start (GTK_BOX (priv->vbox), priv->scrolled_window,
-                      TRUE, TRUE);
+  gtk_widget_set_hexpand (priv->scrolled_window, TRUE);
+  gtk_widget_set_vexpand (priv->scrolled_window, TRUE);
+  gtk_container_add (GTK_CONTAINER (priv->vbox), priv->scrolled_window);
 
   /* we don't want to see the action treeview when no actions have
    * been inserted, so we pack the action treeview after the first
@@ -1323,7 +1324,7 @@ gtk_entry_completion_insert_action (GtkEntryCompletion *completion,
       gtk_tree_path_free (path);
 
       gtk_box_pack_start (GTK_BOX (completion->priv->vbox),
-                          completion->priv->action_view, FALSE, FALSE);
+                          completion->priv->action_view, FALSE);
       gtk_widget_show (completion->priv->action_view);
     }
 }
diff --git a/gtk/gtkfilechooserwidget.c b/gtk/gtkfilechooserwidget.c
index 6524503..3bc7aad 100644
--- a/gtk/gtkfilechooserwidget.c
+++ b/gtk/gtkfilechooserwidget.c
@@ -926,7 +926,7 @@ update_preview_widget_visibility (GtkFileChooserWidget *impl)
       if (!priv->preview_label)
         {
           priv->preview_label = gtk_label_new (priv->preview_display_name);
-          gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_label, FALSE, FALSE);
+          gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_label, FALSE);
           gtk_box_reorder_child (GTK_BOX (priv->preview_box), priv->preview_label, 0);
           gtk_label_set_ellipsize (GTK_LABEL (priv->preview_label), PANGO_ELLIPSIZE_MIDDLE);
           gtk_widget_show (priv->preview_label);
@@ -967,7 +967,7 @@ set_preview_widget (GtkFileChooserWidget *impl,
   if (priv->preview_widget)
     {
       gtk_widget_show (priv->preview_widget);
-      gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_widget, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (priv->preview_box), priv->preview_widget, TRUE);
       gtk_box_reorder_child (GTK_BOX (priv->preview_box),
                              priv->preview_widget,
                              (priv->use_preview_label && priv->preview_label) ? 1 : 0);
@@ -2687,7 +2687,7 @@ save_widgets_create (GtkFileChooserWidget *impl)
   gtk_style_context_add_class (gtk_widget_get_style_context (vbox), "search-bar");
 
   priv->save_widgets_table = gtk_grid_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), priv->save_widgets_table, FALSE);
   gtk_grid_set_row_spacing (GTK_GRID (priv->save_widgets_table), 12);
   gtk_grid_set_column_spacing (GTK_GRID (priv->save_widgets_table), 12);
 
@@ -2707,7 +2707,7 @@ save_widgets_create (GtkFileChooserWidget *impl)
   gtk_label_set_mnemonic_widget (GTK_LABEL (widget), priv->location_entry);
 
   priv->save_widgets = vbox;
-  gtk_box_pack_start (GTK_BOX (impl), priv->save_widgets, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (impl), priv->save_widgets, FALSE);
   gtk_box_reorder_child (GTK_BOX (impl), priv->save_widgets, 0);
   gtk_widget_show (priv->save_widgets);
 }
@@ -2774,7 +2774,7 @@ location_switch_to_filename_entry (GtkFileChooserWidget *impl)
   if (!priv->location_entry)
     {
       location_entry_create (impl);
-      gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (priv->location_entry_box), priv->location_entry, TRUE);
     }
 
   _gtk_file_chooser_entry_set_base_folder (GTK_FILE_CHOOSER_ENTRY (priv->location_entry), 
priv->current_folder);
diff --git a/gtk/gtkheaderbar.c b/gtk/gtkheaderbar.c
index 1f3130a..4473d41 100644
--- a/gtk/gtkheaderbar.c
+++ b/gtk/gtkheaderbar.c
@@ -140,7 +140,7 @@ init_sizing_box (GtkHeaderBar *bar)
   w = gtk_label_new (NULL);
   context = gtk_widget_get_style_context (w);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_TITLE);
-  gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE);
   gtk_label_set_line_wrap (GTK_LABEL (w), FALSE);
   gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE);
   gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END);
@@ -149,7 +149,7 @@ init_sizing_box (GtkHeaderBar *bar)
   w = gtk_label_new (NULL);
   context = gtk_widget_get_style_context (w);
   gtk_style_context_add_class (context, GTK_STYLE_CLASS_SUBTITLE);
-  gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (priv->label_sizing_box), w, FALSE);
   gtk_label_set_line_wrap (GTK_LABEL (w), FALSE);
   gtk_label_set_single_line_mode (GTK_LABEL (w), TRUE);
   gtk_label_set_ellipsize (GTK_LABEL (w), PANGO_ELLIPSIZE_END);
@@ -177,7 +177,7 @@ create_title_box (const char *title,
   gtk_label_set_line_wrap (GTK_LABEL (title_label), FALSE);
   gtk_label_set_single_line_mode (GTK_LABEL (title_label), TRUE);
   gtk_label_set_ellipsize (GTK_LABEL (title_label), PANGO_ELLIPSIZE_END);
-  gtk_box_pack_start (GTK_BOX (label_box), title_label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (label_box), title_label, FALSE);
   gtk_label_set_width_chars (GTK_LABEL (title_label), MIN_TITLE_CHARS);
 
   subtitle_label = gtk_label_new (subtitle);
@@ -186,7 +186,7 @@ create_title_box (const char *title,
   gtk_label_set_line_wrap (GTK_LABEL (subtitle_label), FALSE);
   gtk_label_set_single_line_mode (GTK_LABEL (subtitle_label), TRUE);
   gtk_label_set_ellipsize (GTK_LABEL (subtitle_label), PANGO_ELLIPSIZE_END);
-  gtk_box_pack_start (GTK_BOX (label_box), subtitle_label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (label_box), subtitle_label, FALSE);
   gtk_widget_set_visible (subtitle_label, subtitle && subtitle[0]);
 
   if (ret_title_label)
@@ -441,7 +441,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
 
               if (button)
                 {
-                  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+                  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
                   n_children ++;
                 }
             }
@@ -456,7 +456,7 @@ _gtk_header_bar_update_window_buttons (GtkHeaderBar *bar)
               continue;
             }
 
-          gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE);
+          gtk_box_pack_start (GTK_BOX (box), separator, FALSE);
           if (i == 1)
             gtk_box_reorder_child (GTK_BOX (box), separator, 0);
 
diff --git a/gtk/gtkinfobar.c b/gtk/gtkinfobar.c
index 62efc95..97b601c 100644
--- a/gtk/gtkinfobar.c
+++ b/gtk/gtkinfobar.c
@@ -519,7 +519,7 @@ gtk_info_bar_add_action_widget (GtkInfoBar *info_bar,
     g_warning ("Only 'activatable' widgets can be packed into the action area of a GtkInfoBar");
 
   gtk_box_pack_end (GTK_BOX (info_bar->priv->action_area),
-                    child, FALSE, FALSE);
+                    child, FALSE);
   if (response_id == GTK_RESPONSE_HELP)
     gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (info_bar->priv->action_area),
                                         child, TRUE);
diff --git a/gtk/gtkmenusectionbox.c b/gtk/gtkmenusectionbox.c
index 4d86367..3b147f4 100644
--- a/gtk/gtkmenusectionbox.c
+++ b/gtk/gtkmenusectionbox.c
@@ -134,7 +134,7 @@ gtk_menu_section_box_sync_separators (GtkMenuSectionBox *box,
     return;
 
   if (should_have_separator)
-    gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE, FALSE);
+    gtk_box_pack_start (GTK_BOX (box), box->separator, FALSE);
   else
     gtk_container_remove (GTK_CONTAINER (box), box->separator);
 }
@@ -327,7 +327,7 @@ gtk_menu_section_box_insert_func (GtkMenuTrackerItem *item,
 
   gtk_widget_set_halign (widget, GTK_ALIGN_FILL);
   if (box->iconic)
-    gtk_box_pack_start (GTK_BOX (box->item_box), widget, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (box->item_box), widget, TRUE);
   else
     gtk_container_add (GTK_CONTAINER (box->item_box), widget);
   gtk_box_reorder_child (GTK_BOX (box->item_box), widget, position);
@@ -346,7 +346,7 @@ gtk_menu_section_box_init (GtkMenuSectionBox *box)
 
   item_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   box->item_box = GTK_BOX (item_box);
-  gtk_box_pack_end (GTK_BOX (box), item_box, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (box), item_box, FALSE);
   gtk_widget_set_halign (GTK_WIDGET (item_box), GTK_ALIGN_FILL);
 
   gtk_widget_set_halign (GTK_WIDGET (box), GTK_ALIGN_FILL);
@@ -454,7 +454,7 @@ gtk_menu_section_box_new_submenu (GtkMenuTrackerItem *item,
   g_object_set_data (G_OBJECT (button), "focus", focus);
   g_object_set_data (G_OBJECT (focus), "focus", button);
 
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   g_signal_connect (focus, "clicked", G_CALLBACK (open_submenu), item);
   g_signal_connect (button, "clicked", G_CALLBACK (close_submenu), item);
@@ -514,17 +514,17 @@ gtk_menu_section_box_new_section (GtkMenuTrackerItem *item,
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_widget_set_valign (separator, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE);
 
       title = gtk_label_new (label);
       g_object_bind_property (item, "label", title, "label", G_BINDING_SYNC_CREATE);
       gtk_style_context_add_class (gtk_widget_get_style_context (title), GTK_STYLE_CLASS_SEPARATOR);
       gtk_widget_set_halign (title, GTK_ALIGN_START);
-      gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box->separator), title, FALSE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_widget_set_valign (separator, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box->separator), separator, TRUE);
     }
   else
     {
diff --git a/gtk/gtkmenutoolbutton.c b/gtk/gtkmenutoolbutton.c
index 4f498c5..05509ff 100644
--- a/gtk/gtkmenutoolbutton.c
+++ b/gtk/gtkmenutoolbutton.c
@@ -141,7 +141,7 @@ gtk_menu_tool_button_construct_contents (GtkMenuToolButton *button)
       gtk_container_remove (GTK_CONTAINER (parent),
                             priv->arrow_button);
       gtk_box_pack_end (GTK_BOX (box), priv->arrow_button,
-                        FALSE, FALSE);
+                        FALSE);
       g_object_unref (priv->arrow_button);
     }
 
@@ -286,7 +286,7 @@ gtk_menu_tool_button_init (GtkMenuToolButton *button)
 
   arrow_button = gtk_menu_button_new ();
   gtk_box_pack_end (GTK_BOX (box), arrow_button,
-                    FALSE, FALSE);
+                    FALSE);
 
   /* the arrow button is insentive until we set a menu */
   gtk_widget_set_sensitive (arrow_button, FALSE);
diff --git a/gtk/gtkmodelmenuitem.c b/gtk/gtkmodelmenuitem.c
index 7e2d12e..888bc8e 100644
--- a/gtk/gtkmodelmenuitem.c
+++ b/gtk/gtkmodelmenuitem.c
@@ -180,7 +180,7 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item,
       /* Reparent the child without destroying it */
       g_object_ref (child);
       gtk_container_remove (GTK_CONTAINER (item), child);
-      gtk_box_pack_end (GTK_BOX (box), child, TRUE, TRUE);
+      gtk_box_pack_end (GTK_BOX (box), child, TRUE);
       g_object_unref (child);
 
       gtk_container_add (GTK_CONTAINER (item), box);
@@ -200,7 +200,7 @@ gtk_model_menu_item_set_icon (GtkModelMenuItem *item,
 
       image = gtk_image_new_from_gicon (icon, GTK_ICON_SIZE_MENU);
       gtk_image_set_pixel_size (GTK_IMAGE (image), 16);
-      gtk_box_pack_start (GTK_BOX (child), image, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (child), image, FALSE);
     }
 
   g_object_notify (G_OBJECT (item), "icon");
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index e9cd056..1ddaa19 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -547,17 +547,17 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
 
   /* Build contents */
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE);
 
   icon = gtk_image_new_from_icon_name ("dialog-password",
                                        GTK_ICON_SIZE_DIALOG);
 
   gtk_widget_set_halign (icon, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (icon, GTK_ALIGN_START);
-  gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), icon, FALSE);
 
   main_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 18);
-  gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), main_vbox, TRUE);
 
   secondary = strstr (message, "\n");
   if (secondary != NULL)
@@ -574,7 +574,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
   gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
   gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label),
-                      FALSE, TRUE);
+                      TRUE);
   g_free (primary);
   attrs = pango_attr_list_new ();
   pango_attr_list_insert (attrs, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
@@ -588,7 +588,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_box_pack_start (GTK_BOX (main_vbox), GTK_WIDGET (label),
-                          FALSE, FALSE);
+                          FALSE);
     }
 
   grid = gtk_grid_new ();
@@ -596,7 +596,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
   gtk_grid_set_row_spacing (GTK_GRID (grid), 12);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 12);
   gtk_widget_set_margin_bottom (grid, 12);
-  gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_vbox), grid, FALSE);
 
   can_anonymous = priv->ask_flags & G_ASK_PASSWORD_ANONYMOUS_SUPPORTED;
 
@@ -621,7 +621,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
       choice = gtk_radio_button_new_with_mnemonic (NULL, _("_Anonymous"));
       gtk_box_pack_start (GTK_BOX (anon_box),
                           choice,
-                          FALSE, FALSE);
+                          FALSE);
       g_signal_connect (choice, "toggled",
                         G_CALLBACK (pw_dialog_anonymous_toggled), operation);
       priv->anonymous_toggle = choice;
@@ -630,7 +630,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
       choice = gtk_radio_button_new_with_mnemonic (group, _("Registered U_ser"));
       gtk_box_pack_start (GTK_BOX (anon_box),
                           choice,
-                          FALSE, FALSE);
+                          FALSE);
       g_signal_connect (choice, "toggled",
                         G_CALLBACK (pw_dialog_anonymous_toggled), operation);
     }
@@ -678,7 +678,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
                          GINT_TO_POINTER (G_PASSWORD_SAVE_NEVER));
       g_signal_connect (choice, "toggled",
                         G_CALLBACK (remember_button_toggled), operation);
-      gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE);
 
       group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice));
       choice = gtk_radio_button_new_with_mnemonic (group, _("Remember password until you _logout"));
@@ -688,7 +688,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
                          GINT_TO_POINTER (G_PASSWORD_SAVE_FOR_SESSION));
       g_signal_connect (choice, "toggled",
                         G_CALLBACK (remember_button_toggled), operation);
-      gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE);
 
       group = gtk_radio_button_get_group (GTK_RADIO_BUTTON (choice));
       choice = gtk_radio_button_new_with_mnemonic (group, _("Remember _forever"));
@@ -698,7 +698,7 @@ gtk_mount_operation_ask_password_do_gtk (GtkMountOperation *operation,
                          GINT_TO_POINTER (G_PASSWORD_SAVE_PERMANENTLY));
       g_signal_connect (choice, "toggled",
                         G_CALLBACK (remember_button_toggled), operation);
-      gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (remember_box), choice, FALSE);
     }
 
   g_signal_connect (G_OBJECT (dialog), "response",
@@ -1403,7 +1403,7 @@ create_show_processes_dialog (GtkMountOperation *op,
 
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE);
 
   if (secondary != NULL)
     s = g_strdup_printf ("<big><b>%s</b></big>\n\n%s", primary, secondary);
@@ -1414,7 +1414,7 @@ create_show_processes_dialog (GtkMountOperation *op,
   label = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (label), s);
   g_free (s);
-  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE);
 
   /* First count the items in the list then
    * add the buttons in reverse order */
@@ -1466,7 +1466,7 @@ create_show_processes_dialog (GtkMountOperation *op,
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_IN);
 
   gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE);
 
   g_signal_connect (tree_view, "popup-menu",
                     G_CALLBACK (on_popup_menu_for_process_tree_view),
diff --git a/gtk/gtkpathbar.c b/gtk/gtkpathbar.c
index 9843d11..fe0d228 100644
--- a/gtk/gtkpathbar.c
+++ b/gtk/gtkpathbar.c
@@ -1486,8 +1486,8 @@ make_directory_button (GtkPathBar  *path_bar,
       button_data->image = gtk_image_new ();
       button_data->label = gtk_label_new (NULL);
       child = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (child), button_data->image, FALSE);
+      gtk_box_pack_start (GTK_BOX (child), button_data->label, FALSE);
       break;
     case NORMAL_BUTTON:
     default:
diff --git a/gtk/gtkprintbackend.c b/gtk/gtkprintbackend.c
index 5440fd6..0c850a0 100644
--- a/gtk/gtkprintbackend.c
+++ b/gtk/gtkprintbackend.c
@@ -789,12 +789,12 @@ request_password (GtkPrintBackend  *backend,
 
   /* Packing */
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
-  gtk_box_pack_start (GTK_BOX (content_area), main_box, TRUE, FALSE);
+  gtk_box_pack_start (GTK_BOX (content_area), main_box, FALSE);
 
-  gtk_box_pack_start (GTK_BOX (main_box), icon, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_box), icon, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_box), vbox, FALSE);
 
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE);
 
   /* Right - 2. */
   for (i = 0; i < length; i++)
@@ -820,10 +820,10 @@ request_password (GtkPrintBackend  *backend,
           gtk_entry_set_visibility (GTK_ENTRY (entry), ai_visible[i]);
           gtk_entry_set_activates_default (GTK_ENTRY (entry), TRUE);
 
-          gtk_box_pack_start (GTK_BOX (vbox), box, FALSE, TRUE);
+          gtk_box_pack_start (GTK_BOX (vbox), box, TRUE);
 
-          gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
-          gtk_box_pack_start (GTK_BOX (box), entry, TRUE, TRUE);
+          gtk_box_pack_start (GTK_BOX (box), label, TRUE);
+          gtk_box_pack_start (GTK_BOX (box), entry, TRUE);
 
           g_signal_connect (entry, "changed",
                             G_CALLBACK (store_entry), &(priv->auth_info[i]));
@@ -836,7 +836,7 @@ request_password (GtkPrintBackend  *backend,
       gtk_widget_set_margin_top (chkbtn, 6);
       gtk_widget_set_margin_bottom (chkbtn, 6);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (chkbtn), FALSE);
-      gtk_box_pack_start (GTK_BOX (vbox), chkbtn, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), chkbtn, FALSE);
       g_signal_connect (chkbtn, "toggled",
                         G_CALLBACK (store_auth_info_toggled),
                         &(priv->store_auth_info));
diff --git a/gtk/gtkprinteroptionwidget.c b/gtk/gtkprinteroptionwidget.c
index e270dfa..b0a502d 100644
--- a/gtk/gtkprinteroptionwidget.c
+++ b/gtk/gtkprinteroptionwidget.c
@@ -737,7 +737,7 @@ alternative_append (GtkWidget              *box,
   button = gtk_radio_button_new_with_label (group, label);
   gtk_widget_show (button);
   gtk_widget_set_valign (button, GTK_ALIGN_BASELINE);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   g_object_set_data (G_OBJECT (button), "value", (gpointer)value);
   g_signal_connect (button, "toggled",
@@ -768,7 +768,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       gtk_combo_box_set_active (GTK_COMBO_BOX (priv->combo), 0);
       gtk_widget_set_sensitive (GTK_WIDGET (widget), FALSE);
       gtk_widget_show (priv->combo);
-      gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE);
     }
   else switch (source->type)
     {
@@ -776,7 +776,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       priv->check = gtk_check_button_new_with_mnemonic (source->display_text);
       g_signal_connect (priv->check, "toggled", G_CALLBACK (check_toggled_cb), widget);
       gtk_widget_show (priv->check);
-      gtk_box_pack_start (GTK_BOX (widget), priv->check, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), priv->check, TRUE);
       break;
     case GTK_PRINTER_OPTION_TYPE_PICKONE:
     case GTK_PRINTER_OPTION_TYPE_PICKONE_PASSWORD:
@@ -808,7 +808,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
                           source->choices_display[i],
                           source->choices[i]);
       gtk_widget_show (priv->combo);
-      gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), priv->combo, TRUE);
       g_signal_connect (priv->combo, "changed", G_CALLBACK (combo_changed_cb), widget);
 
       text = g_strdup_printf ("%s:", source->display_text);
@@ -822,7 +822,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       priv->box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
       gtk_widget_set_valign (priv->box, GTK_ALIGN_BASELINE);
       gtk_widget_show (priv->box);
-      gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), priv->box, TRUE);
       for (i = 0; i < source->num_choices; i++)
         {
          group = alternative_append (priv->box,
@@ -850,7 +850,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       gtk_entry_set_activates_default (GTK_ENTRY (priv->entry),
                                        gtk_printer_option_get_activates_default (source));
       gtk_widget_show (priv->entry);
-      gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), priv->entry, TRUE);
       g_signal_connect (priv->entry, "changed", G_CALLBACK (entry_changed_cb), widget);
 
       text = g_strdup_printf ("%s:", source->display_text);
@@ -863,7 +863,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
     case GTK_PRINTER_OPTION_TYPE_FILESAVE:
       priv->button = gtk_button_new ();
       gtk_widget_show (priv->button);
-      gtk_box_pack_start (GTK_BOX (widget), priv->button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), priv->button, TRUE);
       g_signal_connect (priv->button, "clicked", G_CALLBACK (filesave_choose_cb), widget);
 
       text = g_strdup_printf ("%s:", source->display_text);
@@ -877,7 +877,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
       priv->info_label = gtk_label_new (NULL);
       gtk_label_set_selectable (GTK_LABEL (priv->info_label), TRUE);
       gtk_widget_show (priv->info_label);
-      gtk_box_pack_start (GTK_BOX (widget), priv->info_label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), priv->info_label, TRUE);
 
       text = g_strdup_printf ("%s:", source->display_text);
       priv->label = gtk_label_new_with_mnemonic (text);
@@ -891,7 +891,7 @@ construct_widgets (GtkPrinterOptionWidget *widget)
     }
 
   priv->image = gtk_image_new_from_icon_name ("dialog-warning", GTK_ICON_SIZE_MENU);
-  gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (widget), priv->image, FALSE);
 }
 
 /*
diff --git a/gtk/gtkprintunixdialog.c b/gtk/gtkprintunixdialog.c
index 3618e7b..2c014d4 100644
--- a/gtk/gtkprintunixdialog.c
+++ b/gtk/gtkprintunixdialog.c
@@ -1306,13 +1306,13 @@ wrap_in_frame (const gchar *label,
   g_free (bold_text);
 
   frame = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
-  gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (frame), label_widget, FALSE);
 
   gtk_widget_set_margin_start (child, 12);
   gtk_widget_set_halign (child, GTK_ALIGN_FILL);
   gtk_widget_set_valign (child, GTK_ALIGN_FILL);
 
-  gtk_box_pack_start (GTK_BOX (frame), child, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (frame), child, FALSE);
 
   gtk_widget_show (frame);
 
@@ -1357,14 +1357,14 @@ add_option_to_extension_point (GtkPrinterOption *option,
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
       gtk_widget_set_valign (hbox, GTK_ALIGN_BASELINE);
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE);
       gtk_widget_show (hbox);
 
-      gtk_box_pack_start (GTK_BOX (extension_point), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (extension_point), hbox, TRUE);
     }
   else
-    gtk_box_pack_start (GTK_BOX (extension_point), widget, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (extension_point), widget, TRUE);
 }
 
 static gint
@@ -1643,7 +1643,7 @@ update_dialog_from_settings (GtkPrintUnixDialog *dialog)
           gtk_widget_show (frame);
 
           gtk_box_pack_start (GTK_BOX (priv->advanced_vbox),
-                              frame, FALSE, FALSE);
+                              frame, FALSE);
         }
     }
 
diff --git a/gtk/gtkrecentchooserdialog.c b/gtk/gtkrecentchooserdialog.c
index d53c554..2cbcc53 100644
--- a/gtk/gtkrecentchooserdialog.c
+++ b/gtk/gtkrecentchooserdialog.c
@@ -206,7 +206,7 @@ gtk_recent_chooser_dialog_constructed (GObject *object)
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (object));
 
   gtk_box_pack_start (GTK_BOX (content_area),
-                      priv->chooser, TRUE, TRUE);
+                      priv->chooser, TRUE);
 
   _gtk_recent_chooser_set_delegate (GTK_RECENT_CHOOSER (object),
                                    GTK_RECENT_CHOOSER (priv->chooser));
diff --git a/gtk/gtkshortcutssection.c b/gtk/gtkshortcutssection.c
index ac2abc1..b14a76b 100644
--- a/gtk/gtkshortcutssection.c
+++ b/gtk/gtkshortcutssection.c
@@ -458,7 +458,7 @@ gtk_shortcuts_section_init (GtkShortcutsSection *self)
   gtk_widget_set_hexpand (GTK_WIDGET (self->switcher), TRUE);
   gtk_widget_set_halign (GTK_WIDGET (self->switcher), GTK_ALIGN_CENTER);
   gtk_container_add (GTK_CONTAINER (self->footer), GTK_WIDGET (self->switcher));
-  gtk_box_pack_end (GTK_BOX (self->footer), self->show_all, TRUE, TRUE);
+  gtk_box_pack_end (GTK_BOX (self->footer), self->show_all, TRUE);
   gtk_widget_set_halign (self->show_all, GTK_ALIGN_END);
 
   self->pan_gesture = gtk_gesture_pan_new (GTK_WIDGET (self->stack), GTK_ORIENTATION_HORIZONTAL);
diff --git a/gtk/gtktoolbutton.c b/gtk/gtktoolbutton.c
index c8f8e43..6872f4b 100644
--- a/gtk/gtktoolbutton.c
+++ b/gtk/gtktoolbutton.c
@@ -518,8 +518,8 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
       else
         box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL,0);
       if (icon)
-          gtk_box_pack_start (GTK_BOX (box), icon, TRUE, TRUE);
-      gtk_box_pack_end (GTK_BOX (box), label, FALSE, TRUE);
+          gtk_box_pack_start (GTK_BOX (box), icon, TRUE);
+      gtk_box_pack_end (GTK_BOX (box), label, TRUE);
       gtk_container_add (GTK_CONTAINER (button->priv->button), box);
       gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
       gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "text-button");
@@ -530,17 +530,17 @@ gtk_tool_button_construct_contents (GtkToolItem *tool_item)
        {
           box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
          if (icon)
-            gtk_box_pack_start (GTK_BOX (box), icon, label? FALSE : TRUE, TRUE);
+            gtk_box_pack_start (GTK_BOX (box), icon, TRUE);
          if (label)
-            gtk_box_pack_end (GTK_BOX (box), label, TRUE, TRUE);
+            gtk_box_pack_end (GTK_BOX (box), label, TRUE);
        }
       else
        {
           box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
          if (icon)
-            gtk_box_pack_end (GTK_BOX (box), icon, label ? FALSE : TRUE, TRUE);
+            gtk_box_pack_end (GTK_BOX (box), icon, TRUE);
          if (label)
-            gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
+            gtk_box_pack_start (GTK_BOX (box), label, TRUE);
        }
       gtk_container_add (GTK_CONTAINER (button->priv->button), box);
       gtk_style_context_add_class (gtk_widget_get_style_context (button->priv->button), "image-button");
diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 2e2d2a1..df023db 100644
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -849,13 +849,13 @@ gtk_tree_view_column_create_button (GtkTreeViewColumn *tree_column)
 
   if (priv->xalign <= 0.5)
     {
-      gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE);
-      gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE);
     }
   else
     {
-      gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), priv->arrow, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), priv->frame, TRUE);
     }
 
   gtk_container_add (GTK_CONTAINER (priv->frame), child);
diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c
index 6a7bd4e..1f1ac64 100644
--- a/gtk/inspector/general.c
+++ b/gtk/inspector/general.c
@@ -138,13 +138,13 @@ add_check_row (GtkInspectorGeneral *gen,
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE);
 
   check = gtk_image_new_from_icon_name ("object-select-symbolic", GTK_ICON_SIZE_MENU);
   gtk_widget_set_halign (check, GTK_ALIGN_END);
   gtk_widget_set_valign (check, GTK_ALIGN_BASELINE);
   gtk_widget_set_opacity (check, value ? 1.0 : 0.0);
-  gtk_box_pack_start (GTK_BOX (box), check, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), check, TRUE);
 
   row = gtk_list_box_row_new ();
   gtk_container_add (GTK_CONTAINER (row), box);
@@ -176,14 +176,14 @@ add_label_row (GtkInspectorGeneral *gen,
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-  gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE);
 
   label = gtk_label_new (value);
   gtk_label_set_selectable (GTK_LABEL (label), TRUE);
   gtk_widget_set_halign (label, GTK_ALIGN_END);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
   gtk_label_set_xalign (GTK_LABEL (label), 1.0);
-  gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), label, TRUE);
 
   row = gtk_list_box_row_new ();
   gtk_container_add (GTK_CONTAINER (row), box);
diff --git a/gtk/inspector/general.ui b/gtk/inspector/general.ui
index c434793..56513ae 100644
--- a/gtk/inspector/general.ui
+++ b/gtk/inspector/general.ui
@@ -3,6 +3,7 @@
   <template class="GtkInspectorGeneral" parent="GtkScrolledWindow">
     <property name="hscrollbar-policy">never</property>
     <property name="vscrollbar-policy">automatic</property>
+    <property name="expand">0</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -43,10 +44,8 @@
                             <property name="selectable">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -77,10 +76,8 @@
                             <property name="selectable">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -125,10 +122,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -160,10 +155,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -195,10 +188,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -230,10 +221,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -265,10 +254,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -300,10 +287,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -335,10 +320,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -383,10 +366,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -417,10 +398,8 @@
                             <property name="valign">baseline</property>
                             <property name="icon-name">object-select-symbolic</property>
                             <property name="icon-size">1</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -451,10 +430,8 @@
                             <property name="valign">baseline</property>
                             <property name="icon-name">object-select-symbolic</property>
                             <property name="icon-size">1</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -499,10 +476,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -534,10 +509,8 @@
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
                             <property name="ellipsize">end</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
diff --git a/gtk/inspector/misc-info.ui b/gtk/inspector/misc-info.ui
index f1f5591..bdc3705 100644
--- a/gtk/inspector/misc-info.ui
+++ b/gtk/inspector/misc-info.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface domain="gtk40">
   <template class="GtkInspectorMiscInfo" parent="GtkScrolledWindow">
+    <property name="expand">0</property>
     <child>
       <object class="GtkBox">
         <property name="visible">true</property>
@@ -35,10 +36,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="address">
@@ -69,10 +68,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="refcount">
@@ -103,10 +100,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="state">
@@ -137,10 +132,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="buildable_id">
@@ -171,10 +164,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="default_widget">
@@ -215,10 +206,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="focus_widget">
@@ -260,10 +249,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="mnemonic_label">
@@ -295,10 +282,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="request_mode">
@@ -329,10 +314,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="allocated_size">
@@ -363,10 +346,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="baseline">
@@ -397,10 +378,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="clip_area">
@@ -431,10 +410,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0.0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="frame_clock">
@@ -476,10 +453,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkImage" id="tick_callback">
@@ -512,10 +487,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="framecount">
@@ -546,10 +519,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="framerate">
@@ -580,10 +551,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessible_role">
@@ -614,10 +583,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessible_name">
@@ -650,10 +617,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="accessible_description">
@@ -686,10 +651,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkImage" id="mapped">
@@ -722,10 +685,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkImage" id="realized">
@@ -758,10 +719,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkImage" id="is_toplevel">
@@ -794,10 +753,8 @@
                             <property name="halign">start</property>
                             <property name="valign">baseline</property>
                             <property name="xalign">0</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">true</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkImage" id="child_visible">
diff --git a/gtk/inspector/prop-editor.c b/gtk/inspector/prop-editor.c
index e1f1452..72a54ac 100644
--- a/gtk/inspector/prop-editor.c
+++ b/gtk/inspector/prop-editor.c
@@ -938,7 +938,7 @@ property_editor (GObject                *object,
               first = b;
             g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j));
             gtk_widget_show (b);
-            gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE);
+            gtk_box_pack_start (GTK_BOX (box), b, FALSE);
             connect_controller (G_OBJECT (b), "toggled",
                                 object, spec, G_CALLBACK (enum_modified));
             ++j;
@@ -980,7 +980,7 @@ property_editor (GObject                *object,
             b = gtk_check_button_new_with_label (fclass->values[j].value_name);
             g_object_set_data (G_OBJECT (b), "index", GINT_TO_POINTER (j));
             gtk_widget_show (b);
-            gtk_box_pack_start (GTK_BOX (box), b, FALSE, FALSE);
+            gtk_box_pack_start (GTK_BOX (box), b, FALSE);
             connect_controller (G_OBJECT (b), "toggled",
                                 object, spec, G_CALLBACK (flags_modified));
           }
@@ -1605,7 +1605,7 @@ add_gtk_settings_info (GtkInspectorPropEditor *editor)
   gtk_widget_set_halign (button, GTK_ALIGN_END);
   gtk_widget_show (button);
   gtk_widget_set_sensitive (button, FALSE);
-  gtk_box_pack_end (GTK_BOX (row), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (row), button, FALSE);
 
   switch (_gtk_settings_get_setting_source (GTK_SETTINGS (object), name))
     {
diff --git a/gtk/inspector/recorder.c b/gtk/inspector/recorder.c
index bc378be..be2c016 100644
--- a/gtk/inspector/recorder.c
+++ b/gtk/inspector/recorder.c
@@ -348,7 +348,7 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item,
       widget = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-      gtk_box_pack_start (GTK_BOX (widget), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (widget), hbox, TRUE);
 
       for (i = 0; i < g_list_model_get_n_items (priv->recordings); i++)
         {
@@ -387,17 +387,17 @@ gtk_inspector_recorder_recordings_list_create_widget (gpointer item,
       label = gtk_label_new (str);
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       g_free (str);
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       button = gtk_toggle_button_new ();
       gtk_button_set_relief (GTK_BUTTON (button), GTK_RELIEF_NONE);
       gtk_button_set_icon_name (GTK_BUTTON (button), "view-more-symbolic");
 
-      gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, TRUE);
+      gtk_box_pack_end (GTK_BOX (hbox), button, TRUE);
 
       label = gtk_label_new (gtk_inspector_render_recording_get_profiler_info 
(GTK_INSPECTOR_RENDER_RECORDING (recording)));
       gtk_widget_hide (label);
-      gtk_box_pack_end (GTK_BOX (widget), label, FALSE, FALSE);
+      gtk_box_pack_end (GTK_BOX (widget), label, FALSE);
       g_object_bind_property (button, "active", label, "visible", 0);
     }
   else
diff --git a/gtk/inspector/size-groups.c b/gtk/inspector/size-groups.c
index e77dda1..c69c409 100644
--- a/gtk/inspector/size-groups.c
+++ b/gtk/inspector/size-groups.c
@@ -225,7 +225,7 @@ add_size_group (GtkInspectorSizeGroups *sl,
   g_object_set (label, "margin", 10, NULL);
   gtk_widget_set_halign (label, GTK_ALIGN_START);
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
-  gtk_box_pack_start (GTK_BOX (box2), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box2), label, TRUE);
 
   combo = gtk_combo_box_text_new ();
   g_object_set (combo, "margin", 10, NULL);
@@ -238,7 +238,7 @@ add_size_group (GtkInspectorSizeGroups *sl,
   g_object_bind_property (group, "mode",
                           combo, "active",
                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
-  gtk_box_pack_start (GTK_BOX (box2), combo, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box2), combo, FALSE);
 
   listbox = gtk_list_box_new ();
   gtk_container_add (GTK_CONTAINER (box), listbox);
diff --git a/gtk/inspector/strv-editor.c b/gtk/inspector/strv-editor.c
index 3add2e3..38c89f4 100644
--- a/gtk/inspector/strv-editor.c
+++ b/gtk/inspector/strv-editor.c
@@ -68,17 +68,17 @@ add_string (GtkInspectorStrvEditor *editor,
   entry = gtk_entry_new ();
   gtk_entry_set_text (GTK_ENTRY (entry), str);
   gtk_widget_show (entry);
-  gtk_box_pack_start (GTK_BOX (box), entry, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), entry, TRUE);
   g_object_set_data (G_OBJECT (box), "entry", entry);
   g_signal_connect_swapped (entry, "notify::text", G_CALLBACK (emit_changed), editor);
 
   button = gtk_button_new_from_icon_name ("user-trash-symbolic", GTK_ICON_SIZE_MENU);
   gtk_style_context_add_class (gtk_widget_get_style_context (button), "image-button");
   gtk_widget_show (button);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (remove_string), editor);
 
-  gtk_box_pack_start (GTK_BOX (editor->box), box, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (editor->box), box, FALSE);
 
   gtk_widget_grab_focus (entry);
 
@@ -107,8 +107,8 @@ gtk_inspector_strv_editor_init (GtkInspectorStrvEditor *editor)
   gtk_widget_show (editor->button);
   g_signal_connect (editor->button, "clicked", G_CALLBACK (add_cb), editor);
 
-  gtk_box_pack_start (GTK_BOX (editor), editor->box, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (editor), editor->button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (editor), editor->box, TRUE);
+  gtk_box_pack_start (GTK_BOX (editor), editor->button, FALSE);
 }
 
 static void
diff --git a/gtk/inspector/visual.ui b/gtk/inspector/visual.ui
index 359c0a7..a6efa34 100644
--- a/gtk/inspector/visual.ui
+++ b/gtk/inspector/visual.ui
@@ -28,6 +28,7 @@
   <template class="GtkInspectorVisual" parent="GtkScrolledWindow">
     <property name="hscrollbar-policy">never</property>
     <property name="vscrollbar-policy">automatic</property>
+    <property name="expand">0</property>
     <child>
       <object class="GtkBox">
         <property name="visible">True</property>
@@ -69,10 +70,8 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -102,10 +101,8 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -135,10 +132,8 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -172,10 +167,8 @@
                             <property name="width-chars">2</property>
                             <property name="adjustment">cursor_size_adjustment</property>
                             <property name="snap-to-ticks">True</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -205,10 +198,8 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -238,10 +229,8 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -272,13 +261,11 @@
                             <property name="valign">baseline</property>
                             <property name="adjustment">font_scale_adjustment</property>
                             <property name="draw_value">0</property>
+                            <property name="hexpand">1</property>
                             <marks>
                               <mark value="1.0" position="top"/>
                             </marks>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="font_scale_entry">
@@ -317,15 +304,13 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="changed" handler="direction_changed"/>
                             <items>
                               <item translatable="yes" id="ltr">Left-to-Right</item>
                               <item translatable="yes" id="rtl">Right-to-Left</item>
                             </items>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -357,10 +342,8 @@
                             <property name="valign">baseline</property>
                             <property name="adjustment">scale_adjustment</property>
                             <property name="snap-to-ticks">True</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -390,10 +373,8 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -425,13 +406,11 @@
                             <property name="adjustment">slowdown_adjustment</property>
                             <property name="valign">baseline</property>
                             <property name="draw_value">0</property>
+                            <property name="hexpand">1</property>
                             <marks>
                               <mark value="0.0" position="top"/>
                             </marks>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkEntry" id="slowdown_entry">
@@ -482,6 +461,7 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="changed" handler="rendering_mode_changed"/>
                             <items>
                               <item translatable="yes" id="similar">Similar</item>
@@ -489,9 +469,6 @@
                               <item translatable="yes" id="recording">Recording</item>
                             </items>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -521,11 +498,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="updates_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -555,11 +530,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="baselines_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -589,11 +562,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="layout_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -623,11 +594,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="snapshot_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -657,11 +626,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="widget_resize_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -691,10 +658,8 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -736,15 +701,13 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <items>
                               <item translatable="yes" id="maybe">When Needed</item>
                               <item translatable="yes" id="always">Always</item>
                               <item translatable="yes" id="disable">Disabled</item>
                             </items>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -774,11 +737,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="software_gl_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -808,11 +769,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="software_surface_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
@@ -842,11 +801,9 @@
                             <property name="visible">True</property>
                             <property name="halign">end</property>
                             <property name="valign">baseline</property>
+                            <property name="hexpand">1</property>
                             <signal name="notify::active" handler="texture_rectangle_activate"/>
                           </object>
-                          <packing>
-                            <property name="expand">True</property>
-                          </packing>
                         </child>
                       </object>
                     </child>
diff --git a/gtk/ui/gtkaboutdialog.ui b/gtk/ui/gtkaboutdialog.ui
index 681d89b..2f8a335 100644
--- a/gtk/ui/gtkaboutdialog.ui
+++ b/gtk/ui/gtkaboutdialog.ui
@@ -31,6 +31,7 @@
             <property name="orientation">vertical</property>
             <property name="spacing">12</property>
             <property name="margin">5</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkImage" id="logo_image">
                 <property name="visible">1</property>
@@ -59,6 +60,7 @@
                 <property name="visible">1</property>
                 <property name="transition-type">over-up-down</property>
                 <property name="transition-duration">600</property>
+                <property name="vexpand">1</property>
                 <signal name="notify::visible-child" handler="stack_visible_child_notify" swapped="no"/>
                 <child>
                   <object class="GtkBox" id="page_vbox">
@@ -143,6 +145,7 @@
                         <property name="visible">1</property>
                         <property name="hscrollbar-policy">never</property>
                         <property name="shadow-type">in</property>
+                        <property name="vexpand">1</property>
                         <child>
                           <object class="GtkViewport" id="viewport1">
                             <property name="visible">1</property>
@@ -163,9 +166,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -183,6 +183,7 @@
                         <property name="visible">1</property>
                         <property name="hscrollbar-policy">never</property>
                         <property name="shadow-type">in</property>
+                        <property name="vexpand">1</property>
                         <child>
                           <object class="GtkTextView" id="license_view">
                             <property name="visible">1</property>
@@ -196,9 +197,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -216,6 +214,7 @@
                         <property name="visible">1</property>
                         <property name="hscrollbar-policy">never</property>
                         <property name="shadow-type">in</property>
+                        <property name="vexpand">1</property>
                         <child>
                           <object class="GtkTextView" id="system_view">
                             <property name="visible">1</property>
@@ -229,9 +228,6 @@
                           </object>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">1</property>
-                      </packing>
                     </child>
                   </object>
                   <packing>
@@ -241,13 +237,11 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">1</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkappchooserdialog.ui b/gtk/ui/gtkappchooserdialog.ui
index 9acf416..7366944 100644
--- a/gtk/ui/gtkappchooserdialog.ui
+++ b/gtk/ui/gtkappchooserdialog.ui
@@ -41,14 +41,11 @@
                 <property name="valign">center</property>
                 <property name="label">label</property>
                 <property name="wrap">1</property>
+                <property name="vexpand">1</property>
               </object>
-              <packing>
-                <property name="expand">1</property>
-              </packing>
             </child>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">2</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkassistant.ui b/gtk/ui/gtkassistant.ui
index 719fa69..d8c4df7 100644
--- a/gtk/ui/gtkassistant.ui
+++ b/gtk/ui/gtkassistant.ui
@@ -26,18 +26,17 @@
           <object class="GtkBox" id="content_box">
             <property name="visible">1</property>
             <property name="orientation">vertical</property>
+            <property name="hexpand">1</property>
             <child>
               <object class="GtkNotebook" id="content">
                 <property name="visible">1</property>
                 <property name="can-focus">1</property>
                 <property name="show-tabs">0</property>
                 <property name="show-border">0</property>
+                <property name="vexpand">1</property>
                 <signal name="remove" handler="assistant_remove_page_cb" swapped="no"/>
                 <child type="tab"/>
               </object>
-              <packing>
-                <property name="expand">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="action_area">
@@ -163,7 +162,6 @@
             </child>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkcolorchooserdialog.ui b/gtk/ui/gtkcolorchooserdialog.ui
index 436a265..bca006e 100644
--- a/gtk/ui/gtkcolorchooserdialog.ui
+++ b/gtk/ui/gtkcolorchooserdialog.ui
@@ -16,12 +16,12 @@
             <property name="orientation">vertical</property>
             <property name="margin">5</property>
             <property name="rgba">rgb(255,255,255)</property>
+            <property name="expand">1</property>
             <signal name="color-activated" handler="color_activated_cb" swapped="no"/>
             <signal name="notify::rgba" handler="propagate_notify" swapped="no"/>
             <signal name="notify::show-editor" handler="propagate_notify" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkcoloreditor.ui b/gtk/ui/gtkcoloreditor.ui
index aa2f03a..1ecd5f6 100644
--- a/gtk/ui/gtkcoloreditor.ui
+++ b/gtk/ui/gtkcoloreditor.ui
@@ -120,7 +120,6 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
diff --git a/gtk/ui/gtkcombobox.ui b/gtk/ui/gtkcombobox.ui
index 09f7e4e..e6a25d2 100644
--- a/gtk/ui/gtkcombobox.ui
+++ b/gtk/ui/gtkcombobox.ui
@@ -2,6 +2,7 @@
 <interface domain="gtk30">
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkComboBox" parent="GtkBin">
+    <property name="expand">0</property>
     <child>
       <object class="GtkBox" id="box">
         <style>
diff --git a/gtk/ui/gtkfilechooserdialog.ui b/gtk/ui/gtkfilechooserdialog.ui
index 5c59f48..7418e93 100644
--- a/gtk/ui/gtkfilechooserdialog.ui
+++ b/gtk/ui/gtkfilechooserdialog.ui
@@ -20,13 +20,13 @@
         </child>
         <child>
           <object class="GtkFileChooserWidget" id="widget">
+            <property name="expand">1</property>
             <signal name="default-size-changed" handler="file_chooser_widget_default_size_changed" 
swapped="no"/>
             <signal name="file-activated" handler="file_chooser_widget_file_activated" swapped="no"/>
             <signal name="response-requested" handler="file_chooser_widget_response_requested" swapped="no"/>
             <signal name="selection-changed" handler="file_chooser_widget_selection_changed" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkfilechooserwidget.ui b/gtk/ui/gtkfilechooserwidget.ui
index 8f2936e..2083711 100644
--- a/gtk/ui/gtkfilechooserwidget.ui
+++ b/gtk/ui/gtkfilechooserwidget.ui
@@ -9,8 +9,10 @@
         <child>
           <object class="GtkBox" id="browse_widgets_box">
             <property name="orientation">vertical</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkPaned" id="browse_widgets_hpaned">
+                <property name="vexpand">1</property>
                 <child>
                   <object class="GtkPlacesSidebar" id="places_sidebar">
                     <property name="hscrollbar-policy">never</property>
@@ -51,11 +53,9 @@
                                     <property name="margin">6</property>
                                     <child>
                                       <object class="GtkPathBar" id="browse_path_bar">
+                                        <property name="hexpand">1</property>
                                         <signal name="path-clicked" handler="path_bar_clicked" after="yes" 
swapped="no"/>
                                       </object>
-                                      <packing>
-                                        <property name="expand">1</property>
-                                      </packing>
                                     </child>
                                     <child>
                                       <object class="GtkMenuButton" id="browse_new_folder_button">
@@ -125,9 +125,11 @@
                     <child>
                       <object class="GtkBox" id="list_and_preview_box">
                         <property name="spacing">12</property>
+                        <property name="vexpand">1</property>
                         <child>
                           <object class="GtkStack" id="browse_files_stack">
                             <property name="transition-type">crossfade</property>
+                            <property name="expand">1</property>
                             <style>
                               <class name="view"/>
                             </style>
@@ -137,6 +139,7 @@
                                 <child>
                                   <object class="GtkScrolledWindow" id="browse_files_swin">
                                     <property name="hscrollbar-policy">never</property>
+                                    <property name="vexpand">1</property>
                                     <child>
                                       <object class="GtkTreeView" id="browse_files_tree_view">
                                         <property name="has-tooltip">1</property>
@@ -227,9 +230,6 @@
                                       </object>
                                     </child>
                                   </object>
-                                  <packing>
-                                    <property name="expand">1</property>
-                                  </packing>
                                 </child>
                                 <child>
                                   <object class="GtkActionBar" id="remote_warning_bar">
@@ -311,9 +311,6 @@
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="preview_box">
@@ -328,7 +325,6 @@
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">1</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -339,14 +335,10 @@
                 </child>
               </object>
               <packing>
-                <property name="expand">1</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">1</property>
-          </packing>
         </child>
         <child>
           <object class="GtkActionBar" id="extra_and_filters">
diff --git a/gtk/ui/gtkfontchooserdialog.ui b/gtk/ui/gtkfontchooserdialog.ui
index 2b505d0..66bfb3c 100644
--- a/gtk/ui/gtkfontchooserdialog.ui
+++ b/gtk/ui/gtkfontchooserdialog.ui
@@ -12,10 +12,10 @@
         <child>
           <object class="GtkFontChooserWidget" id="fontchooser">
             <property name="visible">1</property>
+            <property name="vexpand">1</property>
             <signal name="font-activated" handler="font_activated_cb" swapped="no"/>
           </object>
           <packing>
-            <property name="expand">1</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gtk/ui/gtkinfobar.ui b/gtk/ui/gtkinfobar.ui
index 1644442..0fad043 100644
--- a/gtk/ui/gtkinfobar.ui
+++ b/gtk/ui/gtkinfobar.ui
@@ -16,9 +16,6 @@
                 <property name="margin">8</property>
                 <property name="hexpand">1</property>
               </object>
-              <packing>
-                <property name="expand">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkButtonBox" id="action_area">
diff --git a/gtk/ui/gtkmessagedialog.ui b/gtk/ui/gtkmessagedialog.ui
index e0b311c..5e350b4 100644
--- a/gtk/ui/gtkmessagedialog.ui
+++ b/gtk/ui/gtkmessagedialog.ui
@@ -26,6 +26,7 @@
                 <property name="visible">1</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">10</property>
+                <property name="hexpand">1</property>
                 <child>
                   <object class="GtkLabel" id="label">
                     <property name="visible">1</property>
@@ -44,17 +45,16 @@
                     <property name="margin-bottom">2</property>
                     <property name="halign">center</property>
                     <property name="valign">start</property>
+                    <property name="vexpand">1</property>
                     <property name="wrap">1</property>
                     <property name="max-width-chars">60</property>
                   </object>
                   <packing>
-                    <property name="expand">1</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
-                <property name="expand">1</property>
                 <property name="position">1</property>
               </packing>
             </child>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index e273f64..71b2dea 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -39,6 +39,7 @@
             <property name="row-spacing">6</property>
             <property name="column-spacing">12</property>
             <property name="margin">5</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkLabel" id="printer_combo_label">
                 <property name="visible">1</property>
@@ -271,9 +272,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 2c7b4e4..d8385de 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -381,7 +381,6 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
@@ -460,7 +459,6 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
diff --git a/gtk/ui/gtkprintunixdialog.ui b/gtk/ui/gtkprintunixdialog.ui
index 95247d0..cf3fefa 100644
--- a/gtk/ui/gtkprintunixdialog.ui
+++ b/gtk/ui/gtkprintunixdialog.ui
@@ -63,6 +63,7 @@
           <object class="GtkBox" id="box1">
             <property name="visible">1</property>
             <property name="orientation">vertical</property>
+            <property name="vexpand">1</property>
             <child>
               <object class="GtkNotebook" id="notebook">
                 <property name="visible">1</property>
@@ -84,6 +85,7 @@
                             <property name="visible">1</property>
                             <property name="can-focus">1</property>
                             <property name="shadow-type">in</property>
+                            <property name="vexpand">1</property>
                             <child>
                               <object class="GtkTreeView" id="printer_treeview">
                                 <property name="visible">1</property>
@@ -144,9 +146,6 @@
                               </object>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="extension_point">
@@ -159,9 +158,6 @@
                           </packing>
                         </child>
                       </object>
-                      <packing>
-                        <property name="expand">1</property>
-                      </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="box3">
@@ -172,6 +168,7 @@
                             <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">1</property>
                             <child>
                               <object class="GtkLabel" id="label_widget1">
                                 <property name="visible">1</property>
@@ -292,15 +289,13 @@
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template2">
                             <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">1</property>
                             <child>
                               <object class="GtkLabel" id="label_widget2">
                                 <property name="visible">1</property>
@@ -404,7 +399,6 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -440,6 +434,7 @@
                             <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">1</property>
                             <child>
                               <object class="GtkLabel" id="label_widget3">
                                 <property name="visible">1</property>
@@ -627,15 +622,13 @@
                               </packing>
                             </child>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="frame_template4">
                             <property name="visible">1</property>
                             <property name="orientation">vertical</property>
                             <property name="spacing">6</property>
+                            <property name="hexpand">1</property>
                             <child>
                               <object class="GtkLabel" id="label_widget4">
                                 <property name="visible">1</property>
@@ -808,7 +801,6 @@
                             </child>
                           </object>
                           <packing>
-                            <property name="expand">1</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -825,14 +817,11 @@
                             <property name="content-width">320</property>
                             <property name="content-height">160</property>
                             <property name="visible">1</property>
+                            <property name="hexpand">1</property>
                           </object>
-                          <packing>
-                            <property name="expand">1</property>
-                          </packing>
                         </child>
                       </object>
                       <packing>
-                        <property name="expand">1</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -1180,6 +1169,7 @@
                   <object class="GtkScrolledWindow" id="image_quality_page">
                     <property name="can-focus">1</property>
                     <property name="hscrollbar-policy">never</property>
+                    <property name="hexpand">1</property>
                     <child>
                       <object class="GtkViewport" id="viewport1">
                         <property name="visible">1</property>
@@ -1309,9 +1299,6 @@
                   </packing>
                 </child>
               </object>
-              <packing>
-                <property name="expand">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkActionBar" id="conflicts_widget">
@@ -1336,9 +1323,6 @@
               </packing>
             </child>
           </object>
-          <packing>
-            <property name="expand">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkrecentchooserdefault.ui b/gtk/ui/gtkrecentchooserdefault.ui
index ef94199..c50b503 100644
--- a/gtk/ui/gtkrecentchooserdefault.ui
+++ b/gtk/ui/gtkrecentchooserdefault.ui
@@ -15,6 +15,7 @@
     <property name="can-focus">False</property>
     <property name="orientation">vertical</property>
     <property name="spacing">6</property>
+    <property name="expand">0</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow">
         <property name="visible">1</property>
@@ -28,6 +29,7 @@
             <property name="can-focus">1</property>
             <property name="has-tooltip">1</property>
             <property name="headers-visible">0</property>
+            <property name="expand">1</property>
             <signal name="button-press-event" handler="recent_view_button_press_cb" swapped="no"/>
             <signal name="drag-begin" handler="recent_view_drag_begin_cb" swapped="no"/>
             <signal name="drag-data-get" handler="recent_view_drag_data_get_cb" swapped="no"/>
@@ -64,7 +66,6 @@
         </child>
       </object>
       <packing>
-        <property name="expand">True</property>
         <property name="fill">True</property>
         <property name="position">0</property>
       </packing>
@@ -88,7 +89,6 @@
         </child>
       </object>
       <packing>
-        <property name="expand">False</property>
         <property name="fill">True</property>
         <property name="position">1</property>
       </packing>
diff --git a/gtk/ui/gtksearchbar.ui b/gtk/ui/gtksearchbar.ui
index 7624ae2..d3a1538 100644
--- a/gtk/ui/gtksearchbar.ui
+++ b/gtk/ui/gtksearchbar.ui
@@ -15,9 +15,6 @@
                 <property name="hexpand">1</property>
                 <property name="orientation">vertical</property>
               </object>
-              <packing>
-                <property name="expand">1</property>
-              </packing>
             </child>
             <child>
               <object class="GtkBox" id="box_center">
@@ -49,9 +46,6 @@
                       </object>
                     </child>
                   </object>
-                  <packing>
-                    <property name="expand">1</property>
-                  </packing>
                 </child>
               </object>
               <packing>
diff --git a/gtk/ui/gtkstatusbar.ui b/gtk/ui/gtkstatusbar.ui
index 025ebe3..bfa354b 100644
--- a/gtk/ui/gtkstatusbar.ui
+++ b/gtk/ui/gtkstatusbar.ui
@@ -3,9 +3,11 @@
   <!-- interface-requires gtk+ 3.10 -->
   <template class="GtkStatusbar" parent="GtkBox">
     <property name="spacing">2</property>
+    <property name="hexpand">0</property>
     <child>
       <object class="GtkFrame" id="frame">
         <property name="shadow-type">none</property>
+        <property name="hexpand">1</property>
         <child>
           <object class="GtkBox" id="message_area">
             <property name="spacing">4</property>
@@ -22,9 +24,6 @@
         </child>
         <child type="label_item"/>
       </object>
-      <packing>
-        <property name="expand">1</property>
-      </packing>
     </child>
   </template>
 </interface>
diff --git a/tests/flicker.c b/tests/flicker.c
index 85890f9..8cb1e19 100644
--- a/tests/flicker.c
+++ b/tests/flicker.c
@@ -75,12 +75,12 @@ create_flicker (void)
   spinbutton7_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton7 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton7_adj), 1, 0);
   gtk_widget_show (spinbutton7);
-  gtk_box_pack_start (GTK_BOX (hbox2), spinbutton7, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox2), spinbutton7, TRUE);
 
   spinbutton8_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton8 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton8_adj), 1, 0);
   gtk_widget_show (spinbutton8);
-  gtk_box_pack_start (GTK_BOX (hbox2), spinbutton8, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox2), spinbutton8, TRUE);
 
   vbox1 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_show (vbox1);
@@ -89,42 +89,42 @@ create_flicker (void)
   spinbutton9_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton9 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton9_adj), 1, 0);
   gtk_widget_show (spinbutton9);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton9, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton9, FALSE);
 
   spinbutton10_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton10 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton10_adj), 1, 0);
   gtk_widget_show (spinbutton10);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton10, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton10, FALSE);
 
   spinbutton11_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton11 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton11_adj), 1, 0);
   gtk_widget_show (spinbutton11);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton11, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton11, FALSE);
 
   spinbutton12_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton12 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton12_adj), 1, 0);
   gtk_widget_show (spinbutton12);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton12, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton12, FALSE);
 
   spinbutton13_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton13 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton13_adj), 1, 0);
   gtk_widget_show (spinbutton13);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton13, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton13, FALSE);
 
   spinbutton14_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton14 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton14_adj), 1, 0);
   gtk_widget_show (spinbutton14);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton14, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton14, FALSE);
 
   spinbutton15_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton15 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton15_adj), 1, 0);
   gtk_widget_show (spinbutton15);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton15, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton15, FALSE);
 
   spinbutton16_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton16 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton16_adj), 1, 0);
   gtk_widget_show (spinbutton16);
-  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton16, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), spinbutton16, FALSE);
 
   vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_widget_show (vpaned1);
@@ -138,17 +138,17 @@ create_flicker (void)
   spinbutton17_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton17 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton17_adj), 1, 0);
   gtk_widget_show (spinbutton17);
-  gtk_box_pack_start (GTK_BOX (hbox1), spinbutton17, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox1), spinbutton17, TRUE);
 
   spinbutton18_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton18 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton18_adj), 1, 0);
   gtk_widget_show (spinbutton18);
-  gtk_box_pack_start (GTK_BOX (hbox1), spinbutton18, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox1), spinbutton18, TRUE);
 
   spinbutton19_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton19 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton19_adj), 1, 0);
   gtk_widget_show (spinbutton19);
-  gtk_box_pack_start (GTK_BOX (hbox1), spinbutton19, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox1), spinbutton19, TRUE);
 
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_widget_show (vbox2);
@@ -157,42 +157,42 @@ create_flicker (void)
   spinbutton20_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton20 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton20_adj), 1, 0);
   gtk_widget_show (spinbutton20);
-  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton20, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton20, FALSE);
 
   spinbutton21_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton21 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton21_adj), 1, 0);
   gtk_widget_show (spinbutton21);
-  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton21, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton21, FALSE);
 
   spinbutton22_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton22 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton22_adj), 1, 0);
   gtk_widget_show (spinbutton22);
-  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton22, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton22, FALSE);
 
   spinbutton23_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton23 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton23_adj), 1, 0);
   gtk_widget_show (spinbutton23);
-  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton23, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton23, FALSE);
 
   spinbutton24_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton24 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton24_adj), 1, 0);
   gtk_widget_show (spinbutton24);
-  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton24, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton24, FALSE);
 
   spinbutton25_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton25 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton25_adj), 1, 0);
   gtk_widget_show (spinbutton25);
-  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton25, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton25, FALSE);
 
   spinbutton26_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton26 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton26_adj), 1, 0);
   gtk_widget_show (spinbutton26);
-  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton26, TRUE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), spinbutton26, FALSE);
 
   spinbutton27_adj = gtk_adjustment_new (1, 0, 100, 1, 10, 10);
   spinbutton27 = gtk_spin_button_new (GTK_ADJUSTMENT (spinbutton27_adj), 1, 0);
   gtk_widget_show (spinbutton27);
-  gtk_box_pack_end (GTK_BOX (vbox2), spinbutton27, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox2), spinbutton27, FALSE);
 
   return window1;
 }
diff --git a/tests/gdkgears.c b/tests/gdkgears.c
index 19f8068..7ee6458 100644
--- a/tests/gdkgears.c
+++ b/tests/gdkgears.c
@@ -175,26 +175,26 @@ main (int argc, char *argv[])
   gtk_gears_set_fps_label (GTK_GEARS (gears), GTK_LABEL (fps_label));
 
   spinner = gtk_spinner_new ();
-  gtk_box_pack_end (GTK_BOX (hbox), spinner, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), spinner, FALSE);
   gtk_widget_show (spinner);
   gtk_spinner_start (GTK_SPINNER (spinner));
 
   check = gtk_check_button_new_with_label ("Animate spinner");
-  gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), check, FALSE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), TRUE);
   gtk_widget_show (check);
   g_signal_connect (check, "toggled",
                     G_CALLBACK (toggle_spin), spinner);
 
   check = gtk_check_button_new_with_label ("Alpha");
-  gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), check, FALSE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
   gtk_widget_show (check);
   g_signal_connect (check, "toggled",
                     G_CALLBACK (toggle_alpha), gears);
 
   check = gtk_check_button_new_with_label ("Overlay");
-  gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), check, FALSE);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), FALSE);
   gtk_widget_show (check);
   g_signal_connect (check, "toggled",
@@ -207,7 +207,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (popover), label);
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (button), popover);
   gtk_widget_show (button);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE);
 
   scrolled = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled),
diff --git a/tests/motion-compression.c b/tests/motion-compression.c
index 8521dd9..5cd7bf5 100644
--- a/tests/motion-compression.c
+++ b/tests/motion-compression.c
@@ -54,15 +54,16 @@ main (int argc, char **argv)
 
   adjustment = gtk_adjustment_new (20, 0, 200, 1, 10, 0);
   scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
-  gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), scale, FALSE);
 
   label = gtk_label_new ("Event processing time (ms):");
   gtk_widget_set_halign (label, GTK_ALIGN_CENTER);
-  gtk_box_pack_end (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), label, FALSE);
 
   da = gtk_drawing_area_new ();
   gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (da), on_draw, NULL, NULL);
-  gtk_box_pack_end (GTK_BOX (vbox), da, TRUE, TRUE);
+  gtk_widget_set_vexpand (da, TRUE);
+  gtk_box_pack_end (GTK_BOX (vbox), da, TRUE);
   
   g_signal_connect (window, "motion-notify-event",
                     G_CALLBACK (on_motion_notify), NULL);
diff --git a/tests/overlayscroll.c b/tests/overlayscroll.c
index 2e7d3bf..b6c8179 100644
--- a/tests/overlayscroll.c
+++ b/tests/overlayscroll.c
@@ -65,7 +65,7 @@ main (int argc, char *argv[])
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_AUTOMATIC);
 
-  gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), sw, TRUE);
 
   content = get_content ();
 
diff --git a/tests/print-editor.c b/tests/print-editor.c
index c559789..c111b2d 100644
--- a/tests/print-editor.c
+++ b/tests/print-editor.c
@@ -321,15 +321,15 @@ create_custom_widget (GtkPrintOperation *operation,
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
   gtk_widget_show (hbox);
 
   label = gtk_label_new ("Font:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
   gtk_widget_show (label);
 
   font = gtk_font_button_new_with_font  (data->font);
-  gtk_box_pack_start (GTK_BOX (hbox), font, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), font, FALSE);
   gtk_widget_show (font);
   data->font_button = font;
 
diff --git a/tests/syncscroll.c b/tests/syncscroll.c
index 7062efa..39556f3 100644
--- a/tests/syncscroll.c
+++ b/tests/syncscroll.c
@@ -32,7 +32,7 @@ main (int argc, char *argv[])
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_EXTERNAL);
-  gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), sw, TRUE);
   tv = gtk_text_view_new ();
   fill_text_view (tv, "Left");
   gtk_container_add (GTK_CONTAINER (sw), tv);
@@ -43,7 +43,7 @@ main (int argc, char *argv[])
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_EXTERNAL);
-  gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), sw, TRUE);
   tv = gtk_text_view_new ();
   fill_text_view (tv, "Middle");
   gtk_container_add (GTK_CONTAINER (sw), tv);
@@ -52,7 +52,7 @@ main (int argc, char *argv[])
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_NEVER,
                                   GTK_POLICY_EXTERNAL);
-  gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), sw, TRUE);
   tv = gtk_text_view_new ();
   fill_text_view (tv, "Right");
   gtk_container_add (GTK_CONTAINER (sw), tv);
diff --git a/tests/testaccel.c b/tests/testaccel.c
index 712d3ec..262d2e2 100644
--- a/tests/testaccel.c
+++ b/tests/testaccel.c
@@ -71,10 +71,11 @@ key_test (void)
         gtk_window_set_default_size (GTK_WINDOW (window), 400, 400);
 
        sw = gtk_scrolled_window_new (NULL, NULL);
+        gtk_widget_set_hexpand (sw, TRUE);
         box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
         gtk_widget_show (box);
        gtk_container_add (GTK_CONTAINER (window), box);
-        gtk_box_pack_start (GTK_BOX (box), sw, TRUE, TRUE);
+        gtk_box_pack_start (GTK_BOX (box), sw, TRUE);
 
        store = gtk_list_store_new (3, G_TYPE_INT, G_TYPE_UINT, G_TYPE_UINT);
        tv = gtk_tree_view_new_with_model (GTK_TREE_MODEL (store));
diff --git a/tests/testactionbar.c b/tests/testactionbar.c
index 6b1eb60..1c69204 100644
--- a/tests/testactionbar.c
+++ b/tests/testactionbar.c
@@ -113,7 +113,7 @@ activate (GApplication *gapp)
                 "row-spacing", 12,
                 "column-spacing", 12,
                 NULL);
-  gtk_box_pack_start (GTK_BOX (box), grid, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), grid, FALSE);
 
   label = gtk_label_new ("Start");
   gtk_widget_set_halign (label, GTK_ALIGN_END);
@@ -147,7 +147,7 @@ activate (GApplication *gapp)
   gtk_grid_attach (GTK_GRID (grid), label, 0, 3, 1, 1);
   gtk_grid_attach (GTK_GRID (grid), check, 1, 3, 1, 1);
 
-  gtk_box_pack_end (GTK_BOX (box), bar, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (box), bar, FALSE);
   gtk_container_add (GTK_CONTAINER (window), box);
   gtk_widget_show (window);
 }
diff --git a/tests/testadjustsize.c b/tests/testadjustsize.c
index 160d6a5..8673c61 100644
--- a/tests/testadjustsize.c
+++ b/tests/testadjustsize.c
@@ -337,7 +337,7 @@ open_valigned_label_window (void)
 
   label = gtk_label_new ("Both labels expand");
   gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), label, TRUE);
 
   label = gtk_label_new ("Some wrapping text with width-chars = 15 and max-width-chars = 35");
   gtk_label_set_line_wrap  (GTK_LABEL (label), TRUE);
@@ -353,7 +353,7 @@ open_valigned_label_window (void)
   gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
   gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
 
-  gtk_box_pack_start (GTK_BOX (box), frame, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), frame, TRUE);
 
   gtk_window_present (GTK_WINDOW (window));
 }
diff --git a/tests/testanimation.c b/tests/testanimation.c
index a42d856..5cbfa20 100644
--- a/tests/testanimation.c
+++ b/tests/testanimation.c
@@ -330,13 +330,13 @@ do_image (const char *filename)
   g_free (escaped);
   g_free (str);
 
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
   gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
   image = gtk_image_new_from_pixbuf (NULL);
   gtk_container_add (GTK_CONTAINER (frame), image);
@@ -384,13 +384,13 @@ do_nonprogressive (const gchar *filename)
   g_free (escaped);
   g_free (str);
 
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   frame = gtk_frame_new (NULL);
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_IN);
   gtk_widget_set_halign (frame, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
   image = gtk_image_new_from_file (filename);
   gtk_container_add (GTK_CONTAINER (frame), image);
diff --git a/tests/testappchooserbutton.c b/tests/testappchooserbutton.c
index 7d3ed69..c96dc11 100644
--- a/tests/testappchooserbutton.c
+++ b/tests/testappchooserbutton.c
@@ -76,22 +76,22 @@ main (int argc,
   gtk_container_add (GTK_CONTAINER (toplevel), box);
 
   combobox = gtk_app_chooser_button_new ("image/jpeg");
-  gtk_box_pack_start (GTK_BOX (box), combobox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), combobox, TRUE);
 
   g_signal_connect (combobox, "changed",
                     G_CALLBACK (combo_changed_cb), NULL);
 
   w = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (w), "<b>Selected app info</b>");
-  gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), w, TRUE);
 
   w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-  gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), w, TRUE);
 
   sel_image = gtk_image_new ();
-  gtk_box_pack_start (GTK_BOX (w), sel_image, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (w), sel_image, TRUE);
   sel_name = gtk_label_new (NULL);
-  gtk_box_pack_start (GTK_BOX (w), sel_name, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (w), sel_name, TRUE);
 
   gtk_app_chooser_button_set_heading (GTK_APP_CHOOSER_BUTTON (combobox), "Choose one, <i>not</i> two");
   gtk_app_chooser_button_append_separator (GTK_APP_CHOOSER_BUTTON (combobox));
diff --git a/tests/testassistant.c b/tests/testassistant.c
index fa966d8..28774f8 100644
--- a/tests/testassistant.c
+++ b/tests/testassistant.c
@@ -377,13 +377,13 @@ create_nonlinear_assistant (GtkWidget *widget)
       page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
 
       button = gtk_radio_button_new_with_label (NULL, "branch A");
-      gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (page), button, FALSE);
       g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (select_branch), GINT_TO_POINTER ('A'));
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
 
       button = gtk_radio_button_new_with_label (gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
                                                "branch B");
-      gtk_box_pack_start (GTK_BOX (page), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (page), button, FALSE);
       g_signal_connect (G_OBJECT (button), "toggled", G_CALLBACK (select_branch), GINT_TO_POINTER ('B'));
 
       gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
@@ -650,7 +650,6 @@ create_page_flipping_assistant (GtkWidget *widget)
       page = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_box_pack_start (GTK_BOX (page),
                           get_test_page ("Page 2"),
-                          TRUE,
                           TRUE);
       gtk_assistant_append_page (GTK_ASSISTANT (assistant), page);
       gtk_assistant_set_page_title (GTK_ASSISTANT (assistant), page, "Page 2");
@@ -722,7 +721,7 @@ main (int argc, gchar *argv[])
        g_signal_connect (G_OBJECT (button), "clicked",
                          G_CALLBACK (buttons[i].func), NULL);
 
-      gtk_box_pack_start (GTK_BOX (box), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), button, TRUE);
     }
 
   gtk_widget_show (window);
diff --git a/tests/testbaseline.c b/tests/testbaseline.c
index a6e1d7e..98c2866 100644
--- a/tests/testbaseline.c
+++ b/tests/testbaseline.c
@@ -100,7 +100,7 @@ main (int    argc,
   for (j = 0; j < 2; j++)
     {
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
       char *aligns_names[] = { "FILL", "BASELINE" };
       GtkAlign aligns[] = { GTK_ALIGN_FILL, GTK_ALIGN_BASELINE};
@@ -136,7 +136,7 @@ main (int    argc,
     }
 
   grid_hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
   combo = gtk_combo_box_text_new ();
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo), baseline_pos_str[0]);
@@ -148,7 +148,7 @@ main (int    argc,
   for (j = 0; j < 2; j++)
     {
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       g_signal_connect (G_OBJECT (combo), "changed",
                        G_CALLBACK (baseline_position_changed), hbox);
@@ -227,7 +227,7 @@ main (int    argc,
                            vbox, gtk_label_new ("grid"));
 
   grid_hbox = hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
   label = gtk_label_new ("Align me:");
   gtk_widget_set_valign (label, GTK_ALIGN_BASELINE);
@@ -295,7 +295,7 @@ main (int    argc,
   gtk_container_add (GTK_CONTAINER (hbox), grid);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   adjustment = gtk_adjustment_new (0.0, -1.0, 5.0, 1.0, 1.0, 0.0);
   spin = gtk_spin_button_new (adjustment, 1.0, 0);
@@ -320,7 +320,7 @@ main (int    argc,
                            vbox, gtk_label_new ("button box"));
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   adjustment = gtk_adjustment_new (34.0, 1.0, 64.0, 1.0, 1.0, 0.0);
   spin = gtk_spin_button_new (adjustment, 1.0, 0);
@@ -333,7 +333,7 @@ main (int    argc,
   for (j = 0; j < 3; j++)
     {
       hbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       gtk_box_set_baseline_position (GTK_BOX (hbox), j);
 
diff --git a/tests/testbbox.c b/tests/testbbox.c
index 5fc76db..754bf92 100644
--- a/tests/testbbox.c
+++ b/tests/testbbox.c
@@ -129,7 +129,7 @@ main (int    argc,
   /* GtkHButtonBox */
 
   hbbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbbox, TRUE);
 
   for (i = 0; i < N_BUTTONS; i++) {
     buttons[i] = gtk_button_new_with_label (strings[i]);
@@ -142,27 +142,27 @@ main (int    argc,
 
   /* GtkVButtonBox */
   vbbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
-  gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), vbbox, TRUE);
 
   /* Options */
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   combo_types = gtk_combo_box_text_new ();
   populate_combo_with (GTK_COMBO_BOX_TEXT (combo_types), types);
   g_signal_connect (G_OBJECT (combo_types), "changed", G_CALLBACK (combo_types_changed_cb), buttons);
-  gtk_box_pack_start (GTK_BOX (hbox), combo_types, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), combo_types, TRUE);
 
   combo_styles = gtk_combo_box_text_new ();
   populate_combo_with (GTK_COMBO_BOX_TEXT (combo_styles), styles);
   g_signal_connect (G_OBJECT (combo_styles), "changed", G_CALLBACK (combo_changed_cb), NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), combo_styles, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), combo_styles, TRUE);
 
   option = gtk_check_button_new_with_label ("Help is secondary");
   g_signal_connect (G_OBJECT (option), "toggled", G_CALLBACK (option_cb), buttons[N_BUTTONS - 1]);
 
-  gtk_box_pack_start (GTK_BOX (hbox), option, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), option, FALSE);
 
   gtk_widget_show (window);
   gtk_widget_hide (vbbox);
diff --git a/tests/testbox.c b/tests/testbox.c
index 0a1b391..1125f70 100644
--- a/tests/testbox.c
+++ b/tests/testbox.c
@@ -1,19 +1,6 @@
 #include <gtk/gtk.h>
 
 static void
-expand_toggled (GtkToggleButton *b, GtkWidget *w)
-{
-  gboolean active;
-  GtkWidget *parent;
-
-  active = gtk_toggle_button_get_active (b);
-  parent = gtk_widget_get_parent (w);
-  gtk_container_child_set (GTK_CONTAINER (parent), w,
-                           "expand", active,
-                           NULL);
-}
-
-static void
 fill_toggled (GtkToggleButton *b, GtkWidget *w)
 {
   gboolean active;
@@ -34,7 +21,7 @@ edit_widget (GtkWidget *button)
   GtkWidget *label;
   GtkWidget *entry;
   GtkWidget *check;
-  gboolean expand, fill;
+  gboolean fill;
 
   dialog = GTK_WIDGET (g_object_get_data (G_OBJECT (button), "dialog"));
 
@@ -71,22 +58,11 @@ edit_widget (GtkWidget *button)
       gtk_grid_attach (GTK_GRID (grid), label, 0, 1, 1, 1);
       gtk_grid_attach (GTK_GRID (grid), check, 1, 1, 1, 1);
 
-      label = gtk_label_new ("Expand:");
-      gtk_widget_set_halign (label, GTK_ALIGN_END);
-      check = gtk_check_button_new ();
-      gtk_box_query_child_packing (GTK_BOX (gtk_widget_get_parent (button)),
-                                   button, &expand, NULL, NULL);
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), expand);
-      g_signal_connect (check, "toggled",
-                        G_CALLBACK (expand_toggled), button);
-      gtk_grid_attach (GTK_GRID (grid), label, 0, 2, 1, 1);
-      gtk_grid_attach (GTK_GRID (grid), check, 1, 2, 1, 1);
-
       label = gtk_label_new ("Fill:");
       gtk_widget_set_halign (label, GTK_ALIGN_END);
       check = gtk_check_button_new ();
       gtk_box_query_child_packing (GTK_BOX (gtk_widget_get_parent (button)),
-                                   button, NULL, &fill, NULL);
+                                   button, &fill, NULL);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check), fill);
       g_signal_connect (check, "toggled",
                         G_CALLBACK (fill_toggled), button);
@@ -138,12 +114,12 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_pack_start (GTK_BOX (box), test_widget ("1"), FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (box), test_widget ("2"), FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (box), test_widget ("3"), FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (box), test_widget ("4"), FALSE, TRUE);
-  gtk_box_pack_end (GTK_BOX (box), test_widget ("5"), FALSE, TRUE);
-  gtk_box_pack_end (GTK_BOX (box), test_widget ("6"), FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("1"), TRUE);
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("2"), TRUE);
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("3"), TRUE);
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("4"), TRUE);
+  gtk_box_pack_end (GTK_BOX (box), test_widget ("5"), TRUE);
+  gtk_box_pack_end (GTK_BOX (box), test_widget ("6"), TRUE);
 
   gtk_box_set_center_widget (GTK_BOX (box), test_widget ("center"));
   gtk_container_add (GTK_CONTAINER (vbox), box);
@@ -162,14 +138,14 @@ main (int argc, char *argv[])
   gtk_widget_set_halign (b, GTK_ALIGN_CENTER);
   label = gtk_label_new ("Spacing:");
   gtk_widget_set_halign (label, GTK_ALIGN_END);
-  gtk_box_pack_start (GTK_BOX (b), label, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (b), label, TRUE);
 
   spin = gtk_spin_button_new_with_range (0, 10, 1);
   gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
   gtk_widget_set_halign (spin, GTK_ALIGN_START);
   g_signal_connect (spin, "value-changed",
                     G_CALLBACK (spacing_changed), box);
-  gtk_box_pack_start (GTK_BOX (b), spin, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (b), spin, TRUE);
   gtk_container_add (GTK_CONTAINER (vbox), b);
 
   gtk_widget_show (window);
diff --git a/tests/testboxcss.c b/tests/testboxcss.c
index 3fee695..02dd744 100644
--- a/tests/testboxcss.c
+++ b/tests/testboxcss.c
@@ -173,15 +173,15 @@ main (gint argc, gchar **argv)
 
   toolbar = gtk_toolbar_new ();
   gtk_toolbar_set_style (GTK_TOOLBAR (toolbar), GTK_TOOLBAR_TEXT);
-  gtk_box_pack_start (GTK_BOX (main_box), toolbar, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (main_box), toolbar, TRUE);
 
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_pack_start (GTK_BOX (main_box), box, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (main_box), box, TRUE);
 
   container = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_min_content_width (GTK_SCROLLED_WINDOW (container), 200);
   gtk_scrolled_window_set_min_content_height (GTK_SCROLLED_WINDOW (container), 200);
-  gtk_box_pack_start (GTK_BOX (main_box), container, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (main_box), container, TRUE);
   child = gtk_text_view_new_with_buffer (css);
   gtk_container_add (GTK_CONTAINER (container), child);
   g_signal_connect (css,
@@ -197,28 +197,28 @@ main (gint argc, gchar **argv)
                     gtk_text_view_get_buffer (GTK_TEXT_VIEW (child)));
 
   container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_pack_start (GTK_BOX (main_box), container, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (main_box), container, TRUE);
   child = gtk_switch_new ();
   gtk_switch_set_active (GTK_SWITCH (child), gtk_widget_get_default_direction () == GTK_TEXT_DIR_LTR);
   g_signal_connect (child,
                     "notify::active",
                     G_CALLBACK (set_orientation),
                     NULL);
-  gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (container), child, FALSE);
   child = gtk_label_new ("left-to-right");
-  gtk_box_pack_start (GTK_BOX (container), child, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (container), child, FALSE);
   child = gtk_button_new_with_label ("Add button");
   g_signal_connect_swapped (child,
                             "clicked",
                             G_CALLBACK (add_button),
                             box);
-  gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (container), child, FALSE);
   child = gtk_button_new_with_label ("Add toolbutton");
   g_signal_connect_swapped (child,
                             "clicked",
                             G_CALLBACK (add_toolbutton),
                             toolbar);
-  gtk_box_pack_end (GTK_BOX (container), child, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (container), child, FALSE);
 
   add_toolbutton (GTK_TOOLBAR (toolbar));
   add_toolbutton (GTK_TOOLBAR (toolbar));
diff --git a/tests/testcalendar.c b/tests/testcalendar.c
index 886e711..4cd6c74 100644
--- a/tests/testcalendar.c
+++ b/tests/testcalendar.c
@@ -495,7 +495,7 @@ create_calendar(void)
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
   frame = create_frame ("<b>Options</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE);
   size = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
   context = gtk_widget_get_style_context (calendar);
@@ -517,9 +517,9 @@ create_calendar(void)
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
   /* Build the width entry */
 
@@ -538,9 +538,9 @@ create_calendar(void)
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
   /* Build the height entry */
 
@@ -559,15 +559,15 @@ create_calendar(void)
   gtk_size_group_add_widget (size, label);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
   /* Build the right details frame */
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
   frame = create_frame ("<b>Details</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_FILL);
-  gtk_box_pack_start (GTK_BOX (rpane), frame, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE);
 
   details = gtk_text_view_new();
   calendar_data.details_buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (details));
@@ -585,12 +585,12 @@ create_calendar(void)
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
 
-  gtk_box_pack_start (GTK_BOX (vbox), scroller, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scroller, TRUE);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, DEF_PAD_SMALL);
   gtk_widget_set_halign (hbox, GTK_ALIGN_START);
   gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
   button = gtk_button_new_with_mnemonic ("Demonstrate _Details");
 
@@ -599,7 +599,7 @@ create_calendar(void)
                             G_CALLBACK (demonstrate_details),
                             &calendar_data);
 
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
 
   button = gtk_button_new_with_mnemonic ("_Reset Details");
 
@@ -608,24 +608,24 @@ create_calendar(void)
                             G_CALLBACK (reset_details),
                             &calendar_data);
 
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
 
   toggle = gtk_check_button_new_with_mnemonic ("_Use Details");
   g_signal_connect (toggle, "toggled",
                     G_CALLBACK(calendar_toggle_details),
                     &calendar_data);
-  gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE);
 
   /* Build the Right frame with the flags in */
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   frame = create_expander ("<b>Flags</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (rpane), frame, TRUE);
 
   for (i = 0; i < G_N_ELEMENTS (calendar_data.settings); i++)
     {
       toggle = gtk_check_button_new_with_mnemonic(flags[i].label);
-      gtk_box_pack_start (GTK_BOX (vbox), toggle, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), toggle, TRUE);
       calendar_data.flag_checkboxes[i] = toggle;
 
       g_signal_connect (toggle, "toggled",
@@ -644,25 +644,25 @@ create_calendar(void)
   frame = create_frame ("<b>Signal Events</b>", vbox, GTK_ALIGN_FILL, GTK_ALIGN_CENTER);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
   label = gtk_label_new ("Signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
   calendar_data.last_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.last_sig, TRUE);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
   label = gtk_label_new ("Previous signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
   calendar_data.prev_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev_sig, TRUE);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 3);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
   label = gtk_label_new ("Second previous signal:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
   calendar_data.prev2_sig = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), calendar_data.prev2_sig, TRUE);
 
   /*
    *  Glue everything together
@@ -678,15 +678,15 @@ create_calendar(void)
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, DEF_PAD_SMALL);
 
   gtk_box_pack_start (GTK_BOX (vbox), hpaned,
-                      TRUE,  TRUE);
+                      TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                      FALSE, TRUE);
+                      TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), frame,
-                      FALSE, TRUE);
+                      TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                      FALSE, TRUE);
+                      TRUE);
   gtk_box_pack_start (GTK_BOX (vbox), bbox,
-                      FALSE, TRUE);
+                      TRUE);
 
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
diff --git a/tests/testcellarea.c b/tests/testcellarea.c
index eae9f02..099e7c0 100644
--- a/tests/testcellarea.c
+++ b/tests/testcellarea.c
@@ -188,27 +188,27 @@ simple_cell_area (void)
 
   hbox  = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
   frame = gtk_frame_new (NULL);
-  gtk_widget_show (hbox);
-  gtk_widget_show (frame);
+  gtk_widget_set_hexpand (frame, TRUE);
 
   gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
   gtk_widget_set_halign (frame, GTK_ALIGN_FILL);
 
   gtk_container_add (GTK_CONTAINER (frame), iconview);
 
-  gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE);
+
+  gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE);
 
   /* Now add some controls */
   vbox  = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_widget_show (vbox);
-  gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE);
 
   widget = gtk_combo_box_text_new ();
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (orientation_changed), iconview);
@@ -216,7 +216,7 @@ simple_cell_area (void)
   widget = gtk_check_button_new_with_label ("Align 2nd Cell");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (align_cell_2_toggled), iconview);
@@ -224,7 +224,7 @@ simple_cell_area (void)
   widget = gtk_check_button_new_with_label ("Align 3rd Cell");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (align_cell_3_toggled), iconview);
@@ -233,7 +233,7 @@ simple_cell_area (void)
   widget = gtk_check_button_new_with_label ("Expand 1st Cell");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (expand_cell_1_toggled), iconview);
@@ -241,7 +241,7 @@ simple_cell_area (void)
   widget = gtk_check_button_new_with_label ("Expand 2nd Cell");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (expand_cell_2_toggled), iconview);
@@ -249,7 +249,7 @@ simple_cell_area (void)
   widget = gtk_check_button_new_with_label ("Expand 3rd Cell");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (expand_cell_3_toggled), iconview);
@@ -434,26 +434,26 @@ focus_cell_area (void)
   iconview = focus_iconview (FALSE, &focus_renderer, &sibling_renderer);
 
   frame = gtk_frame_new (NULL);
-  gtk_widget_show (frame);
+  gtk_widget_set_hexpand (frame, TRUE);
 
   gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
   gtk_widget_set_halign (frame, GTK_ALIGN_FILL);
 
   gtk_container_add (GTK_CONTAINER (frame), iconview);
 
-  gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE);
+  gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE);
 
   /* Now add some controls */
   vbox  = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_widget_show (vbox);
-  gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE);
 
   widget = gtk_combo_box_text_new ();
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget,  FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (orientation_changed), iconview);
@@ -461,7 +461,7 @@ focus_cell_area (void)
   widget = gtk_check_button_new_with_label ("Focus Sibling");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), TRUE);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (focus_sibling_toggled), iconview);
@@ -531,45 +531,43 @@ background_area (void)
   gtk_label_set_line_wrap  (GTK_LABEL (label), TRUE);
   gtk_label_set_width_chars  (GTK_LABEL (label), 40);
   gtk_widget_show (label);
-  gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_vbox), label, FALSE);
 
   iconview = focus_iconview (TRUE, NULL, NULL);
 
   frame = gtk_frame_new (NULL);
-  gtk_widget_show (frame);
+  gtk_widget_set_hexpand (frame, TRUE);
 
   gtk_widget_set_valign (frame, GTK_ALIGN_CENTER);
   gtk_widget_set_halign (frame, GTK_ALIGN_FILL);
 
   gtk_container_add (GTK_CONTAINER (frame), iconview);
 
-  gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE, TRUE);
+  gtk_box_pack_end (GTK_BOX (hbox), frame, TRUE);
 
   /* Now add some controls */
   vbox  = gtk_box_new (GTK_ORIENTATION_VERTICAL, 4);
   gtk_widget_show (vbox);
-  gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), vbox, FALSE);
+  gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE);
 
   widget = gtk_combo_box_text_new ();
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (orientation_changed), iconview);
 
   widget = gtk_spin_button_new_with_range (0, 10, 1);
   label = gtk_label_new ("Cell spacing");
+  gtk_widget_set_hexpand (label, TRUE);
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-  gtk_widget_show (hbox);
-  gtk_widget_show (label);
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "value-changed",
                     G_CALLBACK (cell_spacing_changed), iconview);
@@ -578,27 +576,23 @@ background_area (void)
   widget = gtk_spin_button_new_with_range (0, 10, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), gtk_icon_view_get_row_spacing (GTK_ICON_VIEW 
(iconview)));
   label = gtk_label_new ("Row spacing");
+  gtk_widget_set_hexpand (label, TRUE);
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-  gtk_widget_show (hbox);
-  gtk_widget_show (label);
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "value-changed",
                     G_CALLBACK (row_spacing_changed), iconview);
 
   widget = gtk_spin_button_new_with_range (0, 30, 1);
   label = gtk_label_new ("Item padding");
+  gtk_widget_set_hexpand (label, TRUE);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), gtk_icon_view_get_item_padding (GTK_ICON_VIEW 
(iconview)));
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-  gtk_widget_show (hbox);
-  gtk_widget_show (label);
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox,  FALSE);
 
   g_signal_connect (G_OBJECT (widget), "value-changed",
                     G_CALLBACK (item_padding_changed), iconview);
diff --git a/tests/testcellrenderertext.c b/tests/testcellrenderertext.c
index 9d29524..4a5f3f4 100644
--- a/tests/testcellrenderertext.c
+++ b/tests/testcellrenderertext.c
@@ -266,18 +266,20 @@ main (int argc, char **argv)
   /* LTR */
 
   label = gtk_label_new ("Left to right");
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   tree = create_tree (FALSE);
-  gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE);
+  gtk_widget_set_vexpand (tree, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE);
 
   /* RTL */
 
   label = gtk_label_new ("Right to left");
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   tree = create_tree (TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE, TRUE);
+  gtk_widget_set_vexpand (tree, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), tree, TRUE);
 
   gtk_widget_show (window);
   gtk_main ();
diff --git a/tests/testclipboard.c b/tests/testclipboard.c
index 29cc5b9..6e25bbd 100644
--- a/tests/testclipboard.c
+++ b/tests/testclipboard.c
@@ -120,9 +120,9 @@ main (int argc, char **argv)
                                         NULL);
 
   image = gtk_image_new ();
-  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), image, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), image, FALSE);
   label = gtk_label_new ("No data found");
-  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (window))), label, FALSE);
 
   g_signal_connect (window, "response", G_CALLBACK (on_response), NULL);
 
diff --git a/tests/testcombo.c b/tests/testcombo.c
index f7befc3..64d86a7 100644
--- a/tests/testcombo.c
+++ b/tests/testcombo.c
@@ -1071,7 +1071,7 @@ main (int argc, char **argv)
 
         /* GtkCellView */
         tmp = gtk_frame_new ("GtkCellView");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1092,7 +1092,7 @@ main (int argc, char **argv)
 
         /* GtkComboBox list */
         tmp = gtk_frame_new ("GtkComboBox (list)");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1132,7 +1132,7 @@ main (int argc, char **argv)
 
         /* GtkComboBox dynamic list */
         tmp = gtk_frame_new ("GtkComboBox (dynamic list)");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1175,7 +1175,7 @@ main (int argc, char **argv)
 
         /* GtkComboBox custom entry */
         tmp = gtk_frame_new ("GtkComboBox (custom)");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1229,7 +1229,7 @@ main (int argc, char **argv)
 
         /* GtkComboBox tree */
         tmp = gtk_frame_new ("GtkComboBox (tree)");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1272,18 +1272,18 @@ main (int argc, char **argv)
 
         /* GtkComboBox (grid mode) */
         tmp = gtk_frame_new ("GtkComboBox (grid mode)");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
 
         comboboxgrid = create_combo_box_grid_demo ();
-        gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (boom), comboboxgrid, FALSE);
 
 
         /* GtkComboBoxEntry */
         tmp = gtk_frame_new ("GtkComboBox with entry");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1295,7 +1295,7 @@ main (int argc, char **argv)
 
         /* Phylogenetic tree */
         tmp = gtk_frame_new ("What are you ?");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1317,7 +1317,7 @@ main (int argc, char **argv)
 
         /* Capitals */
         tmp = gtk_frame_new ("Where are you ?");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1348,7 +1348,7 @@ main (int argc, char **argv)
 
         /* Aligned Food */
         tmp = gtk_frame_new ("Hungry ?");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1382,7 +1382,7 @@ main (int argc, char **argv)
 
        /* Ellipsizing growing combos */
         tmp = gtk_frame_new ("Unconstrained Menu");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
 
         boom = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
         gtk_container_add (GTK_CONTAINER (tmp), boom);
@@ -1401,7 +1401,7 @@ main (int argc, char **argv)
        gtk_combo_box_set_popup_fixed_width (GTK_COMBO_BOX (combobox), FALSE);
 
         tmp = gtk_frame_new ("Looong");
-        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE, FALSE);
+        gtk_box_pack_start (GTK_BOX (mainbox), tmp, FALSE);
         combobox = gtk_combo_box_text_new ();
         for (i = 0; i < 200; i++)
           {
diff --git a/tests/testcombochange.c b/tests/testcombochange.c
index fb4656a..730d74c 100644
--- a/tests/testcombochange.c
+++ b/tests/testcombochange.c
@@ -247,29 +247,30 @@ main (int argc, char **argv)
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE);
 
   combo_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), combo_vbox, FALSE);
 
   label = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (label), "<b>Menu mode</b>");
-  gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE);
 
   menu_combo = create_combo ("menu-combo", FALSE);
   gtk_widget_set_margin_start (menu_combo, 12);
-  gtk_box_pack_start (GTK_BOX (combo_vbox), menu_combo, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (combo_vbox), menu_combo, FALSE);
 
   label = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (label), "<b>List mode</b>");
-  gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (combo_vbox), label, FALSE);
 
   list_combo = create_combo ("list-combo", TRUE);
   gtk_widget_set_margin_start (list_combo, 12);
-  gtk_box_pack_start (GTK_BOX (combo_vbox), list_combo, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (combo_vbox), list_combo, FALSE);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), scrolled_window, TRUE, TRUE);
+  gtk_widget_set_hexpand (scrolled_window, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), scrolled_window, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
@@ -280,24 +281,24 @@ main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (scrolled_window), text_view);
 
   button_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button_vbox, FALSE);
 
   gtk_window_set_default_size (GTK_WINDOW (dialog), 500, 300);
 
   button = gtk_button_new_with_label ("Insert");
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (on_insert), NULL);
 
   button = gtk_button_new_with_label ("Delete");
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (on_delete), NULL);
 
   button = gtk_button_new_with_label ("Reorder");
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (on_reorder), NULL);
 
   button = gtk_button_new_with_label ("Animate");
-  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (button_vbox), button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (on_animate), NULL);
 
   gtk_widget_show (dialog);
diff --git a/tests/testellipsise.c b/tests/testellipsise.c
index b2a9e81..273d3f6 100644
--- a/tests/testellipsise.c
+++ b/tests/testellipsise.c
@@ -155,11 +155,12 @@ main (int argc, char *argv[])
 
   overlay = gtk_overlay_new ();
   gtk_container_add (GTK_CONTAINER (overlay), da);
+  gtk_widget_set_vexpand (overlay, TRUE);
   gtk_overlay_add_overlay (GTK_OVERLAY (overlay), label);
 
-  gtk_box_pack_start (GTK_BOX (vbox), combo, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), scale, FALSE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), overlay, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), combo, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scale, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), overlay, TRUE);
 
   g_object_set_data (G_OBJECT (label), "combo", combo);
 
diff --git a/tests/testentrycompletion.c b/tests/testentrycompletion.c
index 0ce5bf7..c48d2c7 100644
--- a/tests/testentrycompletion.c
+++ b/tests/testentrycompletion.c
@@ -307,7 +307,7 @@ main (int argc, char *argv[])
   label = gtk_label_new (NULL);
 
   gtk_label_set_markup (GTK_LABEL (label), "Completion demo, try writing <b>total</b> or <b>gnome</b> for 
example.");
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   /* Create our first entry */
   entry = gtk_entry_new ();
@@ -392,7 +392,7 @@ main (int argc, char *argv[])
   gdk_threads_add_timeout (1000, (GSourceFunc) animation_timer, completion);
 
   /* Fourth entry */
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Model-less entry completion"), FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Model-less entry completion"), FALSE);
 
   entry = gtk_entry_new ();
 
diff --git a/tests/testexpand.c b/tests/testexpand.c
index 88483d2..f8a54e7 100644
--- a/tests/testexpand.c
+++ b/tests/testexpand.c
@@ -55,30 +55,30 @@ create_box_window (void)
 
   gtk_box_pack_start (GTK_BOX (box1),
                       gtk_label_new ("VBox 1 Top"),
-                      FALSE, FALSE);
+                      FALSE);
   gtk_box_pack_start (GTK_BOX (box1),
                       box2,
-                      FALSE, TRUE);
+                       TRUE);
   gtk_box_pack_end (GTK_BOX (box1),
                     gtk_label_new ("VBox 1 Bottom"),
-                    FALSE, FALSE);
+                    FALSE);
 
   gtk_box_pack_start (GTK_BOX (box2),
                       gtk_label_new ("HBox 2 Left"),
-                      FALSE, FALSE);
+                      FALSE);
   gtk_box_pack_start (GTK_BOX (box2),
                       box3,
-                      FALSE, TRUE);
+                      TRUE);
   gtk_box_pack_end (GTK_BOX (box2),
                     gtk_label_new ("HBox 2 Right"),
-                    FALSE, FALSE);
+                    FALSE);
 
   gtk_box_pack_start (GTK_BOX (box3),
                       gtk_label_new ("VBox 3 Top"),
-                      FALSE, FALSE);
+                      FALSE);
   gtk_box_pack_end (GTK_BOX (box3),
                     gtk_label_new ("VBox 3 Bottom"),
-                    FALSE, FALSE);
+                    FALSE);
 
   colorbox = gtk_frame_new (NULL);
 
@@ -90,7 +90,7 @@ create_box_window (void)
                     G_CALLBACK (on_toggle_hexpand), NULL);
   gtk_container_add (GTK_CONTAINER (colorbox), toggle);
 
-  gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box3), colorbox, TRUE);
 
   colorbox = gtk_frame_new (NULL);
 
@@ -101,7 +101,7 @@ create_box_window (void)
   g_signal_connect (G_OBJECT (toggle), "toggled",
                     G_CALLBACK (on_toggle_vexpand), NULL);
   gtk_container_add (GTK_CONTAINER (colorbox), toggle);
-  gtk_box_pack_start (GTK_BOX (box3), colorbox, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box3), colorbox, TRUE);
 
   gtk_container_add (GTK_CONTAINER (window), box1);
   gtk_widget_show (window);
diff --git a/tests/testexpander.c b/tests/testexpander.c
index 6852b29..d7e1126 100644
--- a/tests/testexpander.c
+++ b/tests/testexpander.c
@@ -72,7 +72,9 @@ main (int argc, char *argv[])
                             "resize the window. Do it already !", -1);
   gtk_container_add (GTK_CONTAINER (sw), tv);
   gtk_container_add (GTK_CONTAINER (expander), sw);
-  gtk_box_pack_end (GTK_BOX (area), expander, TRUE, TRUE);
+  gtk_widget_set_hexpand (expander, TRUE);
+  gtk_widget_set_vexpand (expander, TRUE);
+  gtk_box_pack_end (GTK_BOX (area), expander, TRUE);
   g_signal_connect (expander, "notify::expanded",
                     G_CALLBACK (expander_cb), dialog);
 
diff --git a/tests/testfilechooserbutton.c b/tests/testfilechooserbutton.c
index 4bc2185..cdb6c97 100644
--- a/tests/testfilechooserbutton.c
+++ b/tests/testfilechooserbutton.c
@@ -134,25 +134,25 @@ tests_button_clicked_cb (GtkButton *real_button,
       button = gtk_button_new_with_label ("Print Selected Path");
       g_signal_connect (button, "clicked",
                        G_CALLBACK (print_selected_path_clicked_cb), user_data);
-      gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), button, FALSE);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("Add $PWD's Parent as Shortcut");
       g_signal_connect (button, "clicked",
                        G_CALLBACK (add_pwds_parent_as_shortcut_clicked_cb), user_data);
-      gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), button, FALSE);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("Remove $PWD's Parent as Shortcut");
       g_signal_connect (button, "clicked",
                        G_CALLBACK (del_pwds_parent_as_shortcut_clicked_cb), user_data);
-      gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), button, FALSE);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("Unselect all");
       g_signal_connect (button, "clicked",
                        G_CALLBACK (unselect_all_clicked_cb), user_data);
-      gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), button, FALSE);
       gtk_widget_show (button);
 
       g_signal_connect (tests, "delete-event", G_CALLBACK (delete_event_cb), NULL);
@@ -254,7 +254,7 @@ main (int   argc,
   frame = gtk_frame_new ("<b>GtkFileChooserButton</b>");
   gtk_frame_set_shadow_type (GTK_FRAME (frame), GTK_SHADOW_NONE);
   gtk_label_set_use_markup (GTK_LABEL (gtk_frame_get_label_widget (GTK_FRAME (frame))), TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
   gtk_widget_set_halign (frame, GTK_ALIGN_FILL);
   gtk_widget_set_valign (frame, GTK_ALIGN_FILL);
@@ -267,15 +267,16 @@ main (int   argc,
 
   /* OPEN */
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE);
 
   label = gtk_label_new_with_mnemonic ("_Open:");
   gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), label);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
 
   chooser = gtk_file_chooser_button_new ("Select A File - testfilechooserbutton",
                                          GTK_FILE_CHOOSER_ACTION_OPEN);
+  gtk_widget_set_hexpand (chooser, TRUE);
   gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL);
   gtk_file_chooser_remove_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL);
   gtk_label_set_mnemonic_widget (GTK_LABEL (label), chooser);
@@ -284,23 +285,24 @@ main (int   argc,
   g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL);
   g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL);
   g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE);
 
   button = gtk_button_new_with_label ("Tests");
   g_signal_connect (button, "clicked", G_CALLBACK (tests_button_clicked_cb), chooser);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
 
   /* SELECT_FOLDER */
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 12);
-  gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (group_box), hbox, FALSE);
 
   label = gtk_label_new_with_mnemonic ("Select _Folder:");
   gtk_size_group_add_widget (GTK_SIZE_GROUP (label_group), label);
   gtk_label_set_xalign (GTK_LABEL (label), 0.0);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
 
   chooser = gtk_file_chooser_button_new ("Select A Folder - testfilechooserbutton",
                                          GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER);
+  gtk_widget_set_hexpand (chooser, TRUE);
   gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL);
   gtk_file_chooser_remove_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL);
   gtk_file_chooser_add_shortcut_folder (GTK_FILE_CHOOSER (chooser), gtk_src_dir, NULL);
@@ -310,11 +312,11 @@ main (int   argc,
   g_signal_connect (chooser, "selection-changed", G_CALLBACK (chooser_selection_changed_cb), NULL);
   g_signal_connect (chooser, "file-activated", G_CALLBACK (chooser_file_activated_cb), NULL);
   g_signal_connect (chooser, "update-preview", G_CALLBACK (chooser_update_preview_cb), NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), chooser, TRUE);
 
   button = gtk_button_new_with_label ("Tests");
   g_signal_connect (button, "clicked", G_CALLBACK (tests_button_clicked_cb), chooser);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
 
   g_object_unref (label_group);
 
diff --git a/tests/testflowbox.c b/tests/testflowbox.c
index 070eea3..621af02 100644
--- a/tests/testflowbox.c
+++ b/tests/testflowbox.c
@@ -403,14 +403,15 @@ create_window (void)
   gtk_widget_show (vbox);
   gtk_widget_show (hbox);
   gtk_container_add (GTK_CONTAINER (window), hbox);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
+  gtk_widget_set_hexpand (swindow, TRUE);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
   gtk_widget_show (swindow);
-  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE);
 
   flowbox = gtk_flow_box_new ();
   gtk_widget_set_halign (flowbox, GTK_ALIGN_END);
@@ -439,14 +440,14 @@ create_window (void)
   gtk_widget_show (flowbox_cntl);
   gtk_widget_show (expander);
   gtk_container_add (GTK_CONTAINER (expander), flowbox_cntl);
-  gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE);
 
   widget = gtk_check_button_new_with_label ("Homogeneous");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (widget), FALSE);
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set whether the items should be displayed at the same size");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (homogeneous_toggled), flowbox);
@@ -457,7 +458,7 @@ create_window (void)
                           flowbox, "activate-on-single-click",
                           G_BINDING_SYNC_CREATE);
   gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   /* Add alignment controls */
   widget = gtk_combo_box_text_new ();
@@ -469,7 +470,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the horizontal alignment policy");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (horizontal_alignment_changed), flowbox);
@@ -483,7 +484,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the vertical alignment policy");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (vertical_alignment_changed), flowbox);
@@ -496,7 +497,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the flowbox orientation");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (orientation_changed), flowbox);
@@ -511,7 +512,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the selection mode");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (selection_mode_changed), flowbox);
@@ -522,7 +523,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the minimum amount of items per line before wrapping");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (line_length_changed), flowbox);
@@ -535,7 +536,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the natural amount of items per line ");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (max_line_length_changed), flowbox);
@@ -547,43 +548,43 @@ create_window (void)
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("H Spacing");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_spin_button_new_with_range (0, 30, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_CSPACING);
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the horizontal spacing between children");
-  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_HORIZONTAL));
   g_signal_connect (G_OBJECT (widget), "value-changed",
                     G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_HORIZONTAL));
 
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("V Spacing");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_spin_button_new_with_range (0, 30, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (widget), INITIAL_RSPACING);
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the vertical spacing between children");
-  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_VERTICAL));
   g_signal_connect (G_OBJECT (widget), "value-changed",
                     G_CALLBACK (spacing_changed), GINT_TO_POINTER (GTK_ORIENTATION_VERTICAL));
 
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), hbox, FALSE);
 
   /* filtering and sorting */
 
@@ -592,7 +593,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set whether some items should be filtered out");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (filter_toggled), flowbox);
@@ -602,7 +603,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set whether items should be sorted");
-  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (flowbox_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (sort_toggled), flowbox);
@@ -615,7 +616,7 @@ create_window (void)
   gtk_widget_show (items_cntl);
   gtk_widget_show (expander);
   gtk_container_add (GTK_CONTAINER (expander), items_cntl);
-  gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE);
 
   /* Add Items control */
   widget = gtk_combo_box_text_new ();
@@ -628,7 +629,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the item set to use");
-  gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (items_changed), flowbox);
@@ -642,7 +643,7 @@ create_window (void)
   gtk_widget_show (widget);
 
   gtk_widget_set_tooltip_text (widget, "Set the item's text orientation");
-  gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (items_cntl), widget, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (text_orientation_changed), flowbox);
diff --git a/tests/testframe.c b/tests/testframe.c
index 83290b4..208f2be 100644
--- a/tests/testframe.c
+++ b/tests/testframe.c
@@ -160,7 +160,8 @@ int main (int argc, char **argv)
   gtk_container_add (GTK_CONTAINER (window), GTK_WIDGET (vbox));
 
   frame = GTK_FRAME (gtk_frame_new ("Test GtkFrame"));
-  gtk_box_pack_start (vbox, GTK_WIDGET (frame), TRUE, TRUE);
+  gtk_widget_set_vexpand (frame, TRUE);
+  gtk_box_pack_start (vbox, GTK_WIDGET (frame), TRUE);
 
   widget = gtk_button_new_with_label ("Hello!");
   gtk_container_add (GTK_CONTAINER (frame), widget);
@@ -168,7 +169,7 @@ int main (int argc, char **argv)
   grid = GTK_GRID (gtk_grid_new ());
   gtk_grid_set_row_spacing (grid, 12);
   gtk_grid_set_column_spacing (grid, 6);
-  gtk_box_pack_start (vbox, GTK_WIDGET (grid), FALSE, FALSE);
+  gtk_box_pack_start (vbox, GTK_WIDGET (grid), FALSE);
 
   gtk_frame_get_label_align (frame, &xalign, &yalign);
 
diff --git a/tests/testgiconpixbuf.c b/tests/testgiconpixbuf.c
index 9deb533..1d0b835 100644
--- a/tests/testgiconpixbuf.c
+++ b/tests/testgiconpixbuf.c
@@ -36,30 +36,30 @@ main (int argc,
   gtk_container_add (GTK_CONTAINER (toplevel), hbox);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE);
 
   image = gtk_image_new_from_gicon (G_ICON (pixbuf), GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (vbox), image, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), image, FALSE);
 
   label = gtk_label_new (NULL);
   str = g_strdup_printf ("Normal icon, hash %u", g_icon_hash (G_ICON (pixbuf)));
   gtk_label_set_label (GTK_LABEL (label), str);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   otherpix = gdk_pixbuf_new_from_file ("gnome-textfile.png", NULL);
   emblem = g_emblem_new (G_ICON (otherpix));
   emblemed = g_emblemed_icon_new (G_ICON (pixbuf), emblem);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 12);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE);
 
   image2 = gtk_image_new_from_gicon (emblemed, GTK_ICON_SIZE_DIALOG);
-  gtk_box_pack_start (GTK_BOX (vbox), image2, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), image2, FALSE);
 
   label = gtk_label_new (NULL);
   str = g_strdup_printf ("Emblemed icon, hash %u", g_icon_hash (emblemed));
   gtk_label_set_label (GTK_LABEL (label), str);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   gtk_widget_show (toplevel);
 
diff --git a/tests/testgrid.c b/tests/testgrid.c
index 78ded86..78da435 100644
--- a/tests/testgrid.c
+++ b/tests/testgrid.c
@@ -144,21 +144,21 @@ box_comparison (void)
   box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   gtk_container_add (GTK_CONTAINER (vbox), box);
 
-  gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("1", "white"), FALSE);
 
   label = gtk_label_new ("Some ellipsizing text");
   gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
   gtk_label_set_width_chars (GTK_LABEL (label), 10);
-  gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE);
 
-  gtk_box_pack_start (GTK_BOX (box), test_widget ("2", "green"), FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("2", "green"), FALSE);
 
   label = gtk_label_new ("Some text that may wrap if needed");
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
   gtk_label_set_width_chars (GTK_LABEL (label), 10);
-  gtk_box_pack_start (GTK_BOX (box), label, TRUE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), label, FALSE);
 
-  gtk_box_pack_start (GTK_BOX (box), test_widget ("3", "red"), FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), test_widget ("3", "red"), FALSE);
 
   grid = gtk_grid_new ();
   gtk_orientable_set_orientation (GTK_ORIENTABLE (grid), GTK_ORIENTATION_VERTICAL);
diff --git a/tests/testgtk.c b/tests/testgtk.c
index d22225e..3c38d7a 100644
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -214,9 +214,10 @@ build_alpha_widgets (void)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
   label = gtk_label_new (NULL);
   gtk_label_set_markup (GTK_LABEL (label), "<i>Entry: </i>");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+  gtk_widget_set_hexpand (entry, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE);
   gtk_widget_set_hexpand (hbox, TRUE);
   gtk_grid_attach (GTK_GRID (grid), hbox, 0, 3, 2, 1);
 
@@ -263,18 +264,18 @@ create_alpha_window (GtkWidget *widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_box_pack_start (GTK_BOX (content_area), vbox,
-                         TRUE, TRUE);
+                         TRUE);
 
       label = gtk_label_new (NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE);
       
       label = gtk_label_new (NULL);
-      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE);
       display = gtk_widget_get_display (window);
       on_composited_changed (display, NULL, GTK_LABEL (label));
       g_signal_connect (display, "notify::composited", G_CALLBACK (on_composited_changed), label);
 
-      gtk_box_pack_start (GTK_BOX (vbox), build_alpha_widgets (), TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), build_alpha_widgets (), TRUE);
 
       g_signal_connect (window, "destroy",
                        G_CALLBACK (gtk_widget_destroyed),
@@ -336,7 +337,7 @@ create_buttons (GtkWidget *widget)
       grid = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
       gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
-      gtk_box_pack_start (GTK_BOX (box1), grid, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), grid, TRUE);
 
       button[0] = gtk_button_new_with_label ("button1");
       button[1] = gtk_button_new_with_mnemonic ("_button2");
@@ -361,16 +362,16 @@ create_buttons (GtkWidget *widget)
         }
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button[9] = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button[9], "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button[9], TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button[9], TRUE);
       gtk_widget_set_can_default (button[9], TRUE);
       gtk_widget_grab_default (button[9]);
     }
@@ -410,28 +411,28 @@ create_toggle_buttons (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_toggle_button_new_with_label ("button1");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_toggle_button_new_with_label ("button2");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_toggle_button_new_with_label ("button3");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
     }
@@ -530,26 +531,26 @@ create_check_buttons (GtkWidget *widget)
       box1 = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_check_button_new_with_mnemonic ("_button1");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_check_button_new_with_label ("button2");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_check_button_new_with_label ("button3");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_check_button_new_with_label ("inconsistent");
       gtk_check_button_set_inconsistent (GTK_CHECK_BUTTON (button), TRUE);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       table = create_widget_grid (GTK_TYPE_CHECK_BUTTON);
-      gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), table, TRUE);
     }
 
   if (!gtk_widget_get_visible (window))
@@ -593,56 +594,56 @@ create_radio_buttons (GtkWidget *widget)
       box1 = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_radio_button_new_with_label (NULL, "button1");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_radio_button_new_with_label (
                 gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
                 "button2");
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_radio_button_new_with_label (
                  gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
                 "button3");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_radio_button_new_with_label (
                  gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
                 "inconsistent");
       gtk_check_button_set_inconsistent (GTK_CHECK_BUTTON (button), TRUE);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_radio_button_new_with_label (NULL, "button4");
       gtk_check_button_set_draw_indicator (GTK_CHECK_BUTTON (button), FALSE);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_radio_button_new_with_label (
                 gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
                 "button5");
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
       gtk_check_button_set_draw_indicator (GTK_CHECK_BUTTON (button), FALSE);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_radio_button_new_with_label (
                  gtk_radio_button_get_group (GTK_RADIO_BUTTON (button)),
                 "button6");
       gtk_check_button_set_draw_indicator (GTK_CHECK_BUTTON (button), FALSE);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       table = create_widget_grid (GTK_TYPE_RADIO_BUTTON);
-      gtk_box_pack_start (GTK_BOX (box1), table, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), table, TRUE);
     }
 
   if (!gtk_widget_get_visible (window))
@@ -717,58 +718,58 @@ create_button_box (GtkWidget *widget)
     frame_horz = gtk_frame_new ("Horizontal Button Boxes");
     gtk_widget_set_margin_top (frame_horz, 10);
     gtk_widget_set_margin_bottom (frame_horz, 10);
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_horz, TRUE);
 
     vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add (GTK_CONTAINER (frame_horz), vbox);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Spread", 40, 85, 20, GTK_BUTTONBOX_SPREAD),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Edge", 40, 85, 20, GTK_BUTTONBOX_EDGE),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Start", 40, 85, 20, GTK_BUTTONBOX_START),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "End", 40, 85, 20, GTK_BUTTONBOX_END),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (vbox),
                         create_bbox (TRUE, "Center", 40, 85, 20, GTK_BUTTONBOX_CENTER),
-                       TRUE, TRUE);
+                       TRUE);
 
     frame_vert = gtk_frame_new ("Vertical Button Boxes");
     gtk_widget_set_margin_top (frame_vert, 10);
     gtk_widget_set_margin_bottom (frame_vert, 10);
-    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE, TRUE);
+    gtk_box_pack_start (GTK_BOX (main_vbox), frame_vert, TRUE);
 
     hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
     gtk_container_add (GTK_CONTAINER (frame_vert), hbox);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Spread", 30, 85, 20, GTK_BUTTONBOX_SPREAD),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Edge", 30, 85, 20, GTK_BUTTONBOX_EDGE),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Start", 30, 85, 20, GTK_BUTTONBOX_START),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "End", 30, 85, 20, GTK_BUTTONBOX_END),
-                       TRUE, TRUE);
+                       TRUE);
 
     gtk_box_pack_start (GTK_BOX (hbox),
                         create_bbox (FALSE, "Center", 30, 85, 20, GTK_BUTTONBOX_CENTER),
-                       TRUE, TRUE);
+                       TRUE);
   }
 
   if (!gtk_widget_get_visible (window))
@@ -911,10 +912,10 @@ create_statusbar (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       statusbar = gtk_statusbar_new ();
-      gtk_box_pack_end (GTK_BOX (box1), statusbar, TRUE, TRUE);
+      gtk_box_pack_end (GTK_BOX (box1), statusbar, TRUE);
       g_signal_connect (statusbar,
                        "text_popped",
                        G_CALLBACK (statusbar_popped),
@@ -962,16 +963,16 @@ create_statusbar (GtkWidget *widget)
                                 NULL);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
     }
@@ -1022,64 +1023,64 @@ create_alpha_widgets (GtkWidget *widget)
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
 
-      gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (main_hbox), vbox, FALSE);
 
       /* Plain button (no gdkwindows */
 
       label = gtk_label_new ("non-window widget");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       alpha1 = button = gtk_button_new_with_label ("A Button");
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
       /* windowed container with both windowed and normal button */
       label = gtk_label_new ("\nwindow widget");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       alpha2 = event_box = gtk_event_box_new ();
-      gtk_box_pack_start (GTK_BOX (vbox), event_box, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), event_box, FALSE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (event_box), vbox2);
 
       button = gtk_button_new_with_label ("A Button");
-      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE);
 
       event_box = gtk_event_box_new ();
       button = gtk_button_new_with_label ("A Button (in window)");
       gtk_container_add (GTK_CONTAINER (event_box), button);
-      gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE);
 
       /* non-windowed container with both windowed and normal button */
       label = gtk_label_new ("\nnon-window widget with widget child");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       alpha3 = vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), vbox2, FALSE);
 
       button = gtk_button_new_with_label ("A Button");
-      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), button, FALSE);
 
       event_box = gtk_event_box_new ();
       button = gtk_button_new_with_label ("A Button (in window)");
       gtk_container_add (GTK_CONTAINER (event_box), button);
-      gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), event_box, FALSE);
 
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
                                          0, 100, 1);
-      gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE);
       g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha1);
       gtk_range_set_value (GTK_RANGE (scale), 50);
 
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
                                          0, 100, 1);
-      gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE);
       g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha2);
       gtk_range_set_value (GTK_RANGE (scale), 50);
 
       scale = gtk_scale_new_with_range (GTK_ORIENTATION_VERTICAL,
                                          0, 100, 1);
-      gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (main_hbox), scale, FALSE);
       g_signal_connect (scale, "value_changed", G_CALLBACK (alpha_changed), alpha3);
       gtk_range_set_value (GTK_RANGE (scale), 50);
 
@@ -1243,45 +1244,45 @@ void create_labels (GtkWidget *widget)
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
-      gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_end (GTK_BOX (vbox), hbox, FALSE);
 
       button = create_sensitivity_control (hbox);
 
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
       button = create_selectable_control (hbox);
 
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
 
-      gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox,  FALSE);
 
       frame = gtk_frame_new ("Normal Label");
       label = gtk_label_new ("This is a Normal label");
       gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame,  FALSE);
 
       frame = gtk_frame_new ("Multi-line Label");
       label = gtk_label_new ("This is a Multi-line label.\nSecond line\nThird line");
       gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame,  FALSE);
 
       frame = gtk_frame_new ("Left Justified Label");
       label = gtk_label_new ("This is a Left-Justified\nMulti-line label.\nThird      line");
       gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       frame = gtk_frame_new ("Right Justified Label");
       gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_START);
       label = gtk_label_new ("This is a Right-Justified\nMulti-line label.\nFourth line, (j/k)");
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_RIGHT);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       frame = gtk_frame_new ("Internationalized Label");
       label = gtk_label_new (NULL);
@@ -1294,13 +1295,13 @@ void create_labels (GtkWidget *widget)
                            "Japanese <span lang=\"ja\">\345\205\203\346\260\227        
\351\226\213\347\231\272</span>");
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       frame = gtk_frame_new ("Bidirection Label");
       label = gtk_label_new ("\342\200\217Arabic       \330\247\331\204\330\263\331\204\330\247\331\205 
\330\271\331\204\331\212\331\203\331\205\n"
                             "\342\200\217Hebrew        \327\251\327\234\327\225\327\235");
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       frame = gtk_frame_new ("Links in a label");
       label = gtk_label_new ("Some <a href=\"http://en.wikipedia.org/wiki/Text\"; title=\"plain 
text\">text</a> may be marked up\n"
@@ -1308,11 +1309,11 @@ void create_labels (GtkWidget *widget)
                              "or activated via <a href=\"keynav\">keynav</a>");
       gtk_label_set_use_markup (GTK_LABEL (label), TRUE);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
       g_signal_connect (label, "activate-link", G_CALLBACK (activate_link), NULL);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE);
       frame = gtk_frame_new ("Line wrapped label");
       label = gtk_label_new ("This is an example of a line-wrapped label.  It should not be taking "\
                             "up the entire             "/* big space to test spacing */\
@@ -1324,7 +1325,7 @@ void create_labels (GtkWidget *widget)
 
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame,  FALSE);
 
       frame = gtk_frame_new ("Filled, wrapped label");
       label = gtk_label_new ("This is an example of a line-wrapped, filled label.  It should be taking "\
@@ -1337,7 +1338,7 @@ void create_labels (GtkWidget *widget)
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_FILL);
       gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame,  FALSE);
 
       frame = gtk_frame_new ("Underlined label");
       label = gtk_label_new ("This label is underlined!\n"
@@ -1345,7 +1346,7 @@ void create_labels (GtkWidget *widget)
       gtk_label_set_justify (GTK_LABEL (label), GTK_JUSTIFY_LEFT);
       gtk_label_set_pattern (GTK_LABEL (label), "_________________________ _ _________ _ _____ _ __ __  ___ 
____ _____");
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
 
       frame = gtk_frame_new ("Markup label");
       label = gtk_label_new (NULL);
@@ -1372,7 +1373,7 @@ void create_labels (GtkWidget *widget)
       g_assert (gtk_label_get_mnemonic_keyval (GTK_LABEL (label)) == GDK_KEY_s);
 
       gtk_container_add (GTK_CONTAINER (frame), label);
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE);
     }
 
   if (!gtk_widget_get_visible (window))
@@ -1419,18 +1420,18 @@ create_rotated_label (GtkWidget *widget)
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE);
 
       label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (label), "Hello World\n<i>Rotate</i> <span underline='single' 
foreground='blue'>me</span>");
-      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE);
 
       scale_hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), scale_hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), scale_hbox,  FALSE);
 
       scale_label = gtk_label_new (NULL);
       gtk_label_set_markup (GTK_LABEL (scale_label), "<i>Angle: </i>");
-      gtk_box_pack_start (GTK_BOX (scale_hbox), scale_label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (scale_hbox), scale_label, FALSE);
 
       hscale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL,
                                          0, 360, 5);
@@ -1439,7 +1440,7 @@ create_rotated_label (GtkWidget *widget)
 
       gtk_range_set_value (GTK_RANGE (hscale), 45);
       gtk_widget_set_size_request (hscale, 200, -1);
-      gtk_box_pack_start (GTK_BOX (scale_hbox), hscale, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (scale_hbox), hscale, TRUE);
     }
 
   if (!gtk_widget_get_visible (window))
@@ -1551,7 +1552,7 @@ create_rotated_text (GtkWidget *widget)
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
       drawing_area = gtk_drawing_area_new ();
-      gtk_box_pack_start (GTK_BOX (content_area), drawing_area, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), drawing_area, TRUE);
 
       tile_pixbuf = gdk_pixbuf_new_from_file ("marble.xpm", NULL);
 
@@ -1638,22 +1639,22 @@ create_reparent (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       label = gtk_label_new ("Hello World");
 
       frame = gtk_frame_new ("Frame 1");
-      gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), frame, TRUE);
 
       box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_container_add (GTK_CONTAINER (frame), box3);
 
       button = gtk_button_new_with_label ("switch");
       g_object_set_data (G_OBJECT (button), "user_data", label);
-      gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box3), button, TRUE);
 
       event_box = gtk_event_box_new ();
-      gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box3), event_box, TRUE);
       gtk_container_add (GTK_CONTAINER (event_box), label);
 
       g_signal_connect (button, "clicked",
@@ -1665,32 +1666,32 @@ create_reparent (GtkWidget *widget)
                        GINT_TO_POINTER (42));
 
       frame = gtk_frame_new ("Frame 2");
-      gtk_box_pack_start (GTK_BOX (box2), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), frame, TRUE);
 
       box3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_container_add (GTK_CONTAINER (frame), box3);
 
       button = gtk_button_new_with_label ("switch");
       g_object_set_data (G_OBJECT (button), "user_data", label);
-      gtk_box_pack_start (GTK_BOX (box3), button, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box3), button, TRUE);
 
       event_box = gtk_event_box_new ();
-      gtk_box_pack_start (GTK_BOX (box3), event_box, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box3), event_box, TRUE);
 
       g_signal_connect (button, "clicked",
                        G_CALLBACK (reparent_label),
                        event_box);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy), window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
     }
@@ -1791,43 +1792,43 @@ create_saved_position (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (vbox), button);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       label = gtk_label_new ("X Origin : ");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       x_label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), x_label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), x_label,  TRUE);
       g_object_set_data (G_OBJECT (window), "x", x_label);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       label = gtk_label_new ("Y Origin : ");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label,  TRUE);
 
       y_label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), y_label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), y_label, TRUE);
       g_object_set_data (G_OBJECT (window), "y", y_label);
 
       any =
        g_object_new (gtk_separator_get_type (),
                        "GtkWidget::visible", TRUE,
                        NULL);
-      gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), any, TRUE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE);
 
       button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
 
@@ -1872,10 +1873,10 @@ create_pixbuf (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new ();
-      gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box2), button, FALSE);
 
       gdk_window = gtk_widget_get_window (window);
 
@@ -1888,7 +1889,7 @@ create_pixbuf (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (button), box3);
 
       button = gtk_button_new ();
-      gtk_box_pack_start (GTK_BOX (box2), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box2), button, FALSE);
 
       pixbufwid = new_pixbuf ("test.xpm", gdk_window);
 
@@ -1901,16 +1902,16 @@ create_pixbuf (GtkWidget *widget)
       gtk_widget_set_sensitive (button, FALSE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
     }
@@ -1949,15 +1950,15 @@ create_tooltips (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_toggle_button_new_with_label ("button1");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       gtk_widget_set_tooltip_text (button, "This is button 1");
 
       button = gtk_toggle_button_new_with_label ("button2");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       gtk_widget_set_tooltip_text (button,
         "This is button 2. This is also a really long tooltip which probably "
@@ -1965,7 +1966,7 @@ create_tooltips (GtkWidget *widget)
         "Hopefully the wrapping will work correctly.");
 
       toggle = gtk_toggle_button_new_with_label ("Override TipsQuery Label");
-      gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), toggle, TRUE);
 
       gtk_widget_set_tooltip_text (toggle, "Toggle TipsQuery view.");
 
@@ -1983,7 +1984,7 @@ create_tooltips (GtkWidget *widget)
                        "visible", TRUE,
                        "parent", box3,
                        NULL);
-      gtk_box_set_child_packing (GTK_BOX (box3), button, FALSE, FALSE, GTK_PACK_START);
+      gtk_box_set_child_packing (GTK_BOX (box3), button,  FALSE, GTK_PACK_START);
       gtk_widget_set_tooltip_text (button, "Start the Tooltips Inspector");
 
       frame = g_object_new (gtk_frame_get_type (),
@@ -1993,19 +1994,19 @@ create_tooltips (GtkWidget *widget)
                              "parent", box2,
                              NULL);
       gtk_container_add (GTK_CONTAINER (frame), box3);
-      gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, TRUE, GTK_PACK_START);
+      gtk_box_set_child_packing (GTK_BOX (box2), frame, TRUE, GTK_PACK_START);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator,  TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2,  TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button,  TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
 
@@ -2029,11 +2030,11 @@ pack_image (GtkWidget *box,
 {
   gtk_box_pack_start (GTK_BOX (box),
                       gtk_label_new (text),
-                      FALSE, FALSE);
+                      FALSE);
 
   gtk_box_pack_start (GTK_BOX (box),
                       image,
-                      TRUE, TRUE);
+                      TRUE);
 }
 
 static void
@@ -2547,7 +2548,7 @@ create_menus (GtkWidget *widget)
       gtk_widget_show (box1);
       
       menubar = gtk_menu_bar_new ();
-      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), menubar, TRUE);
       gtk_widget_show (menubar);
       
       menu = create_menu (screen, 2, 50);
@@ -2585,7 +2586,7 @@ create_menus (GtkWidget *widget)
       gtk_widget_show (menuitem);
 
       menubar = gtk_menu_bar_new ();
-      gtk_box_pack_start (GTK_BOX (box1), menubar, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), menubar, TRUE);
       gtk_widget_show (menubar);
 
       menu = create_menu (screen, 2, 10);
@@ -2596,7 +2597,7 @@ create_menus (GtkWidget *widget)
       gtk_widget_show (menuitem);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
       gtk_widget_show (box2);
 
       menu = create_menu (screen, 1, 5);
@@ -2638,22 +2639,22 @@ create_menus (GtkWidget *widget)
 
       optionmenu = gtk_combo_box_text_new ();
       gtk_combo_box_set_active (GTK_COMBO_BOX (optionmenu), 3);
-      gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), optionmenu, TRUE);
       gtk_widget_show (optionmenu);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
       gtk_widget_show (separator);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
       gtk_widget_show (box2);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
@@ -2720,33 +2721,33 @@ create_key_lookup (GtkWidget *widget)
       content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
       button = gtk_button_new_with_mnemonic ("Button 1 (_a)");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button,  FALSE);
       button = gtk_button_new_with_mnemonic ("Button 2 (_A)");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button,  FALSE);
       button = gtk_button_new_with_mnemonic ("Button 3 (_\321\204)");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = gtk_button_new_with_mnemonic ("Button 4 (_\320\244)");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button,  FALSE);
       button = gtk_button_new_with_mnemonic ("Button 6 (_b)");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = accel_button_new (accel_group, "Button 7", "<Alt><Shift>b");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = accel_button_new (accel_group, "Button 8", "<Alt>d");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button,  FALSE);
       button = accel_button_new (accel_group, "Button 9", "<Alt>Cyrillic_ve");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = gtk_button_new_with_mnemonic ("Button 10 (_1)");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button,  FALSE);
       button = gtk_button_new_with_mnemonic ("Button 11 (_!)");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = accel_button_new (accel_group, "Button 12", "<Super>a");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = accel_button_new (accel_group, "Button 13", "<Hyper>a");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = accel_button_new (accel_group, "Button 14", "<Meta>a");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
       button = accel_button_new (accel_group, "Button 15", "<Shift><Mod4>b");
-      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, FALSE);
 
       window_ptr = &window;
       g_object_add_weak_pointer (G_OBJECT (window), window_ptr);
@@ -2846,12 +2847,12 @@ create_modal_window (GtkWidget *widget)
 
   /* Pack widgets */
   gtk_container_add (GTK_CONTAINER (window), box1);
-  gtk_box_pack_start (GTK_BOX (box1), frame1, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box1), frame1, TRUE);
   gtk_container_add (GTK_CONTAINER (frame1), box2);
-  gtk_box_pack_start (GTK_BOX (box2), btnColor, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (box2), btnFile, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (box1), btnClose, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box2), btnColor,  FALSE);
+  gtk_box_pack_start (GTK_BOX (box2), btnFile,  FALSE);
+  gtk_box_pack_start (GTK_BOX (box1), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL), FALSE);
+  gtk_box_pack_start (GTK_BOX (box1), btnClose,  FALSE);
 
   /* connect signals */
   g_signal_connect_swapped (btnClose, "clicked",
@@ -3038,7 +3039,7 @@ create_scrolled_windows (GtkWidget *widget)
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), scrolled_window, TRUE);
       gtk_widget_show (scrolled_window);
 
       grid = gtk_grid_new ();
@@ -3194,15 +3195,15 @@ create_entry (GtkWidget *widget)
 
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE);
 
       entry = gtk_entry_new ();
       gtk_entry_set_text (GTK_ENTRY (entry), "hello world \330\247\331\204\330\263\331\204\330\247\331\205 
\330\271\331\204\331\212\331\203\331\205");
       gtk_editable_select_region (GTK_EDITABLE (entry), 0, 5);
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE);
 
       cb = GTK_COMBO_BOX_TEXT (gtk_combo_box_text_new_with_entry ());
 
@@ -3221,41 +3222,41 @@ create_entry (GtkWidget *widget)
       cb_entry = gtk_bin_get_child (GTK_BIN (cb));
       gtk_entry_set_text (GTK_ENTRY (cb_entry), "hello world \n\n\n foo");
       gtk_editable_select_region (GTK_EDITABLE (cb_entry), 0, -1);
-      gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (cb), TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), GTK_WIDGET (cb),  TRUE);
 
       sensitive_check = gtk_check_button_new_with_label("Sensitive");
-      gtk_box_pack_start (GTK_BOX (box2), sensitive_check, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), sensitive_check, TRUE);
       g_signal_connect (sensitive_check, "toggled",
                        G_CALLBACK (entry_toggle_sensitive), entry);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (sensitive_check), TRUE);
 
       has_frame_check = gtk_check_button_new_with_label("Has Frame");
-      gtk_box_pack_start (GTK_BOX (box2), has_frame_check, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), has_frame_check, TRUE);
       g_signal_connect (has_frame_check, "toggled",
                        G_CALLBACK (entry_toggle_frame), entry);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (has_frame_check), TRUE);
 
       progress_check = gtk_check_button_new_with_label("Show Progress");
-      gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), progress_check, TRUE);
       g_signal_connect (progress_check, "toggled",
                        G_CALLBACK (entry_toggle_progress), entry);
 
       progress_check = gtk_check_button_new_with_label("Pulse Progress");
-      gtk_box_pack_start (GTK_BOX (box2), progress_check, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), progress_check,  TRUE);
       g_signal_connect (progress_check, "toggled",
                        G_CALLBACK (entry_toggle_pulse), entry);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
     }
@@ -3291,7 +3292,7 @@ create_expander (GtkWidget *widget)
 
       expander = gtk_expander_new ("The Hidden");
 
-      gtk_box_pack_start (GTK_BOX (box1), expander, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), expander, TRUE);
 
       hidden = gtk_label_new ("Revealed!");
 
@@ -3386,10 +3387,10 @@ create_event_box (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), box1);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (box1), hbox, TRUE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box1), hbox, FALSE);
 
       event_box = gtk_event_box_new ();
-      gtk_box_pack_start (GTK_BOX (hbox), event_box, TRUE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), event_box, FALSE);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (event_box), vbox);
@@ -3401,38 +3402,38 @@ create_event_box (GtkWidget *widget)
                        NULL);
 
       label = gtk_label_new ("Click on this label");
-      gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       button = gtk_button_new_with_label ("button in eventbox");
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button,  FALSE);
       g_signal_connect (button, "clicked",
                        G_CALLBACK (event_box_button_clicked),
                        NULL);
 
 
       visible_window_check = gtk_check_button_new_with_label("Visible Window");
-      gtk_box_pack_start (GTK_BOX (box1), visible_window_check, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), visible_window_check, TRUE);
       g_signal_connect (visible_window_check, "toggled",
                        G_CALLBACK (event_box_toggle_visible_window), event_box);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (visible_window_check), TRUE);
 
       above_child_check = gtk_check_button_new_with_label("Above Child");
-      gtk_box_pack_start (GTK_BOX (box1), above_child_check, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), above_child_check,  TRUE);
       g_signal_connect (above_child_check, "toggled",
                        G_CALLBACK (event_box_toggle_above_child), event_box);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (above_child_check), FALSE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
     }
@@ -3501,7 +3502,7 @@ create_size_group_window (GdkScreen    *screen,
   content_area = gtk_dialog_get_content_area (GTK_DIALOG (window));
 
   grid = gtk_grid_new ();
-  gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (content_area), grid, TRUE);
 
   gtk_grid_set_row_spacing (GTK_GRID (grid), 5);
   gtk_grid_set_column_spacing (GTK_GRID (grid), 5);
@@ -3562,17 +3563,17 @@ create_size_group_window (GdkScreen    *screen,
   g_object_unref (vgroup2);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE);
 
   spin_button = gtk_spin_button_new_with_range (1, 100, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE);
-  gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE);
   g_signal_connect (spin_button, "value_changed",
                    G_CALLBACK (size_group_hsize_changed), main_button);
 
   spin_button = gtk_spin_button_new_with_range (1, 100, 1);
   gtk_spin_button_set_value (GTK_SPIN_BUTTON (spin_button), SIZE_GROUP_INITIAL_SIZE);
-  gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spin_button, TRUE);
   g_signal_connect (spin_button, "value_changed",
                    G_CALLBACK (size_group_vsize_changed), main_button);
 
@@ -3823,7 +3824,7 @@ create_spins (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), main_vbox);
 
       frame = gtk_frame_new ("Not accelerated");
-      gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
@@ -3831,15 +3832,15 @@ create_spins (GtkWidget *widget)
       /* Time, month, hex spinners */
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE);
 
       label = gtk_label_new ("Time :");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label,  TRUE);
 
       adjustment = gtk_adjustment_new (0, 0, 1410, 30, 60, 0);
       spinner = gtk_spin_button_new (adjustment, 0, 0);
@@ -3850,15 +3851,15 @@ create_spins (GtkWidget *widget)
                        NULL);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
       gtk_entry_set_width_chars (GTK_ENTRY (spinner), 5);
-      gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), spinner, TRUE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE);
 
       label = gtk_label_new ("Month :");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE);
 
       adjustment = gtk_adjustment_new (1.0, 1.0, 12.0, 1.0,
                                                  5.0, 0.0);
@@ -3875,15 +3876,15 @@ create_spins (GtkWidget *widget)
                        NULL);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
       gtk_entry_set_width_chars (GTK_ENTRY (spinner), 9);
-      gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), spinner, TRUE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE);
 
       label = gtk_label_new ("Hex :");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE);
 
       adjustment = gtk_adjustment_new (0, 0, 255, 1, 16, 0);
       spinner = gtk_spin_button_new (adjustment, 0, 0);
@@ -3898,87 +3899,87 @@ create_spins (GtkWidget *widget)
                        NULL);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner), TRUE);
       gtk_entry_set_width_chars (GTK_ENTRY (spinner), 4);
-      gtk_box_pack_start (GTK_BOX (vbox2), spinner, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), spinner, TRUE);
 
       frame = gtk_frame_new ("Accelerated");
-      gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE);
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
       gtk_container_add (GTK_CONTAINER (frame), vbox);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE);
 
       label = gtk_label_new ("Value :");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE);
 
       adjustment = gtk_adjustment_new (0.0, -10000.0, 10000.0,
                                                  0.5, 100.0, 0.0);
       spinner1 = gtk_spin_button_new (adjustment, 1.0, 2);
       gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spinner1), TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox2), spinner1, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), spinner1, TRUE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE);
 
       label = gtk_label_new ("Digits :");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox2), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), label, TRUE);
 
       adjustment = gtk_adjustment_new (2, 1, 15, 1, 1, 0);
       spinner2 = gtk_spin_button_new (adjustment, 0.0, 0);
       g_signal_connect (adjustment, "value_changed",
                        G_CALLBACK (change_digits),
                        spinner2);
-      gtk_box_pack_start (GTK_BOX (vbox2), spinner2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), spinner2, TRUE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
       button = gtk_check_button_new_with_label ("Snap to 0.5-ticks");
       g_signal_connect (button, "clicked",
                        G_CALLBACK (toggle_snap),
                        spinner1);
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
 
       button = gtk_check_button_new_with_label ("Numeric only input mode");
       g_signal_connect (button, "clicked",
                        G_CALLBACK (toggle_numeric),
                        spinner1);
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
 
       val_label = gtk_label_new ("");
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       button = gtk_button_new_with_label ("Value as Int");
       g_object_set_data (G_OBJECT (button), "user_data", val_label);
       g_signal_connect (button, "clicked",
                        G_CALLBACK (get_value),
                        GINT_TO_POINTER (1));
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
 
       button = gtk_button_new_with_label ("Value as Float");
       g_object_set_data (G_OBJECT (button), "user_data", val_label);
       g_signal_connect (button, "clicked",
                        G_CALLBACK (get_value),
                        GINT_TO_POINTER (2));
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
 
-      gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), val_label, TRUE);
       gtk_label_set_text (GTK_LABEL (val_label), "0");
 
       frame = gtk_frame_new ("Using Convenience Constructor");
-      gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), frame, TRUE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_container_add (GTK_CONTAINER (frame), hbox);
@@ -3989,17 +3990,17 @@ create_spins (GtkWidget *widget)
       gtk_spin_button_set_value (GTK_SPIN_BUTTON (spinner), 0.0);
       g_signal_connect (spinner, "value_changed",
                        G_CALLBACK (get_spin_value), val_label);
-      gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE, TRUE);
-      gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), val_label, TRUE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE);
 
       button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
     }
 
   if (!gtk_widget_get_visible (window))
@@ -4303,21 +4304,21 @@ create_cursors (GtkWidget *widget)
           guint w, h;
 
           hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-          gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+          gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
           label = gtk_label_new ("Cursor Theme:");
           gtk_widget_set_halign (label, GTK_ALIGN_START);
           gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-          gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+          gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
           entry = gtk_entry_new ();
           gtk_entry_set_text (GTK_ENTRY (entry), "default");
-          gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, TRUE);
+          gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE);
 
           gdk_display_get_maximal_cursor_size (gtk_widget_get_display (vbox), &w, &h);
           size = gtk_spin_button_new_with_range (1.0, MIN (w, h), 1.0);
           gtk_spin_button_set_value (GTK_SPIN_BUTTON (size), 24.0);
-          gtk_box_pack_start (GTK_BOX (hbox), size, TRUE, TRUE);
+          gtk_box_pack_start (GTK_BOX (hbox), size, TRUE);
 
           g_signal_connect (entry, "changed",
                             G_CALLBACK (change_cursor_theme), hbox);
@@ -4326,12 +4327,12 @@ create_cursors (GtkWidget *widget)
         }
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       label = gtk_label_new ("Cursor Name:");
       gtk_widget_set_halign (label, GTK_ALIGN_START);
       gtk_widget_set_valign (label, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       entry = gtk_entry_new ();
       completion = gtk_entry_completion_new ();
@@ -4340,7 +4341,7 @@ create_cursors (GtkWidget *widget)
       gtk_entry_completion_set_text_column (completion, 0);
       gtk_entry_set_completion (GTK_ENTRY (entry), completion);
       g_object_unref (model);
-      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), entry, TRUE);
 
       frame =
        g_object_new (gtk_frame_get_type (),
@@ -4367,16 +4368,16 @@ create_cursors (GtkWidget *widget)
 
 
       any = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (main_vbox), any, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), any, TRUE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (main_vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (main_vbox), hbox, TRUE);
 
       button = gtk_button_new_with_label ("Close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
 
       gtk_widget_show (window);
 
@@ -4530,7 +4531,7 @@ create_flipping (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Bidirectional Flipping");
 
       check_button = gtk_check_button_new_with_label ("Right-to-left global direction");
-      gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE);
 
       if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
        gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (check_button), TRUE);
@@ -4539,22 +4540,22 @@ create_flipping (GtkWidget *widget)
                        G_CALLBACK (flipping_toggled_cb), NULL);
 
       check_button = gtk_check_button_new_with_label ("Toggle orientation of all boxes");
-      gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), check_button, TRUE);
 
       g_signal_connect (check_button, "toggled",
                        G_CALLBACK (flipping_orientation_toggled_cb), NULL);
 
       gtk_box_pack_start (GTK_BOX (content_area),
                          create_forward_back ("Default", GTK_TEXT_DIR_NONE),
-                         TRUE, TRUE);
+                         TRUE);
 
       gtk_box_pack_start (GTK_BOX (content_area),
                          create_forward_back ("Left-to-Right", GTK_TEXT_DIR_LTR),
-                         TRUE, TRUE);
+                         TRUE);
 
       gtk_box_pack_start (GTK_BOX (content_area),
                          create_forward_back ("Right-to-Left", GTK_TEXT_DIR_RTL),
-                         TRUE, TRUE);
+                         TRUE);
 
       gtk_dialog_add_button (GTK_DIALOG (window), "Close", GTK_RESPONSE_CLOSE);
       g_signal_connect (window, "response", G_CALLBACK (gtk_widget_destroy), NULL);
@@ -4641,7 +4642,7 @@ create_focus (GtkWidget *widget)
 
       frame = gtk_frame_new ("Weird tab focus chain");
 
-      gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE);
 
       table = make_focus_table (&list);
 
@@ -4654,7 +4655,7 @@ create_focus (GtkWidget *widget)
 
       frame = gtk_frame_new ("Default tab focus chain");
 
-      gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), frame, TRUE);
 
       list = NULL;
       table = make_focus_table (&list);
@@ -4746,7 +4747,7 @@ dialog_response_cb (GtkWidget *widget, gint response, gpointer unused)
           label = gtk_label_new ("Dialog Test");
           g_object_set (label, "margin", 10, NULL);
           gtk_box_pack_start (GTK_BOX (content_area),
-                              label, TRUE, TRUE);
+                              label, TRUE);
           gtk_widget_show (label);
         }
 
@@ -5001,7 +5002,7 @@ create_event_watcher (GtkWidget *widget)
       g_signal_connect (button, "clicked",
                        G_CALLBACK (event_watcher_toggle),
                        NULL);
-      gtk_box_pack_start (GTK_BOX (content_area), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), button, TRUE);
       gtk_widget_show (button);
 
       gtk_dialog_add_button (GTK_DIALOG (dialog_window), "Close", GTK_RESPONSE_CLOSE);
@@ -5059,7 +5060,7 @@ create_range_controls (GtkWidget *widget)
 
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
       gtk_widget_show (box2);
 
 
@@ -5069,11 +5070,11 @@ create_range_controls (GtkWidget *widget)
       gtk_widget_set_size_request (GTK_WIDGET (scale), 150, -1);
       gtk_scale_set_digits (GTK_SCALE (scale), 1);
       gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
-      gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), scale, TRUE);
       gtk_widget_show (scale);
 
       scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adjustment));
-      gtk_box_pack_start (GTK_BOX (box2), scrollbar, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), scrollbar, TRUE);
       gtk_widget_show (scrollbar);
 
       scale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, GTK_ADJUSTMENT (adjustment));
@@ -5082,7 +5083,7 @@ create_range_controls (GtkWidget *widget)
                         "format_value",
                         G_CALLBACK (reformat_value),
                         NULL);
-      gtk_box_pack_start (GTK_BOX (box2), scale, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), scale, TRUE);
       gtk_widget_show (scale);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
@@ -5091,7 +5092,7 @@ create_range_controls (GtkWidget *widget)
       gtk_widget_set_size_request (scale, -1, 200);
       gtk_scale_set_digits (GTK_SCALE (scale), 2);
       gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
-      gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE);
       gtk_widget_show (scale);
 
       scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment));
@@ -5099,7 +5100,7 @@ create_range_controls (GtkWidget *widget)
       gtk_scale_set_digits (GTK_SCALE (scale), 2);
       gtk_scale_set_draw_value (GTK_SCALE (scale), TRUE);
       gtk_range_set_inverted (GTK_RANGE (scale), TRUE);
-      gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), scale,  TRUE);
       gtk_widget_show (scale);
 
       scale = gtk_scale_new (GTK_ORIENTATION_VERTICAL, GTK_ADJUSTMENT (adjustment));
@@ -5108,20 +5109,20 @@ create_range_controls (GtkWidget *widget)
                         "format_value",
                         G_CALLBACK (reformat_value),
                         NULL);
-      gtk_box_pack_start (GTK_BOX (hbox), scale, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), scale,  TRUE);
       gtk_widget_show (scale);
 
 
-      gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), hbox, TRUE);
       gtk_widget_show (hbox);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
       gtk_widget_show (separator);
 
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
       gtk_widget_show (box2);
 
 
@@ -5129,7 +5130,7 @@ create_range_controls (GtkWidget *widget)
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
@@ -5271,21 +5272,21 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       gtk_box_set_homogeneous (GTK_BOX (hbox), TRUE);
-      gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
       button = gtk_check_button_new_with_label ("Fill Tab");
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
       g_signal_connect (button, "toggled",
                        G_CALLBACK (tab_fill), child);
 
       button = gtk_check_button_new_with_label ("Expand Tab");
-      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
       g_signal_connect (button, "toggled",
                        G_CALLBACK (tab_expand), child);
 
       button = gtk_button_new_with_label ("Hide Page");
-      gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_end (GTK_BOX (vbox), button,  FALSE);
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_hide),
                                child);
@@ -5296,13 +5297,13 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       pixwid = gtk_image_new_from_pixbuf (book_closed);
       g_object_set_data (G_OBJECT (child), "tab_pixmap", pixwid);
 
-      gtk_box_pack_start (GTK_BOX (label_box), pixwid, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (label_box), pixwid, TRUE);
       gtk_widget_set_margin_start (pixwid, 3);
       gtk_widget_set_margin_end (pixwid, 3);
       gtk_widget_set_margin_bottom (pixwid, 1);
       gtk_widget_set_margin_top (pixwid, 1);
       label = gtk_label_new_with_mnemonic (accel_buffer);
-      gtk_box_pack_start (GTK_BOX (label_box), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (label_box), label, TRUE);
       gtk_widget_show (label_box);
 
 
@@ -5310,13 +5311,13 @@ create_pages (GtkNotebook *notebook, gint start, gint end)
       pixwid = gtk_image_new_from_pixbuf (book_closed);
       g_object_set_data (G_OBJECT (child), "menu_pixmap", pixwid);
 
-      gtk_box_pack_start (GTK_BOX (menu_box), pixwid, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (menu_box), pixwid, TRUE);
       gtk_widget_set_margin_start (pixwid, 3);
       gtk_widget_set_margin_end (pixwid, 3);
       gtk_widget_set_margin_bottom (pixwid, 1);
       gtk_widget_set_margin_top (pixwid, 1);
       label = gtk_label_new (buffer);
-      gtk_box_pack_start (GTK_BOX (menu_box), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (menu_box), label, TRUE);
       gtk_widget_show (menu_box);
 
       gtk_notebook_append_page_menu (notebook, child, label_box, menu_box);
@@ -5442,7 +5443,7 @@ create_notebook (GtkWidget *widget)
       g_signal_connect (sample_notebook, "switch_page",
                        G_CALLBACK (page_switch), NULL);
       gtk_notebook_set_tab_pos (GTK_NOTEBOOK (sample_notebook), GTK_POS_TOP);
-      gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), sample_notebook, TRUE);
 
       gtk_widget_realize (sample_notebook);
 
@@ -5455,62 +5456,62 @@ create_notebook (GtkWidget *widget)
       create_pages (GTK_NOTEBOOK (sample_notebook), 1, 5);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator,  TRUE);
 
       box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_check_button_new_with_label ("popup menu");
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box2), button, FALSE);
       g_signal_connect (button, "clicked",
                        G_CALLBACK (notebook_popup),
                        sample_notebook);
 
       box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2,  TRUE);
 
       label = gtk_label_new ("Notebook Style :");
-      gtk_box_pack_start (GTK_BOX (box2), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), label, TRUE);
 
       omenu = build_option_menu (items, G_N_ELEMENTS (items), 0,
                                 notebook_type_changed,
                                 sample_notebook);
-      gtk_box_pack_start (GTK_BOX (box2), omenu, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), omenu, TRUE);
 
       button = gtk_button_new_with_label ("Show all Pages");
-      gtk_box_pack_start (GTK_BOX (box2), button, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       g_signal_connect (button, "clicked",
                        G_CALLBACK (show_all_pages), sample_notebook);
 
       box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
       gtk_box_set_homogeneous (GTK_BOX (box2), TRUE);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
 
       button = gtk_button_new_with_label ("prev");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_notebook_prev_page),
                                sample_notebook);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_button_new_with_label ("next");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_notebook_next_page),
                                sample_notebook);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       button = gtk_button_new_with_label ("rotate");
       g_signal_connect (button, "clicked",
                        G_CALLBACK (rotate_notebook), sample_notebook);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
       button = gtk_button_new_with_label ("close");
       g_signal_connect_swapped (button, "clicked",
                                G_CALLBACK (gtk_widget_destroy),
                                window);
-      gtk_box_pack_start (GTK_BOX (box1), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box1), button,  FALSE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
     }
@@ -5633,7 +5634,7 @@ create_panes (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       vpaned = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), vpaned, TRUE);
 
       hpaned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
       gtk_paned_add1 (GTK_PANED (vpaned), hpaned);
@@ -5663,14 +5664,14 @@ create_panes (GtkWidget *widget)
                                               "Horizontal",
                                               "Left",
                                               "Right"),
-                         FALSE, FALSE);
+                         FALSE);
 
       gtk_box_pack_start (GTK_BOX (vbox),
                          create_pane_options (GTK_PANED (vpaned),
                                               "Vertical",
                                               "Top",
                                               "Bottom"),
-                         FALSE, FALSE);
+                         FALSE);
 
       gtk_widget_show (vbox);
     }
@@ -5725,13 +5726,13 @@ paned_keyboard_window1 (GtkWidget *widget)
   gtk_container_add (GTK_CONTAINER (frame1), vbox1);
 
   button7 = gtk_button_new_with_label ("button7");
-  gtk_box_pack_start (GTK_BOX (vbox1), button7, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), button7, FALSE);
 
   button8 = gtk_button_new_with_label ("button8");
-  gtk_box_pack_start (GTK_BOX (vbox1), button8, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), button8,  FALSE);
 
   button9 = gtk_button_new_with_label ("button9");
-  gtk_box_pack_start (GTK_BOX (vbox1), button9, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox1), button9,  FALSE);
 
   vpaned1 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack2 (GTK_PANED (hpaned1), vpaned1, TRUE, TRUE);
@@ -5747,10 +5748,10 @@ paned_keyboard_window1 (GtkWidget *widget)
   gtk_container_add (GTK_CONTAINER (frame5), hbox1);
 
   button5 = gtk_button_new_with_label ("button5");
-  gtk_box_pack_start (GTK_BOX (hbox1), button5, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox1), button5, FALSE);
 
   button6 = gtk_button_new_with_label ("button6");
-  gtk_box_pack_start (GTK_BOX (hbox1), button6, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox1), button6, FALSE);
 
   frame3 = gtk_frame_new (NULL);
   gtk_paned_pack2 (GTK_PANED (vpaned1), frame3, TRUE, TRUE);
@@ -5812,7 +5813,7 @@ paned_keyboard_window2 (GtkWidget *widget)
   gtk_paned_pack2 (GTK_PANED (hpaned2), hbox2, TRUE, TRUE);
 
   vpaned2 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-  gtk_box_pack_start (GTK_BOX (hbox2), vpaned2, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox2), vpaned2, TRUE);
 
   frame7 = gtk_frame_new (NULL);
   gtk_paned_pack1 (GTK_PANED (vpaned2), frame7, FALSE, TRUE);
@@ -5829,7 +5830,7 @@ paned_keyboard_window2 (GtkWidget *widget)
   gtk_container_add (GTK_CONTAINER (frame8), button11);
 
   button10 = gtk_button_new_with_label ("button10");
-  gtk_box_pack_start (GTK_BOX (hbox2), button10, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox2), button10,  FALSE);
 
   return window2;
 }
@@ -5864,10 +5865,10 @@ paned_keyboard_window3 (GtkWidget *widget)
   gtk_container_add (GTK_CONTAINER (window3), vbox2);
 
   label1 = gtk_label_new ("Three panes nested inside each other");
-  gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox2), label1, FALSE);
 
   hpaned3 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (vbox2), hpaned3, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox2), hpaned3, TRUE);
 
   frame9 = gtk_frame_new (NULL);
   gtk_paned_pack1 (GTK_PANED (hpaned3), frame9, FALSE, TRUE);
@@ -5938,11 +5939,11 @@ paned_keyboard_window4 (GtkWidget *widget)
   gtk_container_add (GTK_CONTAINER (window4), vbox3);
 
   label2 = gtk_label_new ("Widget tree:\n\nhpaned \n - vpaned\n - hbox\n    - vpaned\n    - vpaned\n    - 
vpaned\n");
-  gtk_box_pack_start (GTK_BOX (vbox3), label2, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox3), label2, FALSE);
   gtk_label_set_justify (GTK_LABEL (label2), GTK_JUSTIFY_LEFT);
 
   hpaned6 = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (vbox3), hpaned6, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox3), hpaned6, TRUE);
 
   vpaned3 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
   gtk_paned_pack1 (GTK_PANED (hpaned6), vpaned3, FALSE, TRUE);
@@ -5957,7 +5958,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   gtk_paned_pack2 (GTK_PANED (hpaned6), hbox3, TRUE, TRUE);
 
   vpaned4 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-  gtk_box_pack_start (GTK_BOX (hbox3), vpaned4, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox3), vpaned4,  TRUE);
 
   button21 = gtk_button_new_with_label ("button21");
   gtk_paned_pack1 (GTK_PANED (vpaned4), button21, FALSE, TRUE);
@@ -5966,7 +5967,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   gtk_paned_pack2 (GTK_PANED (vpaned4), button20, TRUE, TRUE);
 
   vpaned5 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-  gtk_box_pack_start (GTK_BOX (hbox3), vpaned5, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox3), vpaned5, TRUE);
 
   button23 = gtk_button_new_with_label ("button23");
   gtk_paned_pack1 (GTK_PANED (vpaned5), button23, FALSE, TRUE);
@@ -5975,7 +5976,7 @@ paned_keyboard_window4 (GtkWidget *widget)
   gtk_paned_pack2 (GTK_PANED (vpaned5), button22, TRUE, TRUE);
 
   vpaned6 = gtk_paned_new (GTK_ORIENTATION_VERTICAL);
-  gtk_box_pack_start (GTK_BOX (hbox3), vpaned6, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox3), vpaned6, TRUE);
 
   button25 = gtk_button_new_with_label ("button25");
   gtk_paned_pack1 (GTK_PANED (vpaned6), button25, FALSE, TRUE);
@@ -6338,17 +6339,17 @@ create_wmhints (GtkWidget *widget)
 
       label = gtk_label_new ("Try iconizing me!");
       gtk_widget_set_size_request (label, 150, 50);
-      gtk_box_pack_start (GTK_BOX (box1), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), label, TRUE);
       gtk_widget_show (label);
 
 
       separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-      gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
       gtk_widget_show (separator);
 
 
       box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-      gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box1), box2, TRUE);
       gtk_widget_show (box2);
 
 
@@ -6358,7 +6359,7 @@ create_wmhints (GtkWidget *widget)
                                G_CALLBACK (gtk_widget_destroy),
                                window);
 
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
       gtk_widget_set_can_default (button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
@@ -6424,7 +6425,7 @@ tracking_label (GtkWidget *window)
 
   label = gtk_label_new ("<no window state events received>");
   gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
 
   g_signal_connect (window,
                    "window_state_event",
@@ -6437,7 +6438,7 @@ tracking_label (GtkWidget *window)
                           G_CALLBACK (gtk_window_deiconify),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Iconify");
   g_signal_connect_object (button,
@@ -6445,7 +6446,7 @@ tracking_label (GtkWidget *window)
                           G_CALLBACK (gtk_window_iconify),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Fullscreen");
   g_signal_connect_object (button,
@@ -6453,7 +6454,7 @@ tracking_label (GtkWidget *window)
                           G_CALLBACK (gtk_window_fullscreen),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Unfullscreen");
   g_signal_connect_object (button,
@@ -6461,7 +6462,7 @@ tracking_label (GtkWidget *window)
                           G_CALLBACK (gtk_window_unfullscreen),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Present");
   g_signal_connect_object (button,
@@ -6469,7 +6470,7 @@ tracking_label (GtkWidget *window)
                           G_CALLBACK (gtk_window_present),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), button,  FALSE);
 
   button = gtk_button_new_with_label ("Show");
   g_signal_connect_object (button,
@@ -6477,7 +6478,7 @@ tracking_label (GtkWidget *window)
                           G_CALLBACK (gtk_widget_show),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), button, FALSE);
 
   gtk_widget_show (hbox);
 
@@ -6525,7 +6526,7 @@ get_state_controls (GtkWidget *window)
                           G_CALLBACK (gtk_window_stick),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button,  FALSE);
 
   button = gtk_button_new_with_label ("Unstick");
   g_signal_connect_object (button,
@@ -6533,7 +6534,7 @@ get_state_controls (GtkWidget *window)
                           G_CALLBACK (gtk_window_unstick),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Maximize");
   g_signal_connect_object (button,
@@ -6541,7 +6542,7 @@ get_state_controls (GtkWidget *window)
                           G_CALLBACK (gtk_window_maximize),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Unmaximize");
   g_signal_connect_object (button,
@@ -6549,7 +6550,7 @@ get_state_controls (GtkWidget *window)
                           G_CALLBACK (gtk_window_unmaximize),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button,  FALSE);
 
   button = gtk_button_new_with_label ("Iconify");
   g_signal_connect_object (button,
@@ -6557,7 +6558,7 @@ get_state_controls (GtkWidget *window)
                           G_CALLBACK (gtk_window_iconify),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Fullscreen");
   g_signal_connect_object (button,
@@ -6565,7 +6566,7 @@ get_state_controls (GtkWidget *window)
                           G_CALLBACK (gtk_window_fullscreen),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Unfullscreen");
   g_signal_connect_object (button,
@@ -6573,21 +6574,21 @@ get_state_controls (GtkWidget *window)
                            G_CALLBACK (gtk_window_unfullscreen),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   button_above = gtk_toggle_button_new_with_label ("Keep above");
   g_signal_connect (button_above,
                    "toggled",
                    G_CALLBACK (keep_window_above),
                    window);
-  gtk_box_pack_start (GTK_BOX (vbox), button_above, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button_above,  FALSE);
 
   button_below = gtk_toggle_button_new_with_label ("Keep below");
   g_signal_connect (button_below,
                    "toggled",
                    G_CALLBACK (keep_window_below),
                    window);
-  gtk_box_pack_start (GTK_BOX (vbox), button_below, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button_below,  FALSE);
 
   g_object_set_data (G_OBJECT (button_above), "radio", button_below);
   g_object_set_data (G_OBJECT (button_below), "radio", button_above);
@@ -6598,7 +6599,7 @@ get_state_controls (GtkWidget *window)
                           G_CALLBACK (gtk_widget_hide),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   gtk_widget_show (vbox);
 
@@ -6852,7 +6853,7 @@ window_controls (GtkWidget *window)
   gtk_container_add (GTK_CONTAINER (control_window), vbox);
 
   label = gtk_label_new ("<no configure events>");
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, TRUE);
 
   g_signal_connect (window,
                    "configure_event",
@@ -6862,14 +6863,14 @@ window_controls (GtkWidget *window)
   adjustment = gtk_adjustment_new (10.0, -2000.0, 2000.0, 1.0, 5.0, 0.0);
   spin = gtk_spin_button_new (adjustment, 0, 0);
 
-  gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), spin, TRUE);
 
   g_object_set_data (G_OBJECT (control_window), "spin1", spin);
 
   adjustment = gtk_adjustment_new (10.0, -2000.0, 2000.0, 1.0, 5.0, 0.0);
   spin = gtk_spin_button_new (adjustment, 0, 0);
 
-  gtk_box_pack_start (GTK_BOX (vbox), spin, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), spin, TRUE);
 
   g_object_set_data (G_OBJECT (control_window), "spin2", spin);
 
@@ -6879,56 +6880,56 @@ window_controls (GtkWidget *window)
                           G_CALLBACK (gtk_widget_queue_resize),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Resize");
   g_signal_connect (button,
                    "clicked",
                    G_CALLBACK (set_size_callback),
                    control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button,  FALSE);
 
   button = gtk_button_new_with_label ("Set default size");
   g_signal_connect (button,
                    "clicked",
                    G_CALLBACK (set_default_size_callback),
                    control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button,  FALSE);
 
   button = gtk_button_new_with_label ("Unset default size");
   g_signal_connect (button,
                    "clicked",
                    G_CALLBACK (unset_default_size_callback),
                     control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button,  FALSE);
 
   button = gtk_button_new_with_label ("Set size request");
   g_signal_connect (button,
                    "clicked",
                    G_CALLBACK (set_size_request_callback),
                    control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button,  FALSE);
 
   button = gtk_button_new_with_label ("Unset size request");
   g_signal_connect (button,
                    "clicked",
                    G_CALLBACK (unset_size_request_callback),
                     control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Move");
   g_signal_connect (button,
                    "clicked",
                    G_CALLBACK (set_location_callback),
                    control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_label ("Move to current position");
   g_signal_connect (button,
                    "clicked",
                    G_CALLBACK (move_to_position_callback),
                    control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button,  FALSE);
 
   button = gtk_check_button_new_with_label ("Allow resize");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (button), TRUE);
@@ -6936,7 +6937,7 @@ window_controls (GtkWidget *window)
                    "toggled",
                    G_CALLBACK (resizable_callback),
                     control_window);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_mnemonic ("_Show");
   g_signal_connect_object (button,
@@ -6944,7 +6945,7 @@ window_controls (GtkWidget *window)
                           G_CALLBACK (gtk_widget_show),
                           window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE);
 
   button = gtk_button_new_with_mnemonic ("_Hide");
   g_signal_connect_object (button,
@@ -6952,7 +6953,7 @@ window_controls (GtkWidget *window)
                           G_CALLBACK (gtk_widget_hide),
                            window,
                           G_CONNECT_SWAPPED);
-  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), button, FALSE);
 
   om = gtk_combo_box_text_new ();
   i = 0;
@@ -6983,7 +6984,7 @@ window_controls (GtkWidget *window)
                    G_CALLBACK (gravity_selected),
                    control_window);
 
-  gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), om, FALSE);
 
 
   om = gtk_combo_box_text_new ();
@@ -7010,7 +7011,7 @@ window_controls (GtkWidget *window)
                    G_CALLBACK (pos_selected),
                    control_window);
 
-  gtk_box_pack_end (GTK_BOX (vbox), om, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), om, FALSE);
 
   gtk_widget_show (vbox);
 
@@ -7248,10 +7249,10 @@ create_progress_bar (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (pdata->window), "GtkProgressBar");
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE);
 
       frame = gtk_frame_new ("Progress");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
@@ -7261,19 +7262,19 @@ create_progress_bar (GtkWidget *widget)
                                       PANGO_ELLIPSIZE_MIDDLE);
       gtk_widget_set_halign (pdata->pbar, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (pdata->pbar, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox2), pdata->pbar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), pdata->pbar,  FALSE);
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 5);
       gtk_widget_set_halign (hbox, GTK_ALIGN_CENTER);
       gtk_widget_set_valign (hbox, GTK_ALIGN_CENTER);
-      gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox2), hbox, FALSE);
       label = gtk_label_new ("Label updated by user :");
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
       pdata->label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), pdata->label, TRUE);
 
       frame = gtk_frame_new ("Options");
-      gtk_box_pack_start (GTK_BOX (vbox), frame, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), frame, TRUE);
 
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
       gtk_container_add (GTK_CONTAINER (frame), vbox2);
@@ -7281,7 +7282,7 @@ create_progress_bar (GtkWidget *widget)
       grid = gtk_grid_new ();
       gtk_grid_set_row_spacing (GTK_GRID (grid), 10);
       gtk_grid_set_column_spacing (GTK_GRID (grid), 10);
-      gtk_box_pack_start (GTK_BOX (vbox2), grid, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), grid,  TRUE);
 
       label = gtk_label_new ("Orientation :");
       gtk_grid_attach (GTK_GRID (grid), label, 0, 0, 1, 1);
@@ -7310,14 +7311,14 @@ create_progress_bar (GtkWidget *widget)
       gtk_grid_attach (GTK_GRID (grid), hbox, 1, 2, 1, 1);
 
       label = gtk_label_new ("Text: ");
-      gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), label, TRUE);
 
       pdata->entry = gtk_entry_new ();
       gtk_widget_set_hexpand (pdata->entry, TRUE);
       g_signal_connect (pdata->entry, "changed",
                        G_CALLBACK (entry_changed),
                        pdata);
-      gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), pdata->entry, TRUE);
       gtk_widget_set_size_request (pdata->entry, 100, -1);
 
       label = gtk_label_new ("Ellipsize text :");
@@ -7640,14 +7641,14 @@ create_snapshot (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), vbox);
 
       button = gtk_button_new_with_label ("Snapshot widget");
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE);
       g_signal_connect (button, "clicked",
                        G_CALLBACK (snapshot_widget),
                        data);
 
       button = gtk_button_new_with_label ("Snapshot toplevel");
       data->toplevel_button = button;
-      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, TRUE);
       g_signal_connect (button, "clicked",
                        G_CALLBACK (snapshot_widget),
                        data);
@@ -7762,16 +7763,16 @@ create_selection_test (GtkWidget *widget)
       /* Create the list */
 
       vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 5);
-      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE);
 
       label = gtk_label_new ("Gets available targets for current selection");
-      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
       scrolled_win = gtk_scrolled_window_new (NULL, NULL);
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_win),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox), scrolled_win, TRUE);
       gtk_widget_set_size_request (scrolled_win, 100, 200);
 
       store = gtk_list_store_new (1, G_TYPE_STRING);
@@ -7910,12 +7911,12 @@ create_scroll_test (GtkWidget *widget)
       gtk_window_set_title (GTK_WINDOW (window), "Scroll Test");
 
       hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE);
       gtk_widget_show (hbox);
 
       drawing_area = gtk_drawing_area_new ();
       gtk_widget_set_size_request (drawing_area, 200, 200);
-      gtk_box_pack_start (GTK_BOX (hbox), drawing_area, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (hbox), drawing_area, TRUE);
       gtk_widget_show (drawing_area);
 
       gtk_widget_set_events (drawing_area, GDK_EXPOSURE_MASK | GDK_SCROLL_MASK);
@@ -7924,7 +7925,7 @@ create_scroll_test (GtkWidget *widget)
       scroll_test_pos = 0.0;
 
       scrollbar = gtk_scrollbar_new (GTK_ORIENTATION_VERTICAL, adjustment);
-      gtk_box_pack_start (GTK_BOX (hbox), scrollbar, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), scrollbar, FALSE);
       gtk_widget_show (scrollbar);
 
       g_signal_connect (drawing_area, "draw",
@@ -8028,7 +8029,7 @@ create_timeout_test (GtkWidget *widget)
 
       label = gtk_label_new ("count: 0");
       g_object_set (label, "margin", 10, NULL);
-      gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), label, TRUE);
       gtk_widget_show (label);
 
       button = gtk_button_new_with_label ("close");
@@ -8036,7 +8037,7 @@ create_timeout_test (GtkWidget *widget)
                                G_CALLBACK (gtk_widget_destroy),
                                window);
       gtk_widget_set_can_default (button, TRUE);
-      gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (action_area), button, TRUE);
       gtk_widget_grab_default (button);
       gtk_widget_show (button);
 
@@ -8045,7 +8046,7 @@ create_timeout_test (GtkWidget *widget)
                        G_CALLBACK(start_timeout_test),
                        label);
       gtk_widget_set_can_default (button, TRUE);
-      gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (action_area), button, TRUE);
       gtk_widget_show (button);
 
       button = gtk_button_new_with_label ("stop");
@@ -8053,7 +8054,7 @@ create_timeout_test (GtkWidget *widget)
                        G_CALLBACK (stop_timeout_test),
                        NULL);
       gtk_widget_set_can_default (button, TRUE);
-      gtk_box_pack_start (GTK_BOX (action_area), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (action_area), button, TRUE);
       gtk_widget_show (button);
     }
 
@@ -8099,7 +8100,7 @@ create_mainloop (GtkWidget *widget)
       label = gtk_label_new ("In recursive main loop...");
       g_object_set (label, "margin", 20, NULL);
 
-      gtk_box_pack_start (GTK_BOX (content_area), label, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (content_area), label, TRUE);
       gtk_widget_show (label);
 
       gtk_dialog_add_button (GTK_DIALOG (window),
@@ -8527,7 +8528,7 @@ create_native_dialogs (GtkWidget *widget)
       gtk_container_add (GTK_CONTAINER (window), box);
 
       label = gtk_label_new ("");
-      gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), label, FALSE);
 
       combo = gtk_combo_box_text_new ();
 
@@ -8540,7 +8541,7 @@ create_native_dialogs (GtkWidget *widget)
       g_signal_connect (combo, "changed",
                         G_CALLBACK (native_action_changed), native);
       gtk_combo_box_set_active (GTK_COMBO_BOX (combo), GTK_FILE_CHOOSER_ACTION_OPEN);
-      gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo, FALSE);
 
       combo = gtk_combo_box_text_new ();
 
@@ -8551,34 +8552,34 @@ create_native_dialogs (GtkWidget *widget)
       g_signal_connect (combo, "changed",
                         G_CALLBACK (native_filter_changed), native);
       gtk_combo_box_set_active (GTK_COMBO_BOX (combo), 0);
-      gtk_box_pack_start (GTK_BOX (box), combo, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), combo, FALSE);
 
       check_button = gtk_check_button_new_with_label ("Modal");
       g_signal_connect (check_button, "toggled",
                         G_CALLBACK (native_modal_toggle), native);
-      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE);
 
       check_button = gtk_check_button_new_with_label ("Multiple select");
       g_signal_connect (check_button, "toggled",
                         G_CALLBACK (native_multi_select_toggle), native);
-      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE);
 
       check_button = gtk_check_button_new_with_label ("Confirm overwrite");
       g_signal_connect (check_button, "toggled",
                         G_CALLBACK (native_overwrite_confirmation_toggle), native);
-      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE);
 
       check_button = gtk_check_button_new_with_label ("Extra widget");
       g_signal_connect (check_button, "toggled",
                         G_CALLBACK (native_extra_widget_toggle), native);
-      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), check_button, FALSE);
 
       show_button = gtk_button_new_with_label ("Show");
       hide_button = gtk_button_new_with_label ("Hide");
       gtk_widget_set_sensitive (hide_button, FALSE);
 
-      gtk_box_pack_start (GTK_BOX (box), show_button, FALSE, FALSE);
-      gtk_box_pack_start (GTK_BOX (box), hide_button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), show_button, FALSE);
+      gtk_box_pack_start (GTK_BOX (box), hide_button, FALSE);
 
       /* connect signals */
       g_signal_connect (native, "response",
@@ -8716,14 +8717,14 @@ create_main_window (void)
             gtk_get_minor_version ());
 
   label = gtk_label_new (buffer);
-  gtk_box_pack_start (GTK_BOX (box1), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box1), label, FALSE);
   gtk_widget_set_name (label, "testgtk-version-label");
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_NEVER, 
                                   GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box1), scrolled_window, TRUE);
 
   box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
   gtk_container_add (GTK_CONTAINER (scrolled_window), box2);
@@ -8741,20 +8742,20 @@ create_main_window (void)
                          NULL);
       else
         gtk_widget_set_sensitive (button, FALSE);
-      gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
     }
 
   separator = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (box1), separator, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box1), separator, TRUE);
 
   box2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 10);
-  gtk_box_pack_start (GTK_BOX (box1), box2, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box1), box2,  TRUE);
 
   button = gtk_button_new_with_mnemonic ("_Close");
   g_signal_connect (button, "clicked",
                    G_CALLBACK (do_exit),
                    window);
-  gtk_box_pack_start (GTK_BOX (box2), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box2), button, TRUE);
   gtk_widget_set_can_default (button, TRUE);
   gtk_widget_grab_default (button);
 
diff --git a/tests/testheaderbar.c b/tests/testheaderbar.c
index 75bde0d..79406ba 100644
--- a/tests/testheaderbar.c
+++ b/tests/testheaderbar.c
@@ -92,10 +92,11 @@ change_header (GtkButton *button, gpointer data)
       g_object_set (box, "margin", 10, NULL);
       gtk_container_add (GTK_CONTAINER (header), box);
       label = gtk_label_new ("Label");
-      gtk_box_pack_start (GTK_BOX (box), label, FALSE, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), label, TRUE);
       widget = gtk_level_bar_new ();
       gtk_level_bar_set_value (GTK_LEVEL_BAR (widget), 0.4);
-      gtk_box_pack_start (GTK_BOX (box), widget, TRUE, TRUE);
+      gtk_widget_set_hexpand (widget, TRUE);
+      gtk_box_pack_start (GTK_BOX (box), widget, TRUE);
     }
   else
     {
@@ -159,12 +160,12 @@ main (int argc, char *argv[])
   button = gtk_button_new_with_label ("Fullscreen");
   gtk_action_bar_pack_end (GTK_ACTION_BAR (footer), button);
   g_signal_connect (button, "clicked", G_CALLBACK (toggle_fullscreen), window);
-  gtk_box_pack_end (GTK_BOX (box), footer, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (box), footer, FALSE);
 
   content = gtk_image_new_from_icon_name ("start-here-symbolic", GTK_ICON_SIZE_DIALOG);
   gtk_image_set_pixel_size (GTK_IMAGE (content), 512);
 
-  gtk_box_pack_start (GTK_BOX (box), content, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), content, TRUE);
 
   gtk_widget_show (window);
 
diff --git a/tests/testheightforwidth.c b/tests/testheightforwidth.c
index 7a0d413..41009b7 100644
--- a/tests/testheightforwidth.c
+++ b/tests/testheightforwidth.c
@@ -977,7 +977,7 @@ create_window (void)
       g_signal_connect (button, "clicked",
                         G_CALLBACK (test_clicked), &interfaces[i]);
 
-      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
     }
 
   return window;
diff --git a/tests/testiconview.c b/tests/testiconview.c
index 9fe3fb8..bc9a77e 100644
--- a/tests/testiconview.c
+++ b/tests/testiconview.c
@@ -433,7 +433,8 @@ main (gint argc, gchar **argv)
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   paned = gtk_paned_new (GTK_ORIENTATION_HORIZONTAL);
-  gtk_box_pack_start (GTK_BOX (vbox), paned, TRUE, TRUE);
+  gtk_widget_set_vexpand (paned, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), paned, TRUE);
 
   icon_list = gtk_icon_view_new ();
   gtk_icon_view_set_selection_mode (GTK_ICON_VIEW (icon_list), GTK_SELECTION_MULTIPLE);
@@ -553,43 +554,43 @@ main (gint argc, gchar **argv)
 
   bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
-  gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE);
 
   button = gtk_button_new_with_label ("Add some");
   g_signal_connect (button, "clicked", G_CALLBACK (add_some), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button,  TRUE);
 
   button = gtk_button_new_with_label ("Add many");
   g_signal_connect (button, "clicked", G_CALLBACK (add_many), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE);
 
   button = gtk_button_new_with_label ("Add large");
   g_signal_connect (button, "clicked", G_CALLBACK (add_large), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button,  TRUE);
 
   button = gtk_button_new_with_label ("Remove selected");
   g_signal_connect (button, "clicked", G_CALLBACK (foreach_selected_remove), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button,  TRUE);
 
   button = gtk_button_new_with_label ("Swap");
   g_signal_connect (button, "clicked", G_CALLBACK (swap_rows), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE);
 
   bbox = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_START);
-  gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), bbox, FALSE);
 
   button = gtk_button_new_with_label ("Select all");
   g_signal_connect (button, "clicked", G_CALLBACK (select_all), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE);
 
   button = gtk_button_new_with_label ("Unselect all");
   g_signal_connect (button, "clicked", G_CALLBACK (unselect_all), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE);
 
   button = gtk_button_new_with_label ("Select nonexisting");
   g_signal_connect (button, "clicked", G_CALLBACK (select_nonexisting), icon_list);
-  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, TRUE);
 
   icon_list = gtk_icon_view_new ();
 
diff --git a/tests/testinput.c b/tests/testinput.c
index 38899ca..d7b4e6e 100644
--- a/tests/testinput.c
+++ b/tests/testinput.c
@@ -256,7 +256,8 @@ main (int argc, char *argv[])
 
   drawing_area = gtk_drawing_area_new ();
   gtk_widget_set_size_request (drawing_area, 200, 200);
-  gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE, TRUE);
+  gtk_widget_set_vexpand (drawing_area, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), drawing_area, TRUE);
 
   gtk_widget_show (drawing_area);
 
@@ -308,7 +309,7 @@ main (int argc, char *argv[])
 
   /* .. And create some buttons */
   button = gtk_button_new_with_label ("Quit");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   g_signal_connect_swapped (button, "clicked",
                            G_CALLBACK (gtk_widget_destroy),
diff --git a/tests/testmultidisplay.c b/tests/testmultidisplay.c
index 6c23a2d..aacc430 100644
--- a/tests/testmultidisplay.c
+++ b/tests/testmultidisplay.c
@@ -78,9 +78,9 @@ make_selection_dialog (GdkScreen * screen,
   vbox = g_object_new (GTK_TYPE_BOX,
                          "orientation", GTK_ORIENTATION_VERTICAL,
                         NULL);
-  gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (content_area), vbox, FALSE);
 
-  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE);
   gtk_widget_grab_focus (entry);
 
   gtk_dialog_add_buttons (GTK_DIALOG (window),
diff --git a/tests/testorientable.c b/tests/testorientable.c
index 12e5833..91ee753 100644
--- a/tests/testorientable.c
+++ b/tests/testorientable.c
@@ -64,13 +64,13 @@ main (int argc, char **argv)
   gtk_grid_attach (GTK_GRID (grid), box, 0, 1, 1, 1);
   gtk_box_pack_start (GTK_BOX (box),
                   gtk_button_new_with_label ("GtkBox 1"),
-                  TRUE, TRUE);
+                  TRUE);
   gtk_box_pack_start (GTK_BOX (box),
                   gtk_button_new_with_label ("GtkBox 2"),
-                  TRUE, TRUE);
+                  TRUE);
   gtk_box_pack_start (GTK_BOX (box),
                   gtk_button_new_with_label ("GtkBox 3"),
-                  TRUE, TRUE);
+                  TRUE);
 
   /* GtkButtonBox */
   box = gtk_button_box_new (GTK_ORIENTATION_HORIZONTAL);
@@ -78,13 +78,13 @@ main (int argc, char **argv)
   gtk_grid_attach (GTK_GRID (grid), box, 1, 1, 1, 1);
   gtk_box_pack_start (GTK_BOX (box),
                   gtk_button_new_with_label ("GtkButtonBox 1"),
-                  TRUE, TRUE);
+                  TRUE);
   gtk_box_pack_start (GTK_BOX (box),
                   gtk_button_new_with_label ("GtkButtonBox 2"),
-                  TRUE, TRUE);
+                  TRUE);
   gtk_box_pack_start (GTK_BOX (box),
                   gtk_button_new_with_label ("GtkButtonBox 3"),
-                  TRUE, TRUE);
+                  TRUE);
 
   /* GtkSeparator */
   box = gtk_separator_new (GTK_ORIENTATION_HORIZONTAL);
diff --git a/tests/testoverlay.c b/tests/testoverlay.c
index 1d510d3..aa0ae6b 100644
--- a/tests/testoverlay.c
+++ b/tests/testoverlay.c
@@ -464,12 +464,12 @@ test_input_stacking (void)
                         "But the entry does");
   gtk_widget_set_margin_top (label, 8);
   gtk_widget_set_margin_bottom (label, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), label, FALSE);
 
   entry = gtk_entry_new ();
   gtk_widget_set_margin_top (entry, 8);
   gtk_widget_set_margin_bottom (entry, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE);
 
 
   gtk_container_add (GTK_CONTAINER (win), overlay);
diff --git a/tests/testpixbuf-scale.c b/tests/testpixbuf-scale.c
index 880410a..3a5f809 100644
--- a/tests/testpixbuf-scale.c
+++ b/tests/testpixbuf-scale.c
@@ -108,13 +108,13 @@ main(int argc, char **argv)
                           NULL);
 
         gtk_widget_set_halign (combo_box, GTK_ALIGN_START);
-       gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE);
+       gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE);
 
        hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+       gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
        label = gtk_label_new ("Overall Alpha:");
-       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+       gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
 
        adjustment = gtk_adjustment_new (overall_alpha, 0, 255, 1, 10, 0);
        g_signal_connect (adjustment, "value_changed",
@@ -122,14 +122,16 @@ main(int argc, char **argv)
 
        hscale = gtk_scale_new (GTK_ORIENTATION_HORIZONTAL, adjustment);
        gtk_scale_set_digits (GTK_SCALE (hscale), 0);
-       gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE, TRUE);
+        gtk_widget_set_hexpand (hscale, TRUE);
+       gtk_box_pack_start (GTK_BOX (hbox), hscale, TRUE);
 
        /* Compute the size without the drawing area, so we know how big to make the default size */
         gtk_widget_get_preferred_size ( (vbox),
                                    &scratch_requisition, NULL);
 
        darea = gtk_drawing_area_new ();
-       gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE, TRUE);
+        gtk_widget_set_hexpand (darea, TRUE);
+       gtk_box_pack_start (GTK_BOX (vbox), darea, TRUE);
 
         gtk_drawing_area_set_draw_func (GTK_DRAWING_AREA (darea), draw_func, NULL, NULL);
 
diff --git a/tests/testrecentchoosermenu.c b/tests/testrecentchoosermenu.c
index 744b008..b3a65c0 100644
--- a/tests/testrecentchoosermenu.c
+++ b/tests/testrecentchoosermenu.c
@@ -167,7 +167,7 @@ main (int argc, char *argv[])
   gtk_widget_show (box);
 
   menubar = gtk_menu_bar_new ();
-  gtk_box_pack_start (GTK_BOX (box), menubar, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), menubar, TRUE);
   gtk_widget_show (menubar);
 
   menu = create_file_menu (accel_group);
@@ -183,14 +183,14 @@ main (int argc, char *argv[])
   gtk_widget_show (menuitem);
 
   label = gtk_label_new ("No recent item selected");
-  gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), label, TRUE);
   gtk_widget_show (label);
 
   button = gtk_button_new_with_label ("Close");
   g_signal_connect_swapped (button, "clicked",
                             G_CALLBACK (gtk_widget_destroy),
                             window);
-  gtk_box_pack_end (GTK_BOX (box), button, TRUE, TRUE);
+  gtk_box_pack_end (GTK_BOX (box), button, TRUE);
   gtk_widget_set_can_default (button, TRUE);
   gtk_widget_grab_default (button);
   gtk_widget_show (button);
diff --git a/tests/testscale.c b/tests/testscale.c
index f33c22c..b4065e5 100644
--- a/tests/testscale.c
+++ b/tests/testscale.c
@@ -130,7 +130,7 @@ int main (int argc, char *argv[])
   scales = g_slist_prepend (scales, scale);
   gtk_scale_set_draw_value (GTK_SCALE (scale), FALSE);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   frame = gtk_frame_new ("With fill level");
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -139,7 +139,7 @@ int main (int argc, char *argv[])
   gtk_range_set_show_fill_level (GTK_RANGE (scale), TRUE);
   gtk_range_set_fill_level (GTK_RANGE (scale), 50);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   frame = gtk_frame_new ("Simple marks");
   extra_scale = scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -149,7 +149,7 @@ int main (int argc, char *argv[])
   gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_BOTTOM, NULL);
   gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_BOTTOM, NULL);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   frame = gtk_frame_new ("Simple marks up");
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -159,7 +159,7 @@ int main (int argc, char *argv[])
   gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_TOP, NULL);
   gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_TOP, NULL);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   frame = gtk_frame_new ("Labeled marks");
   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
@@ -171,7 +171,7 @@ int main (int argc, char *argv[])
   gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_BOTTOM, labels[1]);
   gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_BOTTOM, labels[2]);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   frame = gtk_frame_new ("Some labels");
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -181,7 +181,7 @@ int main (int argc, char *argv[])
   gtk_scale_add_mark (GTK_SCALE (scale), marks[1], GTK_POS_TOP, NULL);
   gtk_scale_add_mark (GTK_SCALE (scale), marks[2], GTK_POS_TOP, labels[2]);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   frame = gtk_frame_new ("Above and below");
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -192,7 +192,7 @@ int main (int argc, char *argv[])
   gtk_scale_add_mark (GTK_SCALE (scale), bath_marks[2], GTK_POS_BOTTOM, bath_labels[2]);
   gtk_scale_add_mark (GTK_SCALE (scale), bath_marks[3], GTK_POS_TOP, bath_labels[3]);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   frame = gtk_frame_new ("Positions");
   scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 100, 1);
@@ -203,7 +203,7 @@ int main (int argc, char *argv[])
   gtk_scale_add_mark (GTK_SCALE (scale), pos_marks[2], GTK_POS_TOP, pos_labels[2]);
   gtk_scale_add_mark (GTK_SCALE (scale), pos_marks[3], GTK_POS_BOTTOM, pos_labels[3]);
   gtk_container_add (GTK_CONTAINER (frame), scale);
-  gtk_box_pack_start (GTK_BOX (box), frame, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), frame, FALSE);
 
   box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_container_add (GTK_CONTAINER (box1), box2);
diff --git a/tests/testscrolledwindow.c b/tests/testscrolledwindow.c
index dcb9f6f..b2818cb 100644
--- a/tests/testscrolledwindow.c
+++ b/tests/testscrolledwindow.c
@@ -102,11 +102,11 @@ scrollable_policy (void)
   gtk_widget_show (vbox);
   gtk_widget_show (hbox);
   gtk_container_add (GTK_CONTAINER (window), hbox);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox, FALSE);
 
   frame = gtk_frame_new ("Scrolled Window");
-  gtk_widget_show (frame);
-  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE, TRUE);
+  gtk_widget_set_hexpand (frame, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), frame, TRUE);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
@@ -140,24 +140,24 @@ scrollable_policy (void)
   gtk_widget_show (cntl);
   gtk_widget_show (expander);
   gtk_container_add (GTK_CONTAINER (expander), cntl);
-  gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), expander, FALSE);
 
   /* Add Horizontal policy control here */
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("hscroll-policy");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_combo_box_text_new ();
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum");
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Natural");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-  gtk_widget_show (widget);
+  gtk_widget_set_hexpand (widget, TRUE);
 
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (horizontal_policy_changed), viewport);
@@ -167,17 +167,17 @@ scrollable_policy (void)
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("vscroll-policy");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_combo_box_text_new ();
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Minimum");
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Natural");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-  gtk_widget_show (widget);
+  gtk_widget_set_hexpand (widget, TRUE);
 
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (vertical_policy_changed), viewport);
@@ -186,12 +186,13 @@ scrollable_policy (void)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 
   widget = gtk_label_new ("min-content-width");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE);
   gtk_widget_show (widget);
   gtk_widget_show (hbox);
 
@@ -201,12 +202,13 @@ scrollable_policy (void)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 
   widget = gtk_label_new ("min-content-height");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_spin_button_new_with_range (100.0, 1000.0, 10.0);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE);
   gtk_widget_show (widget);
   gtk_widget_show (hbox);
 
@@ -218,25 +220,25 @@ scrollable_policy (void)
   gtk_widget_show (hbox);
 
   widget = gtk_label_new ("label-flip");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_combo_box_text_new ();
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Horizontal");
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (widget), "Vertical");
   gtk_combo_box_set_active (GTK_COMBO_BOX (widget), 0);
-  gtk_widget_show (widget);
+  gtk_widget_set_hexpand (widget, TRUE);
 
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (cntl), hbox, FALSE);
 
   g_signal_connect (G_OBJECT (widget), "changed",
                     G_CALLBACK (label_flip_changed), label);
 
   /* Add Kinetic scrolling control here */
   widget = gtk_check_button_new_with_label ("Kinetic scrolling");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (cntl), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (cntl), widget, TRUE);
   g_signal_connect (G_OBJECT (widget), "toggled",
                     G_CALLBACK (kinetic_scrolling_changed), swindow);
 
@@ -248,18 +250,17 @@ scrollable_policy (void)
   widget = gtk_menu_button_new ();
   gtk_menu_button_set_popover (GTK_MENU_BUTTON (widget), popover);
   gtk_container_add (GTK_CONTAINER (widget), gtk_label_new ("Popover"));
-  gtk_box_pack_start (GTK_BOX (cntl), widget, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (cntl), widget, FALSE);
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 6);
   gtk_container_add (GTK_CONTAINER (popover), vbox);
-  gtk_widget_show (vbox);
 
   /* Popover's scrolled window */
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow),
                                   GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
 
-  gtk_box_pack_end (GTK_BOX (vbox), swindow, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (vbox), swindow, FALSE);
   gtk_widget_show (swindow);
   gtk_widget_show (hbox);
 
@@ -272,13 +273,12 @@ scrollable_policy (void)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 
   widget = gtk_label_new ("min-content-width");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_widget_show (widget);
-  gtk_widget_show (hbox);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)),
                           "value",
@@ -287,15 +287,14 @@ scrollable_policy (void)
                           G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
   widget = gtk_label_new ("min-content-height");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
 
   widget = gtk_spin_button_new_with_range (0.0, 150.0, 10.0);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
-  gtk_widget_show (widget);
-  gtk_widget_show (hbox);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)),
                           "value",
@@ -307,13 +306,12 @@ scrollable_policy (void)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 
   widget = gtk_label_new ("max-content-width");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_widget_show (widget);
-  gtk_widget_show (hbox);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)),
                           "value",
@@ -322,14 +320,13 @@ scrollable_policy (void)
                           G_BINDING_DEFAULT | G_BINDING_SYNC_CREATE);
 
   widget = gtk_label_new ("max-content-height");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   widget = gtk_spin_button_new_with_range (250.0, 1000.0, 10.0);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
-  gtk_widget_show (widget);
-  gtk_widget_show (hbox);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   g_object_bind_property (gtk_spin_button_get_adjustment (GTK_SPIN_BUTTON (widget)),
                           "value",
@@ -341,17 +338,16 @@ scrollable_policy (void)
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2);
 
   widget = gtk_button_new_with_label ("Remove");
-  gtk_widget_show (widget);
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
 
   g_signal_connect (widget, "clicked",
                     G_CALLBACK (remove_row), listbox);
 
   widget = gtk_button_new_with_label ("Add");
-  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
-  gtk_widget_show (widget);
-  gtk_widget_show (hbox);
+  gtk_widget_set_hexpand (widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), widget, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   g_signal_connect (widget, "clicked",
                     G_CALLBACK (add_row), listbox);
diff --git a/tests/testselection.c b/tests/testselection.c
index 9f5d073..e0aa482 100644
--- a/tests/testselection.c
+++ b/tests/testselection.c
@@ -418,7 +418,7 @@ main (int argc, char *argv[])
 
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
 
-  gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE);
   gtk_widget_show (vbox);
 
   selection_button = gtk_toggle_button_new_with_label ("Claim Selection");
@@ -449,11 +449,12 @@ main (int argc, char *argv[])
   gtk_widget_show (hbox);
 
   label = gtk_label_new ("Target:");
-  gtk_box_pack_start (GTK_BOX(hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX(hbox), label, FALSE);
   gtk_widget_show (label);
 
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX(hbox), entry, TRUE, TRUE);
+  gtk_widget_set_hexpand (entry, TRUE);
+  gtk_box_pack_start (GTK_BOX(hbox), entry, TRUE);
   gtk_widget_show (entry);
 
   /* .. And create some buttons */
diff --git a/tests/testsensitive.c b/tests/testsensitive.c
index 4f4ccb7..663ce1e 100644
--- a/tests/testsensitive.c
+++ b/tests/testsensitive.c
@@ -65,15 +65,15 @@ int main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (window), box);
 
   w = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 15);
-  gtk_box_pack_start (GTK_BOX (box), w, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (w), gtk_entry_new (), TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), w, TRUE);
+  gtk_box_pack_start (GTK_BOX (w), gtk_entry_new (), TRUE);
   bu = gtk_button_new_with_label ("Bu");
-  gtk_box_pack_start (GTK_BOX (w), bu, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (w), bu, TRUE);
   c = gtk_switch_new ();
   gtk_switch_set_active (GTK_SWITCH (c), TRUE);
   gtk_widget_set_halign (c, GTK_ALIGN_CENTER);
   gtk_widget_set_valign (c, GTK_ALIGN_CENTER);
-  gtk_box_pack_start (GTK_BOX (box), c, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), c, TRUE);
   g_signal_connect (bu, "clicked", G_CALLBACK (set_insensitive), w);
   g_signal_connect (bu, "state-flags-changed", G_CALLBACK (state_flags_changed), NULL);
 
diff --git a/tests/testspinbutton.c b/tests/testspinbutton.c
index 303192e..91d0677 100644
--- a/tests/testspinbutton.c
+++ b/tests/testspinbutton.c
@@ -57,7 +57,7 @@ prepare_window_for_orientation (GtkOrientation orientation)
       gtk_widget_set_halign (GTK_WIDGET (spin), GTK_ALIGN_CENTER);
 
       GtkWidget *hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
-      gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE, FALSE);
+      gtk_box_pack_start (GTK_BOX (hbox), spin, FALSE);
       gtk_container_add (GTK_CONTAINER (mainbox), hbox);
     }
 
diff --git a/tests/teststack.c b/tests/teststack.c
index 1117664..fa06a34 100644
--- a/tests/teststack.c
+++ b/tests/teststack.c
@@ -127,7 +127,7 @@ main (gint argc,
   gtk_container_add (GTK_CONTAINER (window), box);
 
   switcher = gtk_stack_switcher_new ();
-  gtk_box_pack_start (GTK_BOX (box), switcher, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), switcher, FALSE);
 
   stack = gtk_stack_new ();
 
@@ -141,8 +141,9 @@ main (gint argc,
   sidebar = gtk_stack_sidebar_new ();
   gtk_stack_sidebar_set_stack (GTK_STACK_SIDEBAR (sidebar), GTK_STACK (stack));
   layout = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_pack_start (GTK_BOX (layout), sidebar, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (layout), stack, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (layout), sidebar, FALSE);
+  gtk_widget_set_hexpand (stack, TRUE);
+  gtk_box_pack_start (GTK_BOX (layout), stack, TRUE);
 
   gtk_container_add (GTK_CONTAINER (box), layout);
 
diff --git a/tests/testswitch.c b/tests/testswitch.c
index 0d07327..6a483be 100644
--- a/tests/testswitch.c
+++ b/tests/testswitch.c
@@ -26,13 +26,12 @@ make_switch (gboolean is_on,
 
   sw = gtk_switch_new ();
   gtk_switch_set_active (GTK_SWITCH (sw), is_on);
-  gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE);
   gtk_widget_set_sensitive (sw, is_sensitive);
-  gtk_widget_show (sw);
 
   label = gtk_label_new (is_on ? "Enabled" : "Disabled");
-  gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE);
-  gtk_widget_show (label);
+  gtk_widget_set_hexpand (label, TRUE);
+  gtk_box_pack_end (GTK_BOX (hbox), label, TRUE);
 
   g_object_bind_property_full (sw, "active",
                                label, "label",
@@ -117,27 +116,24 @@ make_delayed_switch (gboolean is_on,
 
   sw = gtk_switch_new ();
   gtk_switch_set_active (GTK_SWITCH (sw), is_on);
-  gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), sw, FALSE);
   gtk_widget_set_sensitive (sw, is_sensitive);
-  gtk_widget_show (sw);
 
   g_signal_connect (sw, "state-set", G_CALLBACK (set_state), NULL);
 
   spinner = gtk_spinner_new ();
-  gtk_box_pack_start (GTK_BOX (hbox), spinner, FALSE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), spinner, TRUE);
   gtk_widget_set_opacity (spinner, 0.0);
-  gtk_widget_show (spinner);
 
   check = gtk_check_button_new ();
-  gtk_box_pack_end (GTK_BOX (hbox), check, FALSE, TRUE);
-  gtk_widget_show (check);
+  gtk_box_pack_end (GTK_BOX (hbox), check, TRUE);
   g_object_bind_property (sw, "state",
                           check, "active",
                           G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE);
 
   label = gtk_label_new (is_on ? "Enabled" : "Disabled");
-  gtk_box_pack_end (GTK_BOX (hbox), label, TRUE, TRUE);
-  gtk_widget_show (label);
+  gtk_widget_set_hexpand (label, TRUE);
+  gtk_box_pack_end (GTK_BOX (hbox), label, TRUE);
 
   g_object_bind_property_full (sw, "active",
                                label, "label",
diff --git a/tests/testtoolbar.c b/tests/testtoolbar.c
index 5ab5337..9ae1953 100644
--- a/tests/testtoolbar.c
+++ b/tests/testtoolbar.c
@@ -509,19 +509,19 @@ main (gint argc, gchar **argv)
   gtk_grid_attach (GTK_GRID (grid), hbox2, 1, 2, 1, 1);
 
   checkbox = gtk_check_button_new_with_mnemonic("_Vertical");
-  gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE);
   g_signal_connect (checkbox, "toggled",
                    G_CALLBACK (change_orientation), toolbar);
 
   checkbox = gtk_check_button_new_with_mnemonic("_Show Arrow");
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE);
   g_signal_connect (checkbox, "toggled",
                    G_CALLBACK (change_show_arrow), toolbar);
 
   checkbox = gtk_check_button_new_with_mnemonic("_Set Toolbar Style:");
   g_signal_connect (checkbox, "toggled", G_CALLBACK (set_toolbar_style_toggled), toolbar);
-  gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox1), checkbox, FALSE);
 
   option_menu = gtk_combo_box_text_new ();
   gtk_widget_set_sensitive (option_menu, FALSE);
@@ -531,13 +531,13 @@ main (gint argc, gchar **argv)
     gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), toolbar_styles[i]);
   gtk_combo_box_set_active (GTK_COMBO_BOX (option_menu),
                             gtk_toolbar_get_style (GTK_TOOLBAR (toolbar)));
-  gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE);
   g_signal_connect (option_menu, "changed",
                    G_CALLBACK (change_toolbar_style), toolbar);
 
   checkbox = gtk_check_button_new_with_mnemonic("_Set Icon Size:");
   g_signal_connect (checkbox, "toggled", G_CALLBACK (set_icon_size_toggled), toolbar);
-  gtk_box_pack_start (GTK_BOX (hbox2), checkbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox2), checkbox, FALSE);
 
   option_menu = gtk_combo_box_text_new ();
   g_object_set_data (G_OBJECT (checkbox), "option-menu", option_menu);
@@ -545,7 +545,7 @@ main (gint argc, gchar **argv)
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "small toolbar");
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (option_menu), "large toolbar");
 
-  gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox2), option_menu, FALSE);
   g_signal_connect (option_menu, "changed",
                    G_CALLBACK (icon_size_history_changed), toolbar);
 
@@ -695,13 +695,13 @@ main (gint argc, gchar **argv)
   gtk_grid_attach (GTK_GRID (grid), hbox, 1, 4, 1, 1);
 
   button = gtk_button_new_with_label ("Drag me to the toolbar");
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
 
   label = gtk_label_new ("Drop index:");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
 
   label = gtk_label_new ("");
-  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), label, FALSE);
 
   checkbox = gtk_check_button_new_with_mnemonic("_Right to left");
   if (gtk_widget_get_default_direction () == GTK_TEXT_DIR_RTL)
@@ -710,7 +710,7 @@ main (gint argc, gchar **argv)
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbox), FALSE);
   g_signal_connect (checkbox, "toggled", G_CALLBACK (rtl_toggled), NULL);
 
-  gtk_box_pack_end (GTK_BOX (hbox), checkbox, FALSE, FALSE);
+  gtk_box_pack_end (GTK_BOX (hbox), checkbox, FALSE);
 
   gtk_drag_source_set (button, GDK_BUTTON1_MASK,
                       target_table, G_N_ELEMENTS (target_table),
diff --git a/tests/testtooltips.c b/tests/testtooltips.c
index 6ed4066..64bde2d 100644
--- a/tests/testtooltips.c
+++ b/tests/testtooltips.c
@@ -275,7 +275,7 @@ main (int argc, char *argv[])
   /* A check button using the tooltip-markup property */
   button = gtk_check_button_new_with_label ("This one uses the tooltip-markup property");
   gtk_widget_set_tooltip_text (button, "Hello, I am a static tooltip.");
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   text = gtk_widget_get_tooltip_text (button);
   markup = gtk_widget_get_tooltip_markup (button);
@@ -288,13 +288,13 @@ main (int argc, char *argv[])
   g_object_set (button, "has-tooltip", TRUE, NULL);
   g_signal_connect (button, "query-tooltip",
                    G_CALLBACK (query_tooltip_cb), NULL);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   /* A label */
   button = gtk_label_new ("I am just a label");
   gtk_label_set_selectable (GTK_LABEL (button), FALSE);
   gtk_widget_set_tooltip_text (button, "Label & and tooltip");
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   text = gtk_widget_get_tooltip_text (button);
   markup = gtk_widget_get_tooltip_markup (button);
@@ -306,7 +306,7 @@ main (int argc, char *argv[])
   button = gtk_label_new ("I am a selectable label");
   gtk_label_set_selectable (GTK_LABEL (button), TRUE);
   gtk_widget_set_tooltip_markup (button, "<b>Another</b> Label tooltip");
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   text = gtk_widget_get_tooltip_text (button);
   markup = gtk_widget_get_tooltip_markup (button);
@@ -316,7 +316,7 @@ main (int argc, char *argv[])
 
   /* Another one, with a custom tooltip window */
   button = gtk_check_button_new_with_label ("This one has a custom tooltip window!");
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   tooltip_window = gtk_window_new (GTK_WINDOW_POPUP);
   tooltip_button = gtk_label_new ("blaat!");
@@ -337,7 +337,7 @@ main (int argc, char *argv[])
   button = gtk_button_new_with_label ("This one is insensitive");
   gtk_widget_set_sensitive (button, FALSE);
   g_object_set (button, "tooltip-text", "Insensitive!", NULL);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   /* Testcases from Kris without a tree view don't exist. */
   tree_view = gtk_tree_view_new_with_model (create_model ());
@@ -360,7 +360,7 @@ main (int argc, char *argv[])
   gtk_tree_view_column_set_clickable (column, TRUE);
   g_object_set (gtk_tree_view_column_get_button (column), "tooltip-text", "Header", NULL);
 
-  gtk_box_pack_start (GTK_BOX (box), tree_view, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), tree_view, FALSE);
 
   /* And a text view for Matthias */
   buffer = gtk_text_buffer_new (NULL);
@@ -384,7 +384,7 @@ main (int argc, char *argv[])
   g_signal_connect (text_view, "query-tooltip",
                    G_CALLBACK (query_tooltip_text_view_cb), tag);
 
-  gtk_box_pack_start (GTK_BOX (box), text_view, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), text_view, FALSE);
 
   /* Drawing area */
   drawing_area = gtk_drawing_area_new ();
@@ -395,7 +395,7 @@ main (int argc, char *argv[])
   g_object_set (drawing_area, "has-tooltip", TRUE, NULL);
   g_signal_connect (drawing_area, "query-tooltip",
                    G_CALLBACK (query_tooltip_drawing_area_cb), NULL);
-  gtk_box_pack_start (GTK_BOX (box), drawing_area, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), drawing_area, FALSE);
 
   button = gtk_label_new ("Custom tooltip I");
   label = gtk_label_new ("See, custom");
@@ -403,13 +403,13 @@ main (int argc, char *argv[])
   g_object_set (button, "has-tooltip", TRUE, NULL);
   g_signal_connect (button, "query-tooltip",
                    G_CALLBACK (query_tooltip_label_cb), label);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
 
   button = gtk_label_new ("Custom tooltip II");
   label = gtk_label_new ("See, custom, too");
   g_object_ref_sink (label);
   g_object_set (button, "has-tooltip", TRUE, NULL);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), button, FALSE);
   g_signal_connect (button, "query-tooltip",
                    G_CALLBACK (query_tooltip_label_cb), label);
 
diff --git a/tests/testtoplevelembed.c b/tests/testtoplevelembed.c
index c1cda8d..4115bf9 100644
--- a/tests/testtoplevelembed.c
+++ b/tests/testtoplevelembed.c
@@ -21,8 +21,9 @@ create_tab_label (GtkWidget *toplevel)
   GtkWidget *image = gtk_image_new_from_icon_name ("window-close", GTK_ICON_SIZE_MENU);
 
   gtk_container_add (GTK_CONTAINER (button), image);
-  gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (box), button, FALSE, TRUE);
+  gtk_widget_set_hexpand (label, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), label, TRUE);
+  gtk_box_pack_start (GTK_BOX (box), button, TRUE);
 
   g_signal_connect (button, "clicked",
                    G_CALLBACK (remove_notebook_page), toplevel);
diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 5e9f204..1205943 100644
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -768,7 +768,7 @@ main (int argc, char *argv[])
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, TRUE);
 
   /* Left Pane */
   cell = gtk_cell_renderer_text_new ();
@@ -785,52 +785,52 @@ main (int argc, char *argv[])
   gtk_tree_view_append_column (GTK_TREE_VIEW (left_tree_view), column);
 
   gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
-  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), swindow, TRUE);
 
   /* Middle Pane */
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, FALSE);
 
   bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
-  gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE);
 
   button = gtk_button_new_with_mnemonic ("<< (_Q)");
   gtk_widget_set_sensitive (button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (add_left_clicked), top_right_tree_view);
   g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (top_right_tree_view)),
                     "changed", G_CALLBACK (selection_changed), button);
-  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE);
 
   button = gtk_button_new_with_mnemonic (">> (_W)");
   gtk_widget_set_sensitive (button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (add_right_clicked), top_right_tree_view);
   g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view)),
                     "changed", G_CALLBACK (selection_changed), button);
-  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (bbox), button,  FALSE);
 
   bbox = gtk_button_box_new (GTK_ORIENTATION_VERTICAL);
   gtk_button_box_set_layout (GTK_BUTTON_BOX (bbox), GTK_BUTTONBOX_SPREAD);
-  gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox2), bbox, TRUE);
 
   button = gtk_button_new_with_mnemonic ("<< (_E)");
   gtk_widget_set_sensitive (button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (add_left_clicked), bottom_right_tree_view);
   g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (bottom_right_tree_view)),
                     "changed", G_CALLBACK (selection_changed), button);
-  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE);
 
   button = gtk_button_new_with_mnemonic (">> (_R)");
   gtk_widget_set_sensitive (button, FALSE);
   g_signal_connect (button, "clicked", G_CALLBACK (add_right_clicked), bottom_right_tree_view);
   g_signal_connect (gtk_tree_view_get_selection (GTK_TREE_VIEW (left_tree_view)),
                     "changed", G_CALLBACK (selection_changed), button);
-  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (bbox), button, FALSE);
 
 
   /* Right Pane */
   vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), vbox2, TRUE);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -845,7 +845,7 @@ main (int argc, char *argv[])
   gtk_tree_view_append_column (GTK_TREE_VIEW (top_right_tree_view), column);
 
   gtk_container_add (GTK_CONTAINER (swindow), top_right_tree_view);
-  gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE);
 
   swindow = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (swindow), GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
@@ -859,7 +859,7 @@ main (int argc, char *argv[])
   gtk_tree_view_column_set_cell_data_func (column, cell, get_visible, NULL, NULL);
   gtk_tree_view_append_column (GTK_TREE_VIEW (bottom_right_tree_view), column);
   gtk_container_add (GTK_CONTAINER (swindow), bottom_right_tree_view);
-  gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox2), swindow, TRUE);
 
 
   /* Drag and Drop */
@@ -895,13 +895,13 @@ main (int argc, char *argv[])
 
 
   gtk_box_pack_start (GTK_BOX (vbox), gtk_separator_new (GTK_ORIENTATION_HORIZONTAL),
-                      FALSE, FALSE);
+                       FALSE);
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
   button = gtk_button_new_with_mnemonic ("_Add new Column");
   g_signal_connect (button, "clicked", G_CALLBACK (add_clicked), left_tree_model);
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
 
   gtk_widget_show (window);
   gtk_main ();
diff --git a/tests/testtreecolumnsizing.c b/tests/testtreecolumnsizing.c
index 33c8907..405415c 100644
--- a/tests/testtreecolumnsizing.c
+++ b/tests/testtreecolumnsizing.c
@@ -190,14 +190,15 @@ main (int argc, char **argv)
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), BORDER_EXPAND);
   gtk_combo_box_text_append_text (GTK_COMBO_BOX_TEXT (combo_box), ALL_EXPAND);
 
-  gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), combo_box, FALSE);
 
   /* Scrolled window and tree view */
   sw = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw),
                                   GTK_POLICY_AUTOMATIC,
                                   GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE, TRUE);
+  gtk_widget_set_vexpand (sw, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), sw, TRUE);
 
   tree_view = gtk_tree_view_new_with_model (create_model ());
   gtk_container_add (GTK_CONTAINER (sw), tree_view);
@@ -220,7 +221,7 @@ main (int argc, char **argv)
   button = gtk_toggle_button_new_with_label ("Toggle long content row");
   g_signal_connect (button, "toggled",
                     G_CALLBACK (toggle_long_content_row), tree_view);
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   /* Set up option menu callback and default item */
   g_signal_connect (combo_box, "changed",
diff --git a/tests/testtreeedit.c b/tests/testtreeedit.c
index cd4fc36..8aa4469 100644
--- a/tests/testtreeedit.c
+++ b/tests/testtreeedit.c
@@ -210,7 +210,7 @@ create_control (GtkWidget *box, gint number, gint cntl, CallbackData *data)
   checkbutton = gtk_check_button_new_with_label (name);
   gtk_widget_show (checkbutton);
   gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (checkbutton), cntl == CNTL_FIXED);
-  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (box), checkbutton, FALSE);
 
   g_signal_connect (G_OBJECT (checkbutton), "toggled", callback, data);
   g_free (name);
@@ -246,7 +246,8 @@ main (gint argc, gchar **argv)
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+  gtk_widget_set_vexpand (scrolled_window, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE);
 
   tree_model = create_model ();
   tree_view = gtk_tree_view_new_with_model (tree_model);
@@ -350,12 +351,12 @@ main (gint argc, gchar **argv)
 
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
   gtk_widget_show (hbox);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
 
   /* Alignment controls */
   cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_widget_show (cntl_vbox);
-  gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE);
 
   create_control (cntl_vbox, 1, CNTL_ALIGN, &callback[0]);
   create_control (cntl_vbox, 2, CNTL_ALIGN, &callback[1]);
@@ -365,7 +366,7 @@ main (gint argc, gchar **argv)
   /* Expand controls */
   cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_widget_show (cntl_vbox);
-  gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE);
 
   create_control (cntl_vbox, 1, CNTL_EXPAND, &callback[0]);
   create_control (cntl_vbox, 2, CNTL_EXPAND, &callback[1]);
@@ -375,7 +376,7 @@ main (gint argc, gchar **argv)
   /* Fixed controls */
   cntl_vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 2);
   gtk_widget_show (cntl_vbox);
-  gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), cntl_vbox, FALSE);
 
   create_control (cntl_vbox, 1, CNTL_FIXED, &callback[0]);
   create_control (cntl_vbox, 2, CNTL_FIXED, &callback[1]);
diff --git a/tests/testtreeflow.c b/tests/testtreeflow.c
index c5777fd..4a6c28a 100644
--- a/tests/testtreeflow.c
+++ b/tests/testtreeflow.c
@@ -134,13 +134,14 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Reflow test");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"), FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Incremental Reflow Test"), FALSE);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC,
                                  GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+  gtk_widget_set_vexpand (scrolled_window, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE);
 
   initialize_model ();
   tree_view = gtk_tree_view_new_with_model (model);
@@ -156,9 +157,9 @@ main (int argc, char *argv[])
                                               NULL);
   gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
   button = gtk_button_new_with_mnemonic ("<b>_Futz!!</b>");
-  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, FALSE);
   gtk_label_set_use_markup (GTK_LABEL (gtk_bin_get_child (GTK_BIN (button))), TRUE);
   g_signal_connect (button, "clicked", G_CALLBACK (futz), NULL);
   g_signal_connect (button, "realize", G_CALLBACK (gtk_widget_grab_focus), NULL);
diff --git a/tests/testtreefocus.c b/tests/testtreefocus.c
index d4296f1..8d9a54e 100644
--- a/tests/testtreefocus.c
+++ b/tests/testtreefocus.c
@@ -352,13 +352,14 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Card planning sheet");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE, 
FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan's Holiday Card Planning Sheet"), FALSE);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, 
GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+  gtk_widget_set_vexpand (scrolled_window, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE);
 
   model = make_model ();
   tree_view = gtk_tree_view_new_with_model (model);
@@ -466,13 +467,14 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Model");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("The model revealed"), FALSE);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, 
GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+  gtk_widget_set_vexpand (scrolled_window, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE);
 
 
   tree_view = gtk_tree_view_new_with_model (model);
diff --git a/tests/testtreesort.c b/tests/testtreesort.c
index 3edd941..8cbcb98 100644
--- a/tests/testtreesort.c
+++ b/tests/testtreesort.c
@@ -122,19 +122,20 @@ main (int argc, char *argv[])
   gtk_window_set_title (GTK_WINDOW (window), "Words, words, words - Window 1");
   g_signal_connect (window, "destroy", gtk_main_quit, NULL);
   vbox = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
-  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And 
Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"), FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), gtk_label_new ("Jonathan and Kristian's list of cool words. (And 
Anders' cool list of numbers) \n\nThis is just a GtkTreeStore"), FALSE);
   gtk_container_add (GTK_CONTAINER (window), vbox);
 
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), entry, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), entry,  FALSE);
 
   button = gtk_button_new_with_label ("Switch search method");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
 
   scrolled_window = gtk_scrolled_window_new (NULL, NULL);
   gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scrolled_window), GTK_SHADOW_ETCHED_IN);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_AUTOMATIC, 
GTK_POLICY_AUTOMATIC);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+  gtk_widget_set_vexpand (scrolled_window, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE);
 
   model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, 
G_TYPE_INT);
 
@@ -251,7 +252,7 @@ main (int argc, char *argv[])
       vbox2 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_box_pack_start (GTK_BOX (vbox2), 
                          gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort 
wrapping the GtkTreeStore of window 1"),
-                         FALSE, FALSE);
+                         FALSE);
       gtk_container_add (GTK_CONTAINER (window2), vbox2);
       
       scrolled_window2 = gtk_scrolled_window_new (NULL, NULL);
@@ -260,7 +261,8 @@ main (int argc, char *argv[])
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window2),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE, TRUE);
+      gtk_widget_set_vexpand (scrolled_window2, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox2), scrolled_window2, TRUE);
 
 
       tree_view2 = gtk_tree_view_new_with_model (smodel);
@@ -320,7 +322,7 @@ main (int argc, char *argv[])
       vbox3 = gtk_box_new (GTK_ORIENTATION_VERTICAL, 8);
       gtk_box_pack_start (GTK_BOX (vbox3), 
                          gtk_label_new ("Jonathan and Kristian's list of words.\n\nA GtkTreeModelSort 
wrapping the GtkTreeModelSort of window 2"),
-                         FALSE, FALSE);
+                         FALSE);
       gtk_container_add (GTK_CONTAINER (window3), vbox3);
       
       scrolled_window3 = gtk_scrolled_window_new (NULL, NULL);
@@ -329,7 +331,8 @@ main (int argc, char *argv[])
       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window3),
                                      GTK_POLICY_AUTOMATIC,
                                      GTK_POLICY_AUTOMATIC);
-      gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE, TRUE);
+      gtk_widget_set_vexpand (scrolled_window3, TRUE);
+      gtk_box_pack_start (GTK_BOX (vbox3), scrolled_window3, TRUE);
 
 
       tree_view3 = gtk_tree_view_new_with_model (ssmodel);
diff --git a/tests/testwindowsize.c b/tests/testwindowsize.c
index a7df0b5..3bfd20f 100644
--- a/tests/testwindowsize.c
+++ b/tests/testwindowsize.c
@@ -59,8 +59,9 @@ show_dialog (void)
   gtk_window_set_default_size (GTK_WINDOW (dialog), default_width, default_height);
   gtk_window_set_resizable (GTK_WINDOW (dialog), resizable);
 
+
   gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
-                      label, TRUE, TRUE);
+                      label, TRUE);
   gtk_widget_show (label);
 
   label = gtk_label_new ("? x ?");
diff --git a/tests/treestoretest.c b/tests/treestoretest.c
index 586bd93..a33bcb5 100644
--- a/tests/treestoretest.c
+++ b/tests/treestoretest.c
@@ -328,7 +328,8 @@ make_window (gint view_type)
 
   /* Put them together */
   gtk_container_add (GTK_CONTAINER (scrolled_window), tree_view);
-  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE, TRUE);
+  gtk_widget_set_vexpand (scrolled_window, TRUE);
+  gtk_box_pack_start (GTK_BOX (vbox), scrolled_window, TRUE);
   gtk_container_add (GTK_CONTAINER (window), vbox);
   gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window),
                                  GTK_POLICY_AUTOMATIC,
@@ -337,7 +338,7 @@ make_window (gint view_type)
 
   /* buttons */
   button = gtk_button_new_with_label ("gtk_tree_store_remove");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
   g_signal_connect (selection, "changed",
                     G_CALLBACK (selection_changed),
                     button);
@@ -349,9 +350,9 @@ make_window (gint view_type)
   button = gtk_button_new_with_label ("gtk_tree_store_insert");
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE);
   g_object_set_data (G_OBJECT (button), "user_data", entry);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (iter_insert),
@@ -360,9 +361,9 @@ make_window (gint view_type)
   button = gtk_button_new_with_label ("gtk_tree_store_set");
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE);
   g_object_set_data (G_OBJECT (button), "user_data", entry);
   g_signal_connect (button, "clicked",
                    G_CALLBACK (iter_change),
@@ -371,16 +372,16 @@ make_window (gint view_type)
   button = gtk_button_new_with_label ("gtk_tree_store_insert_with_values");
   hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 8);
   entry = gtk_entry_new ();
-  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE);
-  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE, TRUE);
-  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE);
+  gtk_box_pack_start (GTK_BOX (hbox), button, TRUE);
+  gtk_box_pack_start (GTK_BOX (hbox), entry, FALSE);
   g_object_set_data (G_OBJECT (button), "user_data", entry);
   g_signal_connect (button, "clicked",
                    G_CALLBACK (iter_insert_with_values),
                    tree_view);
 
   button = gtk_button_new_with_label ("gtk_tree_store_insert_before");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (iter_insert_before),
                     tree_view);
@@ -390,7 +391,7 @@ make_window (gint view_type)
   gtk_widget_set_sensitive (button, FALSE);
 
   button = gtk_button_new_with_label ("gtk_tree_store_insert_after");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (iter_insert_after),
                     tree_view);
@@ -400,13 +401,13 @@ make_window (gint view_type)
   gtk_widget_set_sensitive (button, FALSE);
 
   button = gtk_button_new_with_label ("gtk_tree_store_prepend");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (iter_prepend),
                     tree_view);
 
   button = gtk_button_new_with_label ("gtk_tree_store_append");
-  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE, FALSE);
+  gtk_box_pack_start (GTK_BOX (vbox), button, FALSE);
   g_signal_connect (button, "clicked",
                     G_CALLBACK (iter_append),
                     tree_view);
diff --git a/testsuite/a11y/placeholder-text.ui b/testsuite/a11y/placeholder-text.ui
index 4657cb5..c56ce4b 100644
--- a/testsuite/a11y/placeholder-text.ui
+++ b/testsuite/a11y/placeholder-text.ui
@@ -18,7 +18,6 @@
             <property name="placeholder_text">Subject or Addresses contain</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
@@ -33,7 +32,6 @@
             <property name="placeholder_text">Message contains</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
@@ -49,7 +47,6 @@
             <property name="placeholder_text">Body contains</property>
           </object>
           <packing>
-            <property name="expand">False</property>
             <property name="fill">True</property>
             <property name="position">2</property>
           </packing>
diff --git a/testsuite/gtk/builder.c b/testsuite/gtk/builder.c
index 1e0674a..3a32070 100644
--- a/testsuite/gtk/builder.c
+++ b/testsuite/gtk/builder.c
@@ -2153,9 +2153,6 @@ test_message_area (void)
     "          <object class=\"GtkLabel\" id=\"content\">"
     "            <property name=\"label\" translatable=\"yes\">Message</property>"
     "          </object>"
-    "          <packing>"
-    "            <property name='expand'>False</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"
@@ -2397,9 +2394,6 @@ test_no_ids (void)
     "          <object class=\"GtkLabel\">"
     "            <property name=\"label\" translatable=\"yes\">Message</property>"
     "          </object>"
-    "          <packing>"
-    "            <property name='expand'>False</property>"
-    "          </packing>"
     "        </child>"
     "      </object>"
     "    </child>"
diff --git a/testsuite/gtk/ui/container1.ui b/testsuite/gtk/ui/container1.ui
index e0101e7..89ab6cd 100644
--- a/testsuite/gtk/ui/container1.ui
+++ b/testsuite/gtk/ui/container1.ui
@@ -4,7 +4,7 @@
     <child>
       <object class="GtkLabel" id="widget1"/>
       <packing>
-        <property name="expand" translatable="yes" comments="foo" context="bar">True</property>
+        <property name="fill" translatable="yes" comments="foo" context="bar">True</property>
       </packing>
     </child>
     <focus-chain>
diff --git a/testsuite/gtk/ui/container8.ui b/testsuite/gtk/ui/container8.ui
index 09380cf..11708ab 100644
--- a/testsuite/gtk/ui/container8.ui
+++ b/testsuite/gtk/ui/container8.ui
@@ -4,7 +4,7 @@
     <child>
       <object class="GtkLabel" id="widget1"/>
       <packing>
-        <property name="expand" translatable="yes" comments="foo" context="bar">True</property>
+        <property name="fill" translatable="yes" comments="foo" context="bar">True</property>
       </packing>
     </child>
     <focus-chain>


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]