diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 2a1ab97b26..498732df89 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -3050,7 +3050,7 @@ ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* lis
 				    _("No files were ready for clean-up"),
 				    true,
 				    Gtk::MESSAGE_INFO,
-				    (Gtk::ButtonsType)(Gtk::BUTTONS_OK)  );
+				    Gtk::BUTTONS_OK);
 		msgd.set_title (_("Clean-up"));
 		msgd.set_secondary_text (_("If this seems suprising, \n\
 check for any existing snapshots.\n\
@@ -3176,7 +3176,7 @@ ARDOUR_UI::cleanup ()
 	MessageDialog checker (_("Are you sure you want to clean-up?"),
 				true,
 				Gtk::MESSAGE_QUESTION,
-				(Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
+				Gtk::BUTTONS_NONE);
 
 	checker.set_title (_("Clean-up"));
 
diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc
index 6c868978b1..fc07758eea 100644
--- a/gtk2_ardour/main.cc
+++ b/gtk2_ardour/main.cc
@@ -74,9 +74,9 @@ void
 gui_jack_error ()
 {
 	MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME),
-		     false,
-		     Gtk::MESSAGE_INFO,
-		     (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
+	                   false,
+	                   Gtk::MESSAGE_INFO,
+	                   Gtk::BUTTONS_NONE);
 win.set_secondary_text(_("There are several possible reasons:\n\
 \n\
 1) JACK is not running.\n\
@@ -405,7 +405,7 @@ tell_about_jack_death (void* /* ignored */)
 {
 	if (AudioEngine::instance()->processed_frames() == 0) {
 		/* died during startup */
-		MessageDialog msg (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_OK);
+		MessageDialog msg (_("JACK exited"), false);
 		msg.set_position (Gtk::WIN_POS_CENTER);
 		msg.set_secondary_text (string_compose (_(
 "JACK exited unexpectedly, and without notifying %1.\n\
@@ -421,7 +421,7 @@ Click OK to exit %1."), PROGRAM_NAME));
 
 		/* engine has already run, so this is a mid-session JACK death */
 
-		MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE));
+		MessageDialog* msg = manage (new MessageDialog (_("JACK exited"), false));
 		msg->set_secondary_text (string_compose (_(
 "JACK exited unexpectedly, and without notifying %1.\n\
 \n\