diff --git a/src/elrail.cpp b/src/elrail.cpp
index 57be83e01d..5f05158281 100644
--- a/src/elrail.cpp
+++ b/src/elrail.cpp
@@ -406,7 +406,7 @@ static void DrawRailCatenaryRailway(const TileInfo *ti)
 		if (ppp_allowed[i].Any(ppp_preferred[i])) ppp_allowed[i] &= ppp_preferred[i];
 
 		if (IsBridgeAbove(ti->tile)) {
-			Track bridgetrack = GetBridgeAxis(ti->tile) == AXIS_X ? TRACK_X : TRACK_Y;
+			Track bridgetrack = AxisToTrack(GetBridgeAxis(ti->tile));
 			int height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
 
 			if ((height <= GetTileMaxZ(ti->tile) + 1) &&
diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp
index faa07003af..9380c44ef9 100644
--- a/src/rail_cmd.cpp
+++ b/src/rail_cmd.cpp
@@ -2992,7 +2992,7 @@ static VehicleEnterTileStates VehicleEnterTile_Rail(Vehicle *v, TileIndex tile,
 			/* Leave the depot. */
 			if ((v = v->GetMovingNext()) != nullptr) {
 				v->vehstatus.Reset(VehState::Hidden);
-				Train::From(v)->track = (DiagDirToAxis(dir) == AXIS_X ? TRACK_BIT_X : TRACK_BIT_Y);
+				Train::From(v)->track = AxisToTrackBits(DiagDirToAxis(dir));
 			}
 		}
 	} else if (_fractcoords_enter[dir] == fract_coord) {
diff --git a/src/road.cpp b/src/road.cpp
index 9bf2d89054..cdb7f592f5 100644
--- a/src/road.cpp
+++ b/src/road.cpp
@@ -46,7 +46,7 @@ static bool IsPossibleCrossing(const TileIndex tile, Axis ax)
 {
 	return (IsTileType(tile, TileType::Railway) &&
 		GetRailTileType(tile) == RailTileType::Normal &&
-		GetTrackBits(tile) == (ax == AXIS_X ? TRACK_BIT_Y : TRACK_BIT_X) &&
+		GetTrackBits(tile) == AxisToTrackBits(OtherAxis(ax)) &&
 		std::get<Slope>(GetFoundationSlope(tile)) == SLOPE_FLAT);
 }
 
diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp
index b13857ce7c..aa2c7d588c 100644
--- a/src/road_cmd.cpp
+++ b/src/road_cmd.cpp
@@ -1449,13 +1449,13 @@ void DrawRoadCatenary(const TileInfo *ti)
 			road = GetRoadBits(ti->tile, RoadTramType::Road);
 			tram = GetRoadBits(ti->tile, RoadTramType::Tram);
 		} else if (IsLevelCrossing(ti->tile)) {
-			tram = road = (GetCrossingRailAxis(ti->tile) == AXIS_Y ? ROAD_X : ROAD_Y);
+			tram = road = GetCrossingRoadBits(ti->tile);
 		}
 	} else if (IsTileType(ti->tile, TileType::Station)) {
 		if (IsAnyRoadStop(ti->tile)) {
 			if (IsDriveThroughStopTile(ti->tile)) {
 				Axis axis = GetDriveThroughStopAxis(ti->tile);
-				tram = road = (axis == AXIS_X ? ROAD_X : ROAD_Y);
+				tram = road = AxisToRoadBits(axis);
 			} else {
 				tram = road = DiagDirToRoadBits(GetBayRoadStopDir(ti->tile));
 			}
diff --git a/src/road_map.h b/src/road_map.h
index cfc37c96f7..0521d9bf8e 100644
--- a/src/road_map.h
+++ b/src/road_map.h
@@ -347,7 +347,7 @@ inline Axis GetCrossingRoadAxis(Tile t)
 inline Axis GetCrossingRailAxis(Tile t)
 {
 	assert(IsLevelCrossing(t));
-	return OtherAxis((Axis)GetCrossingRoadAxis(t));
+	return OtherAxis(GetCrossingRoadAxis(t));
 }
 
 /**
@@ -357,7 +357,7 @@ inline Axis GetCrossingRailAxis(Tile t)
  */
 inline RoadBits GetCrossingRoadBits(Tile tile)
 {
-	return GetCrossingRoadAxis(tile) == AXIS_X ? ROAD_X : ROAD_Y;
+	return AxisToRoadBits(GetCrossingRoadAxis(tile));
 }
 
 /**
diff --git a/src/saveload/afterload.cpp b/src/saveload/afterload.cpp
index 327378c13e..ce6d24ac54 100644
--- a/src/saveload/afterload.cpp
+++ b/src/saveload/afterload.cpp
@@ -1235,7 +1235,7 @@ bool AfterLoadGame()
 							MakeRailNormal(
 								t,
 								GetTileOwner(t),
-								axis == AXIS_X ? TRACK_BIT_Y : TRACK_BIT_X,
+								AxisToTrackBits(OtherAxis(axis)),
 								GetRailType(t)
 							);
 						} else {
@@ -1245,7 +1245,7 @@ bool AfterLoadGame()
 							SetTileType(t, TileType::Road);
 							t.m2() = town.base();
 							t.m3() = 0;
-							t.m5() = (axis == AXIS_X ? ROAD_Y : ROAD_X).base() | to_underlying(RoadTileType::Normal) << 6;
+							t.m5() = AxisToRoadBits(OtherAxis(axis)).base() | to_underlying(RoadTileType::Normal) << 6;
 							SB(t.m6(), 2, 4, 0);
 							t.m7() = 1 << 6;
 							SetRoadOwner(t, RoadTramType::Tram, OWNER_NONE);
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 1aec7eb448..b6ea08efe9 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -1128,7 +1128,7 @@ static CommandCost CheckFlatLandRoadStop(TileIndex cur_tile, int &allowed_z, con
 		bool build_over_road = is_drive_through && IsNormalRoadTile(cur_tile);
 		/* Road bits in the wrong direction. */
 		RoadBits rb = IsNormalRoadTile(cur_tile) ? GetAllRoadBits(cur_tile) : RoadBits{};
-		if (build_over_road && rb.Any(axis == AXIS_X ? ROAD_Y : ROAD_X)) {
+		if (build_over_road && rb.Any(AxisToRoadBits(OtherAxis(axis)))) {
 			/* Someone was pedantic and *NEEDED* three fracking different error messages. */
 			switch (rb.Count()) {
 				case 1: