diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp
index c7bb781c4f76..2e870abe10eb 100644
--- a/src/openrct2/ride/Vehicle.cpp
+++ b/src/openrct2/ride/Vehicle.cpp
@@ -7674,7 +7674,7 @@ bool Vehicle::UpdateMotionCollisionDetection(const CoordsXYZ& loc, uint16_t* oth
         return direction < 0xF;
     }
 
-    auto location = CoordsXY{ loc.x, loc.y };
+    auto location = CoordsXY{ loc };
 
     bool mayCollide = false;
     Vehicle* collideVehicle = nullptr;
@@ -8237,8 +8237,8 @@ bool Vehicle::UpdateTrackMotionForwards(rct_ride_entry_vehicle* vehicleEntry, Ri
     const auto moveInfo = GetMoveInfo();
     trackType = GetTrackType();
     {
-        CoordsXYZ loc = { TrackLocation.x + moveInfo->x, TrackLocation.y + moveInfo->y,
-                          TrackLocation.z + moveInfo->z + RideTypeDescriptors[curRide->type].Heights.VehicleZOffset };
+        auto loc = TrackLocation
+            + CoordsXYZ{ moveInfo->x, moveInfo->y, moveInfo->z + RideTypeDescriptors[curRide->type].Heights.VehicleZOffset };
 
         regs.ebx = 0;
         if (loc.x != unk_F64E20.x)
@@ -8559,8 +8559,8 @@ loc_6DBA33:;
     track_progress = regs.ax;
     {
         const rct_vehicle_info* moveInfo = GetMoveInfo();
-        CoordsXYZ loc = { TrackLocation.x + moveInfo->x, TrackLocation.y + moveInfo->y,
-                          TrackLocation.z + moveInfo->z + RideTypeDescriptors[curRide->type].Heights.VehicleZOffset };
+        auto loc = TrackLocation
+            + CoordsXYZ{ moveInfo->x, moveInfo->y, moveInfo->z + RideTypeDescriptors[curRide->type].Heights.VehicleZOffset };
 
         regs.ebx = 0;
         if (loc.x != unk_F64E20.x)