diff --git a/src/aircraft_cmd.cpp b/src/aircraft_cmd.cpp
index 4d6683192a..ee70d15b32 100644
--- a/src/aircraft_cmd.cpp
+++ b/src/aircraft_cmd.cpp
@@ -1362,10 +1362,12 @@ static void AircraftEventHandler_InHangar(Aircraft *v, const AirportFTAClass *ap
 		return;
 	}
 
-	if (v->current_order.IsWaitTimetabled())
+	if (v->current_order.IsWaitTimetabled()) {
 		v->HandleWaiting(false);
-	if (v->current_order.IsType(OT_WAITING))
+	}
+	if (v->current_order.IsType(OT_WAITING)) {
 		return;
+	}
 
 	/* if we were sent to the depot, stay there */
 	if (v->current_order.IsType(OT_GOTO_DEPOT) && (v->vehstatus & VS_STOPPED)) {
diff --git a/src/ship_cmd.cpp b/src/ship_cmd.cpp
index a868863bf2..b14e1f2ae5 100644
--- a/src/ship_cmd.cpp
+++ b/src/ship_cmd.cpp
@@ -316,10 +316,12 @@ static bool CheckShipLeaveDepot(Ship *v)
 {
 	if (!v->IsChainInDepot()) return false;
 
-	if (v->current_order.IsWaitTimetabled())
+	if (v->current_order.IsWaitTimetabled()) {
 		v->HandleWaiting(false);
-	if (v->current_order.IsType(OT_WAITING))
+	}
+	if (v->current_order.IsType(OT_WAITING)) {
 		return true;
+	}
 
 	/* We are leaving a depot, but have to go to the exact same one; re-enter */
 	if (v->current_order.IsType(OT_GOTO_DEPOT) &&
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index f69e151ab3..984c15dc46 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -310,7 +310,9 @@ struct TimetableWindow : Window {
 				if (selected % 2 == 1) {
 					disable = order != NULL && (order->IsType(OT_CONDITIONAL) || order->IsType(OT_IMPLICIT));
 				} else {
-				  disable = order == NULL || ((!(order->IsType(OT_GOTO_STATION) || (order->IsType(OT_GOTO_DEPOT) && !(order->GetDepotActionType() & ODATFB_HALT))) || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) && !order->IsType(OT_CONDITIONAL));
+					disable = (order == NULL) ||
+							((!(order->IsType(OT_GOTO_STATION) || (order->IsType(OT_GOTO_DEPOT) && !(order->GetDepotActionType() & ODATFB_HALT))) ||
+								(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) && !order->IsType(OT_CONDITIONAL));
 				}
 			}
 			bool disable_speed = disable || selected % 2 != 1 || v->type == VEH_AIRCRAFT;
diff --git a/src/train_cmd.cpp b/src/train_cmd.cpp
index e9e8bc4089..8c4eed116c 100644
--- a/src/train_cmd.cpp
+++ b/src/train_cmd.cpp
@@ -2131,10 +2131,12 @@ static bool CheckTrainStayInDepot(Train *v)
 		return true;
 	}
 
-	if (v->current_order.IsWaitTimetabled())
+	if (v->current_order.IsWaitTimetabled()) {
 		v->HandleWaiting(false);
-	if (v->current_order.IsType(OT_WAITING))
+	}
+	if (v->current_order.IsType(OT_WAITING)) {
 		return true;
+	}
 
 	SigSegState seg_state;
 
diff --git a/src/vehicle.cpp b/src/vehicle.cpp
index 6b353d8b6a..e733652c30 100644
--- a/src/vehicle.cpp
+++ b/src/vehicle.cpp
@@ -2199,7 +2199,8 @@ void Vehicle::HandleWaiting(bool stop_waiting)
 			break;
 		}
 
-		default: return;
+		default:
+			return;
 	}
 }