diff --git a/src/openrct2/interface/Viewport.cpp b/src/openrct2/interface/Viewport.cpp
index 3863410368..bc6701c459 100644
--- a/src/openrct2/interface/Viewport.cpp
+++ b/src/openrct2/interface/Viewport.cpp
@@ -1592,13 +1592,13 @@ static bool IsSpriteInteractedWithPaletteSet(
         {
             // TODO: SAR in dpi done with `>> 1`, in coordinates with `/ 2`
             DrawPixelInfo zoomed_dpi = {
-                /* .bits = */ dpi.bits,
-                /* .x = */ dpi.x >> 1,
-                /* .y = */ dpi.y >> 1,
-                /* .height = */ dpi.height,
-                /* .width = */ dpi.width,
-                /* .pitch = */ dpi.pitch,
-                /* .zoom_level = */ dpi.zoom_level - 1,
+                .bits = dpi.bits,
+                .x = dpi.x >> 1,
+                .y = dpi.y >> 1,
+                .width = dpi.width,
+                .height = dpi.height,
+                .pitch = dpi.pitch,
+                .zoom_level = dpi.zoom_level - 1,
             };
 
             auto zoomImageId = imageId.WithIndex(imageId.GetIndex() - g1->zoomed_offset);
diff --git a/src/openrct2/ride/RideData.cpp b/src/openrct2/ride/RideData.cpp
index 12fa18d4cf..61cd09ee81 100644
--- a/src/openrct2/ride/RideData.cpp
+++ b/src/openrct2/ride/RideData.cpp
@@ -125,74 +125,78 @@ using namespace OpenRCT2::Entity::Yaw;
 // clang-format off
 
 const CarEntry CableLiftVehicle = {
-    /* .TabRotationMask = */ 31,
-    /* .spacing = */ 0,
-    /* .car_mass = */ 0,
-    /* .tab_height = */ 0,
-    /* .num_seats = */ 0,
-    /* .sprite_width = */ 0,
-    /* .sprite_height_negative = */ 0,
-    /* .sprite_height_positive = */ 0,
-    /* .animation = */ CarEntryAnimation::None,
-    /* .flags = */ 0,
-    /* .base_num_frames = */ 1,
-    /* .base_image_id = */ 29110,
-    /* .SpriteGroups[SlopeFlat] = */ 29110, SpritePrecision::Sprites32,
-    /* .SpriteGroups[Slopes12] = */ 29142, SpritePrecision::Sprites4,
-    /* .SpriteGroups[Slopes25] = */ 29150, SpritePrecision::Sprites32,
-    /* .SpriteGroups[Slopes42] = */ 29214, SpritePrecision::Sprites8,
-    /* .SpriteGroups[Slopes60] = */ 29230, SpritePrecision::Sprites32,
-    /* .SpriteGroups[Slopes75] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes90] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[SlopesLoop] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[SlopeInverted] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes8] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes16] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes50] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[FlatBanked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[FlatBanked45] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[FlatBanked67] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[FlatBanked90] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[InlineTwists] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes12Banked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes8Banked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes25Banked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes8Banked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes16Banked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes16Banked45] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes25Banked45] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes12Banked45] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes25Banked67] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes25Banked90] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes25InlineTwists] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes42Banked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes42Banked45] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes42Banked67] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes42Banked90] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Slopes60Banked22] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[Corkscrews] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[RestraintAnimation] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[CurvedLiftHillUp] = */ 0, SpritePrecision::None,
-    /* .SpriteGroups[CurvedLiftHillDown] = */ 0, SpritePrecision::None,
-    /* .no_vehicle_images = */ 0,
-    /* .no_seating_rows = */ 0,
-    /* .spinning_inertia = */ 0,
-    /* .spinning_friction = */ 255,
-    /* .friction_sound_id = */ OpenRCT2::Audio::SoundId::LiftClassic,
-    /* .log_flume_reverser_vehicle_type = */ 0,
-    /* .sound_range = */ 0,
-    /* .double_sound_frequency = */ 0,
-    /* .powered_acceleration = */ 0,
-    /* .powered_max_speed = */ 0,
-    /* .PaintStyle = */ 0,
-    /* .effect_visual = */ 1,
-    /* .draw_order = */ 14,
-    /* .num_vertical_frames_override = */ 0,
-    /* .peep_loading_positions = */ 0,
-    /* .AnimationExponent = */ 0,
-    /* .AnimationFrames = */ 0,
-    /* .SteamEffectType.longitudinal = */ 0,
-    /* .SteamEffectType.vertical = */ 0
+    .TabRotationMask = 31,
+    .spacing = 0,
+    .car_mass = 0,
+    .tab_height = 0,
+    .num_seats = 0,
+    .sprite_width = 0,
+    .sprite_height_negative = 0,
+    .sprite_height_positive = 0,
+    .animation = CarEntryAnimation::None,
+    .flags = 0,
+    .base_num_frames = 1,
+    .base_image_id = 29110,
+    .SpriteGroups = {
+        /* SpriteGroupType::SlopeFlat */            { 29110, SpritePrecision::Sprites32},
+        /* SpriteGroupType::Slopes12 */             { 29142, SpritePrecision::Sprites4},
+        /* SpriteGroupType::Slopes25 */             { 29150, SpritePrecision::Sprites32},
+        /* SpriteGroupType::Slopes42 */             { 29214, SpritePrecision::Sprites8},
+        /* SpriteGroupType::Slopes60 */             { 29230, SpritePrecision::Sprites32},
+        /* SpriteGroupType::Slopes75 */             { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes90 */             { 0, SpritePrecision::None},
+        /* SpriteGroupType::SlopesLoop */           { 0, SpritePrecision::None},
+        /* SpriteGroupType::SlopeInverted */        { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes8 */              { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes16 */             { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes50 */             { 0, SpritePrecision::None},
+        /* SpriteGroupType::FlatBanked22 */         { 0, SpritePrecision::None},
+        /* SpriteGroupType::FlatBanked45 */         { 0, SpritePrecision::None},
+        /* SpriteGroupType::FlatBanked67 */         { 0, SpritePrecision::None},
+        /* SpriteGroupType::FlatBanked90 */         { 0, SpritePrecision::None},
+        /* SpriteGroupType::InlineTwists */         { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes12Banked22 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes8Banked22 */      { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes25Banked22 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes8Banked22 */      { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes16Banked22 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes16Banked45 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes25Banked45 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes12Banked45 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes25Banked67 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes25Banked90 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes25InlineTwists */ { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes42Banked22 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes42Banked45 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes42Banked67 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes42Banked90 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Slopes60Banked22 */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::Corkscrews */           { 0, SpritePrecision::None},
+        /* SpriteGroupType::RestraintAnimation */   { 0, SpritePrecision::None},
+        /* SpriteGroupType::CurvedLiftHillUp */     { 0, SpritePrecision::None},
+        /* SpriteGroupType::CurvedLiftHillDown */   { 0, SpritePrecision::None},
+    },
+    .NumCarImages = 0,
+    .no_seating_rows = 0,
+    .spinning_inertia = 0,
+    .spinning_friction = 255,
+    .friction_sound_id = OpenRCT2::Audio::SoundId::LiftClassic,
+    .ReversedCarIndex = 0,
+    .sound_range = 0,
+    .double_sound_frequency = 0,
+    .powered_acceleration = 0,
+    .powered_max_speed = 0,
+    .PaintStyle = 0,
+    .effect_visual = 1,
+    .draw_order = 14,
+    .num_vertical_frames_override = 0,
+    .peep_loading_waypoint_segments = 0,
+    .AnimationSpeed = 0,
+    .AnimationFrames = 0,
+    .SteamEffect = {
+        .Longitudinal = 0,
+        .Vertical = 0,
+    },
 };
 
 /* rct2: 0x009A0AA0 */
diff --git a/src/openrct2/ride/RideRatings.cpp b/src/openrct2/ride/RideRatings.cpp
index 6fb54f01fd..5344c9b6f9 100644
--- a/src/openrct2/ride/RideRatings.cpp
+++ b/src/openrct2/ride/RideRatings.cpp
@@ -1694,9 +1694,9 @@ static RatingTuple ride_ratings_get_sheltered_ratings(const Ride& ride)
 static RatingTuple ride_ratings_get_gforce_ratings(const Ride& ride)
 {
     RatingTuple result = {
-        /* .excitement = */ 0,
-        /* .intensity = */ 0,
-        /* .nausea = */ 0,
+        .Excitement = 0,
+        .Intensity = 0,
+        .Nausea = 0,
     };
 
     // Apply maximum positive G force factor