diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 248b4fe003..89a214fdc2 100644
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -1203,7 +1203,7 @@ Session::remove_monitor_section ()
 	}
 
 	remove_route (_monitor_out);
-	if (_state_of_the_state & Deletion) {
+	if (deletion_in_progress ()) {
 		return;
 	}
 
@@ -3740,7 +3740,7 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove)
 			}
 
 			/* speed up session deletion, don't do the solo dance */
-			if (0 == (_state_of_the_state & Deletion)) {
+			if (!deletion_in_progress ()) {
 				(*iter)->solo_control()->set_value (0.0, Controllable::NoGroup);
 			}
 
@@ -6437,7 +6437,7 @@ Session::update_route_record_state ()
 void
 Session::listen_position_changed ()
 {
-	if (loading ())  {
+	if (loading ()) {
 		/* skip duing session restore (already taken care of) */
 		return;
 	}