diff --git a/src/ai/ai_gui.cpp b/src/ai/ai_gui.cpp
index 3568f70410..387e1dde8d 100644
--- a/src/ai/ai_gui.cpp
+++ b/src/ai/ai_gui.cpp
@@ -86,7 +86,7 @@ static WindowDesc _ai_config_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	0,
-	std::begin(_nested_ai_config_widgets), std::end(_nested_ai_config_widgets)
+	_nested_ai_config_widgets
 );
 
 /**
diff --git a/src/airport_gui.cpp b/src/airport_gui.cpp
index 83ed73ee3e..a09bc82a89 100644
--- a/src/airport_gui.cpp
+++ b/src/airport_gui.cpp
@@ -212,7 +212,7 @@ static WindowDesc _air_toolbar_desc(
 	WDP_ALIGN_TOOLBAR, "toolbar_air", 0, 0,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_air_toolbar_widgets), std::end(_nested_air_toolbar_widgets),
+	_nested_air_toolbar_widgets,
 	&BuildAirToolbarWindow::hotkeys
 );
 
@@ -621,7 +621,7 @@ static WindowDesc _build_airport_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_airport_widgets), std::end(_nested_build_airport_widgets)
+	_nested_build_airport_widgets
 );
 
 static void ShowBuildAirportPicker(Window *parent)
diff --git a/src/autoreplace_gui.cpp b/src/autoreplace_gui.cpp
index eba70f9449..065606612a 100644
--- a/src/autoreplace_gui.cpp
+++ b/src/autoreplace_gui.cpp
@@ -766,7 +766,7 @@ static WindowDesc _replace_rail_vehicle_desc(
 	WDP_AUTO, "replace_vehicle_train", 500, 140,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_replace_rail_vehicle_widgets), std::end(_nested_replace_rail_vehicle_widgets)
+	_nested_replace_rail_vehicle_widgets
 );
 
 static constexpr NWidgetPart _nested_replace_road_vehicle_widgets[] = {
@@ -824,7 +824,7 @@ static WindowDesc _replace_road_vehicle_desc(
 	WDP_AUTO, "replace_vehicle_road", 500, 140,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_replace_road_vehicle_widgets), std::end(_nested_replace_road_vehicle_widgets)
+	_nested_replace_road_vehicle_widgets
 );
 
 static constexpr NWidgetPart _nested_replace_vehicle_widgets[] = {
@@ -878,7 +878,7 @@ static WindowDesc _replace_vehicle_desc(
 	WDP_AUTO, "replace_vehicle", 456, 118,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_replace_vehicle_widgets), std::end(_nested_replace_vehicle_widgets)
+	_nested_replace_vehicle_widgets
 );
 
 /**
diff --git a/src/bootstrap_gui.cpp b/src/bootstrap_gui.cpp
index 18a3ebb7f4..a9abfb9303 100644
--- a/src/bootstrap_gui.cpp
+++ b/src/bootstrap_gui.cpp
@@ -44,7 +44,7 @@ static WindowDesc _background_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_BOOTSTRAP, WC_NONE,
 	WDF_NO_CLOSE,
-	std::begin(_background_widgets), std::end(_background_widgets)
+	_background_widgets
 );
 
 /** The background for the game. */
@@ -80,7 +80,7 @@ static WindowDesc _bootstrap_errmsg_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_BOOTSTRAP, WC_NONE,
 	WDF_MODAL | WDF_NO_CLOSE,
-	std::begin(_nested_bootstrap_errmsg_widgets), std::end(_nested_bootstrap_errmsg_widgets)
+	_nested_bootstrap_errmsg_widgets
 );
 
 /** The window for a failed bootstrap. */
@@ -137,7 +137,7 @@ static WindowDesc _bootstrap_download_status_window_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WDF_MODAL | WDF_NO_CLOSE,
-	std::begin(_nested_bootstrap_download_status_window_widgets), std::end(_nested_bootstrap_download_status_window_widgets)
+	_nested_bootstrap_download_status_window_widgets
 );
 
 
@@ -189,7 +189,7 @@ static WindowDesc _bootstrap_query_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
 	WDF_NO_CLOSE,
-	std::begin(_bootstrap_query_widgets), std::end(_bootstrap_query_widgets)
+	_bootstrap_query_widgets
 );
 
 /** The window for the query. It can't use the generic query window as that uses sprites that don't exist yet. */
diff --git a/src/bridge_gui.cpp b/src/bridge_gui.cpp
index b6decec50b..51b4107fa5 100644
--- a/src/bridge_gui.cpp
+++ b/src/bridge_gui.cpp
@@ -338,7 +338,7 @@ static WindowDesc _build_bridge_desc(
 	WDP_AUTO, "build_bridge", 200, 114,
 	WC_BUILD_BRIDGE, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_bridge_widgets), std::end(_nested_build_bridge_widgets)
+	_nested_build_bridge_widgets
 );
 
 /**
diff --git a/src/build_vehicle_gui.cpp b/src/build_vehicle_gui.cpp
index 9040a3cfd6..554472e1ff 100644
--- a/src/build_vehicle_gui.cpp
+++ b/src/build_vehicle_gui.cpp
@@ -1922,7 +1922,7 @@ static WindowDesc _build_vehicle_desc(
 	WDP_AUTO, "build_vehicle", 240, 268,
 	WC_BUILD_VEHICLE, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_vehicle_widgets), std::end(_nested_build_vehicle_widgets),
+	_nested_build_vehicle_widgets,
 	&BuildVehicleWindow::hotkeys
 );
 
diff --git a/src/cheat_gui.cpp b/src/cheat_gui.cpp
index e7fb3caa04..353f1f4cd3 100644
--- a/src/cheat_gui.cpp
+++ b/src/cheat_gui.cpp
@@ -429,7 +429,7 @@ static WindowDesc _cheats_desc(
 	WDP_AUTO, "cheats", 0, 0,
 	WC_CHEATS, WC_NONE,
 	0,
-	std::begin(_nested_cheat_widgets), std::end(_nested_cheat_widgets)
+	_nested_cheat_widgets
 );
 
 /** Open cheat window. */
diff --git a/src/company_gui.cpp b/src/company_gui.cpp
index 47d49385f4..b745d0c72d 100644
--- a/src/company_gui.cpp
+++ b/src/company_gui.cpp
@@ -535,7 +535,7 @@ static WindowDesc _company_finances_desc(
 	WDP_AUTO, "company_finances", 0, 0,
 	WC_FINANCES, WC_NONE,
 	0,
-	std::begin(_nested_company_finances_widgets), std::end(_nested_company_finances_widgets)
+	_nested_company_finances_widgets
 );
 
 /**
@@ -1082,7 +1082,7 @@ static WindowDesc _select_company_livery_desc(
 	WDP_AUTO, "company_color_scheme", 0, 0,
 	WC_COMPANY_COLOUR, WC_NONE,
 	0,
-	std::begin(_nested_select_company_livery_widgets), std::end(_nested_select_company_livery_widgets)
+	_nested_select_company_livery_widgets
 );
 
 void ShowCompanyLiveryWindow(CompanyID company, GroupID group)
@@ -1707,7 +1707,7 @@ static WindowDesc _select_company_manager_face_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_COMPANY_MANAGER_FACE, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_select_company_manager_face_widgets), std::end(_nested_select_company_manager_face_widgets)
+	_nested_select_company_manager_face_widgets
 );
 
 /**
@@ -2084,7 +2084,7 @@ static WindowDesc _company_infrastructure_desc(
 	WDP_AUTO, "company_infrastructure", 0, 0,
 	WC_COMPANY_INFRASTRUCTURE, WC_NONE,
 	0,
-	std::begin(_nested_company_infrastructure_widgets), std::end(_nested_company_infrastructure_widgets)
+	_nested_company_infrastructure_widgets
 );
 
 /**
@@ -2556,7 +2556,7 @@ static WindowDesc _company_desc(
 	WDP_AUTO, "company", 0, 0,
 	WC_COMPANY, WC_NONE,
 	0,
-	std::begin(_nested_company_widgets), std::end(_nested_company_widgets)
+	_nested_company_widgets
 );
 
 /**
@@ -2690,7 +2690,7 @@ static WindowDesc _buy_company_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUY_COMPANY, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_buy_company_widgets), std::end(_nested_buy_company_widgets)
+	_nested_buy_company_widgets
 );
 
 /**
diff --git a/src/console_gui.cpp b/src/console_gui.cpp
index 0f496dac1a..138e52477a 100644
--- a/src/console_gui.cpp
+++ b/src/console_gui.cpp
@@ -144,7 +144,7 @@ static WindowDesc _console_window_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_CONSOLE, WC_NONE,
 	0,
-	std::begin(_nested_console_window_widgets), std::end(_nested_console_window_widgets)
+	_nested_console_window_widgets
 );
 
 struct IConsoleWindow : Window
diff --git a/src/date_gui.cpp b/src/date_gui.cpp
index 2a7c568e1b..404f603971 100644
--- a/src/date_gui.cpp
+++ b/src/date_gui.cpp
@@ -200,7 +200,7 @@ static WindowDesc _set_date_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_SET_DATE, WC_NONE,
 	0,
-	std::begin(_nested_set_date_widgets), std::end(_nested_set_date_widgets)
+	_nested_set_date_widgets
 );
 
 /**
diff --git a/src/depot_gui.cpp b/src/depot_gui.cpp
index de5107cec0..413de02cf7 100644
--- a/src/depot_gui.cpp
+++ b/src/depot_gui.cpp
@@ -89,28 +89,28 @@ static WindowDesc _train_depot_desc(
 	WDP_AUTO, "depot_train", 362, 123,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	0,
-	std::begin(_nested_train_depot_widgets), std::end(_nested_train_depot_widgets)
+	_nested_train_depot_widgets
 );
 
 static WindowDesc _road_depot_desc(
 	WDP_AUTO, "depot_roadveh", 316, 97,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	0,
-	std::begin(_nested_train_depot_widgets), std::end(_nested_train_depot_widgets)
+	_nested_train_depot_widgets
 );
 
 static WindowDesc _ship_depot_desc(
 	WDP_AUTO, "depot_ship", 306, 99,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	0,
-	std::begin(_nested_train_depot_widgets), std::end(_nested_train_depot_widgets)
+	_nested_train_depot_widgets
 );
 
 static WindowDesc _aircraft_depot_desc(
 	WDP_AUTO, "depot_aircraft", 332, 99,
 	WC_VEHICLE_DEPOT, WC_NONE,
 	0,
-	std::begin(_nested_train_depot_widgets), std::end(_nested_train_depot_widgets)
+	_nested_train_depot_widgets
 );
 
 extern void DepotSortList(VehicleList *list);
diff --git a/src/dock_gui.cpp b/src/dock_gui.cpp
index 673762dd4e..ffbf5aa63e 100644
--- a/src/dock_gui.cpp
+++ b/src/dock_gui.cpp
@@ -348,7 +348,7 @@ static WindowDesc _build_docks_toolbar_desc(
 	WDP_ALIGN_TOOLBAR, "toolbar_water", 0, 0,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_docks_toolbar_widgets), std::end(_nested_build_docks_toolbar_widgets),
+	_nested_build_docks_toolbar_widgets,
 	&BuildDocksToolbarWindow::hotkeys
 );
 
@@ -392,7 +392,7 @@ static WindowDesc _build_docks_scen_toolbar_desc(
 	WDP_AUTO, "toolbar_water_scen", 0, 0,
 	WC_SCEN_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_docks_scen_toolbar_widgets), std::end(_nested_build_docks_scen_toolbar_widgets)
+	_nested_build_docks_scen_toolbar_widgets
 );
 
 /**
@@ -502,7 +502,7 @@ static WindowDesc _build_dock_station_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_dock_station_widgets), std::end(_nested_build_dock_station_widgets)
+	_nested_build_dock_station_widgets
 );
 
 static void ShowBuildDockStationPicker(Window *parent)
@@ -597,7 +597,7 @@ static WindowDesc _build_docks_depot_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_docks_depot_widgets), std::end(_nested_build_docks_depot_widgets)
+	_nested_build_docks_depot_widgets
 );
 
 
diff --git a/src/dropdown.cpp b/src/dropdown.cpp
index 3eba2fb835..fe3e90eba6 100644
--- a/src/dropdown.cpp
+++ b/src/dropdown.cpp
@@ -65,7 +65,7 @@ static WindowDesc _dropdown_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_DROPDOWN_MENU, WC_NONE,
 	WDF_NO_FOCUS,
-	std::begin(_nested_dropdown_menu_widgets), std::end(_nested_dropdown_menu_widgets)
+	_nested_dropdown_menu_widgets
 );
 
 /** Drop-down menu window */
diff --git a/src/engine_gui.cpp b/src/engine_gui.cpp
index 31e5f68fac..7145b85c50 100644
--- a/src/engine_gui.cpp
+++ b/src/engine_gui.cpp
@@ -148,7 +148,7 @@ static WindowDesc _engine_preview_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_ENGINE_PREVIEW, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_engine_preview_widgets), std::end(_nested_engine_preview_widgets)
+	_nested_engine_preview_widgets
 );
 
 
diff --git a/src/error_gui.cpp b/src/error_gui.cpp
index 982101fc50..d6877fcd4b 100644
--- a/src/error_gui.cpp
+++ b/src/error_gui.cpp
@@ -47,7 +47,7 @@ static WindowDesc _errmsg_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_ERRMSG, WC_NONE,
 	0,
-	std::begin(_nested_errmsg_widgets), std::end(_nested_errmsg_widgets)
+	_nested_errmsg_widgets
 );
 
 static constexpr NWidgetPart _nested_errmsg_face_widgets[] = {
@@ -67,7 +67,7 @@ static WindowDesc _errmsg_face_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_ERRMSG, WC_NONE,
 	0,
-	std::begin(_nested_errmsg_face_widgets), std::end(_nested_errmsg_face_widgets)
+	_nested_errmsg_face_widgets
 );
 
 /**
diff --git a/src/fios_gui.cpp b/src/fios_gui.cpp
index 2db7745c65..bea51f9851 100644
--- a/src/fios_gui.cpp
+++ b/src/fios_gui.cpp
@@ -887,7 +887,7 @@ static WindowDesc _load_dialog_desc(
 	WDP_CENTER, "load_game", 500, 294,
 	WC_SAVELOAD, WC_NONE,
 	0,
-	std::begin(_nested_load_dialog_widgets), std::end(_nested_load_dialog_widgets)
+	_nested_load_dialog_widgets
 );
 
 /** Load heightmap */
@@ -895,7 +895,7 @@ static WindowDesc _load_heightmap_dialog_desc(
 	WDP_CENTER, "load_heightmap", 257, 320,
 	WC_SAVELOAD, WC_NONE,
 	0,
-	std::begin(_nested_load_heightmap_dialog_widgets), std::end(_nested_load_heightmap_dialog_widgets)
+	_nested_load_heightmap_dialog_widgets
 );
 
 /** Save game/scenario */
@@ -903,7 +903,7 @@ static WindowDesc _save_dialog_desc(
 	WDP_CENTER, "save_game", 500, 294,
 	WC_SAVELOAD, WC_NONE,
 	0,
-	std::begin(_nested_save_dialog_widgets), std::end(_nested_save_dialog_widgets)
+	_nested_save_dialog_widgets
 );
 
 /**
diff --git a/src/framerate_gui.cpp b/src/framerate_gui.cpp
index a2c1a47049..59325d3653 100644
--- a/src/framerate_gui.cpp
+++ b/src/framerate_gui.cpp
@@ -730,7 +730,7 @@ static WindowDesc _framerate_display_desc(
 	WDP_AUTO, "framerate_display", 0, 0,
 	WC_FRAMERATE_DISPLAY, WC_NONE,
 	0,
-	std::begin(_framerate_window_widgets), std::end(_framerate_window_widgets)
+	_framerate_window_widgets
 );
 
 
@@ -1021,7 +1021,7 @@ static WindowDesc _frametime_graph_window_desc(
 	WDP_AUTO, "frametime_graph", 140, 90,
 	WC_FRAMETIME_GRAPH, WC_NONE,
 	0,
-	std::begin(_frametime_graph_window_widgets), std::end(_frametime_graph_window_widgets)
+	_frametime_graph_window_widgets
 );
 
 
diff --git a/src/game/game_gui.cpp b/src/game/game_gui.cpp
index 8f0c1dde2c..c76f1e28dd 100644
--- a/src/game/game_gui.cpp
+++ b/src/game/game_gui.cpp
@@ -78,7 +78,7 @@ static WindowDesc _gs_config_desc(
 	WDP_CENTER, "settings_gs_config", 500, 350,
 	WC_GAME_OPTIONS, WC_NONE,
 	0,
-	std::begin(_nested_gs_config_widgets), std::end(_nested_gs_config_widgets)
+	_nested_gs_config_widgets
 );
 
 /**
diff --git a/src/genworld_gui.cpp b/src/genworld_gui.cpp
index a9da133279..d698e68e67 100644
--- a/src/genworld_gui.cpp
+++ b/src/genworld_gui.cpp
@@ -1004,14 +1004,14 @@ static WindowDesc _generate_landscape_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	0,
-	std::begin(_nested_generate_landscape_widgets), std::end(_nested_generate_landscape_widgets)
+	_nested_generate_landscape_widgets
 );
 
 static WindowDesc _heightmap_load_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	0,
-	std::begin(_nested_heightmap_load_widgets), std::end(_nested_heightmap_load_widgets)
+	_nested_heightmap_load_widgets
 );
 
 static void _ShowGenerateLandscape(GenerateLandscapeWindowMode mode)
@@ -1314,7 +1314,7 @@ static WindowDesc _create_scenario_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_GENERATE_LANDSCAPE, WC_NONE,
 	0,
-	std::begin(_nested_create_scenario_widgets), std::end(_nested_create_scenario_widgets)
+	_nested_create_scenario_widgets
 );
 
 /** Show the window to create a scenario. */
@@ -1340,7 +1340,7 @@ static WindowDesc _generate_progress_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_MODAL_PROGRESS, WC_NONE,
 	0,
-	std::begin(_nested_generate_progress_widgets), std::end(_nested_generate_progress_widgets)
+	_nested_generate_progress_widgets
 );
 
 struct GenWorldStatus {
diff --git a/src/goal_gui.cpp b/src/goal_gui.cpp
index 9104abfad3..9b4573c361 100644
--- a/src/goal_gui.cpp
+++ b/src/goal_gui.cpp
@@ -306,7 +306,7 @@ static WindowDesc _goals_list_desc(
 	WDP_AUTO, "list_goals", 500, 127,
 	WC_GOALS_LIST, WC_NONE,
 	0,
-	std::begin(_nested_goals_list_widgets), std::end(_nested_goals_list_widgets)
+	_nested_goals_list_widgets
 );
 
 /**
@@ -450,25 +450,25 @@ static WindowDesc _goal_question_list_desc[] = {
 		WDP_CENTER, nullptr, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WDF_CONSTRUCTION,
-		std::begin(_nested_goal_question_widgets_question), std::end(_nested_goal_question_widgets_question),
+		_nested_goal_question_widgets_question,
 	},
 	{
 		WDP_CENTER, nullptr, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WDF_CONSTRUCTION,
-		std::begin(_nested_goal_question_widgets_info), std::end(_nested_goal_question_widgets_info),
+		_nested_goal_question_widgets_info,
 	},
 	{
 		WDP_CENTER, nullptr, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WDF_CONSTRUCTION,
-		std::begin(_nested_goal_question_widgets_warning), std::end(_nested_goal_question_widgets_warning),
+		_nested_goal_question_widgets_warning,
 	},
 	{
 		WDP_CENTER, nullptr, 0, 0,
 		WC_GOAL_QUESTION, WC_NONE,
 		WDF_CONSTRUCTION,
-		std::begin(_nested_goal_question_widgets_error), std::end(_nested_goal_question_widgets_error),
+		_nested_goal_question_widgets_error,
 	},
 };
 
diff --git a/src/graph_gui.cpp b/src/graph_gui.cpp
index 2ec9547f6e..9424144c4c 100644
--- a/src/graph_gui.cpp
+++ b/src/graph_gui.cpp
@@ -146,7 +146,7 @@ static WindowDesc _graph_legend_desc(
 	WDP_AUTO, "graph_legend", 0, 0,
 	WC_GRAPH_LEGEND, WC_NONE,
 	0,
-	std::begin(_nested_graph_legend_widgets), std::end(_nested_graph_legend_widgets)
+	_nested_graph_legend_widgets
 );
 
 static void ShowGraphLegend()
@@ -696,7 +696,7 @@ static WindowDesc _operating_profit_desc(
 	WDP_AUTO, "graph_operating_profit", 0, 0,
 	WC_OPERATING_PROFIT, WC_NONE,
 	0,
-	std::begin(_nested_operating_profit_widgets), std::end(_nested_operating_profit_widgets)
+	_nested_operating_profit_widgets
 );
 
 
@@ -755,7 +755,7 @@ static WindowDesc _income_graph_desc(
 	WDP_AUTO, "graph_income", 0, 0,
 	WC_INCOME_GRAPH, WC_NONE,
 	0,
-	std::begin(_nested_income_graph_widgets), std::end(_nested_income_graph_widgets)
+	_nested_income_graph_widgets
 );
 
 void ShowIncomeGraph()
@@ -812,7 +812,7 @@ static WindowDesc _delivered_cargo_graph_desc(
 	WDP_AUTO, "graph_delivered_cargo", 0, 0,
 	WC_DELIVERED_CARGO, WC_NONE,
 	0,
-	std::begin(_nested_delivered_cargo_graph_widgets), std::end(_nested_delivered_cargo_graph_widgets)
+	_nested_delivered_cargo_graph_widgets
 );
 
 void ShowDeliveredCargoGraph()
@@ -876,7 +876,7 @@ static WindowDesc _performance_history_desc(
 	WDP_AUTO, "graph_performance", 0, 0,
 	WC_PERFORMANCE_HISTORY, WC_NONE,
 	0,
-	std::begin(_nested_performance_history_widgets), std::end(_nested_performance_history_widgets)
+	_nested_performance_history_widgets
 );
 
 void ShowPerformanceHistoryGraph()
@@ -933,7 +933,7 @@ static WindowDesc _company_value_graph_desc(
 	WDP_AUTO, "graph_company_value", 0, 0,
 	WC_COMPANY_VALUE, WC_NONE,
 	0,
-	std::begin(_nested_company_value_graph_widgets), std::end(_nested_company_value_graph_widgets)
+	_nested_company_value_graph_widgets
 );
 
 void ShowCompanyValueGraph()
@@ -1170,7 +1170,7 @@ static WindowDesc _cargo_payment_rates_desc(
 	WDP_AUTO, "graph_cargo_payment_rates", 0, 0,
 	WC_PAYMENT_RATES, WC_NONE,
 	0,
-	std::begin(_nested_cargo_payment_rates_widgets), std::end(_nested_cargo_payment_rates_widgets)
+	_nested_cargo_payment_rates_widgets
 );
 
 
@@ -1465,7 +1465,7 @@ static WindowDesc _performance_rating_detail_desc(
 	WDP_AUTO, "league_details", 0, 0,
 	WC_PERFORMANCE_DETAIL, WC_NONE,
 	0,
-	std::begin(_nested_performance_rating_detail_widgets), std::end(_nested_performance_rating_detail_widgets)
+	_nested_performance_rating_detail_widgets
 );
 
 void ShowPerformanceRatingDetail()
diff --git a/src/group_gui.cpp b/src/group_gui.cpp
index 089a529203..12545eecd5 100644
--- a/src/group_gui.cpp
+++ b/src/group_gui.cpp
@@ -1146,14 +1146,14 @@ static WindowDesc _other_group_desc(
 	WDP_AUTO, "list_groups", 460, 246,
 	WC_INVALID, WC_NONE,
 	0,
-	std::begin(_nested_group_widgets), std::end(_nested_group_widgets)
+	_nested_group_widgets
 );
 
 static WindowDesc _train_group_desc(
 	WDP_AUTO, "list_groups_train", 525, 246,
 	WC_TRAINS_LIST, WC_NONE,
 	0,
-	std::begin(_nested_group_widgets), std::end(_nested_group_widgets)
+	_nested_group_widgets
 );
 
 /**
diff --git a/src/help_gui.cpp b/src/help_gui.cpp
index 1c6f7fb167..bcfa1bc4db 100644
--- a/src/help_gui.cpp
+++ b/src/help_gui.cpp
@@ -197,7 +197,7 @@ static WindowDesc _helpwin_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_HELPWIN, WC_NONE,
 	0,
-	std::begin(_nested_helpwin_widgets), std::end(_nested_helpwin_widgets)
+	_nested_helpwin_widgets
 );
 
 void ShowHelpWindow()
diff --git a/src/highscore_gui.cpp b/src/highscore_gui.cpp
index a8b8377463..70bf6fc5c8 100644
--- a/src/highscore_gui.cpp
+++ b/src/highscore_gui.cpp
@@ -218,14 +218,14 @@ static WindowDesc _highscore_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_HIGHSCORE, WC_NONE,
 	0,
-	std::begin(_nested_highscore_widgets), std::end(_nested_highscore_widgets)
+	_nested_highscore_widgets
 );
 
 static WindowDesc _endgame_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_ENDSCREEN, WC_NONE,
 	0,
-	std::begin(_nested_highscore_widgets), std::end(_nested_highscore_widgets)
+	_nested_highscore_widgets
 );
 
 /**
diff --git a/src/industry_gui.cpp b/src/industry_gui.cpp
index 633d0eb118..b78c4c0e95 100644
--- a/src/industry_gui.cpp
+++ b/src/industry_gui.cpp
@@ -299,7 +299,7 @@ static WindowDesc _build_industry_desc(
 	WDP_AUTO, "build_industry", 170, 212,
 	WC_BUILD_INDUSTRY, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_industry_widgets), std::end(_nested_build_industry_widgets)
+	_nested_build_industry_widgets
 );
 
 /** Build (fund or prospect) a new industry, */
@@ -1221,7 +1221,7 @@ static WindowDesc _industry_view_desc(
 	WDP_AUTO, "view_industry", 260, 120,
 	WC_INDUSTRY_VIEW, WC_NONE,
 	0,
-	std::begin(_nested_industry_view_widgets), std::end(_nested_industry_view_widgets)
+	_nested_industry_view_widgets
 );
 
 void ShowIndustryViewWindow(int industry)
@@ -1919,7 +1919,7 @@ static WindowDesc _industry_directory_desc(
 	WDP_AUTO, "list_industries", 428, 190,
 	WC_INDUSTRY_DIRECTORY, WC_NONE,
 	0,
-	std::begin(_nested_industry_directory_widgets), std::end(_nested_industry_directory_widgets),
+	_nested_industry_directory_widgets,
 	&IndustryDirectoryWindow::hotkeys
 );
 
@@ -1958,7 +1958,7 @@ static WindowDesc _industry_cargoes_desc(
 	WDP_AUTO, "industry_cargoes", 300, 210,
 	WC_INDUSTRY_CARGOES, WC_NONE,
 	0,
-	std::begin(_nested_industry_cargoes_widgets), std::end(_nested_industry_cargoes_widgets)
+	_nested_industry_cargoes_widgets
 );
 
 /** Available types of field. */
diff --git a/src/intro_gui.cpp b/src/intro_gui.cpp
index 713031e5da..59bcbe39fe 100644
--- a/src/intro_gui.cpp
+++ b/src/intro_gui.cpp
@@ -460,7 +460,7 @@ static WindowDesc _select_game_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_SELECT_GAME, WC_NONE,
 	WDF_NO_CLOSE,
-	std::begin(_nested_select_game_widgets), std::end(_nested_select_game_widgets)
+	_nested_select_game_widgets
 );
 
 void ShowSelectGameWindow()
diff --git a/src/league_gui.cpp b/src/league_gui.cpp
index 70f2314257..fb62d49375 100644
--- a/src/league_gui.cpp
+++ b/src/league_gui.cpp
@@ -204,7 +204,7 @@ static WindowDesc _performance_league_desc(
 	WDP_AUTO, "performance_league", 0, 0,
 	WC_COMPANY_LEAGUE, WC_NONE,
 	0,
-	std::begin(_nested_performance_league_widgets), std::end(_nested_performance_league_widgets)
+	_nested_performance_league_widgets
 );
 
 void ShowPerformanceLeagueTable()
@@ -439,7 +439,7 @@ static WindowDesc _script_league_desc(
 	WDP_AUTO, "script_league", 0, 0,
 	WC_COMPANY_LEAGUE, WC_NONE,
 	0,
-	std::begin(_nested_script_league_widgets), std::end(_nested_script_league_widgets)
+	_nested_script_league_widgets
 );
 
 void ShowScriptLeagueTable(LeagueTableID table)
diff --git a/src/linkgraph/linkgraph_gui.cpp b/src/linkgraph/linkgraph_gui.cpp
index f59797a812..02f2718e3c 100644
--- a/src/linkgraph/linkgraph_gui.cpp
+++ b/src/linkgraph/linkgraph_gui.cpp
@@ -540,7 +540,7 @@ static WindowDesc _linkgraph_legend_desc(
 	WDP_AUTO, "toolbar_linkgraph", 0, 0,
 	WC_LINKGRAPH_LEGEND, WC_NONE,
 	0,
-	std::begin(_nested_linkgraph_legend_widgets), std::end(_nested_linkgraph_legend_widgets)
+	_nested_linkgraph_legend_widgets
 );
 
 /**
diff --git a/src/main_gui.cpp b/src/main_gui.cpp
index 8a6b7132c9..541d951285 100644
--- a/src/main_gui.cpp
+++ b/src/main_gui.cpp
@@ -517,7 +517,7 @@ static WindowDesc _main_window_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_MAIN_WINDOW, WC_NONE,
 	WDF_NO_CLOSE,
-	std::begin(_nested_main_window_widgets), std::end(_nested_main_window_widgets),
+	_nested_main_window_widgets,
 	&MainWindow::hotkeys
 );
 
diff --git a/src/misc_gui.cpp b/src/misc_gui.cpp
index 6c53b5f499..1b3d6778c8 100644
--- a/src/misc_gui.cpp
+++ b/src/misc_gui.cpp
@@ -64,7 +64,7 @@ static WindowDesc _land_info_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_LAND_INFO, WC_NONE,
 	0,
-	std::begin(_nested_land_info_widgets), std::end(_nested_land_info_widgets)
+	_nested_land_info_widgets
 );
 
 class LandInfoWindow : public Window {
@@ -402,7 +402,7 @@ static WindowDesc _about_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	0,
-	std::begin(_nested_about_widgets), std::end(_nested_about_widgets)
+	_nested_about_widgets
 );
 
 static const std::initializer_list<const std::string_view> _credits = {
@@ -661,7 +661,7 @@ static WindowDesc _tool_tips_desc(
 	WDP_MANUAL, nullptr, 0, 0, // Coordinates and sizes are not used,
 	WC_TOOLTIPS, WC_NONE,
 	WDF_NO_FOCUS | WDF_NO_CLOSE,
-	std::begin(_nested_tooltips_widgets), std::end(_nested_tooltips_widgets)
+	_nested_tooltips_widgets
 );
 
 /** Window for displaying a tooltip. */
@@ -1064,7 +1064,7 @@ static WindowDesc _query_string_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_QUERY_STRING, WC_NONE,
 	0,
-	std::begin(_nested_query_string_widgets), std::end(_nested_query_string_widgets)
+	_nested_query_string_widgets
 );
 
 /**
@@ -1207,7 +1207,7 @@ static WindowDesc _query_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_CONFIRM_POPUP_QUERY, WC_NONE,
 	WDF_MODAL,
-	std::begin(_nested_query_widgets), std::end(_nested_query_widgets)
+	_nested_query_widgets
 );
 
 /**
diff --git a/src/music_gui.cpp b/src/music_gui.cpp
index bfac1656ef..bcad0b15f0 100644
--- a/src/music_gui.cpp
+++ b/src/music_gui.cpp
@@ -671,7 +671,7 @@ static WindowDesc _music_track_selection_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_MUSIC_TRACK_SELECTION, WC_NONE,
 	0,
-	std::begin(_nested_music_track_selection_widgets), std::end(_nested_music_track_selection_widgets)
+	_nested_music_track_selection_widgets
 );
 
 static void ShowMusicTrackSelection()
@@ -930,7 +930,7 @@ static WindowDesc _music_window_desc(
 	WDP_AUTO, "music", 0, 0,
 	WC_MUSIC_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_music_window_widgets), std::end(_nested_music_window_widgets)
+	_nested_music_window_widgets
 );
 
 void ShowMusicWindow()
diff --git a/src/network/network_chat_gui.cpp b/src/network/network_chat_gui.cpp
index c10cf969ed..92cac80a76 100644
--- a/src/network/network_chat_gui.cpp
+++ b/src/network/network_chat_gui.cpp
@@ -433,7 +433,7 @@ static WindowDesc _chat_window_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_SEND_NETWORK_MSG, WC_NONE,
 	0,
-	std::begin(_nested_chat_window_widgets), std::end(_nested_chat_window_widgets)
+	_nested_chat_window_widgets
 );
 
 
diff --git a/src/network/network_content_gui.cpp b/src/network/network_content_gui.cpp
index f20d470903..d0f8afbde5 100644
--- a/src/network/network_content_gui.cpp
+++ b/src/network/network_content_gui.cpp
@@ -98,7 +98,7 @@ static WindowDesc _network_content_download_status_window_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WDF_MODAL,
-	std::begin(_nested_network_content_download_status_window_widgets), std::end(_nested_network_content_download_status_window_widgets)
+	_nested_network_content_download_status_window_widgets
 );
 
 BaseNetworkContentDownloadStatusWindow::BaseNetworkContentDownloadStatusWindow(WindowDesc &desc) :
@@ -1116,7 +1116,7 @@ static WindowDesc _network_content_list_desc(
 	WDP_CENTER, "list_content", 630, 460,
 	WC_NETWORK_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_network_content_list_widgets), std::end(_nested_network_content_list_widgets)
+	_nested_network_content_list_widgets
 );
 
 /**
diff --git a/src/network/network_gui.cpp b/src/network/network_gui.cpp
index 13a8ae5d69..d254ba6559 100644
--- a/src/network/network_gui.cpp
+++ b/src/network/network_gui.cpp
@@ -959,7 +959,7 @@ static WindowDesc _network_game_window_desc(
 	WDP_CENTER, "list_servers", 1000, 730,
 	WC_NETWORK_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_network_game_widgets), std::end(_nested_network_game_widgets)
+	_nested_network_game_widgets
 );
 
 void ShowNetworkGameWindow()
@@ -1226,7 +1226,7 @@ static WindowDesc _network_start_server_window_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_NETWORK_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_network_start_server_window_widgets), std::end(_nested_network_start_server_window_widgets)
+	_nested_network_start_server_window_widgets
 );
 
 static void ShowNetworkStartServerWindow()
@@ -1300,7 +1300,7 @@ static WindowDesc _client_list_desc(
 	WDP_AUTO, "list_clients", 220, 300,
 	WC_CLIENT_LIST, WC_NONE,
 	0,
-	std::begin(_nested_client_list_widgets), std::end(_nested_client_list_widgets)
+	_nested_client_list_widgets
 );
 
 /**
@@ -2195,7 +2195,7 @@ static WindowDesc _network_join_status_window_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_NETWORK_STATUS_WINDOW, WC_NONE,
 	WDF_MODAL,
-	std::begin(_nested_network_join_status_window_widgets), std::end(_nested_network_join_status_window_widgets)
+	_nested_network_join_status_window_widgets
 );
 
 void ShowJoinStatusWindow()
@@ -2312,7 +2312,7 @@ static WindowDesc _network_ask_relay_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_NETWORK_ASK_RELAY, WC_NONE,
 	WDF_MODAL,
-	std::begin(_nested_network_ask_relay_widgets), std::end(_nested_network_ask_relay_widgets)
+	_nested_network_ask_relay_widgets
 );
 
 /**
@@ -2410,7 +2410,7 @@ static WindowDesc _network_ask_survey_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_NETWORK_ASK_SURVEY, WC_NONE,
 	WDF_MODAL,
-	std::begin(_nested_network_ask_survey_widgets), std::end(_nested_network_ask_survey_widgets)
+	_nested_network_ask_survey_widgets
 );
 
 /**
diff --git a/src/newgrf_debug_gui.cpp b/src/newgrf_debug_gui.cpp
index d0f16329e0..34801d9d47 100644
--- a/src/newgrf_debug_gui.cpp
+++ b/src/newgrf_debug_gui.cpp
@@ -673,14 +673,14 @@ static WindowDesc _newgrf_inspect_chain_desc(
 	WDP_AUTO, "newgrf_inspect_chain", 400, 300,
 	WC_NEWGRF_INSPECT, WC_NONE,
 	0,
-	std::begin(_nested_newgrf_inspect_chain_widgets), std::end(_nested_newgrf_inspect_chain_widgets)
+	_nested_newgrf_inspect_chain_widgets
 );
 
 static WindowDesc _newgrf_inspect_desc(
 	WDP_AUTO, "newgrf_inspect", 400, 300,
 	WC_NEWGRF_INSPECT, WC_NONE,
 	0,
-	std::begin(_nested_newgrf_inspect_widgets), std::end(_nested_newgrf_inspect_widgets)
+	_nested_newgrf_inspect_widgets
 );
 
 /**
@@ -1204,7 +1204,7 @@ static WindowDesc _sprite_aligner_desc(
 	WDP_AUTO, "sprite_aligner", 400, 300,
 	WC_SPRITE_ALIGNER, WC_NONE,
 	0,
-	std::begin(_nested_sprite_aligner_widgets), std::end(_nested_sprite_aligner_widgets)
+	_nested_sprite_aligner_widgets
 );
 
 /**
diff --git a/src/newgrf_gui.cpp b/src/newgrf_gui.cpp
index c530ed26e5..10bc174323 100644
--- a/src/newgrf_gui.cpp
+++ b/src/newgrf_gui.cpp
@@ -545,7 +545,7 @@ static WindowDesc _newgrf_parameters_desc(
 	WDP_CENTER, "settings_newgrf_config", 500, 208,
 	WC_GRF_PARAMETERS, WC_NONE,
 	0,
-	std::begin(_nested_newgrf_parameter_widgets), std::end(_nested_newgrf_parameter_widgets)
+	_nested_newgrf_parameter_widgets
 );
 
 void OpenGRFParameterWindow(bool is_baseset, GRFConfig *c, bool editable)
@@ -1940,9 +1940,9 @@ static constexpr NWidgetPart _nested_newgrf_infopanel_widgets[] = {
 /** Construct nested container widget for managing the lists and the info panel of the NewGRF GUI. */
 std::unique_ptr<NWidgetBase> NewGRFDisplay()
 {
-	std::unique_ptr<NWidgetBase> avs = MakeNWidgets(std::begin(_nested_newgrf_availables_widgets), std::end(_nested_newgrf_availables_widgets), nullptr);
-	std::unique_ptr<NWidgetBase> acs = MakeNWidgets(std::begin(_nested_newgrf_actives_widgets), std::end(_nested_newgrf_actives_widgets), nullptr);
-	std::unique_ptr<NWidgetBase> inf = MakeNWidgets(std::begin(_nested_newgrf_infopanel_widgets), std::end(_nested_newgrf_infopanel_widgets), nullptr);
+	std::unique_ptr<NWidgetBase> avs = MakeNWidgets(_nested_newgrf_availables_widgets, nullptr);
+	std::unique_ptr<NWidgetBase> acs = MakeNWidgets(_nested_newgrf_actives_widgets, nullptr);
+	std::unique_ptr<NWidgetBase> inf = MakeNWidgets(_nested_newgrf_infopanel_widgets, nullptr);
 
 	return std::make_unique<NWidgetNewGRFDisplay>(std::move(avs), std::move(acs), std::move(inf));
 }
@@ -1969,7 +1969,7 @@ static WindowDesc _newgrf_desc(
 	WDP_CENTER, "settings_newgrf", 300, 263,
 	WC_GAME_OPTIONS, WC_NONE,
 	0,
-	std::begin(_nested_newgrf_widgets), std::end(_nested_newgrf_widgets)
+	_nested_newgrf_widgets
 );
 
 /**
@@ -2053,7 +2053,7 @@ static WindowDesc _save_preset_desc(
 	WDP_CENTER, "save_preset", 140, 110,
 	WC_SAVE_PRESET, WC_GAME_OPTIONS,
 	WDF_MODAL,
-	std::begin(_nested_save_preset_widgets), std::end(_nested_save_preset_widgets)
+	_nested_save_preset_widgets
 );
 
 /** Class for the save preset window. */
@@ -2198,7 +2198,7 @@ static WindowDesc _scan_progress_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_MODAL_PROGRESS, WC_NONE,
 	0,
-	std::begin(_nested_scan_progress_widgets), std::end(_nested_scan_progress_widgets)
+	_nested_scan_progress_widgets
 );
 
 /** Window for showing the progress of NewGRF scanning. */
diff --git a/src/news_gui.cpp b/src/news_gui.cpp
index cf5550b700..172e0a1847 100644
--- a/src/news_gui.cpp
+++ b/src/news_gui.cpp
@@ -116,7 +116,7 @@ static WindowDesc _normal_news_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_normal_news_widgets), std::end(_nested_normal_news_widgets)
+	_nested_normal_news_widgets
 );
 
 /* New vehicles news items. */
@@ -143,7 +143,7 @@ static WindowDesc _vehicle_news_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_vehicle_news_widgets), std::end(_nested_vehicle_news_widgets)
+	_nested_vehicle_news_widgets
 );
 
 /* Company news items. */
@@ -171,7 +171,7 @@ static WindowDesc _company_news_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_company_news_widgets), std::end(_nested_company_news_widgets)
+	_nested_company_news_widgets
 );
 
 /* Thin news items. */
@@ -194,7 +194,7 @@ static WindowDesc _thin_news_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_thin_news_widgets), std::end(_nested_thin_news_widgets)
+	_nested_thin_news_widgets
 );
 
 /* Small news items. */
@@ -220,7 +220,7 @@ static WindowDesc _small_news_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_NEWS_WINDOW, WC_NONE,
 	0,
-	std::begin(_nested_small_news_widgets), std::end(_nested_small_news_widgets)
+	_nested_small_news_widgets
 );
 
 /**
@@ -1201,7 +1201,7 @@ static WindowDesc _message_history_desc(
 	WDP_AUTO, "list_news", 400, 140,
 	WC_MESSAGE_HISTORY, WC_NONE,
 	0,
-	std::begin(_nested_message_history), std::end(_nested_message_history)
+	_nested_message_history
 );
 
 /** Display window with news messages history */
diff --git a/src/object_gui.cpp b/src/object_gui.cpp
index 494d1445d9..8bc2e98d4c 100644
--- a/src/object_gui.cpp
+++ b/src/object_gui.cpp
@@ -401,7 +401,7 @@ static WindowDesc _build_object_desc(
 	WDP_AUTO, "build_object", 0, 0,
 	WC_BUILD_OBJECT, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_object_widgets), std::end(_nested_build_object_widgets),
+	_nested_build_object_widgets,
 	&BuildObjectWindow::hotkeys
 );
 
diff --git a/src/order_gui.cpp b/src/order_gui.cpp
index 762ab62e46..e83847811e 100644
--- a/src/order_gui.cpp
+++ b/src/order_gui.cpp
@@ -1677,7 +1677,7 @@ static WindowDesc _orders_train_desc(
 	WDP_AUTO, "view_vehicle_orders_train", 384, 100,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_orders_train_widgets), std::end(_nested_orders_train_widgets),
+	_nested_orders_train_widgets,
 	&OrdersWindow::hotkeys
 );
 
@@ -1750,7 +1750,7 @@ static WindowDesc _orders_desc(
 	WDP_AUTO, "view_vehicle_orders", 384, 100,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_orders_widgets), std::end(_nested_orders_widgets),
+	_nested_orders_widgets,
 	&OrdersWindow::hotkeys
 );
 
@@ -1777,7 +1777,7 @@ static WindowDesc _other_orders_desc(
 	WDP_AUTO, "view_vehicle_orders_competitor", 384, 86,
 	WC_VEHICLE_ORDERS, WC_VEHICLE_VIEW,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_other_orders_widgets), std::end(_nested_other_orders_widgets),
+	_nested_other_orders_widgets,
 	&OrdersWindow::hotkeys
 );
 
diff --git a/src/osk_gui.cpp b/src/osk_gui.cpp
index f3ae270576..9eb5de083a 100644
--- a/src/osk_gui.cpp
+++ b/src/osk_gui.cpp
@@ -339,7 +339,7 @@ static WindowDesc _osk_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_OSK, WC_NONE,
 	0,
-	std::begin(_nested_osk_widgets), std::end(_nested_osk_widgets)
+	_nested_osk_widgets
 );
 
 /**
diff --git a/src/picker_gui.cpp b/src/picker_gui.cpp
index 4edde5ed23..f947709cea 100644
--- a/src/picker_gui.cpp
+++ b/src/picker_gui.cpp
@@ -635,7 +635,7 @@ std::unique_ptr<NWidgetBase> MakePickerClassWidgets()
 		EndContainer(),
 	};
 
-	return MakeNWidgets(std::begin(picker_class_widgets), std::end(picker_class_widgets), nullptr);
+	return MakeNWidgets(picker_class_widgets, nullptr);
 }
 
 /** Create nested widgets for the type picker widgets. */
@@ -671,5 +671,5 @@ std::unique_ptr<NWidgetBase> MakePickerTypeWidgets()
 		EndContainer(),
 	};
 
-	return MakeNWidgets(std::begin(picker_type_widgets), std::end(picker_type_widgets), nullptr);
+	return MakeNWidgets(picker_type_widgets, nullptr);
 }
diff --git a/src/rail_gui.cpp b/src/rail_gui.cpp
index 3b0a0c928f..b6f4b45f76 100644
--- a/src/rail_gui.cpp
+++ b/src/rail_gui.cpp
@@ -901,7 +901,7 @@ static WindowDesc _build_rail_desc(
 	WDP_ALIGN_TOOLBAR, "toolbar_rail", 0, 0,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_rail_widgets), std::end(_nested_build_rail_widgets),
+	_nested_build_rail_widgets,
 	&BuildRailToolbarWindow::hotkeys
 );
 
@@ -1430,7 +1430,7 @@ static WindowDesc _station_builder_desc(
 	WDP_AUTO, "build_station_rail", 0, 0,
 	WC_BUILD_STATION, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_station_builder_widgets), std::end(_nested_station_builder_widgets),
+	_nested_station_builder_widgets,
 	&BuildRailStationWindow::hotkeys
 );
 
@@ -1686,7 +1686,7 @@ static WindowDesc _signal_builder_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUILD_SIGNAL, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_signal_builder_widgets), std::end(_nested_signal_builder_widgets)
+	_nested_signal_builder_widgets
 );
 
 /**
@@ -1767,7 +1767,7 @@ static WindowDesc _build_depot_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_depot_widgets), std::end(_nested_build_depot_widgets)
+	_nested_build_depot_widgets
 );
 
 static void ShowBuildTrainDepotPicker(Window *parent)
@@ -1878,7 +1878,7 @@ static WindowDesc _build_waypoint_desc(
 	WDP_AUTO, "build_waypoint", 0, 0,
 	WC_BUILD_WAYPOINT, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_waypoint_widgets), std::end(_nested_build_waypoint_widgets),
+	_nested_build_waypoint_widgets,
 	&BuildRailWaypointWindow::hotkeys
 );
 
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index fb546b2a18..0f57d1ea64 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -858,7 +858,7 @@ static WindowDesc _build_road_desc(
 	WDP_ALIGN_TOOLBAR, "toolbar_road", 0, 0,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_road_widgets), std::end(_nested_build_road_widgets),
+	_nested_build_road_widgets,
 	&BuildRoadToolbarWindow::road_hotkeys
 );
 
@@ -899,7 +899,7 @@ static WindowDesc _build_tramway_desc(
 	WDP_ALIGN_TOOLBAR, "toolbar_tramway", 0, 0,
 	WC_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_tramway_widgets), std::end(_nested_build_tramway_widgets),
+	_nested_build_tramway_widgets,
 	&BuildRoadToolbarWindow::tram_hotkeys
 );
 
@@ -954,7 +954,7 @@ static WindowDesc _build_road_scen_desc(
 	WDP_AUTO, "toolbar_road_scen", 0, 0,
 	WC_SCEN_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_road_scen_widgets), std::end(_nested_build_road_scen_widgets),
+	_nested_build_road_scen_widgets,
 	&BuildRoadToolbarWindow::road_hotkeys
 );
 
@@ -989,7 +989,7 @@ static WindowDesc _build_tramway_scen_desc(
 	WDP_AUTO, "toolbar_tram_scen", 0, 0,
 	WC_SCEN_BUILD_TOOLBAR, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_tramway_scen_widgets), std::end(_nested_build_tramway_scen_widgets),
+	_nested_build_tramway_scen_widgets,
 	&BuildRoadToolbarWindow::tram_hotkeys
 );
 
@@ -1086,7 +1086,7 @@ static WindowDesc _build_road_depot_desc(
 	WDP_AUTO, nullptr, 0, 0,
 	WC_BUILD_DEPOT, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_road_depot_widgets), std::end(_nested_build_road_depot_widgets)
+	_nested_build_road_depot_widgets
 );
 
 static void ShowRoadDepotPicker(Window *parent)
@@ -1464,7 +1464,7 @@ static WindowDesc _road_station_picker_desc(
 	WDP_AUTO, "build_station_road", 0, 0,
 	WC_BUS_STATION, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_road_station_picker_widgets), std::end(_nested_road_station_picker_widgets),
+	_nested_road_station_picker_widgets,
 	&BuildRoadStationWindow::road_hotkeys
 );
 
@@ -1504,7 +1504,7 @@ static WindowDesc _tram_station_picker_desc(
 	WDP_AUTO, "build_station_tram", 0, 0,
 	WC_BUS_STATION, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_tram_station_picker_widgets), std::end(_nested_tram_station_picker_widgets),
+	_nested_tram_station_picker_widgets,
 	&BuildRoadStationWindow::tram_hotkeys
 );
 
diff --git a/src/screenshot_gui.cpp b/src/screenshot_gui.cpp
index 237a0a4bfe..ae8ddd44a9 100644
--- a/src/screenshot_gui.cpp
+++ b/src/screenshot_gui.cpp
@@ -68,7 +68,7 @@ static WindowDesc _screenshot_window_desc(
 	WDP_AUTO, "take_a_screenshot", 200, 100,
 	WC_SCREENSHOT, WC_NONE,
 	0,
-	std::begin(_nested_screenshot), std::end(_nested_screenshot)
+	_nested_screenshot
 );
 
 void ShowScreenshotWindow()
diff --git a/src/script/script_gui.cpp b/src/script/script_gui.cpp
index 28ad637879..88da1556b8 100644
--- a/src/script/script_gui.cpp
+++ b/src/script/script_gui.cpp
@@ -266,7 +266,7 @@ static WindowDesc _script_list_desc(
 	WDP_CENTER, "settings_script_list", 200, 234,
 	WC_SCRIPT_LIST, WC_NONE,
 	0,
-	std::begin(_nested_script_list_widgets), std::end(_nested_script_list_widgets)
+	_nested_script_list_widgets
 );
 
 /**
@@ -611,7 +611,7 @@ static WindowDesc _script_settings_desc(
 	WDP_CENTER, "settings_script", 500, 208,
 	WC_SCRIPT_SETTINGS, WC_NONE,
 	0,
-	std::begin(_nested_script_settings_widgets), std::end(_nested_script_settings_widgets)
+	_nested_script_settings_widgets
 );
 
 /**
@@ -1293,7 +1293,7 @@ static WindowDesc _script_debug_desc(
 	WDP_AUTO, "script_debug", 600, 450,
 	WC_SCRIPT_DEBUG, WC_NONE,
 	0,
-	std::begin(_nested_script_debug_widgets), std::end(_nested_script_debug_widgets),
+	_nested_script_debug_widgets,
 	&ScriptDebugWindow::hotkeys
 );
 
diff --git a/src/settings_gui.cpp b/src/settings_gui.cpp
index 34a5bd60df..64ab66b970 100644
--- a/src/settings_gui.cpp
+++ b/src/settings_gui.cpp
@@ -203,11 +203,11 @@ public:
 		this->plugins = SocialIntegration::GetPlugins();
 
 		if (this->plugins.empty()) {
-			auto widget = MakeNWidgets(std::begin(_nested_social_plugins_none_widgets), std::end(_nested_social_plugins_none_widgets), nullptr);
+			auto widget = MakeNWidgets(_nested_social_plugins_none_widgets, nullptr);
 			this->Add(std::move(widget));
 		} else {
 			for (size_t i = 0; i < this->plugins.size(); i++) {
-				auto widget = MakeNWidgets(std::begin(_nested_social_plugins_widgets), std::end(_nested_social_plugins_widgets), nullptr);
+				auto widget = MakeNWidgets(_nested_social_plugins_widgets, nullptr);
 				this->Add(std::move(widget));
 			}
 		}
@@ -1192,7 +1192,7 @@ static WindowDesc _game_options_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_GAME_OPTIONS, WC_NONE,
 	0,
-	std::begin(_nested_game_options_widgets), std::end(_nested_game_options_widgets)
+	_nested_game_options_widgets
 );
 
 /** Open the game options window. */
@@ -2902,7 +2902,7 @@ static WindowDesc _settings_selection_desc(
 	WDP_CENTER, "settings", 510, 450,
 	WC_GAME_OPTIONS, WC_NONE,
 	0,
-	std::begin(_nested_settings_selection_widgets), std::end(_nested_settings_selection_widgets)
+	_nested_settings_selection_widgets
 );
 
 /** Open advanced settings window. */
@@ -3210,7 +3210,7 @@ static WindowDesc _cust_currency_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_CUSTOM_CURRENCY, WC_NONE,
 	0,
-	std::begin(_nested_cust_currency_widgets), std::end(_nested_cust_currency_widgets)
+	_nested_cust_currency_widgets
 );
 
 /** Open custom currency window. */
diff --git a/src/signs_gui.cpp b/src/signs_gui.cpp
index f4d7438ef3..152d3a7515 100644
--- a/src/signs_gui.cpp
+++ b/src/signs_gui.cpp
@@ -387,7 +387,7 @@ static WindowDesc _sign_list_desc(
 	WDP_AUTO, "list_signs", 358, 138,
 	WC_SIGN_LIST, WC_NONE,
 	0,
-	std::begin(_nested_sign_list_widgets), std::end(_nested_sign_list_widgets),
+	_nested_sign_list_widgets,
 	&SignListWindow::hotkeys
 );
 
@@ -553,7 +553,7 @@ static WindowDesc _query_sign_edit_desc(
 	WDP_CENTER, nullptr, 0, 0,
 	WC_QUERY_STRING, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_query_sign_edit_widgets), std::end(_nested_query_sign_edit_widgets)
+	_nested_query_sign_edit_widgets
 );
 
 /**
diff --git a/src/smallmap_gui.cpp b/src/smallmap_gui.cpp
index ca138823d6..f818bc7b72 100644
--- a/src/smallmap_gui.cpp
+++ b/src/smallmap_gui.cpp
@@ -1950,8 +1950,8 @@ static std::unique_ptr<NWidgetBase> SmallMapDisplay()
 {
 	std::unique_ptr<NWidgetBase> map_display = std::make_unique<NWidgetSmallmapDisplay>();
 
-	map_display = MakeNWidgets(std::begin(_nested_smallmap_display), std::end(_nested_smallmap_display), std::move(map_display));
-	map_display = MakeNWidgets(std::begin(_nested_smallmap_bar), std::end(_nested_smallmap_bar), std::move(map_display));
+	map_display = MakeNWidgets(_nested_smallmap_display, std::move(map_display));
+	map_display = MakeNWidgets(_nested_smallmap_bar, std::move(map_display));
 	return map_display;
 }
 
@@ -1986,7 +1986,7 @@ static WindowDesc _smallmap_desc(
 	WDP_AUTO, "smallmap", 484, 314,
 	WC_SMALLMAP, WC_NONE,
 	0,
-	std::begin(_nested_smallmap_widgets), std::end(_nested_smallmap_widgets)
+	_nested_smallmap_widgets
 );
 
 /**
diff --git a/src/station_gui.cpp b/src/station_gui.cpp
index ecf33815ac..c719dbfbb6 100644
--- a/src/station_gui.cpp
+++ b/src/station_gui.cpp
@@ -769,7 +769,7 @@ static WindowDesc _company_stations_desc(
 	WDP_AUTO, "list_stations", 358, 162,
 	WC_STATION_LIST, WC_NONE,
 	0,
-	std::begin(_nested_company_stations_widgets), std::end(_nested_company_stations_widgets)
+	_nested_company_stations_widgets
 );
 
 /**
@@ -2133,7 +2133,7 @@ static WindowDesc _station_view_desc(
 	WDP_AUTO, "view_station", 249, 117,
 	WC_STATION_VIEW, WC_NONE,
 	0,
-	std::begin(_nested_station_view_widgets), std::end(_nested_station_view_widgets)
+	_nested_station_view_widgets
 );
 
 /**
@@ -2391,7 +2391,7 @@ static WindowDesc _select_station_desc(
 	WDP_AUTO, "build_station_join", 200, 180,
 	WC_SELECT_STATION, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_select_station_widgets), std::end(_nested_select_station_widgets)
+	_nested_select_station_widgets
 );
 
 
diff --git a/src/statusbar_gui.cpp b/src/statusbar_gui.cpp
index f7ed7b2a68..d15b9222e9 100644
--- a/src/statusbar_gui.cpp
+++ b/src/statusbar_gui.cpp
@@ -232,7 +232,7 @@ static WindowDesc _main_status_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_STATUS_BAR, WC_NONE,
 	WDF_NO_FOCUS | WDF_NO_CLOSE,
-	std::begin(_nested_main_status_widgets), std::end(_nested_main_status_widgets)
+	_nested_main_status_widgets
 );
 
 /**
diff --git a/src/story_gui.cpp b/src/story_gui.cpp
index c50caedf37..fe9d928eb2 100644
--- a/src/story_gui.cpp
+++ b/src/story_gui.cpp
@@ -970,14 +970,14 @@ static WindowDesc _story_book_desc(
 	WDP_AUTO, "view_story", 400, 300,
 	WC_STORY_BOOK, WC_NONE,
 	0,
-	std::begin(_nested_story_book_widgets), std::end(_nested_story_book_widgets)
+	_nested_story_book_widgets
 );
 
 static WindowDesc _story_book_gs_desc(
 	WDP_CENTER, "view_story_gs", 400, 300,
 	WC_STORY_BOOK, WC_NONE,
 	0,
-	std::begin(_nested_story_book_widgets), std::end(_nested_story_book_widgets)
+	_nested_story_book_widgets
 );
 
 static CursorID TranslateStoryPageButtonCursor(StoryPageButtonCursor cursor)
diff --git a/src/subsidy_gui.cpp b/src/subsidy_gui.cpp
index df24ba84d9..a7975f84bd 100644
--- a/src/subsidy_gui.cpp
+++ b/src/subsidy_gui.cpp
@@ -271,7 +271,7 @@ static WindowDesc _subsidies_list_desc(
 	WDP_AUTO, "list_subsidies", 500, 127,
 	WC_SUBSIDIES_LIST, WC_NONE,
 	0,
-	std::begin(_nested_subsidies_list_widgets), std::end(_nested_subsidies_list_widgets)
+	_nested_subsidies_list_widgets
 );
 
 
diff --git a/src/terraform_gui.cpp b/src/terraform_gui.cpp
index f9859efd37..3958a4457c 100644
--- a/src/terraform_gui.cpp
+++ b/src/terraform_gui.cpp
@@ -356,7 +356,7 @@ static WindowDesc _terraform_desc(
 	WDP_MANUAL, "toolbar_landscape", 0, 0,
 	WC_SCEN_LAND_GEN, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_terraform_widgets), std::end(_nested_terraform_widgets),
+	_nested_terraform_widgets,
 	&TerraformToolbarWindow::hotkeys
 );
 
@@ -740,7 +740,7 @@ static WindowDesc _scen_edit_land_gen_desc(
 	WDP_AUTO, "toolbar_landscape_scen", 0, 0,
 	WC_SCEN_LAND_GEN, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_scen_edit_land_gen_widgets), std::end(_nested_scen_edit_land_gen_widgets),
+	_nested_scen_edit_land_gen_widgets,
 	&ScenarioEditorLandscapeGenerationWindow::hotkeys
 );
 
diff --git a/src/tests/test_window_desc.cpp b/src/tests/test_window_desc.cpp
index 85d2f6ebd8..0f4305c69a 100644
--- a/src/tests/test_window_desc.cpp
+++ b/src/tests/test_window_desc.cpp
@@ -48,7 +48,7 @@ TEST_CASE("WindowDesc - ini_key validity")
 	const WindowDesc *window_desc = GENERATE(from_range(std::begin(*_window_descs), std::end(*_window_descs)));
 
 	bool has_inikey = window_desc->ini_key != nullptr;
-	bool has_widget = std::any_of(window_desc->nwid_begin, window_desc->nwid_end, [](const NWidgetPart &part) { return part.type == WWT_DEFSIZEBOX || part.type == WWT_STICKYBOX; });
+	bool has_widget = std::any_of(std::begin(window_desc->nwid_parts), std::end(window_desc->nwid_parts), [](const NWidgetPart &part) { return part.type == WWT_DEFSIZEBOX || part.type == WWT_STICKYBOX; });
 
 	INFO(fmt::format("{}:{}", window_desc->source_location.file_name(), window_desc->source_location.line()));
 	CAPTURE(has_inikey);
@@ -60,16 +60,15 @@ TEST_CASE("WindowDesc - ini_key validity")
 /**
  * Test if a NWidgetTree is properly closed, meaning the number of container-type parts matches the number of
  * EndContainer() parts.
- * @param nwid_begin Pointer to beginning of nested widget parts.
- * @param nwid_end Pointer to ending of nested widget parts.
+ * @param nwid_parts Span of nested widget parts.
  * @return True iff nested tree is properly closed.
  */
-static bool IsNWidgetTreeClosed(const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end)
+static bool IsNWidgetTreeClosed(std::span<const NWidgetPart> nwid_parts)
 {
 	int depth = 0;
-	for (; nwid_begin < nwid_end; ++nwid_begin) {
-		if (IsContainerWidgetType(nwid_begin->type)) ++depth;
-		if (nwid_begin->type == WPT_ENDCONTAINER) --depth;
+	for (const auto nwid : nwid_parts) {
+		if (IsContainerWidgetType(nwid.type)) ++depth;
+		if (nwid.type == WPT_ENDCONTAINER) --depth;
 	}
 	return depth == 0;
 }
@@ -80,7 +79,7 @@ TEST_CASE("WindowDesc - NWidgetParts properly closed")
 
 	INFO(fmt::format("{}:{}", window_desc->source_location.file_name(), window_desc->source_location.line()));
 
-	CHECK(IsNWidgetTreeClosed(window_desc->nwid_begin, window_desc->nwid_end));
+	CHECK(IsNWidgetTreeClosed(window_desc->nwid_parts));
 }
 
 TEST_CASE_METHOD(WindowDescTestsFixture, "WindowDesc - NWidgetPart validity")
@@ -92,6 +91,6 @@ TEST_CASE_METHOD(WindowDescTestsFixture, "WindowDesc - NWidgetPart validity")
 	NWidgetStacked *shade_select = nullptr;
 	std::unique_ptr<NWidgetBase> root = nullptr;
 
-	REQUIRE_NOTHROW(root = MakeWindowNWidgetTree(window_desc->nwid_begin, window_desc->nwid_end, &shade_select));
+	REQUIRE_NOTHROW(root = MakeWindowNWidgetTree(window_desc->nwid_parts, &shade_select));
 	CHECK((root != nullptr));
 }
diff --git a/src/textfile_gui.cpp b/src/textfile_gui.cpp
index 9cfe0220fa..d827578dc8 100644
--- a/src/textfile_gui.cpp
+++ b/src/textfile_gui.cpp
@@ -79,7 +79,7 @@ static WindowDesc _textfile_desc(
 	WDP_CENTER, "textfile", 630, 460,
 	WC_TEXTFILE, WC_NONE,
 	0,
-	std::begin(_nested_textfile_widgets), std::end(_nested_textfile_widgets)
+	_nested_textfile_widgets
 );
 
 TextfileWindow::TextfileWindow(TextfileType file_type) : Window(_textfile_desc), file_type(file_type)
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp
index 7591e7da20..7f89bc60c0 100644
--- a/src/timetable_gui.cpp
+++ b/src/timetable_gui.cpp
@@ -856,7 +856,7 @@ static WindowDesc _timetable_desc(
 	WDP_AUTO, "view_vehicle_timetable", 400, 130,
 	WC_VEHICLE_TIMETABLE, WC_VEHICLE_VIEW,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_timetable_widgets), std::end(_nested_timetable_widgets)
+	_nested_timetable_widgets
 );
 
 /**
diff --git a/src/toolbar_gui.cpp b/src/toolbar_gui.cpp
index 3c06ca1a9e..896b495bd8 100644
--- a/src/toolbar_gui.cpp
+++ b/src/toolbar_gui.cpp
@@ -2210,7 +2210,7 @@ static WindowDesc _toolb_normal_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_MAIN_TOOLBAR, WC_NONE,
 	WDF_NO_FOCUS | WDF_NO_CLOSE,
-	std::begin(_nested_toolbar_normal_widgets), std::end(_nested_toolbar_normal_widgets),
+	_nested_toolbar_normal_widgets,
 	&MainToolbarWindow::hotkeys
 );
 
@@ -2539,7 +2539,7 @@ static constexpr NWidgetPart _nested_toolb_scen_inner_widgets[] = {
 
 static std::unique_ptr<NWidgetBase> MakeScenarioToolbar()
 {
-	return MakeNWidgets(std::begin(_nested_toolb_scen_inner_widgets), std::end(_nested_toolb_scen_inner_widgets), std::make_unique<NWidgetScenarioToolbarContainer>());
+	return MakeNWidgets(_nested_toolb_scen_inner_widgets, std::make_unique<NWidgetScenarioToolbarContainer>());
 }
 
 static constexpr NWidgetPart _nested_toolb_scen_widgets[] = {
@@ -2550,7 +2550,7 @@ static WindowDesc _toolb_scen_desc(
 	WDP_MANUAL, nullptr, 0, 0,
 	WC_MAIN_TOOLBAR, WC_NONE,
 	WDF_NO_FOCUS | WDF_NO_CLOSE,
-	std::begin(_nested_toolb_scen_widgets), std::end(_nested_toolb_scen_widgets),
+	_nested_toolb_scen_widgets,
 	&ScenarioEditorToolbarWindow::hotkeys
 );
 
diff --git a/src/town_gui.cpp b/src/town_gui.cpp
index 27c10d220f..b46b7fc9cb 100644
--- a/src/town_gui.cpp
+++ b/src/town_gui.cpp
@@ -346,7 +346,7 @@ static WindowDesc _town_authority_desc(
 	WDP_AUTO, "view_town_authority", 317, 222,
 	WC_TOWN_AUTHORITY, WC_NONE,
 	0,
-	std::begin(_nested_town_authority_widgets), std::end(_nested_town_authority_widgets)
+	_nested_town_authority_widgets
 );
 
 static void ShowTownAuthorityWindow(uint town)
@@ -640,7 +640,7 @@ static WindowDesc _town_game_view_desc(
 	WDP_AUTO, "view_town", 260, TownViewWindow::WID_TV_HEIGHT_NORMAL,
 	WC_TOWN_VIEW, WC_NONE,
 	0,
-	std::begin(_nested_town_game_view_widgets), std::end(_nested_town_game_view_widgets)
+	_nested_town_game_view_widgets
 );
 
 static constexpr NWidgetPart _nested_town_editor_view_widgets[] = {
@@ -671,7 +671,7 @@ static WindowDesc _town_editor_view_desc(
 	WDP_AUTO, "view_town_scen", 260, TownViewWindow::WID_TV_HEIGHT_NORMAL,
 	WC_TOWN_VIEW, WC_NONE,
 	0,
-	std::begin(_nested_town_editor_view_widgets), std::end(_nested_town_editor_view_widgets)
+	_nested_town_editor_view_widgets
 );
 
 void ShowTownViewWindow(TownID town)
@@ -1060,7 +1060,7 @@ static WindowDesc _town_directory_desc(
 	WDP_AUTO, "list_towns", 208, 202,
 	WC_TOWN_DIRECTORY, WC_NONE,
 	0,
-	std::begin(_nested_town_directory_widgets), std::end(_nested_town_directory_widgets),
+	_nested_town_directory_widgets,
 	&TownDirectoryWindow::hotkeys
 );
 
@@ -1294,7 +1294,7 @@ static WindowDesc _found_town_desc(
 	WDP_AUTO, "build_town", 160, 162,
 	WC_FOUND_TOWN, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_found_town_widgets), std::end(_nested_found_town_widgets)
+	_nested_found_town_widgets
 );
 
 void ShowFoundTownWindow()
@@ -1632,7 +1632,7 @@ static WindowDesc _build_house_desc(
 	WDP_AUTO, "build_house", 0, 0,
 	WC_BUILD_HOUSE, WC_BUILD_TOOLBAR,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_house_widgets), std::end(_nested_build_house_widgets),
+	_nested_build_house_widgets,
 	&BuildHouseWindow::hotkeys
 );
 
diff --git a/src/transparency_gui.cpp b/src/transparency_gui.cpp
index 0648f1e4c8..b1758d33ae 100644
--- a/src/transparency_gui.cpp
+++ b/src/transparency_gui.cpp
@@ -152,7 +152,7 @@ static WindowDesc _transparency_desc(
 	WDP_MANUAL, "toolbar_transparency", 0, 0,
 	WC_TRANSPARENCY_TOOLBAR, WC_NONE,
 	0,
-	std::begin(_nested_transparency_widgets), std::end(_nested_transparency_widgets)
+	_nested_transparency_widgets
 );
 
 /**
diff --git a/src/tree_gui.cpp b/src/tree_gui.cpp
index 5288b2c96b..4f683ee9ea 100644
--- a/src/tree_gui.cpp
+++ b/src/tree_gui.cpp
@@ -314,7 +314,7 @@ static WindowDesc _build_trees_desc(
 	WDP_AUTO, "build_tree", 0, 0,
 	WC_BUILD_TREES, WC_NONE,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_build_trees_widgets), std::end(_nested_build_trees_widgets)
+	_nested_build_trees_widgets
 );
 
 void ShowBuildTreesToolbar()
diff --git a/src/vehicle_gui.cpp b/src/vehicle_gui.cpp
index dcfd4a80e5..a2714f9fd6 100644
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -1280,7 +1280,7 @@ static WindowDesc _vehicle_refit_desc(
 	WDP_AUTO, "view_vehicle_refit", 240, 174,
 	WC_VEHICLE_REFIT, WC_VEHICLE_VIEW,
 	WDF_CONSTRUCTION,
-	std::begin(_nested_vehicle_refit_widgets), std::end(_nested_vehicle_refit_widgets)
+	_nested_vehicle_refit_widgets
 );
 
 /**
@@ -2220,14 +2220,14 @@ static WindowDesc _vehicle_list_other_desc(
 	WDP_AUTO, "list_vehicles", 260, 246,
 	WC_INVALID, WC_NONE,
 	0,
-	std::begin(_nested_vehicle_list), std::end(_nested_vehicle_list)
+	_nested_vehicle_list
 );
 
 static WindowDesc _vehicle_list_train_desc(
 	WDP_AUTO, "list_vehicles_train", 325, 246,
 	WC_TRAINS_LIST, WC_NONE,
 	0,
-	std::begin(_nested_vehicle_list), std::end(_nested_vehicle_list)
+	_nested_vehicle_list
 );
 
 static void ShowVehicleListWindowLocal(CompanyID company, VehicleListType vlt, VehicleType vehicle_type, uint32_t unique_number)
@@ -2779,7 +2779,7 @@ static WindowDesc _train_vehicle_details_desc(
 	WDP_AUTO, "view_vehicle_details_train", 405, 178,
 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
 	0,
-	std::begin(_nested_train_vehicle_details_widgets), std::end(_nested_train_vehicle_details_widgets)
+	_nested_train_vehicle_details_widgets
 );
 
 /** Vehicle details window descriptor for other vehicles than a train. */
@@ -2787,7 +2787,7 @@ static WindowDesc _nontrain_vehicle_details_desc(
 	WDP_AUTO, "view_vehicle_details", 405, 113,
 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
 	0,
-	std::begin(_nested_nontrain_vehicle_details_widgets), std::end(_nested_nontrain_vehicle_details_widgets)
+	_nested_nontrain_vehicle_details_widgets
 );
 
 /** Shows the vehicle details window of the given vehicle. */
@@ -3386,7 +3386,7 @@ static WindowDesc _vehicle_view_desc(
 	WDP_AUTO, "view_vehicle", 250, 116,
 	WC_VEHICLE_VIEW, WC_NONE,
 	0,
-	std::begin(_nested_vehicle_view_widgets), std::end(_nested_vehicle_view_widgets),
+	_nested_vehicle_view_widgets,
 	&VehicleViewWindow::hotkeys
 );
 
@@ -3398,7 +3398,7 @@ static WindowDesc _train_view_desc(
 	WDP_AUTO, "view_vehicle_train", 250, 134,
 	WC_VEHICLE_VIEW, WC_NONE,
 	0,
-	std::begin(_nested_vehicle_view_widgets), std::end(_nested_vehicle_view_widgets),
+	_nested_vehicle_view_widgets,
 	&VehicleViewWindow::hotkeys
 );
 
diff --git a/src/viewport_gui.cpp b/src/viewport_gui.cpp
index f20c10f303..4f8e550c83 100644
--- a/src/viewport_gui.cpp
+++ b/src/viewport_gui.cpp
@@ -146,7 +146,7 @@ static WindowDesc _extra_viewport_desc(
 	WDP_AUTO, "extra_viewport", 300, 268,
 	WC_EXTRA_VIEWPORT, WC_NONE,
 	0,
-	std::begin(_nested_extra_viewport_widgets), std::end(_nested_extra_viewport_widgets)
+	_nested_extra_viewport_widgets
 );
 
 /**
diff --git a/src/waypoint_gui.cpp b/src/waypoint_gui.cpp
index 985718849c..0cc5981b27 100644
--- a/src/waypoint_gui.cpp
+++ b/src/waypoint_gui.cpp
@@ -187,7 +187,7 @@ static WindowDesc _waypoint_view_desc(
 	WDP_AUTO, "view_waypoint", 260, 118,
 	WC_WAYPOINT_VIEW, WC_NONE,
 	0,
-	std::begin(_nested_waypoint_view_widgets), std::end(_nested_waypoint_view_widgets)
+	_nested_waypoint_view_widgets
 );
 
 /**
diff --git a/src/widget.cpp b/src/widget.cpp
index 46353c8f72..97bf9b57bb 100644
--- a/src/widget.cpp
+++ b/src/widget.cpp
@@ -2963,13 +2963,13 @@ bool NWidgetLeaf::ButtonHit(const Point &pt)
  * settings that follow it, until encountering a #EndContainer, another
  * #NWidget, or the end of the parts array.
  *
- * @param nwid_begin Pointer to beginning of nested widget parts.
- * @param nwid_end Pointer to ending of nested widget parts.
+ * @param nwid_begin Iterator to beginning of nested widget parts.
+ * @param nwid_end Iterator to ending of nested widget parts.
  * @param dest  Address of pointer to use for returning the composed widget.
  * @param fill_dest Fill the composed widget with child widgets.
- * @return Pointer to remaining nested widget parts.
+ * @return Iterator to remaining nested widget parts.
  */
-static const NWidgetPart *MakeNWidget(const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, std::unique_ptr<NWidgetBase> &dest, bool *fill_dest)
+static std::span<const NWidgetPart>::iterator MakeNWidget(std::span<const NWidgetPart>::iterator nwid_begin, std::span<const NWidgetPart>::iterator nwid_end, std::unique_ptr<NWidgetBase> &dest, bool *fill_dest)
 {
 	dest = nullptr;
 	*fill_dest = false;
@@ -3161,12 +3161,12 @@ bool IsContainerWidgetType(WidgetType tp)
 
 /**
  * Build a nested widget tree by recursively filling containers with nested widgets read from their parts.
- * @param nwid_begin Pointer to beginning of nested widget parts.
- * @param nwid_end Pointer to ending of nested widget parts.
+ * @param nwid_begin Iterator to beginning of nested widget parts.
+ * @param nwid_end Iterator to ending of nested widget parts.
  * @param parent Pointer or container to use for storing the child widgets (*parent == nullptr or *parent == container or background widget).
- * @return Pointer to remaining nested widget parts.
+ * @return Iterator to remaining nested widget parts.
  */
-static const NWidgetPart *MakeWidgetTree(const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, std::unique_ptr<NWidgetBase> &parent)
+static std::span<const NWidgetPart>::iterator MakeWidgetTree(std::span<const NWidgetPart>::iterator nwid_begin, std::span<const NWidgetPart>::iterator nwid_end, std::unique_ptr<NWidgetBase> &parent)
 {
 	/* If *parent == nullptr, only the first widget is read and returned. Otherwise, *parent must point to either
 	 * a #NWidgetContainer or a #NWidgetBackground object, and parts are added as much as possible. */
@@ -3200,23 +3200,22 @@ static const NWidgetPart *MakeWidgetTree(const NWidgetPart *nwid_begin, const NW
 
 	assert(nwid_begin < nwid_end);
 	assert(nwid_begin->type == WPT_ENDCONTAINER);
-	return nwid_begin + 1; // *nwid_begin is also 'used'
+	return std::next(nwid_begin); // *nwid_begin is also 'used'
 }
 
 /**
  * Construct a nested widget tree from an array of parts.
- * @param nwid_begin Pointer to beginning of nested widget parts.
- * @param nwid_end Pointer to ending of nested widget parts.
+ * @param nwid_parts Span of nested widget parts.
  * @param container Container to add the nested widgets to. In case it is nullptr a vertical container is used.
  * @return Root of the nested widget tree, a vertical container containing the entire GUI.
  * @ingroup NestedWidgetParts
  */
-std::unique_ptr<NWidgetBase> MakeNWidgets(const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, std::unique_ptr<NWidgetBase> &&container)
+std::unique_ptr<NWidgetBase> MakeNWidgets(std::span<const NWidgetPart> nwid_parts, std::unique_ptr<NWidgetBase> &&container)
 {
 	if (container == nullptr) container = std::make_unique<NWidgetVertical>();
-	[[maybe_unused]] const NWidgetPart *nwid_part = MakeWidgetTree(nwid_begin, nwid_end, container);
+	[[maybe_unused]] auto nwid_part = MakeWidgetTree(std::begin(nwid_parts), std::end(nwid_parts), container);
 #ifdef WITH_ASSERT
-	if (nwid_part != nwid_end) [[unlikely]] throw std::runtime_error("Did not consume all NWidgetParts");
+	if (nwid_part != std::end(nwid_parts)) [[unlikely]] throw std::runtime_error("Did not consume all NWidgetParts");
 #endif
 	return std::move(container);
 }
@@ -3225,14 +3224,16 @@ std::unique_ptr<NWidgetBase> MakeNWidgets(const NWidgetPart *nwid_begin, const N
  * Make a nested widget tree for a window from a parts array. Besides loading, it inserts a shading selection widget
  * between the title bar and the window body if the first widget in the parts array looks like a title bar (it is a horizontal
  * container with a caption widget) and has a shade box widget.
- * @param nwid_begin Pointer to beginning of nested widget parts.
- * @param nwid_end Pointer to ending of nested widget parts.
+ * @param nwid_parts Span of nested widget parts.
  * @param[out] shade_select Pointer to the inserted shade selection widget (\c nullptr if not unserted).
  * @return Root of the nested widget tree, a vertical container containing the entire GUI.
  * @ingroup NestedWidgetParts
  */
-std::unique_ptr<NWidgetBase> MakeWindowNWidgetTree(const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, NWidgetStacked **shade_select)
+std::unique_ptr<NWidgetBase> MakeWindowNWidgetTree(std::span<const NWidgetPart> nwid_parts, NWidgetStacked **shade_select)
 {
+	auto nwid_begin = std::begin(nwid_parts);
+	auto nwid_end = std::end(nwid_parts);
+
 	*shade_select = nullptr;
 
 	/* Read the first widget recursively from the array. */
@@ -3251,13 +3252,13 @@ std::unique_ptr<NWidgetBase> MakeWindowNWidgetTree(const NWidgetPart *nwid_begin
 		auto shade_stack = std::make_unique<NWidgetStacked>(-1);
 		*shade_select = shade_stack.get();
 		/* Load the remaining parts into the shade stack. */
-		shade_stack->Add(MakeNWidgets(nwid_begin, nwid_end, std::make_unique<NWidgetVertical>()));
+		shade_stack->Add(MakeNWidgets({nwid_begin, nwid_end}, std::make_unique<NWidgetVertical>()));
 		root->Add(std::move(shade_stack));
 		return root;
 	}
 
 	/* Load the remaining parts into 'root'. */
-	return MakeNWidgets(nwid_begin, nwid_end, std::move(root));
+	return MakeNWidgets({nwid_begin, nwid_end}, std::move(root));
 }
 
 /**
diff --git a/src/widget_type.h b/src/widget_type.h
index 8655dd2d1d..76dcd890c4 100644
--- a/src/widget_type.h
+++ b/src/widget_type.h
@@ -1332,8 +1332,8 @@ constexpr NWidgetPart NWidgetFunction(NWidgetFunctionType *func_ptr)
 }
 
 bool IsContainerWidgetType(WidgetType tp);
-std::unique_ptr<NWidgetBase> MakeNWidgets(const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, std::unique_ptr<NWidgetBase> &&container);
-std::unique_ptr<NWidgetBase> MakeWindowNWidgetTree(const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, NWidgetStacked **shade_select);
+std::unique_ptr<NWidgetBase> MakeNWidgets(std::span<const NWidgetPart> nwid_parts, std::unique_ptr<NWidgetBase> &&container);
+std::unique_ptr<NWidgetBase> MakeWindowNWidgetTree(std::span<const NWidgetPart> nwid_parts, NWidgetStacked **shade_select);
 
 std::unique_ptr<NWidgetBase> MakeCompanyButtonRows(WidgetID widget_first, WidgetID widget_last, Colours button_colour, int max_length, StringID button_tooltip, bool resizable = true);
 
diff --git a/src/window.cpp b/src/window.cpp
index 012bab7537..3513b9c33a 100644
--- a/src/window.cpp
+++ b/src/window.cpp
@@ -104,7 +104,7 @@ std::string _windows_file;
 /** Window description constructor. */
 WindowDesc::WindowDesc(WindowPosition def_pos, const char *ini_key, int16_t def_width_trad, int16_t def_height_trad,
 			WindowClass window_class, WindowClass parent_class, uint32_t flags,
-			const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, HotkeyList *hotkeys,
+			const std::span<const NWidgetPart> nwid_parts, HotkeyList *hotkeys,
 			const std::source_location location) :
 	source_location(location),
 	default_pos(def_pos),
@@ -112,8 +112,7 @@ WindowDesc::WindowDesc(WindowPosition def_pos, const char *ini_key, int16_t def_
 	parent_cls(parent_class),
 	ini_key(ini_key),
 	flags(flags),
-	nwid_begin(nwid_begin),
-	nwid_end(nwid_end),
+	nwid_parts(nwid_parts),
 	hotkeys(hotkeys),
 	pref_sticky(false),
 	pref_width(0),
@@ -1723,7 +1722,7 @@ static Point LocalGetWindowPlacement(const WindowDesc &desc, int16_t sm_width, i
  */
 void Window::CreateNestedTree()
 {
-	this->nested_root = MakeWindowNWidgetTree(this->window_desc.nwid_begin, this->window_desc.nwid_end, &this->shade_select);
+	this->nested_root = MakeWindowNWidgetTree(this->window_desc.nwid_parts, &this->shade_select);
 	this->nested_root->FillWidgetLookup(this->widget_lookup);
 }
 
diff --git a/src/window_gui.h b/src/window_gui.h
index 30e1d6fd90..796b9b91f6 100644
--- a/src/window_gui.h
+++ b/src/window_gui.h
@@ -163,7 +163,7 @@ struct WindowDesc : ZeroedMemoryAllocator {
 
 	WindowDesc(WindowPosition default_pos, const char *ini_key, int16_t def_width_trad, int16_t def_height_trad,
 			WindowClass window_class, WindowClass parent_class, uint32_t flags,
-			const NWidgetPart *nwid_begin, const NWidgetPart *nwid_end, HotkeyList *hotkeys = nullptr,
+			const std::span<const NWidgetPart> nwid_parts, HotkeyList *hotkeys = nullptr,
 			const std::source_location location = std::source_location::current());
 
 	~WindowDesc();
@@ -174,8 +174,7 @@ struct WindowDesc : ZeroedMemoryAllocator {
 	WindowClass parent_cls;        ///< Class of the parent window. @see WindowClass
 	const char *ini_key;           ///< Key to store window defaults in openttd.cfg. \c nullptr if nothing shall be stored.
 	uint32_t flags;                  ///< Flags. @see WindowDefaultFlag
-	const NWidgetPart *nwid_begin; ///< Beginning of nested widget parts describing the window.
-	const NWidgetPart *nwid_end; ///< Ending of nested widget parts describing the window.
+	const std::span<const NWidgetPart> nwid_parts; ///< Span of nested widget parts describing the window.
 	HotkeyList *hotkeys;           ///< Hotkeys for the window.
 
 	bool pref_sticky;              ///< Preferred stickyness.