diff --git a/src/autoreplace_cmd.h b/src/autoreplace_cmd.h
index 463112c497..7825af6b03 100644
--- a/src/autoreplace_cmd.h
+++ b/src/autoreplace_cmd.h
@@ -18,7 +18,7 @@
 CommandCost CmdAutoreplaceVehicle(DoCommandFlags flags, VehicleID veh_id);
 CommandCost CmdSetAutoReplace(DoCommandFlags flags, GroupID id_g, EngineID old_engine_type, EngineID new_engine_type, bool when_old);
 
-template <> struct CommandTraits<CMD_AUTOREPLACE_VEHICLE> : DefaultCommandTraits<CMD_AUTOREPLACE_VEHICLE, "CmdAutoreplaceVehicle", CmdAutoreplaceVehicle, {},       CMDT_VEHICLE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_SET_AUTOREPLACE>     : DefaultCommandTraits<CMD_SET_AUTOREPLACE,     "CmdSetAutoReplace",     CmdSetAutoReplace,     {},       CMDT_VEHICLE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_AUTOREPLACE_VEHICLE> : DefaultCommandTraits<CMD_AUTOREPLACE_VEHICLE, "CmdAutoreplaceVehicle", CmdAutoreplaceVehicle, CommandFlags{}, CMDT_VEHICLE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_SET_AUTOREPLACE>     : DefaultCommandTraits<CMD_SET_AUTOREPLACE,     "CmdSetAutoReplace",     CmdSetAutoReplace,     CommandFlags{}, CMDT_VEHICLE_MANAGEMENT> {};
 
 #endif /* AUTOREPLACE_CMD_H */
diff --git a/src/company_cmd.h b/src/company_cmd.h
index 80521b5c17..fbe21a908f 100644
--- a/src/company_cmd.h
+++ b/src/company_cmd.h
@@ -27,10 +27,10 @@ CommandCost CmdSetCompanyColour(DoCommandFlags flags, LiveryScheme scheme, bool
 
 template <> struct CommandTraits<CMD_COMPANY_CTRL>             : DefaultCommandTraits<CMD_COMPANY_CTRL,             "CmdCompanyCtrl",           CmdCompanyCtrl,           CMD_SPECTATOR | CMD_CLIENT_ID | CMD_NO_EST, CMDT_SERVER_SETTING> {};
 template <> struct CommandTraits<CMD_COMPANY_ALLOW_LIST_CTRL>  : DefaultCommandTraits<CMD_COMPANY_ALLOW_LIST_CTRL,  "CmdCompanyAllowListCtrl",  CmdCompanyAllowListCtrl,  CMD_NO_EST,                                 CMDT_SERVER_SETTING> {};
-template <> struct CommandTraits<CMD_GIVE_MONEY>               : DefaultCommandTraits<CMD_GIVE_MONEY,               "CmdGiveMoney",             CmdGiveMoney,             {},                                         CMDT_MONEY_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_RENAME_COMPANY>           : DefaultCommandTraits<CMD_RENAME_COMPANY,           "CmdRenameCompany",         CmdRenameCompany,         {},                                         CMDT_COMPANY_SETTING> {};
-template <> struct CommandTraits<CMD_RENAME_PRESIDENT>         : DefaultCommandTraits<CMD_RENAME_PRESIDENT,         "CmdRenamePresident",       CmdRenamePresident,       {},                                         CMDT_COMPANY_SETTING> {};
-template <> struct CommandTraits<CMD_SET_COMPANY_MANAGER_FACE> : DefaultCommandTraits<CMD_SET_COMPANY_MANAGER_FACE, "CmdSetCompanyManagerFace", CmdSetCompanyManagerFace, {},                                         CMDT_COMPANY_SETTING> {};
-template <> struct CommandTraits<CMD_SET_COMPANY_COLOUR>       : DefaultCommandTraits<CMD_SET_COMPANY_COLOUR,       "CmdSetCompanyColour",      CmdSetCompanyColour,      {},                                         CMDT_COMPANY_SETTING> {};
+template <> struct CommandTraits<CMD_GIVE_MONEY>               : DefaultCommandTraits<CMD_GIVE_MONEY,               "CmdGiveMoney",             CmdGiveMoney,             CommandFlags{},                             CMDT_MONEY_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_RENAME_COMPANY>           : DefaultCommandTraits<CMD_RENAME_COMPANY,           "CmdRenameCompany",         CmdRenameCompany,         CommandFlags{},                             CMDT_COMPANY_SETTING> {};
+template <> struct CommandTraits<CMD_RENAME_PRESIDENT>         : DefaultCommandTraits<CMD_RENAME_PRESIDENT,         "CmdRenamePresident",       CmdRenamePresident,       CommandFlags{},                             CMDT_COMPANY_SETTING> {};
+template <> struct CommandTraits<CMD_SET_COMPANY_MANAGER_FACE> : DefaultCommandTraits<CMD_SET_COMPANY_MANAGER_FACE, "CmdSetCompanyManagerFace", CmdSetCompanyManagerFace, CommandFlags{},                             CMDT_COMPANY_SETTING> {};
+template <> struct CommandTraits<CMD_SET_COMPANY_COLOUR>       : DefaultCommandTraits<CMD_SET_COMPANY_COLOUR,       "CmdSetCompanyColour",      CmdSetCompanyColour,      CommandFlags{},                             CMDT_COMPANY_SETTING> {};
 
 #endif /* COMPANY_CMD_H */
diff --git a/src/depot_cmd.h b/src/depot_cmd.h
index a17acd97b3..0f0095377a 100644
--- a/src/depot_cmd.h
+++ b/src/depot_cmd.h
@@ -15,7 +15,7 @@
 
 CommandCost CmdRenameDepot(DoCommandFlags flags, DepotID depot_id, const std::string &text);
 
-template <> struct CommandTraits<CMD_RENAME_DEPOT> : DefaultCommandTraits<CMD_RENAME_DEPOT, "CmdRenameDepot", CmdRenameDepot, {},       CMDT_OTHER_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_RENAME_DEPOT> : DefaultCommandTraits<CMD_RENAME_DEPOT, "CmdRenameDepot", CmdRenameDepot, CommandFlags{}, CMDT_OTHER_MANAGEMENT> {};
 
 void CcCloneVehicle(Commands cmd, const CommandCost &result, VehicleID veh_id);
 
diff --git a/src/economy_cmd.h b/src/economy_cmd.h
index 53c02673e5..6ab5bccae4 100644
--- a/src/economy_cmd.h
+++ b/src/economy_cmd.h
@@ -15,6 +15,6 @@
 
 CommandCost CmdBuyCompany(DoCommandFlags flags, CompanyID target_company, bool hostile_takeover);
 
-template <> struct CommandTraits<CMD_BUY_COMPANY> : DefaultCommandTraits<CMD_BUY_COMPANY, "CmdBuyCompany", CmdBuyCompany, {},       CMDT_MONEY_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_BUY_COMPANY> : DefaultCommandTraits<CMD_BUY_COMPANY, "CmdBuyCompany", CmdBuyCompany, CommandFlags{}, CMDT_MONEY_MANAGEMENT> {};
 
 #endif /* ECONOMY_CMD_H */
diff --git a/src/engine_cmd.h b/src/engine_cmd.h
index d8a662bfb6..8a0e894f82 100644
--- a/src/engine_cmd.h
+++ b/src/engine_cmd.h
@@ -17,9 +17,9 @@ CommandCost CmdEngineCtrl(DoCommandFlags flags, EngineID engine_id, CompanyID co
 CommandCost CmdRenameEngine(DoCommandFlags flags, EngineID engine_id, const std::string &text);
 CommandCost CmdSetVehicleVisibility(DoCommandFlags flags, EngineID engine_id, bool hide);
 
-template <> struct CommandTraits<CMD_WANT_ENGINE_PREVIEW>    : DefaultCommandTraits<CMD_WANT_ENGINE_PREVIEW,    "CmdWantEnginePreview",    CmdWantEnginePreview,    {},         CMDT_VEHICLE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_WANT_ENGINE_PREVIEW>    : DefaultCommandTraits<CMD_WANT_ENGINE_PREVIEW,    "CmdWantEnginePreview",    CmdWantEnginePreview,    CommandFlags{}, CMDT_VEHICLE_MANAGEMENT> {};
 template <> struct CommandTraits<CMD_ENGINE_CTRL>            : DefaultCommandTraits<CMD_ENGINE_CTRL,            "CmdEngineCtrl",           CmdEngineCtrl,           CMD_DEITY,  CMDT_VEHICLE_MANAGEMENT> {};
 template <> struct CommandTraits<CMD_RENAME_ENGINE>          : DefaultCommandTraits<CMD_RENAME_ENGINE,          "CmdRenameEngine",         CmdRenameEngine,         CMD_SERVER, CMDT_OTHER_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_SET_VEHICLE_VISIBILITY> : DefaultCommandTraits<CMD_SET_VEHICLE_VISIBILITY, "CmdSetVehicleVisibility", CmdSetVehicleVisibility, {},         CMDT_COMPANY_SETTING> {};
+template <> struct CommandTraits<CMD_SET_VEHICLE_VISIBILITY> : DefaultCommandTraits<CMD_SET_VEHICLE_VISIBILITY, "CmdSetVehicleVisibility", CmdSetVehicleVisibility, CommandFlags{}, CMDT_COMPANY_SETTING> {};
 
 #endif /* ENGINE_CMD_H */
diff --git a/src/group_cmd.h b/src/group_cmd.h
index fd81df924a..6e251fc302 100644
--- a/src/group_cmd.h
+++ b/src/group_cmd.h
@@ -34,14 +34,14 @@ CommandCost CmdRemoveAllVehiclesGroup(DoCommandFlags flags, GroupID group_id);
 CommandCost CmdSetGroupFlag(DoCommandFlags flags, GroupID group_id, GroupFlag flag, bool value, bool recursive);
 CommandCost CmdSetGroupLivery(DoCommandFlags flags, GroupID group_id, bool primary, Colours colour);
 
-template <> struct CommandTraits<CMD_CREATE_GROUP>              : DefaultCommandTraits<CMD_CREATE_GROUP,              "CmdCreateGroup",            CmdCreateGroup,            {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_DELETE_GROUP>              : DefaultCommandTraits<CMD_DELETE_GROUP,              "CmdDeleteGroup",            CmdDeleteGroup,            {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_ALTER_GROUP>               : DefaultCommandTraits<CMD_ALTER_GROUP,               "CmdAlterGroup",             CmdAlterGroup,             {},       CMDT_OTHER_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_ADD_VEHICLE_GROUP>         : DefaultCommandTraits<CMD_ADD_VEHICLE_GROUP,         "CmdAddVehicleGroup",        CmdAddVehicleGroup,        {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_ADD_SHARED_VEHICLE_GROUP>  : DefaultCommandTraits<CMD_ADD_SHARED_VEHICLE_GROUP,  "CmdAddSharedVehicleGroup",  CmdAddSharedVehicleGroup,  {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_REMOVE_ALL_VEHICLES_GROUP> : DefaultCommandTraits<CMD_REMOVE_ALL_VEHICLES_GROUP, "CmdRemoveAllVehiclesGroup", CmdRemoveAllVehiclesGroup, {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_SET_GROUP_FLAG>            : DefaultCommandTraits<CMD_SET_GROUP_FLAG,            "CmdSetGroupFlag",           CmdSetGroupFlag,           {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_SET_GROUP_LIVERY>          : DefaultCommandTraits<CMD_SET_GROUP_LIVERY,          "CmdSetGroupLivery",         CmdSetGroupLivery,         {},       CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_CREATE_GROUP>              : DefaultCommandTraits<CMD_CREATE_GROUP,              "CmdCreateGroup",            CmdCreateGroup,            CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_DELETE_GROUP>              : DefaultCommandTraits<CMD_DELETE_GROUP,              "CmdDeleteGroup",            CmdDeleteGroup,            CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_ALTER_GROUP>               : DefaultCommandTraits<CMD_ALTER_GROUP,               "CmdAlterGroup",             CmdAlterGroup,             CommandFlags{}, CMDT_OTHER_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_ADD_VEHICLE_GROUP>         : DefaultCommandTraits<CMD_ADD_VEHICLE_GROUP,         "CmdAddVehicleGroup",        CmdAddVehicleGroup,        CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_ADD_SHARED_VEHICLE_GROUP>  : DefaultCommandTraits<CMD_ADD_SHARED_VEHICLE_GROUP,  "CmdAddSharedVehicleGroup",  CmdAddSharedVehicleGroup,  CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_REMOVE_ALL_VEHICLES_GROUP> : DefaultCommandTraits<CMD_REMOVE_ALL_VEHICLES_GROUP, "CmdRemoveAllVehiclesGroup", CmdRemoveAllVehiclesGroup, CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_SET_GROUP_FLAG>            : DefaultCommandTraits<CMD_SET_GROUP_FLAG,            "CmdSetGroupFlag",           CmdSetGroupFlag,           CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_SET_GROUP_LIVERY>          : DefaultCommandTraits<CMD_SET_GROUP_LIVERY,          "CmdSetGroupLivery",         CmdSetGroupLivery,         CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
 
 void CcCreateGroup(Commands cmd, const CommandCost &result, GroupID new_group, VehicleType vt, GroupID parent_group);
 void CcAddVehicleNewGroup(Commands cmd, const CommandCost &result, GroupID new_group, GroupID, VehicleID veh_id, bool, const VehicleListIdentifier &);
diff --git a/src/misc_cmd.h b/src/misc_cmd.h
index a29a3131b3..07930934c0 100644
--- a/src/misc_cmd.h
+++ b/src/misc_cmd.h
@@ -29,8 +29,8 @@ CommandCost CmdPause(DoCommandFlags flags, PauseMode mode, bool pause);
 
 template <> struct CommandTraits<CMD_MONEY_CHEAT>          : DefaultCommandTraits<CMD_MONEY_CHEAT,          "CmdMoneyCheat",        CmdMoneyCheat,        CMD_OFFLINE,             CMDT_CHEAT> {};
 template <> struct CommandTraits<CMD_CHANGE_BANK_BALANCE>  : DefaultCommandTraits<CMD_CHANGE_BANK_BALANCE,  "CmdChangeBankBalance", CmdChangeBankBalance, CMD_DEITY,               CMDT_MONEY_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_INCREASE_LOAN>        : DefaultCommandTraits<CMD_INCREASE_LOAN,        "CmdIncreaseLoan",      CmdIncreaseLoan,      {},                      CMDT_MONEY_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_DECREASE_LOAN>        : DefaultCommandTraits<CMD_DECREASE_LOAN,        "CmdDecreaseLoan",      CmdDecreaseLoan,      {},                      CMDT_MONEY_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_INCREASE_LOAN>        : DefaultCommandTraits<CMD_INCREASE_LOAN,        "CmdIncreaseLoan",      CmdIncreaseLoan,      CommandFlags{},          CMDT_MONEY_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_DECREASE_LOAN>        : DefaultCommandTraits<CMD_DECREASE_LOAN,        "CmdDecreaseLoan",      CmdDecreaseLoan,      CommandFlags{},          CMDT_MONEY_MANAGEMENT> {};
 template <> struct CommandTraits<CMD_SET_COMPANY_MAX_LOAN> : DefaultCommandTraits<CMD_SET_COMPANY_MAX_LOAN, "CmdSetCompanyMaxLoan", CmdSetCompanyMaxLoan, CMD_DEITY,               CMDT_MONEY_MANAGEMENT> {};
 template <> struct CommandTraits<CMD_PAUSE>                : DefaultCommandTraits<CMD_PAUSE,                "CmdPause",             CmdPause,             CMD_SERVER | CMD_NO_EST, CMDT_SERVER_SETTING> {};
 
diff --git a/src/rail_cmd.h b/src/rail_cmd.h
index f9572637f7..ecdf8f9344 100644
--- a/src/rail_cmd.h
+++ b/src/rail_cmd.h
@@ -33,7 +33,7 @@ template <> struct CommandTraits<CMD_REMOVE_SINGLE_RAIL>    : DefaultCommandTrai
 template <> struct CommandTraits<CMD_BUILD_TRAIN_DEPOT>     : DefaultCommandTraits<CMD_BUILD_TRAIN_DEPOT,     "CmdBuildTrainDepot",     CmdBuildTrainDepot,     CMD_AUTO | CMD_NO_WATER, CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_BUILD_SINGLE_SIGNAL>   : DefaultCommandTraits<CMD_BUILD_SINGLE_SIGNAL,   "CmdBuildSingleSignal",   CmdBuildSingleSignal,   CMD_AUTO,                CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_REMOVE_SINGLE_SIGNAL>  : DefaultCommandTraits<CMD_REMOVE_SINGLE_SIGNAL,  "CmdRemoveSingleSignal",  CmdRemoveSingleSignal,  CMD_AUTO,                CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_CONVERT_RAIL>          : DefaultCommandTraits<CMD_CONVERT_RAIL,          "CmdConvertRail",         CmdConvertRail,         {},                      CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_CONVERT_RAIL>          : DefaultCommandTraits<CMD_CONVERT_RAIL,          "CmdConvertRail",         CmdConvertRail,         CommandFlags{},          CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_BUILD_SIGNAL_TRACK>    : DefaultCommandTraits<CMD_BUILD_SIGNAL_TRACK,    "CmdBuildSignalTrack",    CmdBuildSignalTrack,    CMD_AUTO,                CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_REMOVE_SIGNAL_TRACK>   : DefaultCommandTraits<CMD_REMOVE_SIGNAL_TRACK,   "CmdRemoveSignalTrack",   CmdRemoveSignalTrack,   CMD_AUTO,                CMDT_LANDSCAPE_CONSTRUCTION> {};
 
diff --git a/src/road_cmd.h b/src/road_cmd.h
index c33be0808e..405e643f27 100644
--- a/src/road_cmd.h
+++ b/src/road_cmd.h
@@ -29,7 +29,7 @@ template <> struct CommandTraits<CMD_BUILD_LONG_ROAD>  : DefaultCommandTraits<CM
 template <> struct CommandTraits<CMD_REMOVE_LONG_ROAD> : DefaultCommandTraits<CMD_REMOVE_LONG_ROAD, "CmdRemoveLongRoad", CmdRemoveLongRoad, CMD_AUTO | CMD_NO_TEST,              CMDT_LANDSCAPE_CONSTRUCTION> {}; // towns may disallow removing road bits (as they are connected) in test, but in exec they're removed and thus removing is allowed.
 template <> struct CommandTraits<CMD_BUILD_ROAD>       : DefaultCommandTraits<CMD_BUILD_ROAD,       "CmdBuildRoad",      CmdBuildRoad,      CMD_AUTO | CMD_NO_WATER | CMD_DEITY, CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_BUILD_ROAD_DEPOT> : DefaultCommandTraits<CMD_BUILD_ROAD_DEPOT, "CmdBuildRoadDepot", CmdBuildRoadDepot, CMD_AUTO | CMD_NO_WATER,             CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_CONVERT_ROAD>     : DefaultCommandTraits<CMD_CONVERT_ROAD,     "CmdConvertRoad",    CmdConvertRoad,    {},                                  CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_CONVERT_ROAD>     : DefaultCommandTraits<CMD_CONVERT_ROAD,     "CmdConvertRoad",    CmdConvertRoad,    CommandFlags{},                      CMDT_LANDSCAPE_CONSTRUCTION> {};
 
 CommandCallback CcPlaySound_CONSTRUCTION_OTHER;
 CommandCallback CcBuildRoadTunnel;
diff --git a/src/station_cmd.h b/src/station_cmd.h
index e45850ec40..1f7307a13d 100644
--- a/src/station_cmd.h
+++ b/src/station_cmd.h
@@ -31,10 +31,10 @@ CommandCost CmdOpenCloseAirport(DoCommandFlags flags, StationID station_id);
 template <> struct CommandTraits<CMD_BUILD_AIRPORT>            : DefaultCommandTraits<CMD_BUILD_AIRPORT,            "CmdBuildAirport",          CmdBuildAirport,          CMD_AUTO | CMD_NO_WATER, CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_BUILD_DOCK>               : DefaultCommandTraits<CMD_BUILD_DOCK,               "CmdBuildDock",             CmdBuildDock,             CMD_AUTO,                CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_BUILD_RAIL_STATION>       : DefaultCommandTraits<CMD_BUILD_RAIL_STATION,       "CmdBuildRailStation",      CmdBuildRailStation,      CMD_AUTO | CMD_NO_WATER, CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_REMOVE_FROM_RAIL_STATION> : DefaultCommandTraits<CMD_REMOVE_FROM_RAIL_STATION, "CmdRemoveFromRailStation", CmdRemoveFromRailStation, {},                      CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_REMOVE_FROM_RAIL_STATION> : DefaultCommandTraits<CMD_REMOVE_FROM_RAIL_STATION, "CmdRemoveFromRailStation", CmdRemoveFromRailStation, CommandFlags{},          CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_BUILD_ROAD_STOP>          : DefaultCommandTraits<CMD_BUILD_ROAD_STOP,          "CmdBuildRoadStop",         CmdBuildRoadStop,         CMD_AUTO | CMD_NO_WATER, CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_REMOVE_ROAD_STOP>         : DefaultCommandTraits<CMD_REMOVE_ROAD_STOP,         "CmdRemoveRoadStop",        CmdRemoveRoadStop,        {},                      CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_RENAME_STATION>           : DefaultCommandTraits<CMD_RENAME_STATION,           "CmdRenameStation",         CmdRenameStation,         {},                      CMDT_OTHER_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_OPEN_CLOSE_AIRPORT>       : DefaultCommandTraits<CMD_OPEN_CLOSE_AIRPORT,       "CmdOpenCloseAirport",      CmdOpenCloseAirport,      {},                      CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_REMOVE_ROAD_STOP>         : DefaultCommandTraits<CMD_REMOVE_ROAD_STOP,         "CmdRemoveRoadStop",        CmdRemoveRoadStop,        CommandFlags{},          CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_RENAME_STATION>           : DefaultCommandTraits<CMD_RENAME_STATION,           "CmdRenameStation",         CmdRenameStation,         CommandFlags{},          CMDT_OTHER_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_OPEN_CLOSE_AIRPORT>       : DefaultCommandTraits<CMD_OPEN_CLOSE_AIRPORT,       "CmdOpenCloseAirport",      CmdOpenCloseAirport,      CommandFlags{},          CMDT_ROUTE_MANAGEMENT> {};
 
 #endif /* STATION_CMD_H */
diff --git a/src/timetable_cmd.h b/src/timetable_cmd.h
index fe39f96def..7a2b5a624c 100644
--- a/src/timetable_cmd.h
+++ b/src/timetable_cmd.h
@@ -19,10 +19,10 @@ CommandCost CmdSetVehicleOnTime(DoCommandFlags flags, VehicleID veh, bool apply_
 CommandCost CmdAutofillTimetable(DoCommandFlags flags, VehicleID veh, bool autofill, bool preserve_wait_time);
 CommandCost CmdSetTimetableStart(DoCommandFlags flags, VehicleID veh_id, bool timetable_all, TimerGameTick::TickCounter start_tick);
 
-template <> struct CommandTraits<CMD_CHANGE_TIMETABLE>      : DefaultCommandTraits<CMD_CHANGE_TIMETABLE,      "CmdChangeTimetable",     CmdChangeTimetable,     {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_BULK_CHANGE_TIMETABLE> : DefaultCommandTraits<CMD_BULK_CHANGE_TIMETABLE, "CmdBulkChangeTimetable", CmdBulkChangeTimetable, {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_SET_VEHICLE_ON_TIME>   : DefaultCommandTraits<CMD_SET_VEHICLE_ON_TIME,   "CmdSetVehicleOnTime",    CmdSetVehicleOnTime,    {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_AUTOFILL_TIMETABLE>    : DefaultCommandTraits<CMD_AUTOFILL_TIMETABLE,    "CmdAutofillTimetable",   CmdAutofillTimetable,   {},       CMDT_ROUTE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_SET_TIMETABLE_START>   : DefaultCommandTraits<CMD_SET_TIMETABLE_START,   "CmdSetTimetableStart",   CmdSetTimetableStart,   {},       CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_CHANGE_TIMETABLE>      : DefaultCommandTraits<CMD_CHANGE_TIMETABLE,      "CmdChangeTimetable",     CmdChangeTimetable,     CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_BULK_CHANGE_TIMETABLE> : DefaultCommandTraits<CMD_BULK_CHANGE_TIMETABLE, "CmdBulkChangeTimetable", CmdBulkChangeTimetable, CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_SET_VEHICLE_ON_TIME>   : DefaultCommandTraits<CMD_SET_VEHICLE_ON_TIME,   "CmdSetVehicleOnTime",    CmdSetVehicleOnTime,    CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_AUTOFILL_TIMETABLE>    : DefaultCommandTraits<CMD_AUTOFILL_TIMETABLE,    "CmdAutofillTimetable",   CmdAutofillTimetable,   CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_SET_TIMETABLE_START>   : DefaultCommandTraits<CMD_SET_TIMETABLE_START,   "CmdSetTimetableStart",   CmdSetTimetableStart,   CommandFlags{}, CMDT_ROUTE_MANAGEMENT> {};
 
 #endif /* TIMETABLE_CMD_H */
diff --git a/src/vehicle_cmd.h b/src/vehicle_cmd.h
index 39bc84dbdc..56e25dc725 100644
--- a/src/vehicle_cmd.h
+++ b/src/vehicle_cmd.h
@@ -32,14 +32,14 @@ CommandCost CmdDepotMassAutoReplace(DoCommandFlags flags, TileIndex tile, Vehicl
 template <> struct CommandTraits<CMD_BUILD_VEHICLE>           : DefaultCommandTraits<CMD_BUILD_VEHICLE,           "CmdBuildVehicle",         CmdBuildVehicle,         CMD_CLIENT_ID,                CMDT_VEHICLE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_SELL_VEHICLE>            : DefaultCommandTraits<CMD_SELL_VEHICLE,            "CmdSellVehicle",          CmdSellVehicle,          CMD_CLIENT_ID | CMD_LOCATION, CMDT_VEHICLE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_REFIT_VEHICLE>           : DefaultCommandTraits<CMD_REFIT_VEHICLE,           "CmdRefitVehicle",         CmdRefitVehicle,         CMD_LOCATION,                 CMDT_VEHICLE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_SEND_VEHICLE_TO_DEPOT>   : DefaultCommandTraits<CMD_SEND_VEHICLE_TO_DEPOT,   "CmdSendVehicleToDepot",   CmdSendVehicleToDepot,   {},                           CMDT_VEHICLE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_CHANGE_SERVICE_INT>      : DefaultCommandTraits<CMD_CHANGE_SERVICE_INT,      "CmdChangeServiceInt",     CmdChangeServiceInt,     {},                           CMDT_VEHICLE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_RENAME_VEHICLE>          : DefaultCommandTraits<CMD_RENAME_VEHICLE,          "CmdRenameVehicle",        CmdRenameVehicle,        {},                           CMDT_OTHER_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_SEND_VEHICLE_TO_DEPOT>   : DefaultCommandTraits<CMD_SEND_VEHICLE_TO_DEPOT,   "CmdSendVehicleToDepot",   CmdSendVehicleToDepot,   CommandFlags{},               CMDT_VEHICLE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_CHANGE_SERVICE_INT>      : DefaultCommandTraits<CMD_CHANGE_SERVICE_INT,      "CmdChangeServiceInt",     CmdChangeServiceInt,     CommandFlags{},               CMDT_VEHICLE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_RENAME_VEHICLE>          : DefaultCommandTraits<CMD_RENAME_VEHICLE,          "CmdRenameVehicle",        CmdRenameVehicle,        CommandFlags{},               CMDT_OTHER_MANAGEMENT> {};
 template <> struct CommandTraits<CMD_CLONE_VEHICLE>           : DefaultCommandTraits<CMD_CLONE_VEHICLE,           "CmdCloneVehicle",         CmdCloneVehicle,         CMD_NO_TEST,                  CMDT_VEHICLE_CONSTRUCTION> {}; // NewGRF callbacks influence building and refitting making it impossible to correctly estimate the cost
 template <> struct CommandTraits<CMD_START_STOP_VEHICLE>      : DefaultCommandTraits<CMD_START_STOP_VEHICLE,      "CmdStartStopVehicle",     CmdStartStopVehicle,     CMD_LOCATION,                 CMDT_VEHICLE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_MASS_START_STOP>         : DefaultCommandTraits<CMD_MASS_START_STOP,         "CmdMassStartStopVehicle", CmdMassStartStopVehicle, {},                           CMDT_VEHICLE_MANAGEMENT> {};
-template <> struct CommandTraits<CMD_DEPOT_SELL_ALL_VEHICLES> : DefaultCommandTraits<CMD_DEPOT_SELL_ALL_VEHICLES, "CmdDepotSellAllVehicles", CmdDepotSellAllVehicles, {},                           CMDT_VEHICLE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_DEPOT_MASS_AUTOREPLACE>  : DefaultCommandTraits<CMD_DEPOT_MASS_AUTOREPLACE,  "CmdDepotMassAutoReplace", CmdDepotMassAutoReplace, {},                           CMDT_VEHICLE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_MASS_START_STOP>         : DefaultCommandTraits<CMD_MASS_START_STOP,         "CmdMassStartStopVehicle", CmdMassStartStopVehicle, CommandFlags{},               CMDT_VEHICLE_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_DEPOT_SELL_ALL_VEHICLES> : DefaultCommandTraits<CMD_DEPOT_SELL_ALL_VEHICLES, "CmdDepotSellAllVehicles", CmdDepotSellAllVehicles, CommandFlags{},               CMDT_VEHICLE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_DEPOT_MASS_AUTOREPLACE>  : DefaultCommandTraits<CMD_DEPOT_MASS_AUTOREPLACE,  "CmdDepotMassAutoReplace", CmdDepotMassAutoReplace, CommandFlags{},               CMDT_VEHICLE_CONSTRUCTION> {};
 
 void CcBuildPrimaryVehicle(Commands cmd, const CommandCost &result, VehicleID new_veh_id, uint, uint16_t, CargoArray);
 void CcStartStopVehicle(Commands cmd, const CommandCost &result, VehicleID veh_id, bool);
diff --git a/src/waypoint_cmd.h b/src/waypoint_cmd.h
index 1ea3ad6168..3d0f240fb6 100644
--- a/src/waypoint_cmd.h
+++ b/src/waypoint_cmd.h
@@ -23,11 +23,11 @@ CommandCost CmdRemoveFromRoadWaypoint(DoCommandFlags flags, TileIndex start, Til
 CommandCost CmdBuildBuoy(DoCommandFlags flags, TileIndex tile);
 CommandCost CmdRenameWaypoint(DoCommandFlags flags, StationID waypoint_id, const std::string &text);
 
-template <> struct CommandTraits<CMD_BUILD_RAIL_WAYPOINT>       : DefaultCommandTraits<CMD_BUILD_RAIL_WAYPOINT,       "CmdBuildRailWaypoint",      CmdBuildRailWaypoint,      {},       CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_REMOVE_FROM_RAIL_WAYPOINT> : DefaultCommandTraits<CMD_REMOVE_FROM_RAIL_WAYPOINT, "CmdRemoveFromRailWaypoint", CmdRemoveFromRailWaypoint, {},       CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_BUILD_ROAD_WAYPOINT>       : DefaultCommandTraits<CMD_BUILD_ROAD_WAYPOINT,       "CmdBuildRoadWaypoint",      CmdBuildRoadWaypoint,      {},       CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_REMOVE_FROM_ROAD_WAYPOINT> : DefaultCommandTraits<CMD_REMOVE_FROM_ROAD_WAYPOINT, "CmdRemoveFromRoadWaypoint", CmdRemoveFromRoadWaypoint, {},       CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_BUILD_RAIL_WAYPOINT>       : DefaultCommandTraits<CMD_BUILD_RAIL_WAYPOINT,       "CmdBuildRailWaypoint",      CmdBuildRailWaypoint,      CommandFlags{}, CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_REMOVE_FROM_RAIL_WAYPOINT> : DefaultCommandTraits<CMD_REMOVE_FROM_RAIL_WAYPOINT, "CmdRemoveFromRailWaypoint", CmdRemoveFromRailWaypoint, CommandFlags{}, CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_BUILD_ROAD_WAYPOINT>       : DefaultCommandTraits<CMD_BUILD_ROAD_WAYPOINT,       "CmdBuildRoadWaypoint",      CmdBuildRoadWaypoint,      CommandFlags{}, CMDT_LANDSCAPE_CONSTRUCTION> {};
+template <> struct CommandTraits<CMD_REMOVE_FROM_ROAD_WAYPOINT> : DefaultCommandTraits<CMD_REMOVE_FROM_ROAD_WAYPOINT, "CmdRemoveFromRoadWaypoint", CmdRemoveFromRoadWaypoint, CommandFlags{}, CMDT_LANDSCAPE_CONSTRUCTION> {};
 template <> struct CommandTraits<CMD_BUILD_BUOY>                : DefaultCommandTraits<CMD_BUILD_BUOY,                "CmdBuildBuoy",              CmdBuildBuoy,              CMD_AUTO, CMDT_LANDSCAPE_CONSTRUCTION> {};
-template <> struct CommandTraits<CMD_RENAME_WAYPOINT>           : DefaultCommandTraits<CMD_RENAME_WAYPOINT,           "CmdRenameWaypoint",         CmdRenameWaypoint,         {},       CMDT_OTHER_MANAGEMENT> {};
+template <> struct CommandTraits<CMD_RENAME_WAYPOINT>           : DefaultCommandTraits<CMD_RENAME_WAYPOINT,           "CmdRenameWaypoint",         CmdRenameWaypoint,         CommandFlags{}, CMDT_OTHER_MANAGEMENT> {};
 
 #endif /* WAYPOINT_CMD_H */