diff --git a/src/openrct2/paint/support/MetalSupports.cpp b/src/openrct2/paint/support/MetalSupports.cpp
index e1a1edf377..285b7ba9fe 100644
--- a/src/openrct2/paint/support/MetalSupports.cpp
+++ b/src/openrct2/paint/support/MetalSupports.cpp
@@ -318,13 +318,13 @@ static bool MetalASupportsPaintSetup(
         imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
     }
 
-    uint8_t segment = EnumValue(placement);
-    auto supportType = EnumValue(supportTypeMember);
-    SupportHeight* supportSegments = session.SupportSegments;
     int32_t currentHeight = height;
-    const auto originalSegment = segment;
+    const uint32_t supportType = EnumValue(supportTypeMember);
 
+    const uint8_t originalSegment = EnumValue(placement);
+    uint8_t segment = originalSegment;
     uint16_t segmentHeight = 0xFFFF;
+    SupportHeight* const supportSegments = session.SupportSegments;
     if (currentHeight < supportSegments[segment].height)
     {
         segmentHeight = currentHeight;
@@ -476,7 +476,7 @@ static bool MetalBSupportsPaintSetup(
 {
     if (!(session.Flags & PaintSessionFlags::PassedSurface))
     {
-        return false; // AND
+        return false;
     }
 
     if (session.ViewFlags & VIEWPORT_FLAG_HIDE_SUPPORTS)
@@ -488,12 +488,13 @@ static bool MetalBSupportsPaintSetup(
         imageTemplate = ImageId(0).WithTransparency(FilterPaletteID::PaletteDarken1);
     }
 
-    const uint8_t segment = EnumValue(placement);
-    auto supportType = EnumValue(supportTypeMember);
-    SupportHeight* supportSegments = session.SupportSegments;
-    uint16_t segmentHeight = 0xFFFF;
     int32_t currentHeight = height;
+    const uint32_t supportType = EnumValue(supportTypeMember);
 
+    const uint8_t originalSegment = EnumValue(placement);
+    uint8_t segment = originalSegment;
+    uint16_t segmentHeight = 0xFFFF;
+    SupportHeight* const supportSegments = session.SupportSegments;
     if (height < supportSegments[segment].height)
     {
         segmentHeight = height;