UintLiteral::to_str() suffix with 'u'

Fixed: tint:673
Change-Id: I5a58d9e504446ccff724e368b5ea2cf835d2271b
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/47768
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: Ryan Harrison <rharrison@chromium.org>
diff --git a/src/reader/spirv/function_arithmetic_test.cc b/src/reader/spirv/function_arithmetic_test.cc
index 9ff8fba..9a05b46 100644
--- a/src/reader/spirv/function_arithmetic_test.cc
+++ b/src/reader/spirv/function_arithmetic_test.cc
@@ -70,15 +70,15 @@
   if (assembly == "v2uint_10_20") {
     return R"(TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{10}
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{10u}
+          ScalarConstructor[not set]{20u}
         })";
   }
   if (assembly == "v2uint_20_10") {
     return R"(TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{20}
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{20u}
+          ScalarConstructor[not set]{10u}
         })";
   }
   if (assembly == "v2int_30_40") {
@@ -99,8 +99,8 @@
     return R"(Bitcast[not set]<__vec_2__i32>{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
         })";
   }
@@ -179,7 +179,7 @@
       UnaryOp[not set]{
         negation
         Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     }
@@ -236,7 +236,7 @@
         UnaryOp[not set]{
           negation
           Bitcast[not set]<__i32>{
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{10u}
           }
         }
       }
@@ -297,8 +297,8 @@
         Bitcast[not set]<__vec_2__i32>{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
         }
       }
@@ -362,8 +362,8 @@
           Bitcast[not set]<__vec_2__i32>{
             TypeConstructor[not set]{
               __vec_2__u32
-              ScalarConstructor[not set]{10}
-              ScalarConstructor[not set]{20}
+              ScalarConstructor[not set]{10u}
+              ScalarConstructor[not set]{20u}
             }
           }
         }
@@ -526,8 +526,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpIAdd", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "add",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "add",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpIAdd", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "add",
@@ -554,7 +554,7 @@
           ScalarConstructor[not set]{30}
           add
           Bitcast[not set]<__i32>{
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{10u}
           }
         }
       }
@@ -567,7 +567,7 @@
         ScalarConstructor[not set]{30}
         add
         Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -576,7 +576,7 @@
                           R"(__u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{10}
+        ScalarConstructor[not set]{10u}
         add
         Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{30}
@@ -589,9 +589,9 @@
     {
       Bitcast[not set]<__i32>{
         Binary[not set]{
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{20u}
           add
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -610,8 +610,8 @@
           Bitcast[not set]<__vec_2__i32>{
             TypeConstructor[not set]{
               __vec_2__u32
-              ScalarConstructor[not set]{10}
-              ScalarConstructor[not set]{20}
+              ScalarConstructor[not set]{10u}
+              ScalarConstructor[not set]{20u}
             }
           }
         }
@@ -625,8 +625,8 @@
         Binary[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           add
           Bitcast[not set]<__vec_2__u32>{
@@ -659,8 +659,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpISub", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "subtract",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "subtract",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpISub", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "subtract",
@@ -687,7 +687,7 @@
           ScalarConstructor[not set]{30}
           subtract
           Bitcast[not set]<__i32>{
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{10u}
           }
         }
       }
@@ -700,7 +700,7 @@
         ScalarConstructor[not set]{30}
         subtract
         Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -709,7 +709,7 @@
                           R"(__u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{10}
+        ScalarConstructor[not set]{10u}
         subtract
         Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{30}
@@ -722,9 +722,9 @@
     {
       Bitcast[not set]<__i32>{
         Binary[not set]{
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{20u}
           subtract
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -743,8 +743,8 @@
           Bitcast[not set]<__vec_2__i32>{
             TypeConstructor[not set]{
               __vec_2__u32
-              ScalarConstructor[not set]{10}
-              ScalarConstructor[not set]{20}
+              ScalarConstructor[not set]{10u}
+              ScalarConstructor[not set]{20u}
             }
           }
         }
@@ -758,8 +758,8 @@
         Binary[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           subtract
           Bitcast[not set]<__vec_2__u32>{
@@ -792,8 +792,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpIMul", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "multiply",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "multiply",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpIMul", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "multiply",
@@ -820,7 +820,7 @@
           ScalarConstructor[not set]{30}
           multiply
           Bitcast[not set]<__i32>{
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{10u}
           }
         }
       }
@@ -833,7 +833,7 @@
         ScalarConstructor[not set]{30}
         multiply
         Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -842,7 +842,7 @@
                           R"(__u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{10}
+        ScalarConstructor[not set]{10u}
         multiply
         Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{30}
@@ -855,9 +855,9 @@
     {
       Bitcast[not set]<__i32>{
         Binary[not set]{
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{20u}
           multiply
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -876,8 +876,8 @@
           Bitcast[not set]<__vec_2__i32>{
             TypeConstructor[not set]{
               __vec_2__u32
-              ScalarConstructor[not set]{10}
-              ScalarConstructor[not set]{20}
+              ScalarConstructor[not set]{10u}
+              ScalarConstructor[not set]{20u}
             }
           }
         }
@@ -891,8 +891,8 @@
         Binary[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           multiply
           Bitcast[not set]<__vec_2__u32>{
@@ -925,8 +925,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpUDiv", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "divide",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "divide",
+                   "ScalarConstructor[not set]{20u}"},
         // Both v2uint
         BinaryData{"v2uint", "v2uint_10_20", "OpUDiv", "v2uint_20_10",
                    "__vec_2__u32", AstFor("v2uint_10_20"), "divide",
@@ -953,12 +953,12 @@
         BinaryData{"int", "int_30", "OpSDiv", "uint_10", "__i32",
                    "ScalarConstructor[not set]{30}", "divide",
                    R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         })"},
         // Mixed, returning int, first arg uint
         BinaryData{"int", "uint_10", "OpSDiv", "int_30", "__i32",
                    R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         })",
                    "divide", "ScalarConstructor[not set]{30}"},
         // Mixed, returning v2int, first arg v2uint
@@ -1067,8 +1067,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpUMod", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "modulo",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "modulo",
+                   "ScalarConstructor[not set]{20u}"},
         // Both v2uint
         BinaryData{"v2uint", "v2uint_10_20", "OpUMod", "v2uint_20_10",
                    "__vec_2__u32", AstFor("v2uint_10_20"), "modulo",
@@ -1098,12 +1098,12 @@
         BinaryData{"int", "int_30", "OpSMod", "uint_10", "__i32",
                    "ScalarConstructor[not set]{30}", "modulo",
                    R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         })"},
         // Mixed, returning int, first arg uint
         BinaryData{"int", "uint_10", "OpSMod", "int_30", "__i32",
                    R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         })",
                    "modulo", "ScalarConstructor[not set]{30}"},
         // Mixed, returning v2int, first arg v2uint
diff --git a/src/reader/spirv/function_bit_test.cc b/src/reader/spirv/function_bit_test.cc
index 2c6e266..3873ec0 100644
--- a/src/reader/spirv/function_bit_test.cc
+++ b/src/reader/spirv/function_bit_test.cc
@@ -61,15 +61,15 @@
   if (assembly == "v2uint_10_20") {
     return R"(TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{10}
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{10u}
+          ScalarConstructor[not set]{20u}
         })";
   }
   if (assembly == "v2uint_20_10") {
     return R"(TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{20}
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{20u}
+          ScalarConstructor[not set]{10u}
         })";
   }
   if (assembly == "v2int_30_40") {
@@ -90,8 +90,8 @@
     return R"(Bitcast[not set]<__vec_2__i32>{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
         })";
   }
@@ -212,8 +212,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpShiftLeftLogical", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "shift_left",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "shift_left",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpShiftLeftLogical", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "shift_left",
@@ -221,11 +221,11 @@
         // Mixed, returning uint
         BinaryData{"uint", "int_30", "OpShiftLeftLogical", "uint_10", "__u32",
                    "ScalarConstructor[not set]{30}", "shift_left",
-                   "ScalarConstructor[not set]{10}"},
+                   "ScalarConstructor[not set]{10u}"},
         // Mixed, returning int
         BinaryData{"int", "int_30", "OpShiftLeftLogical", "uint_10", "__i32",
                    "ScalarConstructor[not set]{30}", "shift_left",
-                   "ScalarConstructor[not set]{10}"},
+                   "ScalarConstructor[not set]{10u}"},
         // Both v2uint
         BinaryData{"v2uint", "v2uint_10_20", "OpShiftLeftLogical",
                    "v2uint_20_10", "__vec_2__u32", AstFor("v2uint_10_20"),
@@ -249,8 +249,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpShiftRightLogical", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "shift_right",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "shift_right",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpShiftRightLogical", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "shift_right",
@@ -258,11 +258,11 @@
         // Mixed, returning uint
         BinaryData{"uint", "int_30", "OpShiftRightLogical", "uint_10", "__u32",
                    "ScalarConstructor[not set]{30}", "shift_right",
-                   "ScalarConstructor[not set]{10}"},
+                   "ScalarConstructor[not set]{10u}"},
         // Mixed, returning int
         BinaryData{"int", "int_30", "OpShiftRightLogical", "uint_10", "__i32",
                    "ScalarConstructor[not set]{30}", "shift_right",
-                   "ScalarConstructor[not set]{10}"},
+                   "ScalarConstructor[not set]{10u}"},
         // Both v2uint
         BinaryData{"v2uint", "v2uint_10_20", "OpShiftRightLogical",
                    "v2uint_20_10", "__vec_2__u32", AstFor("v2uint_10_20"),
@@ -286,8 +286,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpShiftRightArithmetic", "uint_20",
-                   "__u32", "ScalarConstructor[not set]{10}", "shift_right",
-                   "ScalarConstructor[not set]{20}"},
+                   "__u32", "ScalarConstructor[not set]{10u}", "shift_right",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpShiftRightArithmetic", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "shift_right",
@@ -295,11 +295,11 @@
         // Mixed, returning uint
         BinaryData{"uint", "int_30", "OpShiftRightArithmetic", "uint_10",
                    "__u32", "ScalarConstructor[not set]{30}", "shift_right",
-                   "ScalarConstructor[not set]{10}"},
+                   "ScalarConstructor[not set]{10u}"},
         // Mixed, returning int
         BinaryData{"int", "int_30", "OpShiftRightArithmetic", "uint_10",
                    "__i32", "ScalarConstructor[not set]{30}", "shift_right",
-                   "ScalarConstructor[not set]{10}"},
+                   "ScalarConstructor[not set]{10u}"},
         // Both v2uint
         BinaryData{"v2uint", "v2uint_10_20", "OpShiftRightArithmetic",
                    "v2uint_20_10", "__vec_2__u32", AstFor("v2uint_10_20"),
@@ -323,8 +323,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpBitwiseAnd", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "and",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "and",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpBitwiseAnd", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "and",
@@ -351,7 +351,7 @@
           ScalarConstructor[not set]{30}
           and
           Bitcast[not set]<__i32>{
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{10u}
           }
         }
       }
@@ -364,7 +364,7 @@
         ScalarConstructor[not set]{30}
         and
         Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -373,7 +373,7 @@
                           R"(__u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{10}
+        ScalarConstructor[not set]{10u}
         and
         Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{30}
@@ -386,9 +386,9 @@
     {
       Bitcast[not set]<__i32>{
         Binary[not set]{
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{20u}
           and
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -408,8 +408,8 @@
           Bitcast[not set]<__vec_2__i32>{
             TypeConstructor[not set]{
               __vec_2__u32
-              ScalarConstructor[not set]{10}
-              ScalarConstructor[not set]{20}
+              ScalarConstructor[not set]{10u}
+              ScalarConstructor[not set]{20u}
             }
           }
         }
@@ -424,8 +424,8 @@
         Binary[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           and
           Bitcast[not set]<__vec_2__u32>{
@@ -445,8 +445,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpBitwiseOr", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "or",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "or",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpBitwiseOr", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "or",
@@ -473,7 +473,7 @@
           ScalarConstructor[not set]{30}
           or
           Bitcast[not set]<__i32>{
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{10u}
           }
         }
       }
@@ -486,7 +486,7 @@
         ScalarConstructor[not set]{30}
         or
         Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -495,7 +495,7 @@
                           R"(__u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{10}
+        ScalarConstructor[not set]{10u}
         or
         Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{30}
@@ -508,9 +508,9 @@
     {
       Bitcast[not set]<__i32>{
         Binary[not set]{
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{20u}
           or
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -530,8 +530,8 @@
           Bitcast[not set]<__vec_2__i32>{
             TypeConstructor[not set]{
               __vec_2__u32
-              ScalarConstructor[not set]{10}
-              ScalarConstructor[not set]{20}
+              ScalarConstructor[not set]{10u}
+              ScalarConstructor[not set]{20u}
             }
           }
         }
@@ -545,8 +545,8 @@
         Binary[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           or
           Bitcast[not set]<__vec_2__u32>{
@@ -566,8 +566,8 @@
     ::testing::Values(
         // Both uint
         BinaryData{"uint", "uint_10", "OpBitwiseXor", "uint_20", "__u32",
-                   "ScalarConstructor[not set]{10}", "xor",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "xor",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"int", "int_30", "OpBitwiseXor", "int_40", "__i32",
                    "ScalarConstructor[not set]{30}", "xor",
@@ -594,7 +594,7 @@
           ScalarConstructor[not set]{30}
           xor
           Bitcast[not set]<__i32>{
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{10u}
           }
         }
       }
@@ -607,7 +607,7 @@
         ScalarConstructor[not set]{30}
         xor
         Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -616,7 +616,7 @@
                           R"(__u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{10}
+        ScalarConstructor[not set]{10u}
         xor
         Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{30}
@@ -629,9 +629,9 @@
     {
       Bitcast[not set]<__i32>{
         Binary[not set]{
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{20u}
           xor
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     })"},
@@ -651,8 +651,8 @@
           Bitcast[not set]<__vec_2__i32>{
             TypeConstructor[not set]{
               __vec_2__u32
-              ScalarConstructor[not set]{10}
-              ScalarConstructor[not set]{20}
+              ScalarConstructor[not set]{10u}
+              ScalarConstructor[not set]{20u}
             }
           }
         }
@@ -667,8 +667,8 @@
         Binary[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           xor
           Bitcast[not set]<__vec_2__u32>{
@@ -729,7 +729,7 @@
       Bitcast[not set]<__i32>{
         UnaryOp[not set]{
           not
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         }
       }
     }
@@ -784,7 +784,7 @@
     {
       UnaryOp[not set]{
         not
-        ScalarConstructor[not set]{10}
+        ScalarConstructor[not set]{10u}
       }
     }
   })"));
@@ -843,8 +843,8 @@
           not
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
         }
       }
@@ -905,8 +905,8 @@
         not
         TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{10}
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{10u}
+          ScalarConstructor[not set]{20u}
         }
       }
     }
diff --git a/src/reader/spirv/function_call_test.cc b/src/reader/spirv/function_call_test.cc
index c35e55f..e7aa477 100644
--- a/src/reader/spirv/function_call_test.cc
+++ b/src/reader/spirv/function_call_test.cc
@@ -110,7 +110,7 @@
     EXPECT_TRUE(fe.EmitBody());
     EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Return{
   {
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
   }
 })"));
   }
@@ -180,7 +180,7 @@
     EXPECT_TRUE(fe.EmitBody()) << p->error();
     EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Return{
   {
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
   }
 })"));
   }
@@ -249,8 +249,8 @@
           Call[not set]{
             Identifier[not set]{x_50}
             (
-              ScalarConstructor[not set]{42}
-              ScalarConstructor[not set]{84}
+              ScalarConstructor[not set]{42u}
+              ScalarConstructor[not set]{84u}
             )
           }
         }
diff --git a/src/reader/spirv/function_cfg_test.cc b/src/reader/spirv/function_cfg_test.cc
index f736578..77b5254 100644
--- a/src/reader/spirv/function_cfg_test.cc
+++ b/src/reader/spirv/function_cfg_test.cc
@@ -7563,7 +7563,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 VariableDeclStatement{
   Variable{
@@ -7582,7 +7582,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
     If{
       (
@@ -7602,7 +7602,7 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{3}
+          ScalarConstructor[not set]{3u}
         }
         Assignment{
           Identifier[not set]{guard10}
@@ -7621,7 +7621,7 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{4}
+          ScalarConstructor[not set]{4u}
         }
         Assignment{
           Identifier[not set]{guard10}
@@ -7633,7 +7633,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -7675,7 +7675,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 VariableDeclStatement{
   Variable{
@@ -7694,7 +7694,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
     Assignment{
       Identifier[not set]{guard10}
@@ -7711,7 +7711,7 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{3}
+          ScalarConstructor[not set]{3u}
         }
         If{
           (
@@ -7731,7 +7731,7 @@
           {
             Assignment{
               Identifier[not set]{var_1}
-              ScalarConstructor[not set]{4}
+              ScalarConstructor[not set]{4u}
             }
             Assignment{
               Identifier[not set]{guard10}
@@ -7745,7 +7745,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -7802,7 +7802,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 VariableDeclStatement{
   Variable{
@@ -7821,7 +7821,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
     If{
       (
@@ -7845,7 +7845,7 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{3}
+          ScalarConstructor[not set]{3u}
         }
       }
     }
@@ -7860,7 +7860,7 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{4}
+          ScalarConstructor[not set]{4u}
         }
         If{
           (
@@ -7880,7 +7880,7 @@
           {
             Assignment{
               Identifier[not set]{var_1}
-              ScalarConstructor[not set]{5}
+              ScalarConstructor[not set]{5u}
             }
           }
         }
@@ -7895,7 +7895,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{6}
+      ScalarConstructor[not set]{6u}
     }
     If{
       (
@@ -7919,7 +7919,7 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{7}
+          ScalarConstructor[not set]{7u}
         }
         Assignment{
           Identifier[not set]{guard10}
@@ -7931,7 +7931,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{8}
+  ScalarConstructor[not set]{8u}
 }
 Return{}
 )";
@@ -8029,7 +8029,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -8038,13 +8038,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8077,7 +8077,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -8090,13 +8090,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8133,7 +8133,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -8142,7 +8142,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -8150,13 +8150,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8200,7 +8200,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -8209,7 +8209,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -8217,7 +8217,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -8228,13 +8228,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8272,7 +8272,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -8281,7 +8281,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -8292,13 +8292,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8336,7 +8336,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -8349,7 +8349,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -8360,13 +8360,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8421,7 +8421,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -8430,7 +8430,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
     If{
       (
@@ -8439,13 +8439,13 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{2}
+          ScalarConstructor[not set]{2u}
         }
       }
     }
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
@@ -8453,7 +8453,7 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
     If{
       (
@@ -8466,19 +8466,19 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{5}
+          ScalarConstructor[not set]{5u}
         }
       }
     }
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{6}
+      ScalarConstructor[not set]{6u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8511,12 +8511,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -8533,7 +8533,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8566,12 +8566,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -8584,7 +8584,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8617,17 +8617,17 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8660,17 +8660,17 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8711,27 +8711,27 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8776,31 +8776,31 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8850,21 +8850,21 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
     If{
       (
@@ -8873,19 +8873,19 @@
       {
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{4}
+          ScalarConstructor[not set]{4u}
         }
       }
     }
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{5}
+      ScalarConstructor[not set]{5u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{999}
+  ScalarConstructor[not set]{999u}
 }
 Return{}
 )";
@@ -8922,16 +8922,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -8944,7 +8944,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{3}
+  ScalarConstructor[not set]{3u}
 }
 Return{}
 )";
@@ -8981,19 +8981,19 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Break{}
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{3}
+  ScalarConstructor[not set]{3u}
 }
 Return{}
 )";
@@ -9041,7 +9041,7 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -9057,18 +9057,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{4}
+  ScalarConstructor[not set]{4u}
 }
 Return{}
 )";
@@ -9108,7 +9108,7 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -9124,18 +9124,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{4}
+  ScalarConstructor[not set]{4u}
 }
 Return{}
 )";
@@ -9187,19 +9187,19 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
       Continue{}
     }
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
@@ -9240,13 +9240,13 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Break{}
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -9289,7 +9289,7 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -9302,7 +9302,7 @@
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -9345,7 +9345,7 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -9362,7 +9362,7 @@
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -9407,7 +9407,7 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -9419,12 +9419,12 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -9469,7 +9469,7 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -9485,12 +9485,12 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -9521,10 +9521,10 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
     Default{
     }
@@ -9532,7 +9532,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -9566,15 +9566,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
@@ -9583,7 +9583,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -9620,21 +9620,21 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 30{
+    Case 30u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
@@ -9643,7 +9643,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -9680,21 +9680,21 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 30{
+    Case 30u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
-    Case 20, 40{
+    Case 20u, 40u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
@@ -9703,7 +9703,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -9746,34 +9746,34 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 40{
+    Case 40u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{40}
+        ScalarConstructor[not set]{40u}
       }
     }
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -9817,37 +9817,37 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 40{
+    Case 40u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{40}
+        ScalarConstructor[not set]{40u}
       }
     }
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
       Fallthrough{}
     }
-    Case 30{
+    Case 30u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -9889,7 +9889,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
   ScalarConstructor[not set]{42}
@@ -9897,19 +9897,19 @@
     Case -294967296{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{40}
+        ScalarConstructor[not set]{40u}
       }
     }
     Case 2000000000{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
     Case 20{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
@@ -9918,7 +9918,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -9959,27 +9959,27 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 50{
+    Case 50u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{40}
+        ScalarConstructor[not set]{40u}
       }
     }
-    Case 2000000000{
+    Case 2000000000u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
@@ -9988,7 +9988,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -10107,7 +10107,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Return{
   {
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
 }
 )";
@@ -10151,14 +10151,14 @@
   {
     Return{
       {
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{2u}
       }
     }
   }
 }
 Return{
   {
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
 }
 )";
@@ -10204,13 +10204,13 @@
   auto* expect = R"(Loop{
   Return{
     {
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
 Return{
   {
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
 }
 )";
@@ -10417,7 +10417,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Return{
   {
-    ScalarConstructor[not set]{0}
+    ScalarConstructor[not set]{0u}
   }
 }
 )";
@@ -10453,7 +10453,7 @@
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -10487,7 +10487,7 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
 }
 Return{}
@@ -10523,15 +10523,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
@@ -10540,7 +10540,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -10583,15 +10583,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       If{
         (
@@ -10600,14 +10600,14 @@
         {
           Assignment{
             Identifier[not set]{var_1}
-            ScalarConstructor[not set]{40}
+            ScalarConstructor[not set]{40u}
           }
           Break{}
         }
       }
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{50}
+        ScalarConstructor[not set]{50u}
       }
     }
     Default{
@@ -10616,7 +10616,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -10655,13 +10655,13 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Break{}
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -10738,7 +10738,7 @@
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
     Break{}
   }
@@ -10779,12 +10779,12 @@
   auto* expect = R"(Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
   }
 }
@@ -10838,19 +10838,19 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
       Continue{}
     }
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
@@ -10901,24 +10901,24 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   Switch{
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
     {
-      Case 40{
+      Case 40u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{4}
+          ScalarConstructor[not set]{4u}
         }
         Continue{}
       }
@@ -10928,18 +10928,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{5}
+    ScalarConstructor[not set]{5u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{6}
+      ScalarConstructor[not set]{6u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -10976,13 +10976,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{2}
+  ScalarConstructor[not set]{2u}
 }
 Return{}
 )";
@@ -11023,13 +11023,13 @@
   {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{2}
+  ScalarConstructor[not set]{2u}
 }
 Return{}
 )";
@@ -11066,22 +11066,22 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       Fallthrough{}
     }
-    Case 30{
+    Case 30u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
     Default{
@@ -11090,7 +11090,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -11117,11 +11117,11 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{2}
+  ScalarConstructor[not set]{2u}
 }
 Return{}
 )";
@@ -11221,17 +11221,17 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -11264,12 +11264,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -11282,7 +11282,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -11315,12 +11315,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -11337,7 +11337,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -11373,12 +11373,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   continuing {
     If{
@@ -11393,7 +11393,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -11429,12 +11429,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   continuing {
     If{
@@ -11453,7 +11453,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -11489,15 +11489,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
     }
     Default{
@@ -11506,7 +11506,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -11550,15 +11550,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       If{
         (
@@ -11567,14 +11567,14 @@
         {
           Assignment{
             Identifier[not set]{var_1}
-            ScalarConstructor[not set]{40}
+            ScalarConstructor[not set]{40u}
           }
           Break{}
         }
       }
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{50}
+        ScalarConstructor[not set]{50u}
       }
     }
     Default{
@@ -11583,7 +11583,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -11633,24 +11633,24 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   Switch{
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
     {
-      Case 40{
+      Case 40u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{40}
+          ScalarConstructor[not set]{40u}
         }
         If{
           (
@@ -11667,18 +11667,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{6}
+    ScalarConstructor[not set]{6u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{7}
+      ScalarConstructor[not set]{7u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{8}
+  ScalarConstructor[not set]{8u}
 }
 Return{}
 )";
@@ -11728,24 +11728,24 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   Switch{
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
     {
-      Case 40{
+      Case 40u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{40}
+          ScalarConstructor[not set]{40u}
         }
         If{
           (
@@ -11766,18 +11766,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{6}
+    ScalarConstructor[not set]{6u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{7}
+      ScalarConstructor[not set]{7u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{8}
+  ScalarConstructor[not set]{8u}
 }
 Return{}
 )";
@@ -11813,15 +11813,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       If{
         (
@@ -11837,7 +11837,7 @@
       }
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
     Default{
@@ -11846,7 +11846,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{8}
+  ScalarConstructor[not set]{8u}
 }
 Return{}
 )";
@@ -11882,15 +11882,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       If{
         (
@@ -11902,7 +11902,7 @@
       }
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
     Default{
@@ -11911,7 +11911,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{8}
+  ScalarConstructor[not set]{8u}
 }
 Return{}
 )";
@@ -11949,15 +11949,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       If{
         (
@@ -11973,10 +11973,10 @@
       }
       Fallthrough{}
     }
-    Case 30{
+    Case 30u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
     Default{
@@ -11985,7 +11985,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -12023,15 +12023,15 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       If{
         (
@@ -12043,10 +12043,10 @@
       }
       Fallthrough{}
     }
-    Case 30{
+    Case 30u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
     Default{
@@ -12055,7 +12055,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -12092,24 +12092,24 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Break{}
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12150,28 +12150,28 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   Break{}
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12223,12 +12223,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -12237,7 +12237,7 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{2u}
       }
       If{
         (
@@ -12256,18 +12256,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12319,12 +12319,12 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -12333,7 +12333,7 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{2u}
       }
       If{
         (
@@ -12352,18 +12352,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12458,16 +12458,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -12483,18 +12483,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12539,16 +12539,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -12560,18 +12560,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12607,23 +12607,23 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12664,27 +12664,27 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -12736,16 +12736,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -12754,25 +12754,25 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{3}
+        ScalarConstructor[not set]{3u}
       }
       Continue{}
     }
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{4}
+    ScalarConstructor[not set]{4u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{5}
+      ScalarConstructor[not set]{5u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{6}
+  ScalarConstructor[not set]{6u}
 }
 Return{}
 )";
@@ -12824,16 +12824,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -12842,19 +12842,19 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{3}
+        ScalarConstructor[not set]{3u}
       }
       Continue{}
     }
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{4}
+    ScalarConstructor[not set]{4u}
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{6}
+  ScalarConstructor[not set]{6u}
 }
 Return{}
 )";
@@ -12903,24 +12903,24 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   Switch{
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
     {
-      Case 40{
+      Case 40u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{4}
+          ScalarConstructor[not set]{4u}
         }
         Continue{}
       }
@@ -12930,18 +12930,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{5}
+    ScalarConstructor[not set]{5u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{6}
+      ScalarConstructor[not set]{6u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -12991,16 +12991,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -13009,7 +13009,7 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{3}
+        ScalarConstructor[not set]{3u}
       }
       If{
         (
@@ -13027,18 +13027,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{4}
+    ScalarConstructor[not set]{4u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{5}
+      ScalarConstructor[not set]{5u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{6}
+  ScalarConstructor[not set]{6u}
 }
 Return{}
 )";
@@ -13088,16 +13088,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -13106,7 +13106,7 @@
     {
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{3}
+        ScalarConstructor[not set]{3u}
       }
       If{
         (
@@ -13120,18 +13120,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{4}
+    ScalarConstructor[not set]{4u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{5}
+      ScalarConstructor[not set]{5u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{6}
+  ScalarConstructor[not set]{6u}
 }
 Return{}
 )";
@@ -13184,24 +13184,24 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   Switch{
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
     {
-      Case 40{
+      Case 40u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{40}
+          ScalarConstructor[not set]{40u}
         }
         If{
           (
@@ -13217,10 +13217,10 @@
         }
         Fallthrough{}
       }
-      Case 50{
+      Case 50u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{50}
+          ScalarConstructor[not set]{50u}
         }
       }
       Default{
@@ -13229,18 +13229,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -13293,24 +13293,24 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   Switch{
-    ScalarConstructor[not set]{42}
+    ScalarConstructor[not set]{42u}
     {
-      Case 40{
+      Case 40u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{40}
+          ScalarConstructor[not set]{40u}
         }
         If{
           (
@@ -13322,10 +13322,10 @@
         }
         Fallthrough{}
       }
-      Case 50{
+      Case 50u{
         Assignment{
           Identifier[not set]{var_1}
-          ScalarConstructor[not set]{50}
+          ScalarConstructor[not set]{50u}
         }
       }
       Default{
@@ -13334,18 +13334,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -13390,16 +13390,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -13415,18 +13415,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -13471,16 +13471,16 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   If{
     (
@@ -13492,18 +13492,18 @@
   }
   Assignment{
     Identifier[not set]{var_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   continuing {
     Assignment{
       Identifier[not set]{var_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
   }
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -13535,7 +13535,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 If{
   (
@@ -13546,7 +13546,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -13620,22 +13620,22 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Switch{
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
   {
-    Case 20{
+    Case 20u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{20u}
       }
       Fallthrough{}
     }
-    Case 30{
+    Case 30u{
       Assignment{
         Identifier[not set]{var_1}
-        ScalarConstructor[not set]{30}
+        ScalarConstructor[not set]{30u}
       }
     }
     Default{
@@ -13644,7 +13644,7 @@
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{7}
+  ScalarConstructor[not set]{7u}
 }
 Return{}
 )";
@@ -13711,11 +13711,11 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Assignment{
   Identifier[not set]{var_1}
-  ScalarConstructor[not set]{2}
+  ScalarConstructor[not set]{2u}
 }
 Return{}
 )";
@@ -14081,9 +14081,9 @@
   EXPECT_TRUE(fe.EmitBody()) << p->error();
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Switch{
-  ScalarConstructor[not set]{20}
+  ScalarConstructor[not set]{20u}
   {
-    Case 20{
+    Case 20u{
       If{
         (
           ScalarConstructor[not set]{false}
@@ -14234,9 +14234,9 @@
   EXPECT_TRUE(fe.EmitBody()) << p->error();
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Switch{
-  ScalarConstructor[not set]{20}
+  ScalarConstructor[not set]{20u}
   {
-    Case 20{
+    Case 20u{
       If{
         (
           ScalarConstructor[not set]{false}
diff --git a/src/reader/spirv/function_composite_test.cc b/src/reader/spirv/function_composite_test.cc
index fd06d3b..022abfa 100644
--- a/src/reader/spirv/function_composite_test.cc
+++ b/src/reader/spirv/function_composite_test.cc
@@ -96,8 +96,8 @@
     {
       TypeConstructor[not set]{
         __vec_2__u32
-        ScalarConstructor[not set]{10}
-        ScalarConstructor[not set]{20}
+        ScalarConstructor[not set]{10u}
+        ScalarConstructor[not set]{20u}
       }
     }
   }
@@ -192,11 +192,11 @@
     {
       TypeConstructor[not set]{
         __array__u32_5
-        ScalarConstructor[not set]{10}
-        ScalarConstructor[not set]{20}
-        ScalarConstructor[not set]{3}
-        ScalarConstructor[not set]{4}
-        ScalarConstructor[not set]{5}
+        ScalarConstructor[not set]{10u}
+        ScalarConstructor[not set]{20u}
+        ScalarConstructor[not set]{3u}
+        ScalarConstructor[not set]{4u}
+        ScalarConstructor[not set]{5u}
       }
     }
   })"));
@@ -227,7 +227,7 @@
           ScalarConstructor[not set]{50.000000}
           ScalarConstructor[not set]{60.000000}
         }
-        ScalarConstructor[not set]{5}
+        ScalarConstructor[not set]{5u}
         ScalarConstructor[not set]{30}
       }
     }
@@ -306,7 +306,7 @@
     {
       ArrayAccessor[not set]{
         Identifier[not set]{x_1}
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{2u}
       }
     }
   })"));
@@ -357,7 +357,7 @@
       MemberAccessor[not set]{
         ArrayAccessor[not set]{
           Identifier[not set]{x_1}
-          ScalarConstructor[not set]{2}
+          ScalarConstructor[not set]{2u}
         }
         Identifier[not set]{y}
       }
@@ -389,7 +389,7 @@
     {
       ArrayAccessor[not set]{
         Identifier[not set]{x_1}
-        ScalarConstructor[not set]{3}
+        ScalarConstructor[not set]{3u}
       }
     }
   })"));
@@ -553,9 +553,9 @@
               Identifier[not set]{x_1}
               Identifier[not set]{field1}
             }
-            ScalarConstructor[not set]{2}
+            ScalarConstructor[not set]{2u}
           }
-          ScalarConstructor[not set]{0}
+          ScalarConstructor[not set]{0u}
         }
         Identifier[not set]{y}
       }
@@ -657,7 +657,7 @@
 Assignment{
   ArrayAccessor[not set]{
     Identifier[not set]{x_2_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   TypeConstructor[not set]{
     __vec_2__f32
@@ -727,7 +727,7 @@
 Assignment{
   ArrayAccessor[not set]{
     Identifier[not set]{x_2_1}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   TypeConstructor[not set]{
     __vec_2__f32
@@ -777,9 +777,9 @@
 Assignment{
   ArrayAccessor[not set]{
     Identifier[not set]{x_2_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
-  ScalarConstructor[not set]{20}
+  ScalarConstructor[not set]{20u}
 }
 VariableDeclStatement{
   VariableConst{
@@ -903,7 +903,7 @@
     Identifier[not set]{x_2_1}
     Identifier[not set]{algo}
   }
-  ScalarConstructor[not set]{10}
+  ScalarConstructor[not set]{10u}
 }
 VariableDeclStatement{
   VariableConst{
@@ -931,7 +931,7 @@
     Identifier[not set]{x_4_1}
     Identifier[not set]{rithm}
   }
-  ScalarConstructor[not set]{10}
+  ScalarConstructor[not set]{10u}
 }
 VariableDeclStatement{
   VariableConst{
@@ -1002,9 +1002,9 @@
           Identifier[not set]{x_2_1}
           Identifier[not set]{field1}
         }
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{2u}
       }
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     }
     Identifier[not set]{y}
   }
@@ -1044,7 +1044,7 @@
     none
     __u32
     {
-      ScalarConstructor[not set]{3}
+      ScalarConstructor[not set]{3u}
     }
   }
 }
@@ -1169,32 +1169,32 @@
         MemberAccessor[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{4}
-            ScalarConstructor[not set]{3}
+            ScalarConstructor[not set]{4u}
+            ScalarConstructor[not set]{3u}
           }
           Identifier[not set]{y}
         }
         MemberAccessor[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{4}
-            ScalarConstructor[not set]{3}
+            ScalarConstructor[not set]{4u}
+            ScalarConstructor[not set]{3u}
           }
           Identifier[not set]{x}
         }
         MemberAccessor[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{3}
-            ScalarConstructor[not set]{4}
+            ScalarConstructor[not set]{3u}
+            ScalarConstructor[not set]{4u}
           }
           Identifier[not set]{y}
         }
         MemberAccessor[not set]{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{3}
-            ScalarConstructor[not set]{4}
+            ScalarConstructor[not set]{3u}
+            ScalarConstructor[not set]{4u}
           }
           Identifier[not set]{x}
         }
@@ -1224,7 +1224,7 @@
     {
       TypeConstructor[not set]{
         __vec_2__u32
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
         MemberAccessor[not set]{
           Identifier[not set]{x_1}
           Identifier[not set]{y}
diff --git a/src/reader/spirv/function_conversion_test.cc b/src/reader/spirv/function_conversion_test.cc
index fa3f328..dd0728d 100644
--- a/src/reader/spirv/function_conversion_test.cc
+++ b/src/reader/spirv/function_conversion_test.cc
@@ -112,8 +112,8 @@
       Bitcast[not set]<__vec_2__f32>{
         TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{10}
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{10u}
+          ScalarConstructor[not set]{20u}
         }
       }
     }
diff --git a/src/reader/spirv/function_logical_test.cc b/src/reader/spirv/function_logical_test.cc
index 061d83a..1cc9917 100644
--- a/src/reader/spirv/function_logical_test.cc
+++ b/src/reader/spirv/function_logical_test.cc
@@ -83,42 +83,42 @@
   if (assembly == "v2uint_10_20") {
     return R"(TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{10}
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{10u}
+          ScalarConstructor[not set]{20u}
         })";
   }
   if (assembly == "cast_uint_10") {
     return R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         })";
   }
   if (assembly == "cast_uint_20") {
     return R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{20u}
         })";
   }
   if (assembly == "cast_v2uint_10_20") {
     return R"(Bitcast[not set]<__vec_2__i32>{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
         })";
   }
   if (assembly == "v2uint_20_10") {
     return R"(TypeConstructor[not set]{
           __vec_2__u32
-          ScalarConstructor[not set]{20}
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{20u}
+          ScalarConstructor[not set]{10u}
         })";
   }
   if (assembly == "cast_v2uint_20_10") {
     return R"(Bitcast[not set]<__vec_2__i32>{
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{20}
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{20u}
+            ScalarConstructor[not set]{10u}
           }
         })";
   }
@@ -300,15 +300,15 @@
     ::testing::Values(
         // uint uint
         BinaryData{"bool", "uint_10", "OpIEqual", "uint_20", "__bool",
-                   "ScalarConstructor[not set]{10}", "equal",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "equal",
+                   "ScalarConstructor[not set]{20u}"},
         // int int
         BinaryData{"bool", "int_30", "OpIEqual", "int_40", "__bool",
                    "ScalarConstructor[not set]{30}", "equal",
                    "ScalarConstructor[not set]{40}"},
         // uint int
         BinaryData{"bool", "uint_10", "OpIEqual", "int_40", "__bool",
-                   "ScalarConstructor[not set]{10}", "equal",
+                   "ScalarConstructor[not set]{10u}", "equal",
                    R"(Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{40}
         })"},
@@ -316,7 +316,7 @@
         BinaryData{"bool", "int_40", "OpIEqual", "uint_10", "__bool",
                    "ScalarConstructor[not set]{40}", "equal",
                    R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         })"},
         // v2uint v2uint
         BinaryData{"v2bool", "v2uint_10_20", "OpIEqual", "v2uint_20_10",
@@ -344,15 +344,15 @@
     ::testing::Values(
         // Both uint
         BinaryData{"bool", "uint_10", "OpINotEqual", "uint_20", "__bool",
-                   "ScalarConstructor[not set]{10}", "not_equal",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "not_equal",
+                   "ScalarConstructor[not set]{20u}"},
         // Both int
         BinaryData{"bool", "int_30", "OpINotEqual", "int_40", "__bool",
                    "ScalarConstructor[not set]{30}", "not_equal",
                    "ScalarConstructor[not set]{40}"},
         // uint int
         BinaryData{"bool", "uint_10", "OpINotEqual", "int_40", "__bool",
-                   "ScalarConstructor[not set]{10}", "not_equal",
+                   "ScalarConstructor[not set]{10u}", "not_equal",
                    R"(Bitcast[not set]<__u32>{
           ScalarConstructor[not set]{40}
         })"},
@@ -360,7 +360,7 @@
         BinaryData{"bool", "int_40", "OpINotEqual", "uint_10", "__bool",
                    "ScalarConstructor[not set]{40}", "not_equal",
                    R"(Bitcast[not set]<__i32>{
-          ScalarConstructor[not set]{10}
+          ScalarConstructor[not set]{10u}
         })"},
         // Both v2uint
         BinaryData{"v2bool", "v2uint_10_20", "OpINotEqual", "v2uint_20_10",
@@ -480,15 +480,15 @@
     ::testing::Values(
         // Both unsigned
         BinaryData{"bool", "uint_10", "OpUGreaterThan", "uint_20", "__bool",
-                   "ScalarConstructor[not set]{10}", "greater_than",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "greater_than",
+                   "ScalarConstructor[not set]{20u}"},
         // First arg signed
         BinaryData{"bool", "int_30", "OpUGreaterThan", "uint_20", "__bool",
                    AstFor("cast_int_30"), "greater_than",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{20u}"},
         // Second arg signed
         BinaryData{"bool", "uint_10", "OpUGreaterThan", "int_40", "__bool",
-                   "ScalarConstructor[not set]{10}", "greater_than",
+                   "ScalarConstructor[not set]{10u}", "greater_than",
                    AstFor("cast_int_40")},
         // Vector, both unsigned
         BinaryData{"v2bool", "v2uint_10_20", "OpUGreaterThan", "v2uint_20_10",
@@ -509,15 +509,15 @@
     ::testing::Values(
         // Both unsigned
         BinaryData{"bool", "uint_10", "OpUGreaterThanEqual", "uint_20",
-                   "__bool", "ScalarConstructor[not set]{10}",
-                   "greater_than_equal", "ScalarConstructor[not set]{20}"},
+                   "__bool", "ScalarConstructor[not set]{10u}",
+                   "greater_than_equal", "ScalarConstructor[not set]{20u}"},
         // First arg signed
         BinaryData{"bool", "int_30", "OpUGreaterThanEqual", "uint_20", "__bool",
                    AstFor("cast_int_30"), "greater_than_equal",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{20u}"},
         // Second arg signed
         BinaryData{"bool", "uint_10", "OpUGreaterThanEqual", "int_40", "__bool",
-                   "ScalarConstructor[not set]{10}", "greater_than_equal",
+                   "ScalarConstructor[not set]{10u}", "greater_than_equal",
                    AstFor("cast_int_40")},
         // Vector, both unsigned
         BinaryData{"v2bool", "v2uint_10_20", "OpUGreaterThanEqual",
@@ -538,15 +538,15 @@
     ::testing::Values(
         // Both unsigned
         BinaryData{"bool", "uint_10", "OpULessThan", "uint_20", "__bool",
-                   "ScalarConstructor[not set]{10}", "less_than",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "less_than",
+                   "ScalarConstructor[not set]{20u}"},
         // First arg signed
         BinaryData{"bool", "int_30", "OpULessThan", "uint_20", "__bool",
                    AstFor("cast_int_30"), "less_than",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{20u}"},
         // Second arg signed
         BinaryData{"bool", "uint_10", "OpULessThan", "int_40", "__bool",
-                   "ScalarConstructor[not set]{10}", "less_than",
+                   "ScalarConstructor[not set]{10u}", "less_than",
                    AstFor("cast_int_40")},
         // Vector, both unsigned
         BinaryData{"v2bool", "v2uint_10_20", "OpULessThan", "v2uint_20_10",
@@ -567,15 +567,15 @@
     ::testing::Values(
         // Both unsigned
         BinaryData{"bool", "uint_10", "OpULessThanEqual", "uint_20", "__bool",
-                   "ScalarConstructor[not set]{10}", "less_than_equal",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{10u}", "less_than_equal",
+                   "ScalarConstructor[not set]{20u}"},
         // First arg signed
         BinaryData{"bool", "int_30", "OpULessThanEqual", "uint_20", "__bool",
                    AstFor("cast_int_30"), "less_than_equal",
-                   "ScalarConstructor[not set]{20}"},
+                   "ScalarConstructor[not set]{20u}"},
         // Second arg signed
         BinaryData{"bool", "uint_10", "OpULessThanEqual", "int_40", "__bool",
-                   "ScalarConstructor[not set]{10}", "less_than_equal",
+                   "ScalarConstructor[not set]{10u}", "less_than_equal",
                    AstFor("cast_int_40")},
         // Vector, both unsigned
         BinaryData{"v2bool", "v2uint_10_20", "OpULessThanEqual", "v2uint_20_10",
@@ -1170,8 +1170,8 @@
       Call[not set]{
         Identifier[not set]{select}
         (
-          ScalarConstructor[not set]{10}
-          ScalarConstructor[not set]{20}
+          ScalarConstructor[not set]{10u}
+          ScalarConstructor[not set]{20u}
           ScalarConstructor[not set]{true}
         )
       }
@@ -1236,13 +1236,13 @@
         (
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{20}
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{20u}
+            ScalarConstructor[not set]{10u}
           }
           ScalarConstructor[not set]{true}
         )
@@ -1276,13 +1276,13 @@
         (
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{10}
-            ScalarConstructor[not set]{20}
+            ScalarConstructor[not set]{10u}
+            ScalarConstructor[not set]{20u}
           }
           TypeConstructor[not set]{
             __vec_2__u32
-            ScalarConstructor[not set]{20}
-            ScalarConstructor[not set]{10}
+            ScalarConstructor[not set]{20u}
+            ScalarConstructor[not set]{10u}
           }
           TypeConstructor[not set]{
             __vec_2__bool
diff --git a/src/reader/spirv/function_memory_test.cc b/src/reader/spirv/function_memory_test.cc
index d0cb02b..6e0c699 100644
--- a/src/reader/spirv/function_memory_test.cc
+++ b/src/reader/spirv/function_memory_test.cc
@@ -80,11 +80,11 @@
   EXPECT_TRUE(fe.EmitBody());
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 }
 Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })"));
 }
 
@@ -274,7 +274,7 @@
   EXPECT_TRUE(fe.EmitBody());
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 })"));
 }
 
@@ -344,7 +344,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{z}
   }
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 })"));
 }
 
@@ -407,7 +407,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{x_11}
   }
-  ScalarConstructor[not set]{42}
+  ScalarConstructor[not set]{42u}
 })"));
 }
 
@@ -442,7 +442,7 @@
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   ArrayAccessor[not set]{
     Identifier[not set]{myvar}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   TypeConstructor[not set]{
     __vec_4__f32
@@ -485,7 +485,7 @@
   EXPECT_THAT(ToString(p->builder(), fe.ast_body()), HasSubstr(R"(Assignment{
   ArrayAccessor[not set]{
     Identifier[not set]{myvar}
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   TypeConstructor[not set]{
     __vec_4__f32
@@ -688,7 +688,7 @@
       Identifier[not set]{myvar}
       Identifier[not set]{age}
     }
-    ScalarConstructor[not set]{2}
+    ScalarConstructor[not set]{2u}
   }
   ScalarConstructor[not set]{42.000000}
 })"));
@@ -726,7 +726,7 @@
   MemberAccessor[not set]{
     ArrayAccessor[not set]{
       Identifier[not set]{myvar}
-      ScalarConstructor[not set]{2}
+      ScalarConstructor[not set]{2u}
     }
     Identifier[not set]{w}
   }
@@ -836,7 +836,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{field0}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Assignment{
   ArrayAccessor[not set]{
@@ -844,9 +844,9 @@
       Identifier[not set]{myvar}
       Identifier[not set]{field1}
     }
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })"));
 }
 
@@ -878,7 +878,7 @@
     Identifier[not set]{myvar}
     Identifier[not set]{field0}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Assignment{
   ArrayAccessor[not set]{
@@ -886,9 +886,9 @@
       Identifier[not set]{myvar}
       Identifier[not set]{field1}
     }
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })")) << got
       << p->error();
 }
@@ -918,9 +918,9 @@
       Identifier[not set]{myvar}
       Identifier[not set]{field1}
     }
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })")) << p->error();
 }
 
@@ -956,14 +956,14 @@
           Identifier[not set]{myvar}
           Identifier[not set]{field1}
         }
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
 }
 Assignment{
   Identifier[not set]{x_2}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 })")) << p->error();
 }
 
@@ -999,8 +999,8 @@
   ASSERT_TRUE(p->BuildAndParseInternalModule()) << assembly << p->error();
   FunctionEmitter fe(p.get(), *spirv_function(p.get(), 100));
   EXPECT_TRUE(fe.EmitBody()) << p->error();
-  EXPECT_THAT(ToString(p->builder(), fe.ast_body()),
-              Eq(R"(VariableDeclStatement{
+  EXPECT_EQ(ToString(p->builder(), fe.ast_body()),
+            R"(VariableDeclStatement{
   Variable{
     x_2
     function
@@ -1019,7 +1019,7 @@
           Identifier[not set]{myvar}
           Identifier[not set]{field1}
         }
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
@@ -1031,10 +1031,10 @@
 }
 Assignment{
   Identifier[not set]{x_2}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Return{}
-)")) << p->error();
+)") << p->error();
 }
 
 TEST_F(SpvParserTest, DISABLED_RemapStorageBuffer_ThroughFunctionCall) {
diff --git a/src/reader/spirv/function_misc_test.cc b/src/reader/spirv/function_misc_test.cc
index c2a5e62..5f747b5 100644
--- a/src/reader/spirv/function_misc_test.cc
+++ b/src/reader/spirv/function_misc_test.cc
@@ -81,7 +81,7 @@
     none
     __u32
     {
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     }
   }
 }
@@ -151,8 +151,8 @@
     {
       TypeConstructor[not set]{
         __vec_2__u32
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   }
@@ -224,7 +224,7 @@
     none
     __u32
     {
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     }
   }
 }
@@ -277,8 +277,8 @@
     {
       TypeConstructor[not set]{
         __vec_2__u32
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   }
@@ -380,8 +380,8 @@
     {
       TypeConstructor[not set]{
         __array__u32_2
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   }
@@ -414,7 +414,7 @@
       TypeConstructor[not set]{
         __struct_S
         ScalarConstructor[not set]{false}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
         ScalarConstructor[not set]{0}
         ScalarConstructor[not set]{0.000000}
       }
diff --git a/src/reader/spirv/function_var_test.cc b/src/reader/spirv/function_var_test.cc
index 53a028b..6762822 100644
--- a/src/reader/spirv/function_var_test.cc
+++ b/src/reader/spirv/function_var_test.cc
@@ -244,7 +244,7 @@
     function
     __u32
     {
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -308,7 +308,7 @@
     function
     __u32
     {
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     }
   }
 }
@@ -436,8 +436,8 @@
     {
       TypeConstructor[not set]{
         __array__u32_2
-        ScalarConstructor[not set]{1}
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{1u}
+        ScalarConstructor[not set]{2u}
       }
     }
   }
@@ -471,8 +471,8 @@
     {
       TypeConstructor[not set]{
         __alias_Arr__array__u32_2_stride_16
-        ScalarConstructor[not set]{1}
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{1u}
+        ScalarConstructor[not set]{2u}
       }
     }
   }
@@ -506,8 +506,8 @@
     {
       TypeConstructor[not set]{
         __array__u32_2
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   }
@@ -541,8 +541,8 @@
     {
       TypeConstructor[not set]{
         __alias_Arr__array__u32_2_stride_16
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   }
@@ -576,12 +576,12 @@
     {
       TypeConstructor[not set]{
         __struct_S
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
         ScalarConstructor[not set]{1.500000}
         TypeConstructor[not set]{
           __array__u32_2
-          ScalarConstructor[not set]{1}
-          ScalarConstructor[not set]{2}
+          ScalarConstructor[not set]{1u}
+          ScalarConstructor[not set]{2u}
         }
       }
     }
@@ -616,12 +616,12 @@
     {
       TypeConstructor[not set]{
         __struct_S
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
         ScalarConstructor[not set]{0.000000}
         TypeConstructor[not set]{
           __array__u32_2
-          ScalarConstructor[not set]{0}
-          ScalarConstructor[not set]{0}
+          ScalarConstructor[not set]{0u}
+          ScalarConstructor[not set]{0u}
         }
       }
     }
@@ -663,14 +663,14 @@
 }
 Assignment{
   Identifier[not set]{x_25}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Assignment{
   Identifier[not set]{x_25}
   Binary[not set]{
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
     add
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
 }
 Return{}
@@ -715,16 +715,16 @@
     __u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
         add
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
 }
 Assignment{
   Identifier[not set]{x_25}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Assignment{
   Identifier[not set]{x_25}
@@ -787,16 +787,16 @@
     __u32
     {
       Binary[not set]{
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
         add
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
 }
 Assignment{
   Identifier[not set]{x_25}
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
 }
 Loop{
   continuing {
@@ -808,7 +808,7 @@
 }
 Assignment{
   Identifier[not set]{x_25}
-  ScalarConstructor[not set]{2}
+  ScalarConstructor[not set]{2u}
 }
 Return{}
 )";
@@ -874,7 +874,7 @@
   auto got = ToString(p->builder(), fe.ast_body());
   auto* expect = R"(Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{0}
+  ScalarConstructor[not set]{0u}
 }
 Loop{
   VariableDeclStatement{
@@ -886,7 +886,7 @@
   }
   Assignment{
     Identifier[not set]{x_1}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -898,7 +898,7 @@
   }
   Assignment{
     Identifier[not set]{x_1}
-    ScalarConstructor[not set]{3}
+    ScalarConstructor[not set]{3u}
   }
   If{
     (
@@ -908,9 +908,9 @@
       Assignment{
         Identifier[not set]{x_2}
         Binary[not set]{
-          ScalarConstructor[not set]{1}
+          ScalarConstructor[not set]{1u}
           add
-          ScalarConstructor[not set]{1}
+          ScalarConstructor[not set]{1u}
         }
       }
     }
@@ -927,7 +927,7 @@
   continuing {
     Assignment{
       Identifier[not set]{x_1}
-      ScalarConstructor[not set]{4}
+      ScalarConstructor[not set]{4u}
     }
     If{
       (
@@ -941,7 +941,7 @@
 }
 Assignment{
   Identifier[not set]{x_1}
-  ScalarConstructor[not set]{5}
+  ScalarConstructor[not set]{5u}
 }
 Return{}
 )";
@@ -996,7 +996,7 @@
     none
     __u32
     {
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -1086,7 +1086,7 @@
         none
         __u32
         {
-          ScalarConstructor[not set]{1}
+          ScalarConstructor[not set]{1u}
         }
       }
     }
@@ -1173,14 +1173,14 @@
         none
         __u32
         {
-          ScalarConstructor[not set]{1}
+          ScalarConstructor[not set]{1u}
         }
       }
     }
     Switch{
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
       {
-        Case 0{
+        Case 0u{
         }
         Default{
         }
@@ -1251,7 +1251,7 @@
     none
     __u32
     {
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
 }
@@ -1356,11 +1356,11 @@
   }
   Assignment{
     Identifier[not set]{x_2_phi}
-    ScalarConstructor[not set]{0}
+    ScalarConstructor[not set]{0u}
   }
   Assignment{
     Identifier[not set]{x_3_phi}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -1396,7 +1396,7 @@
       Binary[not set]{
         Identifier[not set]{x_2}
         add
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
     Assignment{
@@ -1500,11 +1500,11 @@
   }
   Assignment{
     Identifier[not set]{x_2_phi}
-    ScalarConstructor[not set]{0}
+    ScalarConstructor[not set]{0u}
   }
   Assignment{
     Identifier[not set]{x_3_phi}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   If{
     (
@@ -1556,7 +1556,7 @@
         Binary[not set]{
           Identifier[not set]{x_2}
           add
-          ScalarConstructor[not set]{1}
+          ScalarConstructor[not set]{1u}
         }
       }
       Assignment{
@@ -1648,11 +1648,11 @@
   }
   Assignment{
     Identifier[not set]{x_2_phi}
-    ScalarConstructor[not set]{0}
+    ScalarConstructor[not set]{0u}
   }
   Assignment{
     Identifier[not set]{x_5_phi}
-    ScalarConstructor[not set]{1}
+    ScalarConstructor[not set]{1u}
   }
   Loop{
     VariableDeclStatement{
@@ -1691,7 +1691,7 @@
           Binary[not set]{
             Identifier[not set]{x_2}
             add
-            ScalarConstructor[not set]{1}
+            ScalarConstructor[not set]{1u}
           }
         }
       }
@@ -1705,7 +1705,7 @@
           Binary[not set]{
             Identifier[not set]{x_4}
             add
-            ScalarConstructor[not set]{1}
+            ScalarConstructor[not set]{1u}
           }
         }
       }
@@ -1833,7 +1833,7 @@
     {
       Assignment{
         Identifier[not set]{x_2_phi}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
       }
       Continue{}
     }
@@ -1842,7 +1842,7 @@
     {
       Assignment{
         Identifier[not set]{x_2_phi}
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
@@ -1950,7 +1950,7 @@
   }
   Assignment{
     Identifier[not set]{x_2_phi}
-    ScalarConstructor[not set]{0}
+    ScalarConstructor[not set]{0u}
   }
   If{
     (
@@ -1959,7 +1959,7 @@
     {
       Assignment{
         Identifier[not set]{x_2_phi}
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
@@ -2044,15 +2044,15 @@
   }
 }
 Switch{
-  ScalarConstructor[not set]{1}
+  ScalarConstructor[not set]{1u}
   {
     Default{
       Fallthrough{}
     }
-    Case 0{
+    Case 0u{
       Fallthrough{}
     }
-    Case 1{
+    Case 1u{
       If{
         (
           ScalarConstructor[not set]{true}
@@ -2064,14 +2064,14 @@
         {
           Assignment{
             Identifier[not set]{x_35_phi}
-            ScalarConstructor[not set]{0}
+            ScalarConstructor[not set]{0u}
           }
           Break{}
         }
       }
       Assignment{
         Identifier[not set]{x_35_phi}
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
       }
     }
   }
diff --git a/src/reader/spirv/parser_impl_function_decl_test.cc b/src/reader/spirv/parser_impl_function_decl_test.cc
index ab9da9d..5b2e753 100644
--- a/src/reader/spirv/parser_impl_function_decl_test.cc
+++ b/src/reader/spirv/parser_impl_function_decl_test.cc
@@ -209,7 +209,7 @@
   {
     Return{
       {
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
       }
     }
   }
diff --git a/src/reader/spirv/parser_impl_module_var_test.cc b/src/reader/spirv/parser_impl_module_var_test.cc
index b70bdef..220261e 100644
--- a/src/reader/spirv/parser_impl_module_var_test.cc
+++ b/src/reader/spirv/parser_impl_module_var_test.cc
@@ -890,7 +890,7 @@
     private
     __u32
     {
-      ScalarConstructor[not set]{1}
+      ScalarConstructor[not set]{1u}
     }
   }
   Variable{
@@ -939,7 +939,7 @@
     private
     __u32
     {
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     }
   }
   Variable{
@@ -988,7 +988,7 @@
     private
     __u32
     {
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     }
   }
   Variable{
@@ -1087,8 +1087,8 @@
     {
       TypeConstructor[not set]{
         __vec_2__u32
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   })"));
@@ -1110,8 +1110,8 @@
     {
       TypeConstructor[not set]{
         __vec_2__u32
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   })"));
@@ -1340,8 +1340,8 @@
     {
       TypeConstructor[not set]{
         __array__u32_2
-        ScalarConstructor[not set]{1}
-        ScalarConstructor[not set]{2}
+        ScalarConstructor[not set]{1u}
+        ScalarConstructor[not set]{2u}
       }
     }
   })"));
@@ -1363,8 +1363,8 @@
     {
       TypeConstructor[not set]{
         __array__u32_2
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   })"));
@@ -1386,8 +1386,8 @@
     {
       TypeConstructor[not set]{
         __array__u32_2
-        ScalarConstructor[not set]{0}
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
+        ScalarConstructor[not set]{0u}
       }
     }
   })"));
@@ -1411,12 +1411,12 @@
     {
       TypeConstructor[not set]{
         __struct_S
-        ScalarConstructor[not set]{1}
+        ScalarConstructor[not set]{1u}
         ScalarConstructor[not set]{1.500000}
         TypeConstructor[not set]{
           __array__u32_2
-          ScalarConstructor[not set]{1}
-          ScalarConstructor[not set]{2}
+          ScalarConstructor[not set]{1u}
+          ScalarConstructor[not set]{2u}
         }
       }
     }
@@ -1440,12 +1440,12 @@
     {
       TypeConstructor[not set]{
         __struct_S
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
         ScalarConstructor[not set]{0.000000}
         TypeConstructor[not set]{
           __array__u32_2
-          ScalarConstructor[not set]{0}
-          ScalarConstructor[not set]{0}
+          ScalarConstructor[not set]{0u}
+          ScalarConstructor[not set]{0u}
         }
       }
     }
@@ -1469,12 +1469,12 @@
     {
       TypeConstructor[not set]{
         __struct_S
-        ScalarConstructor[not set]{0}
+        ScalarConstructor[not set]{0u}
         ScalarConstructor[not set]{0.000000}
         TypeConstructor[not set]{
           __array__u32_2
-          ScalarConstructor[not set]{0}
-          ScalarConstructor[not set]{0}
+          ScalarConstructor[not set]{0u}
+          ScalarConstructor[not set]{0u}
         }
       }
     }
@@ -1906,7 +1906,7 @@
     none
     __u32
     {
-      ScalarConstructor[not set]{42}
+      ScalarConstructor[not set]{42u}
     }
   }
 })")) << module_str;
@@ -2762,7 +2762,7 @@
   EXPECT_THAT(module_str, HasSubstr(R"(
     Assignment{
       Identifier[not set]{x_1}
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     })"))
       << module_str;
 }
@@ -2798,7 +2798,7 @@
   EXPECT_THAT(module_str, HasSubstr(R"(
     Assignment{
       Identifier[not set]{x_1}
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     })"))
       << module_str;
 }
@@ -2834,7 +2834,7 @@
   EXPECT_THAT(module_str, HasSubstr(R"(
     Assignment{
       Identifier[not set]{x_1}
-      ScalarConstructor[not set]{0}
+      ScalarConstructor[not set]{0u}
     })"))
       << module_str;
 }