diff --git a/errors/src/common/formatted.rs b/errors/src/common/formatted.rs
index ee7b88ab92..f4262e0de4 100644
--- a/errors/src/common/formatted.rs
+++ b/errors/src/common/formatted.rs
@@ -118,7 +118,7 @@ impl fmt::Display for FormattedError {
         write!(
             f,
             "\n{indent     }--> {path}:{line_start}:{start}\n\
-            {indent     } ",
+            {indent     } |\n",
             indent = INDENT,
             path = &*self.span.path,
             line_start = self.span.line_start,
@@ -128,7 +128,7 @@ impl fmt::Display for FormattedError {
         for (line_no, line) in self.span.content.lines().enumerate() {
             writeln!(
                 f,
-                "|\n{line_no:width$} | {text}",
+                "{line_no:width$} | {text}",
                 width = INDENT.len(),
                 line_no = self.span.line_start + line_no,
                 text = line,
diff --git a/errors/src/common/span.rs b/errors/src/common/span.rs
index e2d1d451f3..c10d259642 100644
--- a/errors/src/common/span.rs
+++ b/errors/src/common/span.rs
@@ -152,11 +152,23 @@ impl std::ops::Add for Span {
             let other_lines = other.content.lines().collect::<Vec<_>>();
             for line in self.line_start.min(other.line_start)..self.line_stop.max(other.line_stop) + 1 {
                 if line >= self.line_start && line <= self.line_stop {
-                    new_content.push(self_lines.get(line - self.line_start).copied().unwrap_or_default());
+                    new_content.push(
+                        self_lines
+                            .get(line - self.line_start)
+                            .copied()
+                            .unwrap_or_default()
+                            .to_string(),
+                    );
                 } else if line >= other.line_start && line <= other.line_stop {
-                    new_content.push(other_lines.get(line - other.line_start).copied().unwrap_or_default());
+                    new_content.push(
+                        other_lines
+                            .get(line - other.line_start)
+                            .copied()
+                            .unwrap_or_default()
+                            .to_string(),
+                    );
                 } else if new_content.last().map(|x| *x != "...").unwrap_or(true) {
-                    new_content.push("...");
+                    new_content.push(format!("{:<1$}...", " ", other.col_start + 4));
                 }
             }
             let new_content = new_content.join("\n").into();
diff --git a/tests/expectations/compiler/compiler/address/branch.leo.out b/tests/expectations/compiler/compiler/address/branch.leo.out
index f820743540..3d0a5f4dce 100644
--- a/tests/expectations/compiler/compiler/address/branch.leo.out
+++ b/tests/expectations/compiler/compiler/address/branch.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 9c0c4094669cbb415b9d650a42335ba05a7026573e925d468de562577f90686b
-    canonicalized_ast: 9c0c4094669cbb415b9d650a42335ba05a7026573e925d468de562577f90686b
-    type_inferenced_ast: 1b636553844640391e976115df709060a44e64346cbf06b4207a6f4c443e36b1
+    initial_ast: 0788eb39577304b655f147fe3045e1fad995b31811444afadc228bf99f505994
+    canonicalized_ast: 0788eb39577304b655f147fe3045e1fad995b31811444afadc228bf99f505994
+    type_inferenced_ast: 57aa71789a8ba7ac075f734ecc0450ae4b56b2343cff19e345cdab9c7715e1ee
diff --git a/tests/expectations/compiler/compiler/address/equal.leo.out b/tests/expectations/compiler/compiler/address/equal.leo.out
index 06d3c264e9..491c8bb576 100644
--- a/tests/expectations/compiler/compiler/address/equal.leo.out
+++ b/tests/expectations/compiler/compiler/address/equal.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: a98138d9c59f7f9d7a6ed08713bc78a84059734eb5ee7479abeea88ce02da881
-    canonicalized_ast: a98138d9c59f7f9d7a6ed08713bc78a84059734eb5ee7479abeea88ce02da881
-    type_inferenced_ast: e0c1d57acb15679e25c78cc4fe3266b85ce26d4d7d23b55a78c49c33f0b3d550
+    initial_ast: e057591dddc93027645e671870d9bb932a32647a600a452657e0a8a3748f0921
+    canonicalized_ast: e057591dddc93027645e671870d9bb932a32647a600a452657e0a8a3748f0921
+    type_inferenced_ast: 1d32fc5c118dc328274a6e2c4048c0efeea2b128fa2d2733ddf7d4fde4daf46f
diff --git a/tests/expectations/compiler/compiler/address/index.leo.out b/tests/expectations/compiler/compiler/address/index.leo.out
index 251698d31e..59194f6bf4 100644
--- a/tests/expectations/compiler/compiler/address/index.leo.out
+++ b/tests/expectations/compiler/compiler/address/index.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 87761daaf7a803becfc809b948e4f34a2c38e4bfe3b8f5184e6923ad707be714
-    canonicalized_ast: 87761daaf7a803becfc809b948e4f34a2c38e4bfe3b8f5184e6923ad707be714
-    type_inferenced_ast: 46539f9daa06cc132acaeeacf88a766d7f7673de8b9d2ea3ef01bb330520b00f
+    initial_ast: 76cba1a1eb179db8b21c2e05403861e133983feec9b987c764a5584da78c16fb
+    canonicalized_ast: 76cba1a1eb179db8b21c2e05403861e133983feec9b987c764a5584da78c16fb
+    type_inferenced_ast: 822de2e0c4fdf74f7b476666b6a8a38782bd828dc2d216a7a68bf70edc444fbf
diff --git a/tests/expectations/compiler/compiler/address/ternary.leo.out b/tests/expectations/compiler/compiler/address/ternary.leo.out
index 94d76dce8b..fb25d02dd7 100644
--- a/tests/expectations/compiler/compiler/address/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/address/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: 08a406e8214b12bec43b41364c4d19fd81b227915ab2deb9c572b140c43aeabe
-    canonicalized_ast: 08a406e8214b12bec43b41364c4d19fd81b227915ab2deb9c572b140c43aeabe
-    type_inferenced_ast: 5c194c9590eb53fa1a6af575e63bf54860befa24d3636610aa68c46b72d839a8
+    initial_ast: 8a34bf070edd7585daad47802214b7df49b6df6dd9a6344644a4f121b320e449
+    canonicalized_ast: 8a34bf070edd7585daad47802214b7df49b6df6dd9a6344644a4f121b320e449
+    type_inferenced_ast: 2254abca31e4326444ef2066c8f85b3280505a3ecbaffaf7e472276a3034cc2f
diff --git a/tests/expectations/compiler/compiler/array/complex_access.leo.out b/tests/expectations/compiler/compiler/array/complex_access.leo.out
index b7f4e36e2a..d3cd24862e 100644
--- a/tests/expectations/compiler/compiler/array/complex_access.leo.out
+++ b/tests/expectations/compiler/compiler/array/complex_access.leo.out
@@ -16,6 +16,6 @@ outputs:
             out:
               type: bool
               value: "true"
-    initial_ast: 10f8520f03661d994c22d2c73d8049a1b2af19a9a0d75edd6af15a8979aa299a
-    canonicalized_ast: 3b8301335066fe2bfe8eba905ab33bc816e911591a7873d9ea4ce42ea1709aee
-    type_inferenced_ast: 380dcc1b3581ded8098020e5a311d98aa17c5b19259ea0b7a4457d417ac2fe5f
+    initial_ast: 589670c04ad13f8dbe2ea01562fa6bdff1c6dfaf118730e60d0a55e5bb2168b9
+    canonicalized_ast: 82fd732401abaced235b6522298a454fd0491ea1dc0a80170773e1a129320657
+    type_inferenced_ast: 14321d2bd1a2d9da60f52372feee4c8bf6aa98d516c01bf309d219c903b7f241
diff --git a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
index 55b00f98ff..f593750149 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer.leo.out
@@ -22,6 +22,6 @@ outputs:
             x:
               type: bool
               value: "false"
-    initial_ast: fda944cb99bf4cedbfd531f2aafa9338f3d374ecbbfd40196cd82ccdfc462541
-    canonicalized_ast: 5e78fec68f5bf00fcc574930106ebf0883cc6122e3378fa245294619e7b2dc84
-    type_inferenced_ast: 7db6bf5aae7f4929e44e3d068c366a8917b937a43770b2f62ee35df4fb58eb81
+    initial_ast: c4b7aca1f9002da95f8efab340d4dc5d38e64d97274b1815126e7f88f40e155a
+    canonicalized_ast: c8b633546058b56b76a0864ab0fce2aa7169554b716e17250ebc688708dcd206
+    type_inferenced_ast: 9411e52e1ab1ddec7d5d1111aa8c10a5ec916b9d5e86d24ed5348462ec0adb71
diff --git a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
index 6a76b09bed..2068f31405 100644
--- a/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
+++ b/tests/expectations/compiler/compiler/array/equal_initializer_2.leo.out
@@ -22,6 +22,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 7c27f9b122c5bfdff2c53d5474e99c4e7da6a4a1454f43242c87e508ed564c72
-    canonicalized_ast: 3d416efd3620b8851ac1ce3e14dc0b80baa7c11901beee61cc7e47ea7d177fe2
-    type_inferenced_ast: 34042fc568040adc10883279bd68c7efd24ba63717013aca008eeaaef32bc1c9
+    initial_ast: 2cbe00dbca8111c92a55dcb9a18766ddb9a407e71535ae62d3bf4d6ec409fca2
+    canonicalized_ast: 75d8d33b9a5376fea14bb9821abe1bc5e1661cfccbf962f58facb42e539b1b04
+    type_inferenced_ast: 45b1b5d994a229da8fb761d97c474778a65b8a5fdd87cfbd6e4aaa4a1ddef7a0
diff --git a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
index 9d3c5d1d5d..bc64293f28 100644
--- a/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_nested_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 218388bf03161d2c04e5aeea2c86e9c81d2bec8f080a1cf8cdaf003c15598f23
-    canonicalized_ast: dcc0c2c9f6acc9d8b565c0445e5e879ad76564c2b323587ae5d8ed84b5977d13
-    type_inferenced_ast: 26266c1f1ddaf309dbead42e49f4e41752e5e1fe72cdc3a24953088d08df953a
+    initial_ast: 002647d1f55a3b5f358cbd27beff81736973fc142dc3d708f8df8d634c1e8fa4
+    canonicalized_ast: b36a5f62c09093fcfce2797b89fe936c4bb94fe1e4aca6608cda4f529677b005
+    type_inferenced_ast: 524e0682eec030dda6f12637fb92af0122a7cf3986a8d7c974a2bc8a1554552d
diff --git a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
index 30616ab39e..16b86824b3 100644
--- a/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/input_tuple_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: fda944cb99bf4cedbfd531f2aafa9338f3d374ecbbfd40196cd82ccdfc462541
-    canonicalized_ast: 5e78fec68f5bf00fcc574930106ebf0883cc6122e3378fa245294619e7b2dc84
-    type_inferenced_ast: 7db6bf5aae7f4929e44e3d068c366a8917b937a43770b2f62ee35df4fb58eb81
+    initial_ast: c4b7aca1f9002da95f8efab340d4dc5d38e64d97274b1815126e7f88f40e155a
+    canonicalized_ast: c8b633546058b56b76a0864ab0fce2aa7169554b716e17250ebc688708dcd206
+    type_inferenced_ast: 9411e52e1ab1ddec7d5d1111aa8c10a5ec916b9d5e86d24ed5348462ec0adb71
diff --git a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
index cbda44a22b..b8fe56c3cb 100644
--- a/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
+++ b/tests/expectations/compiler/compiler/array/multi_initializer.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 32a53c1270d2a7384c5d1a0cbda49d9634db09dc2b69fae444fb4f36109bb8fa
-    canonicalized_ast: 88df9d661f84ad6650c5d81dd0ec07b5a07fbb2ceda5fde1ba545bc3391ac9ce
-    type_inferenced_ast: 5aaf153f3c03ac9e11e500a1e60f0ea11d1b5c736c3209118f3c67c0321a490b
+    initial_ast: 411fd383234eaff206ddb89e59c53eb3cf89cc0584065cbcc6a407f7b6c657da
+    canonicalized_ast: 8730ae623fae334d698ea4169b630365f3026e6b39264da353e194feb07c0863
+    type_inferenced_ast: 48ede78fbd4de76d6693bc2a50b813f119024f80d0a6c73f174f1a7ba56a92ce
diff --git a/tests/expectations/compiler/compiler/array/nested.leo.out b/tests/expectations/compiler/compiler/array/nested.leo.out
index cc8839129d..a372f6cfae 100644
--- a/tests/expectations/compiler/compiler/array/nested.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8f10cab9e9d44f9e2bf63d3de712fbfd56e311fe1bf9a8cdd2d29d23acdca9bd
-    canonicalized_ast: f4516c7e913f38f8fcfe8be1061ea4960a44891e92f369f7a114ff87ae08385d
-    type_inferenced_ast: 530a5d13568caa8db612d73623d876294110f2d2ca4fa57f7dc67d7a8b6bb75b
+    initial_ast: 436ce80cb3f81cd43e5747a105b14947964f29c0c35070c394728cd2cd9b1fa3
+    canonicalized_ast: 3097d80c877f857bd36f1e3ca56aefd7524a2fc46239959190ae9c5ef166ba9a
+    type_inferenced_ast: 873a71a8f9894e1967f0f750d63011597f17e0a51b5cd42ea0b74191ffa357a1
diff --git a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
index 12dafb6498..5f11aa99e8 100644
--- a/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/nested_3x2_value.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 896fc62bde36645825dc69df4fadb323db666acf660708e94a699f1028fff42e
-    canonicalized_ast: 7ee6031329c67e55206272781e4b790372743eaf797585428417995e833ce6e0
-    type_inferenced_ast: 37f276c62c7619fc7e541006b5d70f2d628419243b561b52352ea5d944f395bb
+    initial_ast: 33a39a0f27f018eee2f2986d1356bcc9354ce3128447a60859f4392b8a4e4f29
+    canonicalized_ast: c227ab0a4e864f62af90e4b1d843dcd41e65b65354107558cf26383831010a1d
+    type_inferenced_ast: c2515f900d7b2ae04c80ed1f7a3bf5729fec502dffc910cae03ac8cf02530dce
diff --git a/tests/expectations/compiler/compiler/array/registers.leo.out b/tests/expectations/compiler/compiler/array/registers.leo.out
index a5e25dc509..f03de935e4 100644
--- a/tests/expectations/compiler/compiler/array/registers.leo.out
+++ b/tests/expectations/compiler/compiler/array/registers.leo.out
@@ -22,6 +22,6 @@ outputs:
             r:
               type: "[u8; 3]"
               value: "\"123\""
-    initial_ast: 8081e76e99bf5f637adacbf3ebc7f55c0cce51add474de0bd53da72ea559f489
-    canonicalized_ast: 8081e76e99bf5f637adacbf3ebc7f55c0cce51add474de0bd53da72ea559f489
-    type_inferenced_ast: 7fdc1c08d6bc57661b15407868ca23940aea04ec9e4d36d9e41f151a8cf09461
+    initial_ast: c6b18b6fca7fda77a9eba151f4d27d084e1ad7aa616e6ec9deb1ef5f4bff2d24
+    canonicalized_ast: c6b18b6fca7fda77a9eba151f4d27d084e1ad7aa616e6ec9deb1ef5f4bff2d24
+    type_inferenced_ast: 6f6e6b35b55543bc87589005ac9a47830e3f65680a4db82e3f17d9280d6fa4ad
diff --git a/tests/expectations/compiler/compiler/array/slice.leo.out b/tests/expectations/compiler/compiler/array/slice.leo.out
index b81968aa2f..4eb93da246 100644
--- a/tests/expectations/compiler/compiler/array/slice.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: e29ed0519cc383934fa19fb0efb6d8789f973a26dbeef8d88859efb29624c3d9
-    canonicalized_ast: e29ed0519cc383934fa19fb0efb6d8789f973a26dbeef8d88859efb29624c3d9
-    type_inferenced_ast: 7051b05b956b9b30cd64b5e7fb93837b78731742431f3210e0b67cc308fd37f4
+    initial_ast: e75ae154dab0f64ed38fc12e28289351e79787787e882847fbc020a780bc429f
+    canonicalized_ast: e75ae154dab0f64ed38fc12e28289351e79787787e882847fbc020a780bc429f
+    type_inferenced_ast: c5a14533d3c5d0751b98beb612a88eac2c7687ae77858dfcbc3424b160f1cd7d
diff --git a/tests/expectations/compiler/compiler/array/slice_lower.leo.out b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
index 75eea7dc8e..a93da800f0 100644
--- a/tests/expectations/compiler/compiler/array/slice_lower.leo.out
+++ b/tests/expectations/compiler/compiler/array/slice_lower.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 847923c2af8832e5f2e9b7ba33e6da05ce6b782fc49061817bf0e8c1f308af78
-    canonicalized_ast: 847923c2af8832e5f2e9b7ba33e6da05ce6b782fc49061817bf0e8c1f308af78
-    type_inferenced_ast: d9feb9d3324d32ade64eb50f2f49ba54f656430197085755558bc972f3d76252
+    initial_ast: 748ad013543f1352f922fc5b566b38bf6a9de939a566c4484660f17460ef5cee
+    canonicalized_ast: 748ad013543f1352f922fc5b566b38bf6a9de939a566c4484660f17460ef5cee
+    type_inferenced_ast: 80f8d5b301bc982f189c63a4d908c7bf7a9a2d5ea351778d740035bad95f166a
diff --git a/tests/expectations/compiler/compiler/array/spread.leo.out b/tests/expectations/compiler/compiler/array/spread.leo.out
index 7e9446a229..09685b4e01 100644
--- a/tests/expectations/compiler/compiler/array/spread.leo.out
+++ b/tests/expectations/compiler/compiler/array/spread.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: b213065cf9a69052aa42e5e2599ebbec19429b7c8f286dd29baefdd22de5ae11
-    canonicalized_ast: b213065cf9a69052aa42e5e2599ebbec19429b7c8f286dd29baefdd22de5ae11
-    type_inferenced_ast: 6cbb6af27980d61e07df3f9f54b77ca34463c79df3f4980870b9c184847eac27
+    initial_ast: 97004d55104bcf3b6698926656fb23c849cc1c488e387d151c1f3e2be4438fe0
+    canonicalized_ast: 97004d55104bcf3b6698926656fb23c849cc1c488e387d151c1f3e2be4438fe0
+    type_inferenced_ast: 7294dc3dee9189573cbf54b90692869b2a02a78fb3bbb6fe3e2436d2cca377fc
diff --git a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
index 290104d615..360c7d70c1 100644
--- a/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
+++ b/tests/expectations/compiler/compiler/array/ternary_in_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: d073d355e5dc63d782bf7511301b7d3460b1909f20cb951275b4160818f91e96
-    canonicalized_ast: d073d355e5dc63d782bf7511301b7d3460b1909f20cb951275b4160818f91e96
-    type_inferenced_ast: e896efa565b20c373020f3e3fb2ca68c2ee836512b4968d61b920e9ed6889fdb
+    initial_ast: aa978e3283733cfee6cef1e6eff20b4847cf56962ccb3501b6501d31cd42ddb5
+    canonicalized_ast: aa978e3283733cfee6cef1e6eff20b4847cf56962ccb3501b6501d31cd42ddb5
+    type_inferenced_ast: edcba3eea639506ff172054105ac6533c6d184c131240e73f896f307983ba3c2
diff --git a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
index 4d05669210..e31f9bed5d 100644
--- a/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
+++ b/tests/expectations/compiler/compiler/array/tuple_3x2_value.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e2d243135efb97b9b091ce0e5c7286b71ff3561da860cae9db7af5cbeb696f6c
-    canonicalized_ast: 28d1ec3e1349fa7d140bbb51cdefbe85dc73ce6e1ef540fa4cf9ce7700411a8c
-    type_inferenced_ast: 9928c37278b67a3d0882f1cb7b2b1fe630ad0771ac1e95509028c3e9241a3bbf
+    initial_ast: f92dd478e6c8fdb9a7f0dfd3ad0cf9e6e0239c59e5ee1fda0851fdcdfb2ca589
+    canonicalized_ast: 0ce7eb5522cc65d45b259560b138eca8750b7a4231435f6b5df21c906db4d5ba
+    type_inferenced_ast: 1aeacac3268aed9b99f7d5a7736e9f32cd1a65905d3234d11ec5f6027bd68c66
diff --git a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
index c373102927..66d3e5d43c 100644
--- a/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: ddb20cbb9ecf52a8f9d61766f0bdf76d01d3a7854c5ca018f88e226592e44940
-    canonicalized_ast: ddb20cbb9ecf52a8f9d61766f0bdf76d01d3a7854c5ca018f88e226592e44940
-    type_inferenced_ast: c7c2205a1fb4587b6281f21d34a2cafae1583106e19af3beaead87b623cb61d6
+    initial_ast: ab709670db7a5cc6642a175a78541054b53210f6be39a174d90ee57f3c5570f5
+    canonicalized_ast: ab709670db7a5cc6642a175a78541054b53210f6be39a174d90ee57f3c5570f5
+    type_inferenced_ast: f870e0b5181e4187da90ea8f7ea562596f0fea420425a403a972d761131718af
diff --git a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
index 4f5f0df1eb..03baa309e3 100644
--- a/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_input_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 8b5cb35e1fe17071cd7aa404be247a325dde350d6954aaa1c58ee0bb0dd4d333
-    canonicalized_ast: 8b5cb35e1fe17071cd7aa404be247a325dde350d6954aaa1c58ee0bb0dd4d333
-    type_inferenced_ast: 4661ca8ff2e993ddae82000b6db73db86b63af8c4557d22975abbe9a63cb14e5
+    initial_ast: 05ee62d30364f4d4ea3a6f680b049c3743d6fcb2cd7e751d798e61b38f1f0c70
+    canonicalized_ast: 05ee62d30364f4d4ea3a6f680b049c3743d6fcb2cd7e751d798e61b38f1f0c70
+    type_inferenced_ast: a1307016717f76519ff0f813ead70ed5460644e0e8414827665a1bd066159a76
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
index c1b8050f09..d77376c25f 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: af5c8bc684c384ee78844b52c6752ba286378bb41218faf63446caf1d7d98c6f
-    canonicalized_ast: af5c8bc684c384ee78844b52c6752ba286378bb41218faf63446caf1d7d98c6f
-    type_inferenced_ast: c15b64210f2f8afad3f9819f877f287c2a6a08e2edd6adeb4375527c4d1f426b
+    initial_ast: 8caeaa858353e7f461b14364b898d538508c2e45c477c36dddc2960d4d626ed9
+    canonicalized_ast: 8caeaa858353e7f461b14364b898d538508c2e45c477c36dddc2960d4d626ed9
+    type_inferenced_ast: a61912871814695d648b0f176feaa0409b3d6bae3cb7c7a1234bf6543e015a5f
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
index 370eac3c75..10106726b4 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_nested_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 98381a0a6fe09deaba7e43c014332664b608098bed9855ce1c19b6494b26cebd
-    canonicalized_ast: 98381a0a6fe09deaba7e43c014332664b608098bed9855ce1c19b6494b26cebd
-    type_inferenced_ast: 40c047076318d5931ad0d3a3aaa6ddd8245a012b68f5ae3792c1b6334e444bbb
+    initial_ast: 77b015384e8f21d34eef7f56465605fa133e739863a6bc33b01315232a86647e
+    canonicalized_ast: 77b015384e8f21d34eef7f56465605fa133e739863a6bc33b01315232a86647e
+    type_inferenced_ast: 4be69d8478185f5b9d4dcee3fc16ad4af858b7a47122bbc8e757d0dbc4bf92d8
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
index e9b1149d19..97d78e0fef 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e51e19607178661b8069b140d903234ad67047f876e428cd98577a317c1c63ea
-    canonicalized_ast: 9ece5eb8b7cfd8d9f46e1f5d56932463bfade9ed0dc7aa5cb4ea1a02710fabb6
-    type_inferenced_ast: 75035a66a260d555fd66fc58a8c349cf77a88e649d9af5a21620b1d0ce69ab76
+    initial_ast: ce12666930386785c7a5afe142793c47eae62145ff1d50c590dc82c2b4baded6
+    canonicalized_ast: 8220bc2881fe07bbfa873376696618fc182aff993d2a7d1a23ace5cc00965ff8
+    type_inferenced_ast: c14a7e89debd9289883db476fdbc814d14bfc410d40d1ac100bbece88d35b7c8
diff --git a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
index 15843373df..4c0c8b246d 100644
--- a/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_nested_value_tuple_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c7388d8c25c6c593bbf9df42442c773fde414f17c608ea3f44e7d2b1d2da742a
-    canonicalized_ast: 1f78e26797ec426580278599d668230e3ff5c73f8bfe5ee34aa2cfeb2bc8f501
-    type_inferenced_ast: e1850f46b6a18ce3fdc6be9fe8cd71df61b47c11cf4b6904e9006feec39724a7
+    initial_ast: 609dfd962592e1dbf90051979163cead865cb69c0722c641517fad4f3091ec57
+    canonicalized_ast: 4d6b8380c844ac6655c7dcc4c4a2ff45f14001577c82f21d87b4546e04c7e776
+    type_inferenced_ast: d86da787361b7cea05474815138f2a1f98642b93232641bf399647788c0d5ecd
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
index e2d1fa8e57..621b4b1bed 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5ef47c66a7103fb79151a128b79e270c775761f85ba7b600fa62feedb9d776a1
-    canonicalized_ast: d85e3d11bcb9ea34f4c0115bc19ab6cc9706e24f337127a5deb76a23762b1cc7
-    type_inferenced_ast: 4b484d40365dd5e0440645a4ae057979e008f58b9072977da44a4936d6844201
+    initial_ast: 67cb2ae1b5b3e19a7c7aa8783d0f566b69bfb995e7848ec7746e1af0448c1aa8
+    canonicalized_ast: 4aba053c866851bfcd22da037e0270ad43a7fabbdc263629af52eea38d577b7a
+    type_inferenced_ast: b44ceb7749802ff53c82221efad075565264531500665a01aa94f745e0c304cd
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
index fcfdc4afa1..29a8a9c198 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_nested_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9c4ccc3962870de33739e88f016f9ad2a26fce1dd9d83777e75146a770a7c843
-    canonicalized_ast: 342998b2e6b4e15992c0ae8f8f9e88fd61028b9f5251a1a44eb0a5e748fb914a
-    type_inferenced_ast: bcb57fa0c03974b04bab42f1000a0896442859aefed0b3da4122f9e2eb6d3bcb
+    initial_ast: 9867f722c5ce3ccbc3701238c216acc2b7e37bdc6163a8f7a4a4d88b7f19b73a
+    canonicalized_ast: d5f9deb2b7806ec665a6c6a5a6a0bee2c76310ecec4f34a8a479aa6934902b3a
+    type_inferenced_ast: ed9cee663a3a9dc51ba06a80e5f192fdcc49e62b8e4cb0ae9582f3a7f7b1de25
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
index 446db73b3b..20cd329a0c 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f58024907a398764d1f82717bfb3c428f3bcaf199612fb58f57da612dc0f31d9
-    canonicalized_ast: f08780773dfd122a26f9afb8a17ead2177a7741fe658510d4cb3e00e80ac43e6
-    type_inferenced_ast: cfb5f5e51dede0eb87e637bfc6cf995c8f15c32fea3caf92c0a73b5af430a9fb
+    initial_ast: 222950738e89721363dd15b8f5d240befa46d434c45f486857ec4898806d0e84
+    canonicalized_ast: b89098b4159b284f07be789cfb5b196515c9d33821be1411c4bc25ae3c90425f
+    type_inferenced_ast: 4e0acee05ff837a30c1057dec0c5cc18a6ce573e5891218990f88584fef683a7
diff --git a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
index c467079faf..cb1620363c 100644
--- a/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
+++ b/tests/expectations/compiler/compiler/array/type_tuple_value_tuple_4x3x2.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: aabfd4724373f68e44dac450426c84c619f8441e02f4cec46bf1a96b01d687c6
-    canonicalized_ast: 2768446224453862bedd1449de91a6f9e82a06ce41a23dc4afef2e8bc2faf078
-    type_inferenced_ast: 24346a907649334e87888b2744dfda551e8ca3248b1e357d432ce0d027f44a9b
+    initial_ast: a312fb26b99d2c4a7891d482079f0220663dba780bc68b9f651def2cd9bad960
+    canonicalized_ast: 01c472ee0495bbb164f67159e86483a29421918178a7115ebd3b905d6909150f
+    type_inferenced_ast: ac2c37891e21027028b4a1e4b8f5972e5ee64f91f6b2ba6a85218c622192ce02
diff --git a/tests/expectations/compiler/compiler/boolean/and.leo.out b/tests/expectations/compiler/compiler/boolean/and.leo.out
index 996e5e721a..5714d0de0b 100644
--- a/tests/expectations/compiler/compiler/boolean/and.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/and.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: e412bc079077d0894afdfb1b2bdcb0627216e64e05b93d53c065acaab6602648
-    canonicalized_ast: e412bc079077d0894afdfb1b2bdcb0627216e64e05b93d53c065acaab6602648
-    type_inferenced_ast: 8455cc489d00cc4c2efb999f238544d267605c78c4a3711f3968daff8b1b691f
+    initial_ast: 9f6929c30448a269b4a22f3001085be75f91bc91503978f2804f4d6bf7dd246f
+    canonicalized_ast: 9f6929c30448a269b4a22f3001085be75f91bc91503978f2804f4d6bf7dd246f
+    type_inferenced_ast: b41ada9ca834d73d94641fa3f28c95bea6e6862819bab431ac4b02cc342fb659
diff --git a/tests/expectations/compiler/compiler/boolean/conditional.leo.out b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
index d0f6d47bc6..0551b1c42f 100644
--- a/tests/expectations/compiler/compiler/boolean/conditional.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 76acb7e9a4a70256e7a92d168c9455fed850a3773a9ea92ec5216456b2f3f5ca
-    canonicalized_ast: 76acb7e9a4a70256e7a92d168c9455fed850a3773a9ea92ec5216456b2f3f5ca
-    type_inferenced_ast: ae2c4bcde83fa9bddf1c0a7a2c32a910f7f8e43abf52bcb2275c8fce1349af1f
+    initial_ast: 3de9d88d40969c01145790a5903ab2dfa1a7614ec4f4d62c20b86b917653008e
+    canonicalized_ast: 3de9d88d40969c01145790a5903ab2dfa1a7614ec4f4d62c20b86b917653008e
+    type_inferenced_ast: 53a91ffe37b6a96f1c239669f04ab600f51d2a200a8aed2dee0dc50bb5fa4f7d
diff --git a/tests/expectations/compiler/compiler/boolean/equal.leo.out b/tests/expectations/compiler/compiler/boolean/equal.leo.out
index 52e543e167..8e0ba59214 100644
--- a/tests/expectations/compiler/compiler/boolean/equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/equal.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: 9ca546550b286113dcfe9e345b58f996e01e7f3429b33f4829bdeda7a09939a1
-    canonicalized_ast: 9ca546550b286113dcfe9e345b58f996e01e7f3429b33f4829bdeda7a09939a1
-    type_inferenced_ast: f5ad424921b7256fb2553793ee3a83d11cb70e2c6f7d6df99d93631bb534ab90
+    initial_ast: 7fe0c7281b31c1f126d41c425f852930de3283b0deb54362fba0834b6eb83ae3
+    canonicalized_ast: 7fe0c7281b31c1f126d41c425f852930de3283b0deb54362fba0834b6eb83ae3
+    type_inferenced_ast: 5c851d6f023000766f370ec5bc048af431212368c68fb1ba674500ae7451a36e
diff --git a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
index 55e1086478..04575f4f5e 100644
--- a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "false"
-    initial_ast: c220ba73f75ff1651a98991ee4f5ea021dabdde2a1c08e949deb2aa1ecb65390
-    canonicalized_ast: c220ba73f75ff1651a98991ee4f5ea021dabdde2a1c08e949deb2aa1ecb65390
-    type_inferenced_ast: 30507ab22a8ebd6bb0f239d34923201b6381a722e11649c0b1ee73acd9317902
+    initial_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
+    canonicalized_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
+    type_inferenced_ast: 5b110c3aa3e0d65942f7a7fdbdccfc745aa810ea7d71137358f220d2bfecb0b7
diff --git a/tests/expectations/compiler/compiler/boolean/or.leo.out b/tests/expectations/compiler/compiler/boolean/or.leo.out
index 06dddec499..19ef883621 100644
--- a/tests/expectations/compiler/compiler/boolean/or.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/or.leo.out
@@ -34,6 +34,6 @@ outputs:
             x:
               type: bool
               value: "true"
-    initial_ast: b511fd260063b7d9608269bd67b0fdbe8ad9bd4ea1263fe1de4487ae071ce373
-    canonicalized_ast: b511fd260063b7d9608269bd67b0fdbe8ad9bd4ea1263fe1de4487ae071ce373
-    type_inferenced_ast: e1844ed06868262cb955e23c6844a44e64c156897ab166356a5ce4b1e0f6ce16
+    initial_ast: 35fd6670d1c00d5c70861e58f988536f86dbe84d26cb1cdf601228a3b784296e
+    canonicalized_ast: 35fd6670d1c00d5c70861e58f988536f86dbe84d26cb1cdf601228a3b784296e
+    type_inferenced_ast: 3dd86ce4e1ecce14619b49e274f1c3275ec7561f82655eadda4752f20e771802
diff --git a/tests/expectations/compiler/compiler/char/circuit.leo.out b/tests/expectations/compiler/compiler/char/circuit.leo.out
index db3bf3dd36..727dce531b 100644
--- a/tests/expectations/compiler/compiler/char/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/char/circuit.leo.out
@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'\\u{1f62d}'"
-    initial_ast: cd951a04ce5ef7c9de242229574bea37ff8b7b9f74ab673b01c3d41527de2179
-    canonicalized_ast: cd951a04ce5ef7c9de242229574bea37ff8b7b9f74ab673b01c3d41527de2179
-    type_inferenced_ast: 3fe7acb8144387410019e5bdfaff1b87c7969a25f68184df6b11091ac1bf64bf
+    initial_ast: aa3eb0c4de0eebada9490b11e35c36923316559727a3afce28fe3852a805354a
+    canonicalized_ast: aa3eb0c4de0eebada9490b11e35c36923316559727a3afce28fe3852a805354a
+    type_inferenced_ast: 73309200d30bf2831847477f3da7ede4ba9f4aa377e6ebf15c9c34774f53bcb5
diff --git a/tests/expectations/compiler/compiler/char/neq.leo.out b/tests/expectations/compiler/compiler/char/neq.leo.out
index 21321ccb74..b78933acc7 100644
--- a/tests/expectations/compiler/compiler/char/neq.leo.out
+++ b/tests/expectations/compiler/compiler/char/neq.leo.out
@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'a'"
-    initial_ast: be224a09ae4accb70784b57ed46907da9ffec12019023cd93d57c0496f508fd3
-    canonicalized_ast: be224a09ae4accb70784b57ed46907da9ffec12019023cd93d57c0496f508fd3
-    type_inferenced_ast: b287f08b3e9cf836b40d4ed75dc0195fa6e70e84051976e33529a7708790fc6f
+    initial_ast: d3a773c0b0555cc2c3a6d2fafb9e567488ea8fd91ea965f758ec9f58a4679dd7
+    canonicalized_ast: d3a773c0b0555cc2c3a6d2fafb9e567488ea8fd91ea965f758ec9f58a4679dd7
+    type_inferenced_ast: 460b284982e0fb9819768800b2c84ab682929bba1b6056f03e5e90bfe7f92420
diff --git a/tests/expectations/compiler/compiler/char/nonprinting.leo.out b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
index d56ddc3bbe..3ab1b59a50 100644
--- a/tests/expectations/compiler/compiler/char/nonprinting.leo.out
+++ b/tests/expectations/compiler/compiler/char/nonprinting.leo.out
@@ -19,6 +19,6 @@ outputs:
             r1:
               type: bool
               value: "true"
-    initial_ast: 740e6bb885f1daaa7fee1d7f54a885a46315be42cfbdc3ccce59e1c5fc9ca9f1
-    canonicalized_ast: 740e6bb885f1daaa7fee1d7f54a885a46315be42cfbdc3ccce59e1c5fc9ca9f1
-    type_inferenced_ast: fd2b61864849e92b4ff3ba2e6d116db22e260754db0cd4cc4f09396cb065387a
+    initial_ast: b03b0ea8ad821952fa64e477900b43c830e9fbd9693478018ad4b13abd12b027
+    canonicalized_ast: b03b0ea8ad821952fa64e477900b43c830e9fbd9693478018ad4b13abd12b027
+    type_inferenced_ast: 4ded1909fcd3fa1edf7de8111d3f7b97fced37b5b2d18b316f9fee3aad246f5e
diff --git a/tests/expectations/compiler/compiler/char/out.leo.out b/tests/expectations/compiler/compiler/char/out.leo.out
index 72630163a4..52b322b5b0 100644
--- a/tests/expectations/compiler/compiler/char/out.leo.out
+++ b/tests/expectations/compiler/compiler/char/out.leo.out
@@ -100,6 +100,6 @@ outputs:
             r:
               type: char
               value: "'\\u{1f62d}'"
-    initial_ast: d99f5828d608a8276317325e26e0160a8f715a3f12d336a1ad4c7a487665ab2b
-    canonicalized_ast: d99f5828d608a8276317325e26e0160a8f715a3f12d336a1ad4c7a487665ab2b
-    type_inferenced_ast: a183d62d41415685263e16f9f434b96b110421d5f9344e29f96f9a3ba6bdd63f
+    initial_ast: 2e1dc058de58dbe98a1f19e7b883fed916d58fc5087de2c2bd06bb98324411d5
+    canonicalized_ast: 2e1dc058de58dbe98a1f19e7b883fed916d58fc5087de2c2bd06bb98324411d5
+    type_inferenced_ast: 40d126753bfa96341a167671ffc7244c6430d8f40934d8197c969baa9b49c785
diff --git a/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out b/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
index d3ea62fbaf..25c76f1edc 100644
--- a/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/big_self_in_circuit_replacement.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 12a3a0966e472cd150c9be3488ef8fa05c2acbd8e6bd7a8b4e60810060100717
-    canonicalized_ast: 376cd2cd19920d2e08a647a65a94320e6921bb9bdd93307c3958fc25fa4d3073
-    type_inferenced_ast: 85e9c164aea5fc92e5351b8bec47ec1e65620d56f01423e11fe034259b67d7da
+    initial_ast: 776ea4bb946bb5d56430c22be58f3539dbecb25a11ec07e5e8bd3db49be7f937
+    canonicalized_ast: 6a95acbcb25193b7b9f9e7a2bbcaeafa83ec09163e097b12076ea512a9daaf14
+    type_inferenced_ast: d71ab34660bf998f236dfe59e55050f9f5fba8671bacbbdde04b4902927ec571
diff --git a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
index 0827822dbc..cd5036c8e5 100644
--- a/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/const_self_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e381c58c3d3af3336ded12b5db5a2f2a71b420cd1fdbbf7eaa2dbe0ec903d547
-    canonicalized_ast: e381c58c3d3af3336ded12b5db5a2f2a71b420cd1fdbbf7eaa2dbe0ec903d547
-    type_inferenced_ast: 208f0a2681d12c62b60bdd85c25c28c60b479c20846792d2a5b06426c045edc1
+    initial_ast: b438fb664bd7b8683beabd5044efba7669d3fcab093994b1c386a30ad63fff14
+    canonicalized_ast: b438fb664bd7b8683beabd5044efba7669d3fcab093994b1c386a30ad63fff14
+    type_inferenced_ast: 9094424be690a804ae2e5d3ca2787104de01dc6bca89fe6d349db5709c5161ac
diff --git a/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out b/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
index c3a06e4e34..cc4b1e0369 100644
--- a/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/define_circuit_inside_circuit_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 71afd59d48b7a5725c040ba4f5cbc217bd46d0fbaad0bd82047032b20dc1cea7
-    canonicalized_ast: 71afd59d48b7a5725c040ba4f5cbc217bd46d0fbaad0bd82047032b20dc1cea7
-    type_inferenced_ast: 47ad2c3e7620a0ae7b24169100607802fad08cf9f0ab595ebd78addbc5359d12
+    initial_ast: 7221141253b1998cbddad5f0c1385e7b53450a535112c0eb112b5af01474ce20
+    canonicalized_ast: 7221141253b1998cbddad5f0c1385e7b53450a535112c0eb112b5af01474ce20
+    type_inferenced_ast: f208046c46de9c4a42c47079504791711c9b0c8b3fb35dd413243fcbfd7dbd90
diff --git a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
index 86c27a6c27..ab25d96b9a 100644
--- a/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/duplicate_name_context.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 111c8bca8f07afa989ca6c7e90e66bf6951e04d59aa2ef60f64d0038f6bd06a6
-    canonicalized_ast: 111c8bca8f07afa989ca6c7e90e66bf6951e04d59aa2ef60f64d0038f6bd06a6
-    type_inferenced_ast: 19623dcb1932cbfa82b16d5708cbe3283c7ffce9d1af1e177276e7ebcbe7e951
+    initial_ast: 46d600c5f3b64378fbdcff7b4097d54e3855eded01d642f5af25fa3aef44eede
+    canonicalized_ast: 46d600c5f3b64378fbdcff7b4097d54e3855eded01d642f5af25fa3aef44eede
+    type_inferenced_ast: e5cdf935d34157bdbc2eb228c94e2222887c91fc3bc1c9f24bc6e84fddde9730
diff --git a/tests/expectations/compiler/compiler/circuits/inline.leo.out b/tests/expectations/compiler/compiler/circuits/inline.leo.out
index 7f814ccfb5..f5649f0b60 100644
--- a/tests/expectations/compiler/compiler/circuits/inline.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: u32
               value: "100"
-    initial_ast: 181f6d20025c125f510c3bbf9dab7936155b23a046e30663b602543262690efe
-    canonicalized_ast: 181f6d20025c125f510c3bbf9dab7936155b23a046e30663b602543262690efe
-    type_inferenced_ast: f6ab78af624e7e102515f1ee9f50a84e987db4584307141d526775cdb80da506
+    initial_ast: ba821e922e3b934581e39a58e2ef08d14b6cb0355500ed79f017dc0ecd39651c
+    canonicalized_ast: ba821e922e3b934581e39a58e2ef08d14b6cb0355500ed79f017dc0ecd39651c
+    type_inferenced_ast: 03fadaa1772f83ffa18a67a2279a65bad0715a6077f7219ff8955b45707c0437
diff --git a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
index 9d1e3faded..024e4f07b1 100644
--- a/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/inline_member_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d5e8c08c6a19699ff2be86d39e9ebd41e323dc284576ba6f52c49a62eeab79c9
-    canonicalized_ast: 2433daf73b2335fc2db4f00f8804ca516f04072e273a5e7217a5b290445043e1
-    type_inferenced_ast: 3199daaafcb76155503937860b663a8a92162e84e0b4c942f94fd2b1dbe0dc66
+    initial_ast: 58d028cbd020f04ef3b1025a07dabbc8bc4f5a2adf7e2ca4bb67cc229d4f64cd
+    canonicalized_ast: 5e72d67df40e8ecd2ae9999419888ade6ebf1c054f1f80f91a274360e294d361
+    type_inferenced_ast: 177f3be4bed2ca8e1a9543b8bb71a75a751d6835dcac15910bc4bd5fa9e25897
diff --git a/tests/expectations/compiler/compiler/circuits/member_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
index 47a0d09b00..0f4bb0e507 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5289f23055d0851d8b154501acbbace2da9ae7d5064f78e9e870b3c0450ac3e1
-    canonicalized_ast: 5289f23055d0851d8b154501acbbace2da9ae7d5064f78e9e870b3c0450ac3e1
-    type_inferenced_ast: 53668b53579ae10c6299e4ef5ccdc459dab29b35b996476334022c24fe915958
+    initial_ast: 681bcdc031155971ce0dab8c8ee659df3f09b97b4e6b4525d47f4a045765a57c
+    canonicalized_ast: 681bcdc031155971ce0dab8c8ee659df3f09b97b4e6b4525d47f4a045765a57c
+    type_inferenced_ast: 40920da878d0316ea8fd4d1963e53843b1d8933441fd568adba5f11e4ded7246
diff --git a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
index 4297a6d213..7869be8c61 100644
--- a/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_function_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 103ec635fd095c831e1b7dd0e89fb86f82380f85ac96df20e91a2f75ddb8b87d
-    canonicalized_ast: 103ec635fd095c831e1b7dd0e89fb86f82380f85ac96df20e91a2f75ddb8b87d
-    type_inferenced_ast: 43313200085be347f7429b294e8e5edc61f6a7698df689f5ca9f9740984c8534
+    initial_ast: 05ea77fc193abe91954fc2fcd338d3ebfaff6bb7939339e9dcc78e514802dd42
+    canonicalized_ast: 05ea77fc193abe91954fc2fcd338d3ebfaff6bb7939339e9dcc78e514802dd42
+    type_inferenced_ast: 9827f4b622a95714f55620295e8ce9d9cf6fc85603a869b178825c818d64d768
diff --git a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
index deb77ed8fb..997cb9340a 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a09c26dcd49814e5df7dc933932bbcdcf502d3e40e5b9975a73f63f03bdbda21
-    canonicalized_ast: a09c26dcd49814e5df7dc933932bbcdcf502d3e40e5b9975a73f63f03bdbda21
-    type_inferenced_ast: 2b000c5f36d84015d02ee34afe409ba569090a3744786a7c6f7fff78d397120c
+    initial_ast: da39dd8a0b9ddb1304cfe1fd1dd555c01c43750524db4021d27e1425ec175322
+    canonicalized_ast: da39dd8a0b9ddb1304cfe1fd1dd555c01c43750524db4021d27e1425ec175322
+    type_inferenced_ast: 6cdc6a128cc2fb9220293b7c34ba4066cc63911f5ffbe00959142992f358e488
diff --git a/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out b/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
index d33254e205..65a10e56bf 100644
--- a/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_static_function_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b001d188b90cae9717d631d28e5d1863c439441e17d61b0be9560b2b3bbb1e0d
-    canonicalized_ast: fbb2e8a8462d2b2da2e445d1111d0e33f89e88cc5d20ddbd3af707616c5672d5
-    type_inferenced_ast: ceb9c391dee91311bb2a5c7e48ac4cad327d9f1c502b559ba88df956727bd866
+    initial_ast: 380f44a5f5d7c1ef76c593da32936d480e79240bb7cd17fce0122b18c9e7f722
+    canonicalized_ast: 82f1edfa14a6e28b57828bf5f4be2aaaf21fb5468c0388088a56a4e44adb31fe
+    type_inferenced_ast: ab690a29d11e08699223ec4009174acdec23c3667d523af63556187d7396e66b
diff --git a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
index a43d211bcf..ff6d455507 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3aa5764cbd902c2cc381caf3799f6444d8a751ac296d2df46836798c7c2516c7
-    canonicalized_ast: 3aa5764cbd902c2cc381caf3799f6444d8a751ac296d2df46836798c7c2516c7
-    type_inferenced_ast: 81579961aa1f500134365339e17642c1e18ef0fc7c4a2231c71bbd5136be81b1
+    initial_ast: 0723285d6c4dac924f6c86e0a6fd57eb78947cfcecd45f2520b7b0f0029f3279
+    canonicalized_ast: 0723285d6c4dac924f6c86e0a6fd57eb78947cfcecd45f2520b7b0f0029f3279
+    type_inferenced_ast: c42738de8987ca76cacc30dbf86688ff11d5dbf7dccba67947cc78eb452460fd
diff --git a/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out b/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
index 944eca671d..402638f498 100644
--- a/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/member_variable_and_function.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c47b15931cf28e5e59b3d179a47fcc4587983b70ca759005a857453c672e2a9e
-    canonicalized_ast: c47b15931cf28e5e59b3d179a47fcc4587983b70ca759005a857453c672e2a9e
-    type_inferenced_ast: c3eb89894262dfa346936a88224a76a113faf0b260918a9d70b9cd9327f98ab3
+    initial_ast: bbad7fd765dee42c9ebaca7e07201d61befefa5e7d5af700130954ac29cdd27c
+    canonicalized_ast: bbad7fd765dee42c9ebaca7e07201d61befefa5e7d5af700130954ac29cdd27c
+    type_inferenced_ast: cb8745ad419c19ad007a9d9d905f01c0d85d2e78cb82be0b82342c44015c322e
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
index e4e8062313..4dbac2b20a 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 88691b6324a60d5e0dd23b6afa9078c4e806395f9b5fc072b2d59c72d4e242f8
-    canonicalized_ast: 9f92fbeecfc58a153d539735798e482a44deb5d1bf303463838f15639de24d7e
-    type_inferenced_ast: 0c1b51a5710965c5e07f9189775e7e2f9b0e9a6bc0e368ae1162547fbf55f993
+    initial_ast: d2d5680f0e011b93b2e55aebb62f51b4e78cf68289ffd84a80f852d2a82a6723
+    canonicalized_ast: 57c2e52b3f73e7052fdc92d0c668b598b282321cd390ed836f20b92bc528b6e0
+    type_inferenced_ast: 4f8c32d94398d49ffb9b1eab3639076e77d77159411c1891d814b4946751e554
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
index 9895e288ff..301d38f9ac 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable_branch.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7c4442a07900405f1bb78d46068d1599b16183552f0878abf9c3e661b6cc5f41
-    canonicalized_ast: d52ffd68c34f9cb3833c30936001f18de9a340873615bb5b911ef5df4e2ed5eb
-    type_inferenced_ast: 2422a89048dd0a5f6ee26a31a095f9cab777b14886a367be90ad78fe18e71523
+    initial_ast: 15da2283babf7f4a490bd7bdc0331522107f7ce4c88949863178ba4a00419ead
+    canonicalized_ast: 96a167f8b897e9973bb7b9d13faa81da0b635a6611ef09124a5d12f817b35254
+    type_inferenced_ast: 82c54a8e54820fc234a7029cb4c6018df99e7a3d4b47f418efc8835889b1c6cc
diff --git a/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out b/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
index 91f96d4963..b9b10201cb 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_self_variable_conditional.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e5d4fa7417a305e83e4af12e3dcc9e085d372068babbefa514ae9a28bc96a819
-    canonicalized_ast: c588d34fa9b1fce593f783a68cd3effff86f7be33dc08a5fd7656daa3a48f208
-    type_inferenced_ast: 7d2d688ad6f94b586fd60dab4dd072d66cfeadad9e61e3009e9d83bee93f2a42
+    initial_ast: 6fd3b11431e3e71f2b628bc9c64cb51d04c77df08d7584503b76b3dff7bc90cc
+    canonicalized_ast: a7a942a8a40f7cf8bfd79fdea0ed81fb6b56cfd9009b01b3d0225b427ef583cd
+    type_inferenced_ast: d3cc0e19adac957e11d520bf727133bfcc85eef5f306373cb5057b840b1a41f6
diff --git a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
index dbf432a628..8afebb1042 100644
--- a/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mut_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ed8aa86dd6afe56565d936044fec2b6c290e84637d27b09d25935b4c35fc70ee
-    canonicalized_ast: ed8aa86dd6afe56565d936044fec2b6c290e84637d27b09d25935b4c35fc70ee
-    type_inferenced_ast: 3d7bb92c36d453181318441e251d393fd5168de3c15441a744af9b5230420b0e
+    initial_ast: 48713617e0f06ade7b443ec779e646b0ff82e025f040c8a28bf2ea7eb37f3399
+    canonicalized_ast: 48713617e0f06ade7b443ec779e646b0ff82e025f040c8a28bf2ea7eb37f3399
+    type_inferenced_ast: 68e4f8baf01d452f42d0765f2819783adb55000238d5d57304a314fb5cff3c22
diff --git a/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out b/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
index ae3f5b6f97..5f12f27e1c 100644
--- a/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/mutable_call_immutable_context.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a65aa4129ecc625f548f2eeaa411c3949f2f5b51db559842fe889b5a063981d9
-    canonicalized_ast: 0fa4ca18f2103707d382cc926b3787ebee35d00a7e29692ecbb4158b87ddbb6e
-    type_inferenced_ast: 57c4afa4a03a741af17435b4f10907bcf65ef9f17a55a50cc779aa24af39a2dd
+    initial_ast: 2f6262df5e4a39a662b85cff0985d297fa2628d56fc3c036b5beb31d683a8574
+    canonicalized_ast: 4bb2ac425c192058af2f97684019d74959bc40abc0f886a741894a89cc8e8d4f
+    type_inferenced_ast: 6c3c3d16ba595ab33902ece671d2460c3a25347e1e33e35ec82ff8622926afd2
diff --git a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
index fd5ce09577..d77bccc2b7 100644
--- a/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/pedersen_mock.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 56a342fe09244cea63c7ed0cf0b641d7347978abfc28e4f19e60b38cc94087a2
-    canonicalized_ast: a44d595304cf53de81e57ede4bf038dbcc641d45d3776bf6fb475a0d48673b29
-    type_inferenced_ast: 4eee3c5c2c191e3b9bd9acf8cf52836207712259f835ffa0ae9e63769fb4fb65
+    initial_ast: 591aa0cc25f8c009c7df6425697003904e97e74c55f887c5ed3b27984fda4176
+    canonicalized_ast: 7232353691a314166deb747de9046b05e507b581d35132479b01c6db41e72df6
+    type_inferenced_ast: ae5cb090082e845a9a058a15de6345a672864bf2ad2061930922475cc2c3f8e1
diff --git a/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out b/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
index b5632884f5..43b372e66e 100644
--- a/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/return_self_type_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0e091ebf70c2e190b09debae086753f0d032504419ae0bcf42836fa4963ce48e
-    canonicalized_ast: 290e223dacaff5c99f401c452e213c35acbba0452b24d9d590eb7c77f641cff5
-    type_inferenced_ast: 5849fd77de59448ac443a392fc2124d2f5df4a896150f3175b7d0e3ba5d98354
+    initial_ast: f7e0f5bba37e3a25b8fdf655d2588054659ff212cade431c17bb548757a7781d
+    canonicalized_ast: 8425ce431117fc5d543a83ddde9e0cf946e0435146ede09096906a0f1fe9eff2
+    type_inferenced_ast: da1985f44598222e3940c14fefed9ce269e43d474aaf15b622292cd63f3efe87
diff --git a/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out b/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
index d85ebe08c5..41f11b772c 100644
--- a/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/return_self_type_tuple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 691004b2affad4a5a06ad6e69ad3b8a279aee131b538d5f07b6a972e18bce22c
-    canonicalized_ast: c38d5fefdb424c8bac4b7684f50112bf3bfe776060895a4f95d8fe657f237c8b
-    type_inferenced_ast: 481ef7f98947c543be02395a827f08b5e0117df951129584661a249b4c76d144
+    initial_ast: ab5c9ec7a0930713141b84e303355a1ddf69340f5222699c2192868e0e0dc8c4
+    canonicalized_ast: 3442d75d2ced2e10abfde09306d9bf91046cecd295a5e48e66a1823abff28ffc
+    type_inferenced_ast: ace67f309b2535d71ec2b277b42569fa3f89e6bcb817e8b911f7a773c9c4186e
diff --git a/tests/expectations/compiler/compiler/circuits/self_member.leo.out b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
index 01ca00717e..d51b0bc9b9 100644
--- a/tests/expectations/compiler/compiler/circuits/self_member.leo.out
+++ b/tests/expectations/compiler/compiler/circuits/self_member.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2b9656370d8c43247d8924222ec13e2f2ee988558b13b0e52e3b8fa0b9752115
-    canonicalized_ast: 2b9656370d8c43247d8924222ec13e2f2ee988558b13b0e52e3b8fa0b9752115
-    type_inferenced_ast: 0096338c25c3f93d38e41ae493fcb53396d95b83c4d277b97cca7f7692f0fefe
+    initial_ast: 6b54a642c55d3a7991a063c5346797a4d7facf21533c8ec7b2e22eb9394caba0
+    canonicalized_ast: 6b54a642c55d3a7991a063c5346797a4d7facf21533c8ec7b2e22eb9394caba0
+    type_inferenced_ast: 5b4b8ea9431aca05e19fcf8987c4f4c824c065e2ed6fc7198cd769b8829ee4f1
diff --git a/tests/expectations/compiler/compiler/console/assert.leo.out b/tests/expectations/compiler/compiler/console/assert.leo.out
index a7e0c31461..6d42c7f054 100644
--- a/tests/expectations/compiler/compiler/console/assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dd4fe27f2213405f1261a5dd08619e96f2164c6984ce1efbc034ebeb0f8159f6
-    canonicalized_ast: dd4fe27f2213405f1261a5dd08619e96f2164c6984ce1efbc034ebeb0f8159f6
-    type_inferenced_ast: 72c60ddc90e6db8f7e97f9881813ece3d45d333ca4aa5d64368565113c42522f
+    initial_ast: 8a1b1671e3685c54d7974b31fbc758210d2cafd8443c33ed8a3b14ad3a1b9fc4
+    canonicalized_ast: 8a1b1671e3685c54d7974b31fbc758210d2cafd8443c33ed8a3b14ad3a1b9fc4
+    type_inferenced_ast: e60210b668a87ade79886bffd2ebc8ded95f47d12d5c8b67adfd896ea3a1009e
diff --git a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
index 492efd51f6..df7e07e181 100644
--- a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: cond_2.in
         output:
           registers: {}
-    initial_ast: bf6d2879d4bd942a4ef5eef595f5770edb8f718eab43108bce52b5864c54cdf2
-    canonicalized_ast: 0d7d8284630e9e3a72809d48b53cd178efe4cd5652ef37ecb01d366d0c21351e
-    type_inferenced_ast: 1cab3711be24468ea0c8291fc6ced605fc908220a52b6444c6b0fe00571d26a7
+    initial_ast: 4bafaebf2c6733478fdff48ba2aca4892da0874d88a8cde9a9ea7299939cfa92
+    canonicalized_ast: 036d49891c7d9eb0c713eb9eaf7a66321fdd32ff225fa1428f9a7184ebf3679e
+    type_inferenced_ast: 3d13c527af96ec05f92678c2009047200736e8799fd29875ba371fd34d95ce5a
diff --git a/tests/expectations/compiler/compiler/console/error.leo.out b/tests/expectations/compiler/compiler/console/error.leo.out
index 91f5bdbaff..d198e0551d 100644
--- a/tests/expectations/compiler/compiler/console/error.leo.out
+++ b/tests/expectations/compiler/compiler/console/error.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f65d7556d2d52b3e33bfd12a70350bc67ff21a55d470e8795700e7d3fad7d04d
-    canonicalized_ast: f65d7556d2d52b3e33bfd12a70350bc67ff21a55d470e8795700e7d3fad7d04d
-    type_inferenced_ast: 7b5616a0e84f7a6b0acfdd98a770832382914b1d3d16cbdf33605beb207475b1
+    initial_ast: d9518f1fbefe56299388ca536aa8d0cc8070eb4ddebf824472d369111578f4ec
+    canonicalized_ast: d9518f1fbefe56299388ca536aa8d0cc8070eb4ddebf824472d369111578f4ec
+    type_inferenced_ast: f45369f6227b5fed3322d1d28718bc84382c1312214b6fa0b315b3e02c66f48b
diff --git a/tests/expectations/compiler/compiler/console/log.leo.out b/tests/expectations/compiler/compiler/console/log.leo.out
index 24587486a3..a03f02f37b 100644
--- a/tests/expectations/compiler/compiler/console/log.leo.out
+++ b/tests/expectations/compiler/compiler/console/log.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: affca079b67e0869881ba79627ffd7ccd27ea8d5f189403d8427ef98e1056bd7
-    canonicalized_ast: affca079b67e0869881ba79627ffd7ccd27ea8d5f189403d8427ef98e1056bd7
-    type_inferenced_ast: 521fd1f1dbc9c68595e4bdbe1e9bad8e6c44710d145438fc35269e2f8c438df1
+    initial_ast: aecf83a2f4aa6587964d65a38e106eb9547d25267fde72fcf078d2498944818b
+    canonicalized_ast: aecf83a2f4aa6587964d65a38e106eb9547d25267fde72fcf078d2498944818b
+    type_inferenced_ast: a5345a4bf0f979eef1166902ee0e70ba3635125f1793b0b0742162cc98f46681
diff --git a/tests/expectations/compiler/compiler/console/log_conditional.leo.out b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
index 758799b010..d11c386ccd 100644
--- a/tests/expectations/compiler/compiler/console/log_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a5bd96138155ee38f07e7b41608868d053f06bb3e938fd5a90303028a8996fdd
-    canonicalized_ast: a5bd96138155ee38f07e7b41608868d053f06bb3e938fd5a90303028a8996fdd
-    type_inferenced_ast: ad95e7881e367efc029e79d2df541305add838367a6b03816c73aed641890740
+    initial_ast: f8e35dfef4049fcb03445300a6c86627b4b2b3934e948d4e15849f0464ad318b
+    canonicalized_ast: f8e35dfef4049fcb03445300a6c86627b4b2b3934e948d4e15849f0464ad318b
+    type_inferenced_ast: 684c132f914cd9b2bbe55cc7fa868d9f4818a5951cefba287989d787c13c40d3
diff --git a/tests/expectations/compiler/compiler/console/log_input.leo.out b/tests/expectations/compiler/compiler/console/log_input.leo.out
index 14c302e08d..bf67ccd495 100644
--- a/tests/expectations/compiler/compiler/console/log_input.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ac8959bcbddd11b5df0b91b4986970098c022785b78391ba7e55386bdab41571
-    canonicalized_ast: ac8959bcbddd11b5df0b91b4986970098c022785b78391ba7e55386bdab41571
-    type_inferenced_ast: 427a709da8683a8ea6cc21c64d56d77d504b647600813f13c6d29586ee76f33d
+    initial_ast: 92825fee401d5b953f2fbb155a1069148ba9ceb7dc61efadd5b29bc2ac483ac7
+    canonicalized_ast: 92825fee401d5b953f2fbb155a1069148ba9ceb7dc61efadd5b29bc2ac483ac7
+    type_inferenced_ast: 0b2d12419a1f32d70683f171ddaad7c5d683fe7975e2315cb6167dbcd16f382d
diff --git a/tests/expectations/compiler/compiler/console/log_parameter.leo.out b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
index 887ba57dc4..cea1bf46f7 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 84f235f5e82fd83c0d4ac44037b460ab8c4ee985e834f4cbb1cdf7ab0516bc8d
-    canonicalized_ast: 84f235f5e82fd83c0d4ac44037b460ab8c4ee985e834f4cbb1cdf7ab0516bc8d
-    type_inferenced_ast: cab71b6db461a948e4ce6de5f49976a50619e84de81e22f26f73b38f30db0e57
+    initial_ast: ab38ae5a77b338e05dcf4554f9510f78d48277964a5f10fb58506967d9e4be8a
+    canonicalized_ast: ab38ae5a77b338e05dcf4554f9510f78d48277964a5f10fb58506967d9e4be8a
+    type_inferenced_ast: 0af520b7cbdb4f67914880e62a5ba7ead23ee6c3f173d4573b0d306532f4bf03
diff --git a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
index 849ee610be..c8452bd882 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8826a62285bb93b0aaacfda5ed2ae4cdef50948a7b2472700b72cfb328edc1dc
-    canonicalized_ast: 8826a62285bb93b0aaacfda5ed2ae4cdef50948a7b2472700b72cfb328edc1dc
-    type_inferenced_ast: 0c40ac594ca6adf8cf625b3ac63d9d925975be323bf358ca55aaa4f3aa39aa46
+    initial_ast: 746e67c3c32b565a747779078d83f41197856a657b59eeb9cc9ea4e60677dac0
+    canonicalized_ast: 746e67c3c32b565a747779078d83f41197856a657b59eeb9cc9ea4e60677dac0
+    type_inferenced_ast: a586b22d1a595440d7a0262c959ae1b668be2980d131c056ebc6536827606454
diff --git a/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out b/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
index 4698b66c89..b3770394c0 100644
--- a/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_circuit_star_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n          |"
+  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n     |\n     |"
diff --git a/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out b/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
index 4698b66c89..b3770394c0 100644
--- a/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_package_invalid.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n          |"
+  - "Error [EASG0373001]: failed to resolve import: 'core'\n    --> :0:0\n     |\n     |"
diff --git a/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out b/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
index 93668fe671..e118826f9b 100644
--- a/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
+++ b/tests/expectations/compiler/compiler/core/core_unstable_package_invalid.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373001]: failed to resolve import: 'core.unstable'\n    --> :0:0\n          |"
+  - "Error [EASG0373001]: failed to resolve import: 'core.unstable'\n    --> :0:0\n     |\n     |"
diff --git a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
index 82156e826e..e11f80b6f7 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9a3c1d44f1c7e23b08441e6b429e0aaf96b9091a85884a892e046b6213872adf
-    canonicalized_ast: 52166ba1dada6040b5bb273a3778a719751baf263f27da2ebb43e4fcaff1707e
-    type_inferenced_ast: 8251d737314510e1f1d4d029dea6d3b529d64bd92714d006f1bfcb08539867f3
+    initial_ast: 61087d13f528efabd02f9993e0e5ff23051fa0de9e93a96ef8835f3a0457d87c
+    canonicalized_ast: 36bde977c62949baf95dd50d0cfaadd1a4a926a2a4d7f55388b21beaefd5e43c
+    type_inferenced_ast: ab6c6ed97331a676348142fb242cf0f589468f893f97c3e4832f60d4736fc0ca
diff --git a/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out b/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
index 3911df5905..6ce8d6fb90 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order_with_import.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1ee4aa8742bab66bd1342ff64083c537ebd3cc0bd2a7c27274129696c04d5523
-    canonicalized_ast: 1bbf3438c4ab147d1fb3c76bdbe77fef1787c173376b8677485c30acf27561fb
-    type_inferenced_ast: 1b1ffd1f7a17e597fc1118606ddf872d363febf800e6d84dfaa7bacfdff63c61
+    initial_ast: e1792bcb7fe5be2fdb8ca2abd21feb63c9aadbc367d2cba1750fff1b34b8d1b2
+    canonicalized_ast: 9badf16677c761fbcb56ea79f0e67b46f8e12c3dc83a9c3fc35559cbc509ff88
+    type_inferenced_ast: 571f7723bd45c3e54c04038aa20707640282efe293ba23dfff65b1b318a3a173
diff --git a/tests/expectations/compiler/compiler/field/add.leo.out b/tests/expectations/compiler/compiler/field/add.leo.out
index a7a4fa7cb9..7f7f43887e 100644
--- a/tests/expectations/compiler/compiler/field/add.leo.out
+++ b/tests/expectations/compiler/compiler/field/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: 41ce88a99d310e57e8e58fed720ecd68fd372944aa309541fb75b5eda51a9f39
-    canonicalized_ast: 41ce88a99d310e57e8e58fed720ecd68fd372944aa309541fb75b5eda51a9f39
-    type_inferenced_ast: 3047d9e127644a596e0836ebe715098c1bf7dedbd8a4cdbf3443ee91612298f6
+    initial_ast: ade887261346e7629dcda78e09b43be2bf742af8cf7aa5e8d3f22d1d9c2c2f24
+    canonicalized_ast: ade887261346e7629dcda78e09b43be2bf742af8cf7aa5e8d3f22d1d9c2c2f24
+    type_inferenced_ast: af10005d855a2c6277340bd98a1a8893dbc90827eda252f9956e25b131a4dc6c
diff --git a/tests/expectations/compiler/compiler/field/div.leo.out b/tests/expectations/compiler/compiler/field/div.leo.out
index 0932fd91ee..7d881df6d0 100644
--- a/tests/expectations/compiler/compiler/field/div.leo.out
+++ b/tests/expectations/compiler/compiler/field/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: ebb9776abaaf0b45d2c83013db7decbf4c71e9844be91a435d9bca6f0956465e
-    canonicalized_ast: ebb9776abaaf0b45d2c83013db7decbf4c71e9844be91a435d9bca6f0956465e
-    type_inferenced_ast: 1aab2a3f766a4216073d86ec4c3dd1444459863c16e2db69890f9d7662eea006
+    initial_ast: 150c20bc77cda0c046ef9c2f77fe3db7887722125912ee4bc45e61aca3b3275a
+    canonicalized_ast: 150c20bc77cda0c046ef9c2f77fe3db7887722125912ee4bc45e61aca3b3275a
+    type_inferenced_ast: 3c72b501b373df6d34d8c9a20c7d73e1e1e6f61cbaa3713b3324c157036f866e
diff --git a/tests/expectations/compiler/compiler/field/eq.leo.out b/tests/expectations/compiler/compiler/field/eq.leo.out
index 016deb5fe7..804084d676 100644
--- a/tests/expectations/compiler/compiler/field/eq.leo.out
+++ b/tests/expectations/compiler/compiler/field/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: a15fced3bedb13d55187bb839abbb5db8ea20e23bb8ceb4e24ee8636a43c22da
-    canonicalized_ast: a15fced3bedb13d55187bb839abbb5db8ea20e23bb8ceb4e24ee8636a43c22da
-    type_inferenced_ast: 083d96a04074a68d7cbaba40c460e743e6ff6fcd37994730914d4a1345f524d9
+    initial_ast: 00df32b9a2a3cc1c3b8ec2e4b7f1a15e38d4539992e4a805764814062fd3614e
+    canonicalized_ast: 00df32b9a2a3cc1c3b8ec2e4b7f1a15e38d4539992e4a805764814062fd3614e
+    type_inferenced_ast: 786b1a7c74542185e90e6690d6034487b19b1ba7047e3985cc9b85824c98b26f
diff --git a/tests/expectations/compiler/compiler/field/field.leo.out b/tests/expectations/compiler/compiler/field/field.leo.out
index ee0b350350..ebfa1d2868 100644
--- a/tests/expectations/compiler/compiler/field/field.leo.out
+++ b/tests/expectations/compiler/compiler/field/field.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: ac26e1ea6dcfa33791349731ab9cf1481764a0b365feffb261f96f24f92b5534
-    canonicalized_ast: ac26e1ea6dcfa33791349731ab9cf1481764a0b365feffb261f96f24f92b5534
-    type_inferenced_ast: e4e48995001316d9851878018c999cd5babec0c5396d0eb0136f3e0a7469a4c9
+    initial_ast: 2fcfda40a52babd238ce5125a6a0b2b829ade39f94d2ce0b216387939c59431e
+    canonicalized_ast: 2fcfda40a52babd238ce5125a6a0b2b829ade39f94d2ce0b216387939c59431e
+    type_inferenced_ast: b63f0f712a535d3f14f8c1a443568c3af9f140440e6b115de23e463a1728debf
diff --git a/tests/expectations/compiler/compiler/field/mul.leo.out b/tests/expectations/compiler/compiler/field/mul.leo.out
index 5890df0840..0218d43581 100644
--- a/tests/expectations/compiler/compiler/field/mul.leo.out
+++ b/tests/expectations/compiler/compiler/field/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "false"
-    initial_ast: b0f186baff2a170ec1cc2400380ecf7fc7e9b5ce16765eadc5bde530a9d14a85
-    canonicalized_ast: b0f186baff2a170ec1cc2400380ecf7fc7e9b5ce16765eadc5bde530a9d14a85
-    type_inferenced_ast: 5bf8ce5327801fc84fe90818827c733f0be2794e2feeaa8dee27ad5e1d9a3cdf
+    initial_ast: 2635739c604a7ae3a3555480bb442b819af18179044e24bf19faf5ba546c307a
+    canonicalized_ast: 2635739c604a7ae3a3555480bb442b819af18179044e24bf19faf5ba546c307a
+    type_inferenced_ast: 813b8fb791cf91468b34722fb4cb8b2a0005cddb135eee6e1688675104794ab5
diff --git a/tests/expectations/compiler/compiler/field/negate.leo.out b/tests/expectations/compiler/compiler/field/negate.leo.out
index 7f240198da..e5ea188c6a 100644
--- a/tests/expectations/compiler/compiler/field/negate.leo.out
+++ b/tests/expectations/compiler/compiler/field/negate.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: bool
               value: "true"
-    initial_ast: c6944601ce98355c6050683c7efeccca59566b281dc9e33d364ea5eaeeede8aa
-    canonicalized_ast: c6944601ce98355c6050683c7efeccca59566b281dc9e33d364ea5eaeeede8aa
-    type_inferenced_ast: a807a5420a071df5a2c1281cf44cf98bd32a3066ad35c1ebd2cf585405e7e044
+    initial_ast: 3584ba6c06f32660612d44e78a7d8a83075046a49ff4cd47a6165d603ebf85c3
+    canonicalized_ast: 3584ba6c06f32660612d44e78a7d8a83075046a49ff4cd47a6165d603ebf85c3
+    type_inferenced_ast: 336ecb6f4ead5395c4c5ad52fa5eb29993aa7db2ab65749acdb39c068961e64b
diff --git a/tests/expectations/compiler/compiler/function/array_input.leo.out b/tests/expectations/compiler/compiler/function/array_input.leo.out
index 0e3f93e6e0..ede2412315 100644
--- a/tests/expectations/compiler/compiler/function/array_input.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 50cc91a73be6ea74dab65fa196daf6931f84a56896a4a8e398aedba47f4cf005
-    canonicalized_ast: e2421a0ffcef3eb9f57640168d92313c9b6b95b5dcf55ccdee6807327b418eed
-    type_inferenced_ast: 4b0f0827da9e66d8acdc11415820a06dc4fd2ada3ab3b29f1553bfde827565da
+    initial_ast: f57c7199a6f40d6f898133390fc69cc7ac17c6522adc2653eba92635eddad340
+    canonicalized_ast: 6402aa395f7030e58a146ed91755220ee495693e59b9b544f7db59e190b3ef17
+    type_inferenced_ast: 94a3c2e3632d3ab5fd7af3ea51b9f8bedb82f00762686a10764d103b35787261
diff --git a/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out b/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
index 1462960ab9..27d44cf87f 100644
--- a/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
+++ b/tests/expectations/compiler/compiler/function/array_params_direct_call.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e2001b1f9372ef49090e86f4a1dcaac8e2cc0492f5eaa3650cb9823b809c17e0
-    canonicalized_ast: 57c23bdefab42e9a131f70d784df69646dfc4e0c2963981e6bc52223c81db63b
-    type_inferenced_ast: edcb6ee24685782a3c1fb8fd0eb98ad095288bd7afa87ae4349267a6eb65c7c1
+    initial_ast: 8e231f37db8feb5d0490f9ee8ad1b4844327cc213238b849b9250dcd416c578c
+    canonicalized_ast: 63c46bc9757274e52cecf05bdab4b2adaa2177ccc3ced0a8e6a6e0d3ec73038d
+    type_inferenced_ast: 958cf68742c142d071df29899bb8b81f66e9c5d325325b71d94543762c804001
diff --git a/tests/expectations/compiler/compiler/function/conditional_return.leo.out b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
index 1ebc3249bd..decebbaae1 100644
--- a/tests/expectations/compiler/compiler/function/conditional_return.leo.out
+++ b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: u32
               value: "4"
-    initial_ast: f26cde6c2a1b4b3a97821353bdbfdc9d56ef657a478e9a25624f66c564cc5eee
-    canonicalized_ast: f26cde6c2a1b4b3a97821353bdbfdc9d56ef657a478e9a25624f66c564cc5eee
-    type_inferenced_ast: 84a23e71e8a617ff4446a4183fba5fa8fdb410f876ee6ca97c93cc26085c0884
+    initial_ast: 606414e516d1f59459d71c58f650c63cea9e3213ab59ebbcc617001677d9eea3
+    canonicalized_ast: 606414e516d1f59459d71c58f650c63cea9e3213ab59ebbcc617001677d9eea3
+    type_inferenced_ast: 74c63a94510e5e000a5b6fb213f34c89bc1d35c69a549eea3b5aad627dd7c43a
diff --git a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
index 9a1ad26683..c8c2dd729f 100644
--- a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373016]: a function named \"main\" already exists in this scope\n    --> compiler-test:8:1\n     |\n   8 | function main() {\n|\n   9 | ...\n|\n  10 | }\n     | ^"
+  - "Error [EASG0373016]: a function named \"main\" already exists in this scope\n    --> compiler-test:8:1\n     |\n   8 | function main() {\n   9 |      ...\n  10 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/function/empty.leo.out b/tests/expectations/compiler/compiler/function/empty.leo.out
index 5b5bab8a81..40c161337f 100644
--- a/tests/expectations/compiler/compiler/function/empty.leo.out
+++ b/tests/expectations/compiler/compiler/function/empty.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 25dcbe87acec22191a60e99bb9abff5d6502b398b2cff423565af816f1e13544
-    canonicalized_ast: c6623025e0169b5548d537b9d6bef8fa8aa1d3aa5bf7ede5f90fbf159b511e34
-    type_inferenced_ast: 00a616f64800ec97e30df10fedef4993adc14368cad2e4be757e46ff6052d055
+    initial_ast: 2dd3bd6fa202a0356e48f757a1e745888aafab1c89721e272eb65534f658a8ef
+    canonicalized_ast: 689cc7ed7957d488050014971ea55b69970e43a8863fe36176f95224fa601323
+    type_inferenced_ast: c8b358ff7af51a9f0e11db6ceb465ff36142bbc14159a7aaeefba55ce9c18a69
diff --git a/tests/expectations/compiler/compiler/function/iteration.leo.out b/tests/expectations/compiler/compiler/function/iteration.leo.out
index 2c81b753c6..b2a2865bb1 100644
--- a/tests/expectations/compiler/compiler/function/iteration.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3f4e82eda9825e87ed21e40d62213aedaf757134c41a204dad8e81e89341db52
-    canonicalized_ast: 509f630dfca7c3b33cad307f42342005c1c0519fdf5ab444dc147ddbfe35a3f2
-    type_inferenced_ast: 6358553eed92aa8c1ae4fd2a8712d95bc198a40b96fa6e6ff8ada4a9d98fb453
+    initial_ast: bce6dc51b76cc0f285be76d5c35f28dc1121a2b814e60e0094c858d58e83272e
+    canonicalized_ast: ac7e9987e1a6c30c0ee21665fa824e201b58e186b2d662b6f3817eab3ac3dfa9
+    type_inferenced_ast: bd8524c62243e04203ac7b1f1ce7f22c7969c8511463eef2d63ae55ea5d21b69
diff --git a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
index 354d3d7f1d..94c85ceefe 100644
--- a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4ae2929cc0c72fd75f38a87f49b83e37b29e2131f2cf15db7e55a4da5b007f10
-    canonicalized_ast: 1a0c36ef1c6108a7a84dc7c43d012d0e9f0bcf3ae15634128a98ea04c4f335ed
-    type_inferenced_ast: 3c270a3472eb019d1426c8c1a8e184f6b4dda7c88bb8d136cb59bd94120d1ca8
+    initial_ast: e00d6916d7234d7ed9f405c02e281301bc5482800ca70c5b6d3f72e84ea22f58
+    canonicalized_ast: bfba19b1a25966ba895c0b318845f4e0e2bf32eb98cba02c1a332fb6f211c532
+    type_inferenced_ast: f6c7f08d785a0dc516a4ffd1165e63b54b7e04c6e9d4b22c12ffd3c282562d0b
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
index 048bbefff5..800cc96588 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c4d98a91631a78bb154e70846486e0ff12472f7cdf0dba1ff706fadafdcc4424
-    canonicalized_ast: c4d98a91631a78bb154e70846486e0ff12472f7cdf0dba1ff706fadafdcc4424
-    type_inferenced_ast: 0eb7c97884a7b1cd58e40cd51d0707892654c1083819ba1653767876b8b6aa27
+    initial_ast: 8bbbd1ddbb1a616fb3b6cc813734f6dec1989f305dcf2b1580c66c91e023e3db
+    canonicalized_ast: 8bbbd1ddbb1a616fb3b6cc813734f6dec1989f305dcf2b1580c66c91e023e3db
+    type_inferenced_ast: 88fbd7fea3a02a091f2f00347f1e862710a621898f80d8acc91d4041e3adc9f2
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
index f1d0427062..68c53fc358 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373035]: function 'main' failed to validate return path: 'cannot have asymmetrical return in if statement'\n    --> compiler-test:4:5\n     |\n   4 |     if true {\n|\n   5 | ...\n|\n   6 |     }\n     |     ^"
+  - "Error [EASG0373035]: function 'main' failed to validate return path: 'cannot have asymmetrical return in if statement'\n    --> compiler-test:4:5\n     |\n   4 |     if true {\n   5 |          ...\n   6 |     }\n     |     ^"
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out
index 814f563ee2..a8b0dfd0c9 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_fail_conditional.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EASG0373034]: function 'main' missing return for all paths\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n|\n   4 | ...\n|\n   5 | }\n|\n   6 | \n|\n   7 | \n|\n   8 | \n|\n   9 | \n|\n  10 | \n     | ^"
+  - "Error [EASG0373034]: function 'main' missing return for all paths\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n   4 |      ...\n   5 |      ...\n   6 |      ...\n   7 |      ...\n   8 |      ...\n   9 |      ...\n  10 |      ...\n  11 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out b/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
index 0a6d8c54cc..208288b578 100644
--- a/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
+++ b/tests/expectations/compiler/compiler/function/multiple_returns_main.leo.out
@@ -19,6 +19,6 @@ outputs:
             r1:
               type: bool
               value: "true"
-    initial_ast: c571bc844b073f4a4c66ab9b0bdcee6745271a80298dc5d871e1036d13213187
-    canonicalized_ast: c571bc844b073f4a4c66ab9b0bdcee6745271a80298dc5d871e1036d13213187
-    type_inferenced_ast: 89a7dcde1fb148fed4f5bcc6412b4275a1c2b0009e7960b7df8db0217da14e5e
+    initial_ast: f982480cc10a58594b1ed75be2d2dcd29ed874fa666497f2c14b58c338a4443f
+    canonicalized_ast: f982480cc10a58594b1ed75be2d2dcd29ed874fa666497f2c14b58c338a4443f
+    type_inferenced_ast: f70e1d694f99f56777ac863e764615c6bc496ebb4f476c2faf8356e9246f4d24
diff --git a/tests/expectations/compiler/compiler/function/newlines.leo.out b/tests/expectations/compiler/compiler/function/newlines.leo.out
index 8941d57016..7dfc3aefb5 100644
--- a/tests/expectations/compiler/compiler/function/newlines.leo.out
+++ b/tests/expectations/compiler/compiler/function/newlines.leo.out
@@ -19,6 +19,6 @@ outputs:
             b:
               type: u32
               value: "0"
-    initial_ast: 1cd1942f945063ca28425deb842703edaf7c9c41101a06b0b8471ef47fd3ae88
-    canonicalized_ast: 1cd1942f945063ca28425deb842703edaf7c9c41101a06b0b8471ef47fd3ae88
-    type_inferenced_ast: 865cad30a2aeae6615efb2f4dbaed8c7fd6c6b0a5adc0d0050ee4617ec393866
+    initial_ast: 15f65ebeef2a1394bad8e787b7f85b4ce097c92d4f83723d2f04fc94a2f704fe
+    canonicalized_ast: 15f65ebeef2a1394bad8e787b7f85b4ce097c92d4f83723d2f04fc94a2f704fe
+    type_inferenced_ast: 80d4650ca4846bc858164dc5d39d8e9333046ed58a655a0c739a5fb2b3018b90
diff --git a/tests/expectations/compiler/compiler/function/repeated.leo.out b/tests/expectations/compiler/compiler/function/repeated.leo.out
index ea5312e1ac..871d97f0fb 100644
--- a/tests/expectations/compiler/compiler/function/repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/repeated.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e0ed84f76e2a79b3b784ed989db10d1893968fd0ae07eb3b28eafb45afa3762f
-    canonicalized_ast: e0ed84f76e2a79b3b784ed989db10d1893968fd0ae07eb3b28eafb45afa3762f
-    type_inferenced_ast: c9f98a09d0a48fbbaaf43032a7050ea4e01e90595b321ec70b7fdabb4a6322dd
+    initial_ast: 500b33c3ca695738a761854a5c97d7d46ef4689e80fcf0c2dc4694ab09499b7f
+    canonicalized_ast: 500b33c3ca695738a761854a5c97d7d46ef4689e80fcf0c2dc4694ab09499b7f
+    type_inferenced_ast: 1383b0311db00a303f411f023eb3d87c8c29b95776bcf09d8b9622ab3af789f6
diff --git a/tests/expectations/compiler/compiler/function/return.leo.out b/tests/expectations/compiler/compiler/function/return.leo.out
index 4330aeb266..8561fede33 100644
--- a/tests/expectations/compiler/compiler/function/return.leo.out
+++ b/tests/expectations/compiler/compiler/function/return.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7e9cf69f95600d12d299b37a52a2ba19e1194da8349d2aa4b9d082a0c90c36c8
-    canonicalized_ast: 7e9cf69f95600d12d299b37a52a2ba19e1194da8349d2aa4b9d082a0c90c36c8
-    type_inferenced_ast: 21ea10f8ab44c8c521ac7216555775d7c8e23439e21ae25a4fe142a39df891fa
+    initial_ast: bb569604b5c03343d63deca1fb42fbfb2a275a78d22009e24c58dfc3ac0156ab
+    canonicalized_ast: bb569604b5c03343d63deca1fb42fbfb2a275a78d22009e24c58dfc3ac0156ab
+    type_inferenced_ast: fb793f59586351711471dd75136a8c380c154690feccf9cf7174cef82591e6f7
diff --git a/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out b/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out
index 3e3df80380..a26c9321b3 100644
--- a/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_array_nested_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2cb5bb420cacd6ac0012ed38f3081a124842fe7b4ccc37a21a009e2353049b2b
-    canonicalized_ast: eeb7d6efb45cfffe4d11bf2235fac0c5ad44693aad4935053ad3d964af342d70
-    type_inferenced_ast: 643e5e8709c1d8c473a42906fa549d893839506cbc138313d6e3dbdf1299b8a0
+    initial_ast: 0d5b759de15703ed61e503ca8d70f2f8423e29dc817d2612ca384fb29d204f15
+    canonicalized_ast: 9698b926f7b85ac3fbb6183a37a08b4681eeea8ccae65aeaa66e691f62487d0b
+    type_inferenced_ast: 3bf56872a33b1c61d71dd0141acb87050cef59915ea7dbf6559f15345c9d6736
diff --git a/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out b/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out
index 6bcd7c7b42..8123254983 100644
--- a/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_array_tuple_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6625f9dae21c9ee661f29e7b22c466f9ed4d7bcd9571e4e8b4d451fb052d4bfa
-    canonicalized_ast: 15f43abb1cab938d6c93efcfb37774cb40a489aa33f8d40a7bdeaa2e08236876
-    type_inferenced_ast: 22bdd3e29298099053079c14ecf002ffd51bb60c8fceca2441b7cf95058c5d02
+    initial_ast: 3c4dacd555f9a91ffe40ddc302bb764ef757462cfad20f6461707b8bf6005196
+    canonicalized_ast: 5913a06c38457b98f8aac60740450faf1ebc25760ccb8d6cb86edefd0c217cc6
+    type_inferenced_ast: 697c8ad6d1d6ecff77818d3ee92733cd9210c2d151ec8b15093e54ef21cd3b64
diff --git a/tests/expectations/compiler/compiler/function/return_tuple.leo.out b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
index 560491c6b3..984cb65bbc 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple.leo.out
@@ -19,6 +19,6 @@ outputs:
             r1:
               type: u32
               value: "103"
-    initial_ast: 8f5a723bcf45dfefb932723af97f4aeccfdd8e14ede2011a07b6499c517f87e0
-    canonicalized_ast: 8f5a723bcf45dfefb932723af97f4aeccfdd8e14ede2011a07b6499c517f87e0
-    type_inferenced_ast: f10f80d86887b764f5177202c36f538eaa7d255216be58fda9804f3bfb370251
+    initial_ast: 05733c81aa57b7c0c2f89d6ab74b31df49d78414ad354a707ae3474e54fd7951
+    canonicalized_ast: 05733c81aa57b7c0c2f89d6ab74b31df49d78414ad354a707ae3474e54fd7951
+    type_inferenced_ast: 81ba2fb5f7c788306b516c750361f7984a1a04ef35d72a47ed8ea0c3acf3cb7f
diff --git a/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out b/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
index eb2d1b1057..30f2a3f58a 100644
--- a/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/function/return_tuple_conditional.leo.out
@@ -19,6 +19,6 @@ outputs:
             b:
               type: u32
               value: "1"
-    initial_ast: 3313971add9f81c5da70cdd66fc134e8bab9437d8ca7a50f41721250d5fa0225
-    canonicalized_ast: 3313971add9f81c5da70cdd66fc134e8bab9437d8ca7a50f41721250d5fa0225
-    type_inferenced_ast: 0a9387bf11f5c88d719463b8b0c3fa1b935a83ef3a382b575de21d3aafa955e6
+    initial_ast: 91fd89c2d91693622b5305b302c762d139bca3ff839dc5352be5ab694300ad8b
+    canonicalized_ast: 91fd89c2d91693622b5305b302c762d139bca3ff839dc5352be5ab694300ad8b
+    type_inferenced_ast: bfefba5d47f28d8939c2f296d1a52559fbcefc88d75cedde390233f4d4db1e98
diff --git a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
index 5f341dbb00..ca20b3c22e 100644
--- a/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
+++ b/tests/expectations/compiler/compiler/function/value_unchanged.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 65b078bf25edb054039cb244fbef0316a865274d6c44a2ceea72d3aefa90626b
-    canonicalized_ast: 7ec00e4ae76e7ed97f272ef523a462662bb6032cfafeeb9e8f11c266f45835f5
-    type_inferenced_ast: 77195eeb9765908133dec5cf01abd1ad744a5a61139d808f91218706487f9fdd
+    initial_ast: d3d54367b0fcc1b5a01185aec3cfe669941bd0a1b6f4218a73a1928f9dea5dbc
+    canonicalized_ast: eb82bb09e23368391dca2472a6838bb7f9d704a9bb1ca53169550fafb79b6eed
+    type_inferenced_ast: eeae07f387addad134aca399c105f020006f79fa64e4d1395abd2e27d42e0ae8
diff --git a/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out b/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out
index 407bbb6de5..bfc4883877 100644
--- a/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out
+++ b/tests/expectations/compiler/compiler/global_consts/global_const_types.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 9347e76e49daae38da61524f6c0ec6c2e4b0384a01c8c7773c6dae9aa75e20dd
-    canonicalized_ast: c9e8250d4cfe44fcb7f3e836aae5753b9a87a58bf20d13c4d712a6181e486f90
-    type_inferenced_ast: 3b8b47a915814590af43fc237a72bfb976ead7485b2b2a901571cbb29be55976
+    initial_ast: 97024a9c26e890afe8f4dc64b727a72e837f46b27ff56cddc1231c29671dc2b4
+    canonicalized_ast: 8674af05f953dfda5eb360e367447912e9d0ec5abf513eaba14444bd66bd9cae
+    type_inferenced_ast: 33017f3824095dcb4431f73db16a3fe1e845d30d7a6366182b247a23445eb26d
diff --git a/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out b/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out
index f8592604fc..afd08250f6 100644
--- a/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out
+++ b/tests/expectations/compiler/compiler/import_dependency/tests/import_dependency_folder.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3f359dbec82cacf3b542a67b0e90fa59ae410b9c2eaa2f2e4ce71746176c6049
-    canonicalized_ast: 2c036d46e9e8ee9278fdce6c0b11297e1e74f36c320f94eec6c3bc85025a19ef
-    type_inferenced_ast: e21be9e68e24ccefe83cd5a8ea330fe9931b3fa8b2a9c4298d798c2429c78907
+    initial_ast: 3f1b8c03ff4676240e6a1deaf46094a95f87b0c5375b7af09b9fd796ee9d7639
+    canonicalized_ast: d677dff4951f6b48675b4b38c3725b21914619c5af9494510f0ea9fdb50bec74
+    type_inferenced_ast: e053cf66b0a4b1ed0208c18d45566d8cd6277bbcb56f3547a28ef095deb25153
diff --git a/tests/expectations/compiler/compiler/import_local/import_all.leo.out b/tests/expectations/compiler/compiler/import_local/import_all.leo.out
index 60979b84a4..3b261da032 100644
--- a/tests/expectations/compiler/compiler/import_local/import_all.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_all.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 313c0094a00da55fdda3dade0bfa021056e0469852b9113a46d91d1c831b73e4
-    canonicalized_ast: 313c0094a00da55fdda3dade0bfa021056e0469852b9113a46d91d1c831b73e4
-    type_inferenced_ast: d94a5e74d7f1d2d467eb221277139efa6ba6983588ab854d84a7868b61f93de9
+    initial_ast: b01c46ace6ae994f48ca0042be1a1ec06bf844211f5a29a30594f74fdd6ccb90
+    canonicalized_ast: b01c46ace6ae994f48ca0042be1a1ec06bf844211f5a29a30594f74fdd6ccb90
+    type_inferenced_ast: 0b46b4b8fe6e9a397d8e9a64761f0f7c84f50a4be2f4ac3f08770183f27b6565
diff --git a/tests/expectations/compiler/compiler/import_local/import_as.leo.out b/tests/expectations/compiler/compiler/import_local/import_as.leo.out
index d16688ea2d..66be5fc42c 100644
--- a/tests/expectations/compiler/compiler/import_local/import_as.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_as.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a5e1be713c8c75cdaa001bc621958e83eec76d9ff25f23e14268eeb973b66d35
-    canonicalized_ast: 17f236ac4931259059f7f9470af948691131eb57d76d254e90a678c2e88e79e2
-    type_inferenced_ast: 751a6eda60bd0fd88d8fdc6a693ac410b944d449b27b62e9179304df0183baf1
+    initial_ast: 09ae5023ca083bbf3e4cd4634d83b4cb5d5b4ad44b51c6f849273540b74c05bf
+    canonicalized_ast: d12f6315280c12a7052e08f635d41e8d81d89c98ae6f760fbc3885da42224c4a
+    type_inferenced_ast: cd79fce9b7c1325a1d992159466c1dfba53a123f383aefa34940ceb2593fa483
diff --git a/tests/expectations/compiler/compiler/import_local/import_dir.leo.out b/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
index 9e1118b449..9b6756ecd2 100644
--- a/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_dir.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dc0d2962e432e48bb90aa3a780ca5996fd3ace2345e3050d9c25d920a7a3ccaf
-    canonicalized_ast: a32ad043e10c6c28e93c35a34190fa2476be891e3eb9c46ba04dd13ebc83c7ca
-    type_inferenced_ast: d835ff6b3ce1467d70ca008a8d741374ea7b92b99cb5f54061aee7eb1b069b87
+    initial_ast: 326263da73e6edfe8788d5d6db70ee879999bf0339690fdbb3d3c27508966125
+    canonicalized_ast: b81f83d7d31ec610e10e52f89a21e268664cf95cc6fb08bf2153403dc9c2f37f
+    type_inferenced_ast: 69402330a4fb2015c1ba2990104d3c8c43e05bc5d701c79587066092d3aabfa1
diff --git a/tests/expectations/compiler/compiler/import_local/import_files.leo.out b/tests/expectations/compiler/compiler/import_local/import_files.leo.out
index f487b27323..6859d46ba1 100644
--- a/tests/expectations/compiler/compiler/import_local/import_files.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_files.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 923ff9c192722eef3feee2a5b17f7b7dcea646aa6685bc54297bf1eb974295fb
-    canonicalized_ast: d0f68c4594e44e7695eab4716cb38a1808921e1265789263f053b91c32a26a38
-    type_inferenced_ast: e5ee9ff2838905ca61bfbafe24dfdf726d0da0567ea22bea9436ff9106d764e2
+    initial_ast: 1e48fe05ca987660d68c6166f45097631ac3a900da03ed1ff66a9f5410f7b817
+    canonicalized_ast: 567ae9a9f0641d4805d14ce57cbe7beb3fc33115e11187b1087d34c14f86b270
+    type_inferenced_ast: 3a934ed3696b799ce020a7d51db12af1039ea94608bf909804664521828348e3
diff --git a/tests/expectations/compiler/compiler/import_local/import_many.leo.out b/tests/expectations/compiler/compiler/import_local/import_many.leo.out
index e061af4cc7..3ca9429193 100644
--- a/tests/expectations/compiler/compiler/import_local/import_many.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_many.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: db01ccd5aaf375bfe49f9e95cde47adf741353ebb60c0463ea5f8b3477716edd
-    canonicalized_ast: db01ccd5aaf375bfe49f9e95cde47adf741353ebb60c0463ea5f8b3477716edd
-    type_inferenced_ast: 0718585fcc9d9b7922abb93e0162461d6e04c5b7fb03f729187443d75f8357af
+    initial_ast: 64f447a80a88cb665651c9d4a8d6c195d4f9529c0157d6c2f3c6557062b9361b
+    canonicalized_ast: 64f447a80a88cb665651c9d4a8d6c195d4f9529c0157d6c2f3c6557062b9361b
+    type_inferenced_ast: a31ce23735af584c7c21b27ba0b3e27cea01dbdb50efb87f690fdd5e0fa94547
diff --git a/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out b/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out
index d8403e37d6..ac8ce750b5 100644
--- a/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_weird_names.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ee9ec4ceedf5f1f7326b00e1a74af44fb04faae128ebf01d4517c903f9b827b1
-    canonicalized_ast: ee9ec4ceedf5f1f7326b00e1a74af44fb04faae128ebf01d4517c903f9b827b1
-    type_inferenced_ast: 0f89a0317173e34f2ca3c65654ac6b5f99108468eb274c3552b9e9829aaf9d4c
+    initial_ast: e58bc13bf652921c07e471122832498fa2b5fc317976fab07e34e9bb62e6ddca
+    canonicalized_ast: e58bc13bf652921c07e471122832498fa2b5fc317976fab07e34e9bb62e6ddca
+    type_inferenced_ast: 4e807d6d0dc3435ca3d6a1ab34b7d9f819664837cf32b5b26a81b027bbc05d71
diff --git a/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out b/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out
index 41eac9ad44..6598931551 100644
--- a/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out
+++ b/tests/expectations/compiler/compiler/import_local/import_weird_names_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f786b67e5542f66910d8548c8185197a6d49b4dcbf9c5d9a738b0c94ab6f8b73
-    canonicalized_ast: f786b67e5542f66910d8548c8185197a6d49b4dcbf9c5d9a738b0c94ab6f8b73
-    type_inferenced_ast: ecda036eab96446fe84286c610eba0297edb6522e0ea1ef724d83013adb41fdc
+    initial_ast: e1b0fc42c16ba92201081238a603e1a1c9a464882a274613cc8f99465d80334e
+    canonicalized_ast: e1b0fc42c16ba92201081238a603e1a1c9a464882a274613cc8f99465d80334e
+    type_inferenced_ast: 0f876207fdc179cc01db6d4b65350454dc0be5e20f6de2356eb53e0ff0e8ee97
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
index daa2b626b9..3bc9bbd98a 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 069cfa9c7178060bf3c0230f31d64b9bd22be6a88447568018dec560aa32e500
-    canonicalized_ast: 069cfa9c7178060bf3c0230f31d64b9bd22be6a88447568018dec560aa32e500
-    type_inferenced_ast: e30a262885a2dbd047409a5f7fd2de81fd9cc91686de88fe39a03e835e3580ea
+    initial_ast: fd5d65f5f25616d2b3ebb6ee863f8f5099544e19448534131299fca6dc090387
+    canonicalized_ast: fd5d65f5f25616d2b3ebb6ee863f8f5099544e19448534131299fca6dc090387
+    type_inferenced_ast: 20cc52c351fcacc3321fd3b56a79d81824e475e2c4bf9c63451e39d2545b7c05
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out
index ba1a8c378e..a3522c3118 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d47db8120f5667f5afd0ce44f515bdd2d41f1153b79972fb4d8763b62840324d
-    canonicalized_ast: d47db8120f5667f5afd0ce44f515bdd2d41f1153b79972fb4d8763b62840324d
-    type_inferenced_ast: 48192d8f242cdeac6855df7c92d1c60e008314d2e25fb6c33d5963b238a743b6
+    initial_ast: 75de104d23e3eda322cf8335ea2b72ca32c26fe79b9c7b8946f1b957a5a58b5d
+    canonicalized_ast: 75de104d23e3eda322cf8335ea2b72ca32c26fe79b9c7b8946f1b957a5a58b5d
+    type_inferenced_ast: 86e9c692a93d08c3d6ff7ffb82d885e6df78fb6c477c1efc6627881b5db02402
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out
index 516003f667..5e72920d14 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_char.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4ccdfaed84d17ced4a459baea27898dc165cc898f25ba5db9def1faf9aebc9ff
-    canonicalized_ast: 4ccdfaed84d17ced4a459baea27898dc165cc898f25ba5db9def1faf9aebc9ff
-    type_inferenced_ast: 00355f5036d0a753fe0b3486dadc06fdacb6f5eedc0d40b9c2f85b26314ac182
+    initial_ast: 79d9c8c5681e8eda47e4cc625e555cdc25de8b46f359db004ec2b5408d740f84
+    canonicalized_ast: 79d9c8c5681e8eda47e4cc625e555cdc25de8b46f359db004ec2b5408d740f84
+    type_inferenced_ast: 6a25166a63b0ef30ed2beb723ce9bca0b848da95ab633889409fd797f18a8fef
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
index f533a62956..82f0893667 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: e32fc158d0d4e25d5512f6a407b12ba50a6ea73f9f0598ec8c9e5d1ffc4843d0
-    canonicalized_ast: e32fc158d0d4e25d5512f6a407b12ba50a6ea73f9f0598ec8c9e5d1ffc4843d0
-    type_inferenced_ast: a3fd6659f4619343eff16cb73005a13c4207412160088b06f9a9d0dd3acd7dd8
+    initial_ast: f1c4e2b8a27e2575293486977b41988a4fdc9195c40ac70b703cd6b34c52e526
+    canonicalized_ast: f1c4e2b8a27e2575293486977b41988a4fdc9195c40ac70b703cd6b34c52e526
+    type_inferenced_ast: 38bf188ec70371f03856ec64b1df460cd3217a1565040f143aff30f1c3740c70
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
index 8805bcb07c..942216f150 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: input/main_group.in
         output:
           registers: {}
-    initial_ast: 781f09b5cb574e4aebd1eb0c9c2ebc02a81ca52b869ed16f1a451d1dacea4112
-    canonicalized_ast: 0c9813c834d335045cf71a6a5b543814ebaaec1be366ef48854b8b6985a7c710
-    type_inferenced_ast: c99f3db5fda1e4aed85a5aca1ffa87e7bc4560658736e04d3338091acd3d177d
+    initial_ast: 734254f32edba7e044d3d9f73dd222a0dd967707d51f4a6fdc3c89af9bc79f6c
+    canonicalized_ast: 8e37317e62d5c398c84aa4470c96a2bef33e63b5bb1a0e469a4cf1a49c565a74
+    type_inferenced_ast: 6f5a6a68f766ee45ea2f4b3e16a6f85ac13fe60fbe3a27cea90e5da7bd7982c4
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out
index 62a37208eb..32b62ddcee 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_multi_dimension_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4745f2ae8312973d7391eef93452656a16e1f2edabd1a1518da9e644e510dcc3
-    canonicalized_ast: d2bccd8f77fcc43c8c4a2431e12ec7cfc9c28bc140d3e8b43b7e40f030aa86d3
-    type_inferenced_ast: f88787d3f406ee8822fc36faa0a976d72b6c90b616e006b4bb86a95ddda7c51b
+    initial_ast: da5236e9a81e2048dacfd3004db8a370a342ca2fb966b3d8ba6535ba4d3fae17
+    canonicalized_ast: f65c8486c62ea1df95bb7ef70577388da94d200ceba32ce15620e5498ce245e9
+    type_inferenced_ast: dca62cb02813f4047d5f69c1b70d945902dc99044c980f74e7789611dc6968b1
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out
index 24b63542df..6d17836eeb 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_multiple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c220ba73f75ff1651a98991ee4f5ea021dabdde2a1c08e949deb2aa1ecb65390
-    canonicalized_ast: c220ba73f75ff1651a98991ee4f5ea021dabdde2a1c08e949deb2aa1ecb65390
-    type_inferenced_ast: 30507ab22a8ebd6bb0f239d34923201b6381a722e11649c0b1ee73acd9317902
+    initial_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
+    canonicalized_ast: aae17ba5bd2ce376b5c440df42be442b0731feb499fa37b133b89f364a8790bf
+    type_inferenced_ast: 5b110c3aa3e0d65942f7a7fdbdccfc745aa810ea7d71137358f220d2bfecb0b7
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out
index bf86c50e30..9f50a60077 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_string.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: cd2766745f0e89484a8699958dfa1d34465a7ae76985581ff5cedb64b1af358d
-    canonicalized_ast: 1aed123b79d7c26d8d10f05883a5daca1d87c1a5874cf74cf8889fce7b0a448d
-    type_inferenced_ast: 1ef118bd57f7a113f9cf1f8990fb29ee61b018e0142e33ecf940566b86cd71a2
+    initial_ast: febb53aab48ab8b14c5254dbabd4962986633cd1d8e835cb2cd37273eb679f19
+    canonicalized_ast: 87a760c60ea690797600988e8bb9e3f767aea097d226e1c4975f96103c2de8b6
+    type_inferenced_ast: 43c510a75ca27431f2f85be85e1cc7a92cd4c6da43cd38e74bb3d3fd1fa525b5
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out
index 8113b455de..1a5835c8e8 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_tuple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 89629e72caced78aff784b485cbcce3afaf9fbb3d87031df0c29f06998ae7ed1
-    canonicalized_ast: 89629e72caced78aff784b485cbcce3afaf9fbb3d87031df0c29f06998ae7ed1
-    type_inferenced_ast: f3b74fe5acc0245c6db719848b4326a59997528e82f149c57890cb66aec3f310
+    initial_ast: f7d08c7f104e732a04c7a71522a04d8a781afd3b67b28db8978a41d34c7ae472
+    canonicalized_ast: f7d08c7f104e732a04c7a71522a04d8a781afd3b67b28db8978a41d34c7ae472
+    type_inferenced_ast: 358265a83714b484456d92d5ccc15e4259e94bdd28072914628c5ac9773adfd8
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out
index 1d5f514839..1b01d3a1c3 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/basic.leo.out
@@ -16,6 +16,6 @@ outputs:
             b:
               type: bool
               value: "true"
-    initial_ast: ec6cdda564d981bedb77ad0180a3d6f32fb5e5f35e50e116de4f2b9337d6f4e1
-    canonicalized_ast: ec6cdda564d981bedb77ad0180a3d6f32fb5e5f35e50e116de4f2b9337d6f4e1
-    type_inferenced_ast: 57655819a50e4ee7d73fd9ec5dfbd92116d47bc9026beee48ba91c4df416bd15
+    initial_ast: 2cfed669110dc972ec11a67149117c6dd2f4d09d7791d7d3cdfe334c32bfc3eb
+    canonicalized_ast: 2cfed669110dc972ec11a67149117c6dd2f4d09d7791d7d3cdfe334c32bfc3eb
+    type_inferenced_ast: 4df0dad517cafd4f8f4e9a9717e0b4d3decd2c07091338cd65fe97fdcc5e8778
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out
index 0780b72788..f3559fa361 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_and_program_state/token_withdraw.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 57c1127a90a478f057ca43c10d8b729c8c61229467ea730da014b678874d3320
-    canonicalized_ast: 57c1127a90a478f057ca43c10d8b729c8c61229467ea730da014b678874d3320
-    type_inferenced_ast: 910fc1e704a7aa20a5e3b1e6fa316d9e2d52596e1be016e502dd8d50ce9196e9
+    initial_ast: 2a87c1d20941f840d6e6535b0145568e8aea7f87466c5e313329e3844efeef82
+    canonicalized_ast: 2a87c1d20941f840d6e6535b0145568e8aea7f87466c5e313329e3844efeef82
+    type_inferenced_ast: 34a0270bb47f0ba1b72f8789a1223084b6719933dd937f6703759502ace7a346
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
index 990eee377e..d7047044c2 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 77097dfd19148cfb6cd04a2dc41f0fbaa87be222facb9e7b3409543257e4c13a
-    canonicalized_ast: 77097dfd19148cfb6cd04a2dc41f0fbaa87be222facb9e7b3409543257e4c13a
-    type_inferenced_ast: cd4e2c77e83b9e88b1ed9c68656db0020f78c4cff5762f22eb5bfcd5ae7bfc3b
+    initial_ast: e007051c65717fe114d8886204b8c097d81c38144ab4afc1ab1bc382e5773dd8
+    canonicalized_ast: e007051c65717fe114d8886204b8c097d81c38144ab4afc1ab1bc382e5773dd8
+    type_inferenced_ast: a22c5c90adcd19441b5fef47a637f1dc1b1f849a31a1c8adcbe377897dc292ca
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out
index 9c8acc2541..33588fcfe7 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 948bb28600521fd994c66f618131a3ed94f65cbe11a0a93a3dc5c5d7a1042827
-    canonicalized_ast: 948bb28600521fd994c66f618131a3ed94f65cbe11a0a93a3dc5c5d7a1042827
-    type_inferenced_ast: 4e80b126a79870ca02d171ec0af332d0811860e57f16bea68e35fdb348dc157d
+    initial_ast: 9957e99bb4cb4b2b9b4c8a49435f05773cdae1bdaf20ea6b98aa1e77b804d94c
+    canonicalized_ast: 9957e99bb4cb4b2b9b4c8a49435f05773cdae1bdaf20ea6b98aa1e77b804d94c
+    type_inferenced_ast: 3a1dcb5ea333c1dfc1b1ceb5516c59a449cd882d22a7439833c1d3a0a3eca3f3
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out
index e3d4b19f28..b6a5b28c2e 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_char.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 09c3ff107f188d9e074cccea5e1d0c0b70e77f3b072e6e2cafbad0bcb926cdd2
-    canonicalized_ast: 09c3ff107f188d9e074cccea5e1d0c0b70e77f3b072e6e2cafbad0bcb926cdd2
-    type_inferenced_ast: f551e1f4c578a8686d6a2e6b5e018b23974298b10ccbbce6f9be7a74250f7383
+    initial_ast: a1518e5bbc6ee7140232bb483f4dd6ec53455aff8aa8c517c5e27921ebeab3af
+    canonicalized_ast: a1518e5bbc6ee7140232bb483f4dd6ec53455aff8aa8c517c5e27921ebeab3af
+    type_inferenced_ast: 0940493f8d297c71d9286c980ce74405a10115412a16c6a5247c03280747e76f
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
index 503603ee14..f3dfc7b125 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 2da9d8687c2f9a42663f5afde33486393b497cf247dfd43441e649a91e41a927
-    canonicalized_ast: 2da9d8687c2f9a42663f5afde33486393b497cf247dfd43441e649a91e41a927
-    type_inferenced_ast: 5f5a16af0989e4c786a31756509e034f747b9b04431c206d0d079ba097f54ba4
+    initial_ast: 8c41518bf856943776335f7134085d5ec579fcd3f074c684bf15a088d5706cc5
+    canonicalized_ast: 8c41518bf856943776335f7134085d5ec579fcd3f074c684bf15a088d5706cc5
+    type_inferenced_ast: 0e64948c43c40dc90e3256093e0d5ee21d03593c38331febf90d6ef3ac381b7a
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
index ed8d7308a3..033fa39be3 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3c34a303e6cd914e00b8f2d89afc9139336d29c44df72bf6e0e3850b7f9d4329
-    canonicalized_ast: 3c34a303e6cd914e00b8f2d89afc9139336d29c44df72bf6e0e3850b7f9d4329
-    type_inferenced_ast: 5e846f4809259c1a1b17da2ed86beaa849e04dc30a0fb9c3befefd9a530d74b3
+    initial_ast: d23e3cc53865b5079111a5f568576fcc760b7ab3d97261b7d8c6c26a1dbc3da3
+    canonicalized_ast: d23e3cc53865b5079111a5f568576fcc760b7ab3d97261b7d8c6c26a1dbc3da3
+    type_inferenced_ast: dbfabbf984c9ff0741ed1d00ff5ef3a2e3408ccc16270ec835a5781f206edc7b
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out
index c325f638d9..3fb727c90a 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multi_dimension_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dc7f5b9419e039b9c72df637b656a2a040157b3345da403add0f228998314482
-    canonicalized_ast: 5f12bde4c55c0e3d90beeb6863bccfeddfd197dc8da962b35c7a296729f65fe8
-    type_inferenced_ast: ea3c5083990d249fbe307c4cfa4009f667ba7edc447e17340ee84600b694f36b
+    initial_ast: fc34aa149a013b9dc5b89b37e19a9ab4b8c721bfb0194332b18491354005c757
+    canonicalized_ast: 70e54f09c930683fdf01d942fbf818de72f73fe17de4bc06c428bb3166fca7b6
+    type_inferenced_ast: 8eb214fdbd3319530abbbbf834c99fd5339513d6be7aed84490fae01b5e9ca47
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
index d70ebb5838..3d3e03bbdb 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f9e01e97c1be1bd3991cbc552cefbe185237369cedb02bb69b1ed4bcd115f258
-    canonicalized_ast: f9e01e97c1be1bd3991cbc552cefbe185237369cedb02bb69b1ed4bcd115f258
-    type_inferenced_ast: 44148dcb760268261352c9f97fa511d4250f9814869073b892bb636f0516a48c
+    initial_ast: 6ca86b141b3b3ca7236fa991bf26c91e9451208080803c05878229721adece7e
+    canonicalized_ast: 6ca86b141b3b3ca7236fa991bf26c91e9451208080803c05878229721adece7e
+    type_inferenced_ast: 466038c7c7bc66b05eb0e58ffff56a491e754aa315b4b75779012236ff1f1c1c
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out
index 844eff4aa3..a442df980a 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_string.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 94fc54750aa6600e97e134680399cdd196dd8ff3a52d84598027e4d8a9c73f15
-    canonicalized_ast: 463ff0dcd4188c31383c22334d1517c09a9eca308476c91f9c0fd9b2e45d48ec
-    type_inferenced_ast: 543f04ccfe58b08618cf2d537a76787e0ce4f6d53f0668d54dac8ee63c0d26a1
+    initial_ast: 613d2bc2c09f5bc83f69f1a412e95d0131111bc74b60b9ed7d1fa8bb2006120c
+    canonicalized_ast: a6601205f9b1deb01c7029664cc1074a5c4497be5e4702fa66886f7791b20d94
+    type_inferenced_ast: bc5f71c3a2a6918c75cb361514d4bdaecbb54f294ba20ec16ccecd20b582fbd5
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out
index 8575cf1522..424015348d 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_tuple.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c8ea02057486165df1e3cdbea322408b7eb59226d3914effb358fb1d8ab6aa85
-    canonicalized_ast: c8ea02057486165df1e3cdbea322408b7eb59226d3914effb358fb1d8ab6aa85
-    type_inferenced_ast: 2eabb38706b4136d3c3404107cb20e9e72408a45e97e01f54c79d7d83eee432e
+    initial_ast: fae106810af4f4f1778934609b37de40b91e8f813b66b745c50343e3ff862dde
+    canonicalized_ast: fae106810af4f4f1778934609b37de40b91e8f813b66b745c50343e3ff862dde
+    type_inferenced_ast: 8ec29af283c7f3e23ee77643cc0fd7b7e8fe07639870b87ecd952ca187e4fc20
diff --git a/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out b/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out
index c0e3a4dbd8..56cb3f6df3 100644
--- a/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_registers/registers_array.leo.out
@@ -16,6 +16,6 @@ outputs:
             r2:
               type: "[[u8; 4]; 2]"
               value: "\"[0, 0, 0, 0][0, 0, 0, 0]\""
-    initial_ast: 5327d26979b458288e0e2cf6ce1a4def74216c233e2440f2963ffde9955921a8
-    canonicalized_ast: 5327d26979b458288e0e2cf6ce1a4def74216c233e2440f2963ffde9955921a8
-    type_inferenced_ast: bd6c9906e9a5c5df4dd141325d91746a09ec87f7daee7d4dce58af968c8803b0
+    initial_ast: fc0375f232a4a8d600789df4c17c872438ae3e918c7a617364085c62b9873c8e
+    canonicalized_ast: fc0375f232a4a8d600789df4c17c872438ae3e918c7a617364085c62b9873c8e
+    type_inferenced_ast: 8566dcec6a7bb0a0105c25331486c7a69d03bf12734f62b9136b3179d7f22432
diff --git a/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out b/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out
index f79dfeeb70..3fd558ebfb 100644
--- a/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_registers/registers_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ECMP0376037]: Mismatched types. Expected register output type `u8`, found type `bool`.\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n|\n   4 | ...\n|\n   5 | }\n     | ^"
+  - "Error [ECMP0376037]: Mismatched types. Expected register output type `u8`, found type `bool`.\n    --> compiler-test:3:1\n     |\n   3 | function main() -> bool {\n   4 |      ...\n   5 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out b/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out
index da5546034d..f6ec6ba7c5 100644
--- a/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_registers/registers_pass.leo.out
@@ -16,6 +16,6 @@ outputs:
             r:
               type: u8
               value: "101"
-    initial_ast: 7f4fc74c20ba6f2aefead777b0230cee03af4922a9dbf9e77b90baea3649f3f1
-    canonicalized_ast: 7f4fc74c20ba6f2aefead777b0230cee03af4922a9dbf9e77b90baea3649f3f1
-    type_inferenced_ast: 871513e8b5723b79065dd4f56aae315854e4798fb26973af95e0a34c415e9b65
+    initial_ast: cf6a76290b73851a3ed589650d1a25ffbb75e663f510dfe3274b66600678bc64
+    canonicalized_ast: cf6a76290b73851a3ed589650d1a25ffbb75e663f510dfe3274b66600678bc64
+    type_inferenced_ast: ce87463df0f9dee5d06d1d872340e8f40ca5cab1bc5a9dbb4e422165714798d4
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out
index 30fe6e1a0b..e53c68cb4a 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/access_all.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dbafd64b73c9e5c7f9abe597a14c99d53b819cf81fcd02e95936e2559c2fc903
-    canonicalized_ast: dbafd64b73c9e5c7f9abe597a14c99d53b819cf81fcd02e95936e2559c2fc903
-    type_inferenced_ast: fc41b1ddef2242c578b80e746574cebb208a4b72692136241a1d55f55f825d92
+    initial_ast: 6fd4f46e0a795fd0edef840925c6a152c8b69685f30b42b1dc5aeaf2e0f1296a
+    canonicalized_ast: 6fd4f46e0a795fd0edef840925c6a152c8b69685f30b42b1dc5aeaf2e0f1296a
+    type_inferenced_ast: ad948d43d662198b33e752ac1c20807b5d79525c4cc61f15d41155f31ade71c4
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out
index 719ce75894..e5a5c707d0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/access_state.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8dd720153c3f27d9c23174d3a15281819020e58ea02e8996a6db4716087bef82
-    canonicalized_ast: 8dd720153c3f27d9c23174d3a15281819020e58ea02e8996a6db4716087bef82
-    type_inferenced_ast: 3d9814fb189ffb1699e820ebaf194959654932f061cdfc2052e249433bb3aafb
+    initial_ast: 14d707805bc7e51b4b01dc9272ce7e7f1018c52a885a14177acb4e7ca34174f5
+    canonicalized_ast: 14d707805bc7e51b4b01dc9272ce7e7f1018c52a885a14177acb4e7ca34174f5
+    type_inferenced_ast: b399e663877ab10bb59844997e4a6a94e53c67cec20112a125906087a91f3a32
diff --git a/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out b/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out
index 00ccad0091..2cef53b2e9 100644
--- a/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_state/basic.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 31353a3e583defe93fffe28828c3b43de3477006a2dbfbcad230be651e6f31a8
-    canonicalized_ast: 31353a3e583defe93fffe28828c3b43de3477006a2dbfbcad230be651e6f31a8
-    type_inferenced_ast: 3c989502fc45d58e2356ae71fbe816a24d132f9f6916e9fa91dc16741a9514eb
+    initial_ast: 4f9380a273ae5ba7862fd6b8f8be1a46cf6595c6f89d7538760239e7b99dc3d0
+    canonicalized_ast: 4f9380a273ae5ba7862fd6b8f8be1a46cf6595c6f89d7538760239e7b99dc3d0
+    type_inferenced_ast: 92e14566897c6c2d06f9044837878814b75995beed268edf3f36b4691819bc7c
diff --git a/tests/expectations/compiler/compiler/integers/i128/add.leo.out b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
index 0956c89cc9..c1d7276af8 100644
--- a/tests/expectations/compiler/compiler/integers/i128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ac462de11506c6dca67eb4f68d1d3ab28212305b9d51019a8ba034678491e430
-    canonicalized_ast: ac462de11506c6dca67eb4f68d1d3ab28212305b9d51019a8ba034678491e430
-    type_inferenced_ast: 7ab77561ac7c95a290f91b50fc0861511102a9ef640f8af145d0e8b290958c32
+    initial_ast: c473f0dfff63bc3a34b3da6eba52325b9eb84899d5adabfddab819f13f3d5c12
+    canonicalized_ast: c473f0dfff63bc3a34b3da6eba52325b9eb84899d5adabfddab819f13f3d5c12
+    type_inferenced_ast: 9aacff57a9dc5e20202d0caf861d3b221291e9b24b55dae3d6af7cae0d462523
diff --git a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
index 25dc663b17..f003bd352f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i128.in
         output:
           registers: {}
-    initial_ast: 62a53d49c0d37f9560c418178f61c1d128189b72755c3f742eede96d26ca5130
-    canonicalized_ast: 029b66864f067b5b2eff38d6754adf60346502b797eb96ef669f679a2b70421c
-    type_inferenced_ast: 3c16f03f281e074f0bc8783836b1b757a8daa6f0f224ea8de959ff9168c1ea92
+    initial_ast: 9179994f97bb644f2398fb05b40a3a953f07131cde0835661ddf13c02b9a79ff
+    canonicalized_ast: 84d32c3262b3ae07914ddfc44ff21be8e1ba8750e8a36dca109d615db2393f85
+    type_inferenced_ast: e0a51a2a919c8fbd7225bac172d55a1f03592b4355b7f7894a3b7ad2816f36bf
diff --git a/tests/expectations/compiler/compiler/integers/i128/div.leo.out b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
index a198c2aa9e..ae5b136f59 100644
--- a/tests/expectations/compiler/compiler/integers/i128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f1291dcd53d870f53667970ff090bb123ccbf46fc1695e53c9e783404dac680a
-    canonicalized_ast: f1291dcd53d870f53667970ff090bb123ccbf46fc1695e53c9e783404dac680a
-    type_inferenced_ast: 2317beb358f489c2de51c7a2ab3ea6564c6043a6cd293e61205c89c2c0d2af5a
+    initial_ast: ccff1bd7ccdd4deb2856d537f9662b07c2b095f5ee46f7161c2b6a51b9ebb85b
+    canonicalized_ast: ccff1bd7ccdd4deb2856d537f9662b07c2b095f5ee46f7161c2b6a51b9ebb85b
+    type_inferenced_ast: 9e2e24001539561dbe1dbecfa55b0c7b8d92f8c85de213a144d0c5fcd505204a
diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
index b4b52f098e..392d47b56f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a356099c735cfc2aadee33e79a876df32d77b2eeedd2a5e3114432fc85f250c8
-    canonicalized_ast: a356099c735cfc2aadee33e79a876df32d77b2eeedd2a5e3114432fc85f250c8
-    type_inferenced_ast: 5f6e79b8b2023fee6377cda103a0c9e115f4043456f5b5b52f43a141b044fcc6
+    initial_ast: 193c20aaf2312cc8408d2c9e38af8db7cfc77765a2c0f550f75fe36bf893ddb6
+    canonicalized_ast: 193c20aaf2312cc8408d2c9e38af8db7cfc77765a2c0f550f75fe36bf893ddb6
+    type_inferenced_ast: 4a6b35a5d378b03e2c4f342d8fee17b06ae117a8c2c67e3e694da0ca82fceefe
diff --git a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
index dd709c20d6..8dd73b9917 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e23e1934b9dd1e6eb4f5ab61a38aa2b8b08fd611dce862b964c7d2c9276e5d27
-    canonicalized_ast: e23e1934b9dd1e6eb4f5ab61a38aa2b8b08fd611dce862b964c7d2c9276e5d27
-    type_inferenced_ast: cd1420b2695d013f43bd78a5c2310b1399bb03831019b8f65598c453801fb43e
+    initial_ast: 41a3c24f3843caa402b24c4efadfbdd439613a0dadacc2c4c4fbb14eecdd3012
+    canonicalized_ast: 41a3c24f3843caa402b24c4efadfbdd439613a0dadacc2c4c4fbb14eecdd3012
+    type_inferenced_ast: 080a3cda9504d930a392811175a4d3960667e2eb6c3a1ed0ba0ef784adbe74ca
diff --git a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
index ffc6e2e597..671fb45330 100644
--- a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 83d601d1b35665b459726420ecbe77108b9ff2e2c9213c5160e77b7d3065a5e8
-    canonicalized_ast: 83d601d1b35665b459726420ecbe77108b9ff2e2c9213c5160e77b7d3065a5e8
-    type_inferenced_ast: 9d7a01a5dd805625f7d8f32718ff0e4657a3e2453d64ec72de3c05ca0df4a7b3
+    initial_ast: 8fde7a555355f0cb3109c38e6708590f0cf23440c95f498d9ff1b63ef8ac7fbb
+    canonicalized_ast: 8fde7a555355f0cb3109c38e6708590f0cf23440c95f498d9ff1b63ef8ac7fbb
+    type_inferenced_ast: 4ed1fc29250d7175f812cfd956ea7641676f9216e8d66ba22f2fe2b8fceaafaa
diff --git a/tests/expectations/compiler/compiler/integers/i128/le.leo.out b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
index eda04f2526..cf0cf15ae4 100644
--- a/tests/expectations/compiler/compiler/integers/i128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b42ac7802bbd024bce3cdeab0fc177910f4a02f719fd820c4e98623b07c4a0eb
-    canonicalized_ast: b42ac7802bbd024bce3cdeab0fc177910f4a02f719fd820c4e98623b07c4a0eb
-    type_inferenced_ast: 858f318b38f76968d917f163fb49e7695916390ebe04f8b91230ca39656feb7a
+    initial_ast: 78d701153a1bd0e37caffd3623672bbc15eef30013f0d6945622e3c773b0e40b
+    canonicalized_ast: 78d701153a1bd0e37caffd3623672bbc15eef30013f0d6945622e3c773b0e40b
+    type_inferenced_ast: bcc72ba644e3e085e4fb7ec5ad81cad31c8a3e52ca695c508a5a974084557fa5
diff --git a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
index bdcfe4f15e..c7e449d401 100644
--- a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d2e54559c35ba0233d44d6ee1e298325c669513272423537181b86ce4233e7cb
-    canonicalized_ast: d2e54559c35ba0233d44d6ee1e298325c669513272423537181b86ce4233e7cb
-    type_inferenced_ast: d56adb188c2c3df0b8f2e97116c13808e1308abb1c1aee1bbfdf3168662b4bf8
+    initial_ast: a525dab584b9e4cf919db4362ae18124ecb4b75870aa1f221764a8a16f0eed77
+    canonicalized_ast: a525dab584b9e4cf919db4362ae18124ecb4b75870aa1f221764a8a16f0eed77
+    type_inferenced_ast: 462717ffba89b46c65e2452dadc959f14fcebb49b78c60172f223c1c4bb0ebe8
diff --git a/tests/expectations/compiler/compiler/integers/i128/max.leo.out b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
index 599b11f873..cdd1782c75 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bcaa1e94d6d9f6cc6e30076890e8cf3426d514859decc3a63aa7296e88c5a53e
-    canonicalized_ast: bcaa1e94d6d9f6cc6e30076890e8cf3426d514859decc3a63aa7296e88c5a53e
-    type_inferenced_ast: d9e1540c6e87be7a291866eb9dc27a4faa88ccb74c061ccaa03b3cecb64b3ad6
+    initial_ast: 8b2ac26a6a27f74b2f7a9f7523972083a5caad1fd95597cfb15ac21d58bc32e9
+    canonicalized_ast: 8b2ac26a6a27f74b2f7a9f7523972083a5caad1fd95597cfb15ac21d58bc32e9
+    type_inferenced_ast: 7f01c95106c222834c49509fdc88b7cf3b9d74cf2ff4923f0000968535859fa1
diff --git a/tests/expectations/compiler/compiler/integers/i128/min.leo.out b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
index 5a3ed9a6b2..007e2a219d 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 81f19c70aa243402136cb83389766503933b4a16af54eb267e3beca47b39c3fd
-    canonicalized_ast: 81f19c70aa243402136cb83389766503933b4a16af54eb267e3beca47b39c3fd
-    type_inferenced_ast: 68075edede17cbaaac7f6a13d690a8c387c39883aaee642e91f7b79f0c399a93
+    initial_ast: ca4b9ce444b0d445a84d26e4711d25c9f8670b8cae8ce0c456680b9ddd49663a
+    canonicalized_ast: ca4b9ce444b0d445a84d26e4711d25c9f8670b8cae8ce0c456680b9ddd49663a
+    type_inferenced_ast: 122e02aff2e30b825b64251f34dd01ef81429e5cf7807e18b5f33adc9709e67e
diff --git a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
index f7528c303f..ed9d73e5d7 100644
--- a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 186ffdd352b08c5c49d88c75c33aa7c11ef19d378025b30e7c90e415244fe167
-    canonicalized_ast: 186ffdd352b08c5c49d88c75c33aa7c11ef19d378025b30e7c90e415244fe167
-    type_inferenced_ast: 713e660370a3ccd00762874b730882ac8f4057b489a6a187f5408a3ccad150af
+    initial_ast: 228b473e19bbba4b71e7d157b704e89d6ef8aa446663844077719db104d1569b
+    canonicalized_ast: 228b473e19bbba4b71e7d157b704e89d6ef8aa446663844077719db104d1569b
+    type_inferenced_ast: 06a3d13f280995c019cb81a4e5de4457815a45c6f507d27911bda75ffd2e0f98
diff --git a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
index 67798c24c7..2dbbe9130f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7fab027642da486a2f3ea3dd8556179e75568a61144b5662dd260493852eeba3
-    canonicalized_ast: 7fab027642da486a2f3ea3dd8556179e75568a61144b5662dd260493852eeba3
-    type_inferenced_ast: 6ecdad348f6f23553bbabe8b30835e9c898d9d97f0a5aa1366f5acb94d8f6b3a
+    initial_ast: 0c0a73b6892c05a8e28baeb86e1d18d28af3b602f7e6de4adba4ae28335ca509
+    canonicalized_ast: 0c0a73b6892c05a8e28baeb86e1d18d28af3b602f7e6de4adba4ae28335ca509
+    type_inferenced_ast: b2a1e5f4428e37b0c5ae52cc63ed3f4c0908885c6732d4f353825b816fa6136c
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
index e0611ad1bc..6d4fa039ec 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fa78dc309cc81c6c96b9fac180fad7870e5262f79fda6cee57290154ea48f7ac
-    canonicalized_ast: fa78dc309cc81c6c96b9fac180fad7870e5262f79fda6cee57290154ea48f7ac
-    type_inferenced_ast: 086c21d92666126135c7800554648b1edfa596262878fb3ee3ccdbd3a4d67493
+    initial_ast: d059629756c072e44c3ca938339712f85b2b69fb0649051bf76d1908e4b2eade
+    canonicalized_ast: d059629756c072e44c3ca938339712f85b2b69fb0649051bf76d1908e4b2eade
+    type_inferenced_ast: 9b3f2561a65416b13d6409492bfc989bae6bc67976faba9825fb02f1451a4c17
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
index f47709e3dd..ab4f777fed 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1b6248de2bf261e167aac374a03f0d4457a72b1db5a0ea82bcded1ef35d15228
-    canonicalized_ast: 1b6248de2bf261e167aac374a03f0d4457a72b1db5a0ea82bcded1ef35d15228
-    type_inferenced_ast: c088d9226acf93203adb5f50e2eaa04df39804ab0d07ecf8c79d95637ac6c079
+    initial_ast: a0009b59b8ff05ebb3309395250a94e675663417730aceed483ce2338880d8fd
+    canonicalized_ast: a0009b59b8ff05ebb3309395250a94e675663417730aceed483ce2338880d8fd
+    type_inferenced_ast: 5140944155158eba88db7a3c6614dac1b50ba37a30d906b10d6c86729dc1c923
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
index bff2338f7e..26d7c1642a 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d1750fe6b12ccdce3369a1d4731ee246d03dc1bde628373d549bc5f3381d8930
-    canonicalized_ast: d1750fe6b12ccdce3369a1d4731ee246d03dc1bde628373d549bc5f3381d8930
-    type_inferenced_ast: 26b0d2e0de90d256c74ad90d9a1953a62c08d27e7213eca59563774114efc142
+    initial_ast: c9e977ef13cd2c8e6b6c3e50ce14888865d51e858e6fa8660076015986692978
+    canonicalized_ast: c9e977ef13cd2c8e6b6c3e50ce14888865d51e858e6fa8660076015986692978
+    type_inferenced_ast: b59d18c7f15c7b4cdadd36feb0c4da91ff5d72d362be4e8c69039bbcd6d262d0
diff --git a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
index 6d450e56c3..f95190326a 100644
--- a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 084ac84295a8f4fda5e3511fee4068a96934fe4521aea5540f9e0a40ae1a7d60
-    canonicalized_ast: 084ac84295a8f4fda5e3511fee4068a96934fe4521aea5540f9e0a40ae1a7d60
-    type_inferenced_ast: a6d6b276dda67099e6cbb7d5188befb863cf61d15073dc1730112c858fe31276
+    initial_ast: 94fc493ab84b819b8c12f68a7c4d01e9adfd7eaa1cc533bafcbcce10b547cddb
+    canonicalized_ast: 94fc493ab84b819b8c12f68a7c4d01e9adfd7eaa1cc533bafcbcce10b547cddb
+    type_inferenced_ast: 6238710e4e6696f1020a31763f3edaa17be46f9ba4fd55bd72497e5c4bfe1cd7
diff --git a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
index 4d9ad31975..76111474a5 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3e8596a265aa5e71ae65161316ed3d789fec123d775f2d40a4c1311b224d1561
-    canonicalized_ast: 3e8596a265aa5e71ae65161316ed3d789fec123d775f2d40a4c1311b224d1561
-    type_inferenced_ast: 4e3d21eb9358220080cc24ed3bafe3873e41713cf543e375b29cf3ef779837ad
+    initial_ast: eee17d124eb8d460f62417c1af0bbbe424cc14a6751250c6f606df1b28d191d3
+    canonicalized_ast: eee17d124eb8d460f62417c1af0bbbe424cc14a6751250c6f606df1b28d191d3
+    type_inferenced_ast: c37cd2aa068f66eb9debcda671ad096b852639b3d074f11deced4d2e93dba370
diff --git a/tests/expectations/compiler/compiler/integers/i16/add.leo.out b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
index d572444b26..6f0ee352a9 100644
--- a/tests/expectations/compiler/compiler/integers/i16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ae4527e4325ed14332c6ccf66f317d048b042e3b81c3f3e91d639ab1509b72f9
-    canonicalized_ast: ae4527e4325ed14332c6ccf66f317d048b042e3b81c3f3e91d639ab1509b72f9
-    type_inferenced_ast: 3fb4bd89f41f243b8bcf0961a9c5993520dcc1bd0c66fd71388b99b462dd0e71
+    initial_ast: 4fd0a999f8398beef7f71c3315355df0bd1124f66a6fda726db6830442a9069f
+    canonicalized_ast: 4fd0a999f8398beef7f71c3315355df0bd1124f66a6fda726db6830442a9069f
+    type_inferenced_ast: d7a93d56836cb99a113174804450f53e19096901e14b4ec31acbfab389df7eed
diff --git a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
index 506271fa0b..95d01494f5 100644
--- a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i16.in
         output:
           registers: {}
-    initial_ast: 9fd06d094a4c40e018572aa89322695cc5a6d04f0e5ab496b6b53b3dc9584f6b
-    canonicalized_ast: b3a66c2d4b7e3784731a43e42c32e77a7823b13b0426b3dbf368e465cd56fdda
-    type_inferenced_ast: 3cb58466b051cebe768038210691299387219dad2616af6063515c20aad6a996
+    initial_ast: b2877669171aea3b2c3f020ba997de1fe6c5a64328f041620a502fad992f820f
+    canonicalized_ast: 33d960627a5a40386fcf1fc1edd259379bca4517a77155440f5417919e69c6b3
+    type_inferenced_ast: e03a6ef7557c36c6c2a57306d1d4ff1d6f7c5d1955d938af2a64ed5a37cc257d
diff --git a/tests/expectations/compiler/compiler/integers/i16/div.leo.out b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
index 58c1256bf4..388f0f87f1 100644
--- a/tests/expectations/compiler/compiler/integers/i16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9fea4fb63e9c60ae1090363860ba64d29159064580aa750920d2369e047c3760
-    canonicalized_ast: 9fea4fb63e9c60ae1090363860ba64d29159064580aa750920d2369e047c3760
-    type_inferenced_ast: 8d19db9384105c6aa8dd86de7443dbb7926928847094049fee40088404ed5fda
+    initial_ast: d50e609d7e88ef14c86c8a72cdff0c92106ed4580a06faf3705c789141181782
+    canonicalized_ast: d50e609d7e88ef14c86c8a72cdff0c92106ed4580a06faf3705c789141181782
+    type_inferenced_ast: 78f3ab4058104f17d002e8baedea424719e8ef6f99666e68042b89326cbb4916
diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
index b48fee5c60..29e49a0c30 100644
--- a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e459cff3f061bfcaf69f5d7e9079a12b00a7f8a5ded25f90419846daa1d4b087
-    canonicalized_ast: e459cff3f061bfcaf69f5d7e9079a12b00a7f8a5ded25f90419846daa1d4b087
-    type_inferenced_ast: dec3a94ef9e82ae84e93a20ca17a4b3dfddf69f475d8e104bcb8d6ab05ab50a3
+    initial_ast: 9a4e11bacd644fd08dd1bce9b88fde724b357dfc1ec5f8d123f8c0479de36e71
+    canonicalized_ast: 9a4e11bacd644fd08dd1bce9b88fde724b357dfc1ec5f8d123f8c0479de36e71
+    type_inferenced_ast: 56798e8bcbbda12ea8540466cf8e25051000cb66c8bb15bae72c106ec8a8e0e5
diff --git a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
index da6c631d5d..36c60c60ac 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5345c5b3e64e283ec690a7c8fb8d83f1233447a9bf00d75abb66e5c2bacd75ca
-    canonicalized_ast: 5345c5b3e64e283ec690a7c8fb8d83f1233447a9bf00d75abb66e5c2bacd75ca
-    type_inferenced_ast: c7ecefa4bbcb107758fcc016ec46eff5b63faea2cb0f4c7312f6883db29075e7
+    initial_ast: 57a7f4ea91f1b8168f64c44bbc972451f1b928f0b24a3fe2ae54d140db200e11
+    canonicalized_ast: 57a7f4ea91f1b8168f64c44bbc972451f1b928f0b24a3fe2ae54d140db200e11
+    type_inferenced_ast: c36a49da5d76dfd83be7fae709163ca9055a7561f1e4c0dd0ea45cacb50ff5fc
diff --git a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
index d09ee34a5a..7b4e62e28c 100644
--- a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0c681b6733c860b010e2022e7513c62d1a8ff0fe767410650c4974cea18b0329
-    canonicalized_ast: 0c681b6733c860b010e2022e7513c62d1a8ff0fe767410650c4974cea18b0329
-    type_inferenced_ast: d0e9ec10e9ebf832d7654ff0d78fb72db7b24833bbc56eed92efb82dacda154f
+    initial_ast: d04f1a60245b6bbb02ed550a9f1a7d39d6ed52a8b096fa19196992f79f1118f8
+    canonicalized_ast: d04f1a60245b6bbb02ed550a9f1a7d39d6ed52a8b096fa19196992f79f1118f8
+    type_inferenced_ast: c1e6bf995eebfaf0c4615af2657876836001e793d5eee5701dac65374a98a452
diff --git a/tests/expectations/compiler/compiler/integers/i16/le.leo.out b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
index dda445625c..7ab8abb8d1 100644
--- a/tests/expectations/compiler/compiler/integers/i16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: cab9fabdb4694c4c07a5d9a3479071e05f94947fdaab130aba71fa15c225fb36
-    canonicalized_ast: cab9fabdb4694c4c07a5d9a3479071e05f94947fdaab130aba71fa15c225fb36
-    type_inferenced_ast: 850e28561df02d13dfa38c6a92febde2484ad8cc4b3cba8fc8f84df52eb40b67
+    initial_ast: 1791b30d366c1380e67e6526ce5c33a532937d2315b9c73c18066200dfe9f3d2
+    canonicalized_ast: 1791b30d366c1380e67e6526ce5c33a532937d2315b9c73c18066200dfe9f3d2
+    type_inferenced_ast: 52fbb77cfe63d3736526f72032c784fc9d854e6b7ab20e3951ea9a7171dd3265
diff --git a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
index 456a6e9676..d3dc3fdd7c 100644
--- a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e33908f5fd9f81857edc0e304476592aaee18dc36464e9b6200b41f13133c21c
-    canonicalized_ast: e33908f5fd9f81857edc0e304476592aaee18dc36464e9b6200b41f13133c21c
-    type_inferenced_ast: 2cbe62e95746f6ca3d4edcd58cfa8f58454d05e2df0d9082202e6170560775a7
+    initial_ast: ddb410ad0b9d0a078744b5ff1f8bdb7991f46f2dde53e754b69b163e4ab60d27
+    canonicalized_ast: ddb410ad0b9d0a078744b5ff1f8bdb7991f46f2dde53e754b69b163e4ab60d27
+    type_inferenced_ast: b560aa7679b75616a300f942a2d863e58715227703b6d7c17bbd11ab02840944
diff --git a/tests/expectations/compiler/compiler/integers/i16/max.leo.out b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
index 029cbed454..529dfe111e 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2c75f41bf231656d8c5e37856218ec865072a6c2ef6127f7129a8bc902c4e561
-    canonicalized_ast: 2c75f41bf231656d8c5e37856218ec865072a6c2ef6127f7129a8bc902c4e561
-    type_inferenced_ast: d75251e96176eddced5662c52107b01a7546757e39061a4af85063a5ac6f8f90
+    initial_ast: f156257ed496945bb2c1c3453c6abadb8cf83ee3db1943932fd381eb63d7172d
+    canonicalized_ast: f156257ed496945bb2c1c3453c6abadb8cf83ee3db1943932fd381eb63d7172d
+    type_inferenced_ast: b398428451e40f14d765e57cefd7b500df7eb14b84589545ef772b4d08bca9cc
diff --git a/tests/expectations/compiler/compiler/integers/i16/min.leo.out b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
index 7e00f95861..b5baabb2c8 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9d8422ea1b1b3b958945accea6123bc08195e5142554c22d84593efc6a122eb4
-    canonicalized_ast: 9d8422ea1b1b3b958945accea6123bc08195e5142554c22d84593efc6a122eb4
-    type_inferenced_ast: c75cbfa758ad820de51cf36b88a7090c6d96c8ed7c9f9ddc8a40cde8680499b6
+    initial_ast: b5cd4df2823d12fa01257069c35fb1385cba00c646822bc0fd9fa660d1edc085
+    canonicalized_ast: b5cd4df2823d12fa01257069c35fb1385cba00c646822bc0fd9fa660d1edc085
+    type_inferenced_ast: 6d3fcd70910f98e8980782b2d87ac394debd331dc54167df5cc8f58ea1f4477d
diff --git a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
index b2b7d3c9fb..213c7903ac 100644
--- a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c8d52b9372a99a546d481f6c4591c271f93b866d0ab52f476e78bb504759298a
-    canonicalized_ast: c8d52b9372a99a546d481f6c4591c271f93b866d0ab52f476e78bb504759298a
-    type_inferenced_ast: 44225cf9afb1fb954fe022c8a1522149c39272af12e56ce3c93fa147c2495460
+    initial_ast: 8ada3ff469df0290e1dbb7f3fa12d094710cd68249fb6083c27eaea7f95a1cbb
+    canonicalized_ast: 8ada3ff469df0290e1dbb7f3fa12d094710cd68249fb6083c27eaea7f95a1cbb
+    type_inferenced_ast: 83c7e2a44566f7829e05668d44f940c045e3174db2729508d711b7eb8f848753
diff --git a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
index 0b9387375e..86e717f877 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 94b4015d8da05386aa665ec4b08ac25fa233d5f1ea0077f9d365ccd61963e3b5
-    canonicalized_ast: 94b4015d8da05386aa665ec4b08ac25fa233d5f1ea0077f9d365ccd61963e3b5
-    type_inferenced_ast: 1cd8bc86facc3512ce1dbc3fdb9cc9ef247523546ac99d39b3e9d14edad585b2
+    initial_ast: 6fdf2386103f6bf3d5f551149b5f565f60ceb5181caca425668127be3e945884
+    canonicalized_ast: 6fdf2386103f6bf3d5f551149b5f565f60ceb5181caca425668127be3e945884
+    type_inferenced_ast: 4c373148bcec4f7d483cc9c560eb079746765c00a5e51c303449a9181696fae0
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
index 505c09c9f8..4129d6126a 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d3769cf2fe2c68d0d3d6efa85eb78227470f321fff28a1fb09eecd887f1d9377
-    canonicalized_ast: d3769cf2fe2c68d0d3d6efa85eb78227470f321fff28a1fb09eecd887f1d9377
-    type_inferenced_ast: 4b73146b8f8a1a663122fda1b28610e66a37cae020eb3e4a714c58e6e906bbb5
+    initial_ast: 78b70e6ae55381a259898d0ffbc671c24841583e81b57e2f354bc1de69060818
+    canonicalized_ast: 78b70e6ae55381a259898d0ffbc671c24841583e81b57e2f354bc1de69060818
+    type_inferenced_ast: d38e16eaab8936e730c5aed27b7bcdee553374dc14879e2007137e529aea1a71
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
index edb3d47847..67eb91d545 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6cf050d7488737deb6ac639e9d35ed7237d951318330ff2843c8f5bc8dced47e
-    canonicalized_ast: 6cf050d7488737deb6ac639e9d35ed7237d951318330ff2843c8f5bc8dced47e
-    type_inferenced_ast: 0f53280293d48fd77a456e4824dd3c7cc9fddef7848cef1fcddebe57957f984e
+    initial_ast: 4a65eba57cd4644e8470ab20438d6777573f513b1f5d922cd99d4114eac64c8c
+    canonicalized_ast: 4a65eba57cd4644e8470ab20438d6777573f513b1f5d922cd99d4114eac64c8c
+    type_inferenced_ast: bc8a7a7ea6867eadfdc5fe662239f591b6d2d2dfc46af9021376338294eeccea
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
index cb76c33eaf..9b9a95d776 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dae33b99995f0c9a93f013ff9e86b32147ceca3aacf46b98e0b2bef8f3b9737d
-    canonicalized_ast: dae33b99995f0c9a93f013ff9e86b32147ceca3aacf46b98e0b2bef8f3b9737d
-    type_inferenced_ast: 18fdbd89358b33dde12e670258801b963366a931028228c7f2ad1b08ee200638
+    initial_ast: 59f05a78cd18913660f463f5ee7bc407f5a3893fb36049fabf385b7ad0b826d3
+    canonicalized_ast: 59f05a78cd18913660f463f5ee7bc407f5a3893fb36049fabf385b7ad0b826d3
+    type_inferenced_ast: 0d90246cadbc95713dc45b0d09330d532cc9e6fd206b4c9426876f8ba25f2bd2
diff --git a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
index 19b54f7e66..51a8b60107 100644
--- a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b99849ab9fda79207a1d127b21832deb2519516e289bc662fbcc310af3865c88
-    canonicalized_ast: b99849ab9fda79207a1d127b21832deb2519516e289bc662fbcc310af3865c88
-    type_inferenced_ast: fdbce14f1e4d7392b6113638a35c3fea10c731061661cf29cc7c435cd935491d
+    initial_ast: 385d1b0ffca199ec557e28fc9b51b40414c458b01ab549f67772f45064da727f
+    canonicalized_ast: 385d1b0ffca199ec557e28fc9b51b40414c458b01ab549f67772f45064da727f
+    type_inferenced_ast: af05a924222674c6d50fec716217083cd675424c6e04840ece1d1c2f39fd5345
diff --git a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
index 0b9f2eeb4a..d943b090db 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: cf779aa13cc10a2d75005bc9e00f2bc7f05e6ce36bea5811866da0d87d4c51ad
-    canonicalized_ast: cf779aa13cc10a2d75005bc9e00f2bc7f05e6ce36bea5811866da0d87d4c51ad
-    type_inferenced_ast: c05c5c84b6a83abb65aaf4c089737a1ebd86a6486083bf2128c2bca12958d33a
+    initial_ast: b77183d532a218611aff8db0203b9a043a2e8f5acacf5e03b79a27c75d566d26
+    canonicalized_ast: b77183d532a218611aff8db0203b9a043a2e8f5acacf5e03b79a27c75d566d26
+    type_inferenced_ast: 88c4cd08d33755f4990b5dacd9884730499781a128ebc01b616e3b93897476c4
diff --git a/tests/expectations/compiler/compiler/integers/i32/add.leo.out b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
index 2a77444462..ebaa4dc882 100644
--- a/tests/expectations/compiler/compiler/integers/i32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ed7931aecce4acc246c5fcc70e0264b5b573e0a3c73aac23bad0db0cdefd6f7c
-    canonicalized_ast: ed7931aecce4acc246c5fcc70e0264b5b573e0a3c73aac23bad0db0cdefd6f7c
-    type_inferenced_ast: 9d835982907623f63204f1b181f14baf4d8b51bf2a274b1035fcc7d100d80f9c
+    initial_ast: e867242ead014273d3c7f6829e55851b9e2b01883b55499dfdce94b45c9ebb7d
+    canonicalized_ast: e867242ead014273d3c7f6829e55851b9e2b01883b55499dfdce94b45c9ebb7d
+    type_inferenced_ast: 3575a9b8ffa5f5ec96c86dab2230e3333d6525b38789b0b1b8cbc44df3d9c190
diff --git a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
index 8f5275b762..095005acde 100644
--- a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i32.in
         output:
           registers: {}
-    initial_ast: b09faa2b600e664eca4d5ebcb1365ee0c71c814755ecefe0f13b39400cab881f
-    canonicalized_ast: dec0b5748739766befb71f405fb73d5bcb6cddc693bde5c92976c48aa291ff72
-    type_inferenced_ast: 224d5e773b39805a5f4f7cee153ac46af1a1c4793774eb9cab0f921131a3447f
+    initial_ast: c2a72c4ab80cce9d171a487cfaf2a930a4ee9191298786335af894d483e58857
+    canonicalized_ast: 4cea550893a8ccb47451f8c54a8f568c2ca29c8a73a4d4a6e6c3fe69ea081e20
+    type_inferenced_ast: c7c946c493772f30c641a53a56a410c9a17af557b24fa6411af7162b8cf49394
diff --git a/tests/expectations/compiler/compiler/integers/i32/div.leo.out b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
index a720017153..c1bad5b24c 100644
--- a/tests/expectations/compiler/compiler/integers/i32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d5d18e03b5cfafc01eced52338728703c4e0f3a8ead4ecd879c7d7656b3e1f1a
-    canonicalized_ast: d5d18e03b5cfafc01eced52338728703c4e0f3a8ead4ecd879c7d7656b3e1f1a
-    type_inferenced_ast: 3a5000a6619cd8f5a55da7cab198e3bf26989c4767d6897c59df5b92ca2008ff
+    initial_ast: aeb8257825486463ebfd0b8f24c68960cbe1d214841e28233f9971c61fa869cb
+    canonicalized_ast: aeb8257825486463ebfd0b8f24c68960cbe1d214841e28233f9971c61fa869cb
+    type_inferenced_ast: 68e6a4be72ecc4d11831756e72591474765077951f919f7bc511fa37fd40ac24
diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
index 98a9432ca6..abbda763bb 100644
--- a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 24e9d0ebbf651ed584519189bfe7aee59199997204c58cfd3c4f14cea0f7f628
-    canonicalized_ast: 24e9d0ebbf651ed584519189bfe7aee59199997204c58cfd3c4f14cea0f7f628
-    type_inferenced_ast: 8536be9c3a56f295d1d8cf9c5c034b5ea8c51f384245f222f6809336e96d4324
+    initial_ast: 2398622edbbd3f627a9d39f056c359fb00ca8d4ff393ac784ab809ebbe2dbc87
+    canonicalized_ast: 2398622edbbd3f627a9d39f056c359fb00ca8d4ff393ac784ab809ebbe2dbc87
+    type_inferenced_ast: 6492773ea5bdcbcdfb0b846a8e5446cefe7a1417033a07c0207308c7870c5753
diff --git a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
index f4ffb50e81..759df606c9 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 64d73d49eb1fcb14180456031975ca5eced3950c1ce187a1c031308d9f15faa7
-    canonicalized_ast: 64d73d49eb1fcb14180456031975ca5eced3950c1ce187a1c031308d9f15faa7
-    type_inferenced_ast: 147f1c62f5fa78d12dad891ebaebb13f8a72466f360531eba7c06a4c64ae86e7
+    initial_ast: d48fecdcedb16ee73c9206b370c525c1e76fed03e8465eb3a139deef81d74c1e
+    canonicalized_ast: d48fecdcedb16ee73c9206b370c525c1e76fed03e8465eb3a139deef81d74c1e
+    type_inferenced_ast: 0542e9c4cae0e395a5b0bfc0b190064a4f8cbf1ea1d87be62943a8b8f4ef1503
diff --git a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
index b65b2c3ac7..618d4d6b96 100644
--- a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ab52dcf22b3b470626bf2ddf4f37671d64a889ad4f4d59e7d919a89c0dbfc2e3
-    canonicalized_ast: ab52dcf22b3b470626bf2ddf4f37671d64a889ad4f4d59e7d919a89c0dbfc2e3
-    type_inferenced_ast: 0f5bd273b878011c7faa012bfe0f52103b1b46fcb3b95f9179b564f0c8b083f4
+    initial_ast: 2400dfd1d48a4543a52a23ddb2f8da736d42dbfbd6a7d9831b7751e4cb278125
+    canonicalized_ast: 2400dfd1d48a4543a52a23ddb2f8da736d42dbfbd6a7d9831b7751e4cb278125
+    type_inferenced_ast: 5e5227aff1ba94756a53585d4f6f0749216ae54e2e33fa30f268fe774025933d
diff --git a/tests/expectations/compiler/compiler/integers/i32/le.leo.out b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
index 538cc5ff58..42b1744479 100644
--- a/tests/expectations/compiler/compiler/integers/i32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 75bfd668757f4cecc7332c3b838e0f5ff9ef2096ae697877f1bc2eddbdfdb956
-    canonicalized_ast: 75bfd668757f4cecc7332c3b838e0f5ff9ef2096ae697877f1bc2eddbdfdb956
-    type_inferenced_ast: fa14d06e8d288439bf48b1345b2dfc294012d927624466331b152f6d90d4717e
+    initial_ast: 79661a6c772991cbf0784607b942ddb356b8af566e3faa5cf1f8865edaeed36e
+    canonicalized_ast: 79661a6c772991cbf0784607b942ddb356b8af566e3faa5cf1f8865edaeed36e
+    type_inferenced_ast: c4c7a350f77be14beb28f65218146d4cb9dc1e93b43d14cbd5c2b177b21ed4d6
diff --git a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
index 64769c6a5a..880956d247 100644
--- a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 311be6e4af216210e43dbee415bd65fc2cf1b16cfc91a7f6037fa0ed91356a0d
-    canonicalized_ast: 311be6e4af216210e43dbee415bd65fc2cf1b16cfc91a7f6037fa0ed91356a0d
-    type_inferenced_ast: d77aa422e72ba19be49de7aeba1445b6e335edb7f76731f57fc95558aff9793c
+    initial_ast: 6b82c3a9c3cea936a71ba9e75aac084cbfebe9ebb69483dd40e4ed8996705699
+    canonicalized_ast: 6b82c3a9c3cea936a71ba9e75aac084cbfebe9ebb69483dd40e4ed8996705699
+    type_inferenced_ast: e27449f028c9e2fd55193bc63ed828fbb4b570847d4c3abf6332d80150963474
diff --git a/tests/expectations/compiler/compiler/integers/i32/max.leo.out b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
index 099495f33c..357397ce29 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5ffa08f1bd05a2f9fccb47a59ab3156ea74052976dd53757b6264b4183bfe1e9
-    canonicalized_ast: 5ffa08f1bd05a2f9fccb47a59ab3156ea74052976dd53757b6264b4183bfe1e9
-    type_inferenced_ast: 30cb87c5b554a4e2a60702a7e5931a2a421dcf3b47a08d21cb79e164377f3c31
+    initial_ast: 7781647f89d8ee15673130bce176dc295ae269680f6b8283dc40e188233a6522
+    canonicalized_ast: 7781647f89d8ee15673130bce176dc295ae269680f6b8283dc40e188233a6522
+    type_inferenced_ast: 3b4c83cf724723beece52d8beca13295a41b94b07c9fe6ded1b1ce06ee58d525
diff --git a/tests/expectations/compiler/compiler/integers/i32/min.leo.out b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
index c02fee0f9d..1907b6427e 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 96905722f145d9ca26364477885f5a02ba6f610b3cd704ca458ad30affcd1099
-    canonicalized_ast: 96905722f145d9ca26364477885f5a02ba6f610b3cd704ca458ad30affcd1099
-    type_inferenced_ast: 3393f70f2cad4ad7793a732d29a46006c60a53e33bd651aa4475fa1423436c0e
+    initial_ast: 7a10c1da523c0929e30db9ffda38a23978a8ec6114db4c5745f6acd766c8b861
+    canonicalized_ast: 7a10c1da523c0929e30db9ffda38a23978a8ec6114db4c5745f6acd766c8b861
+    type_inferenced_ast: 33d60b91125897d8efb05c8df8df7f2eb6f10f9f74a69f7b954933916f3e2937
diff --git a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
index 7d83874237..f592780112 100644
--- a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7ff114251124c9ab97133a9adf375c1d8ce4365399ac95776aec0cb336b66857
-    canonicalized_ast: 7ff114251124c9ab97133a9adf375c1d8ce4365399ac95776aec0cb336b66857
-    type_inferenced_ast: 748f269f5eb1f5a0d278c122d810151a662dae5bc175ff0f33f203b5a72dc16e
+    initial_ast: 685076ff4cb6847b0c44552796371d14bc6a0edc1d1cb78c98c84134345bb7ac
+    canonicalized_ast: 685076ff4cb6847b0c44552796371d14bc6a0edc1d1cb78c98c84134345bb7ac
+    type_inferenced_ast: e064f9845933cccaccc411d9837ffa1e36d158cac25dc9529ab940532211add3
diff --git a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
index c8dcac7d7d..e6a4a8d212 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a09ebf839675ddc42a32b7f2fa4ea2d7e0d343c2c572259a5127015bf233ba3c
-    canonicalized_ast: a09ebf839675ddc42a32b7f2fa4ea2d7e0d343c2c572259a5127015bf233ba3c
-    type_inferenced_ast: e5fceb3e11ffb4e44578e1dc7ce0f84fb75f8c1167ddb2229355dc5348d6230e
+    initial_ast: b01fb5830de1334b20c40a846a0f5097059e1f23f7e03a93344b01a85daf45c0
+    canonicalized_ast: b01fb5830de1334b20c40a846a0f5097059e1f23f7e03a93344b01a85daf45c0
+    type_inferenced_ast: 9dee212732866b561e7543608592425fd8a70ae2d7e286cb56037bff66eb2714
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
index e4fb159445..52194d22a7 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bcf180202292e16413e1a74fdecec6cf0e94aba79f6ca27f7be198ee34def8b4
-    canonicalized_ast: bcf180202292e16413e1a74fdecec6cf0e94aba79f6ca27f7be198ee34def8b4
-    type_inferenced_ast: 32ed0dbf2810896e4d9c0d2708fb35a1624a1422af814619cd93e613e2d2a3bf
+    initial_ast: 6d1ee39de9724740815e6ae902cc6d554c68b25d52c46e8a083891edd44d5115
+    canonicalized_ast: 6d1ee39de9724740815e6ae902cc6d554c68b25d52c46e8a083891edd44d5115
+    type_inferenced_ast: d79fcaaf02bff685eab7de7678089cbcf5a2094cc2e93572f666439aeaad48ab
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
index cf4aadd6f1..a5095f76da 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a09954841faa5b5bf932a11ce8f7cfe70ed071d142f84d739097af575e37ebc7
-    canonicalized_ast: a09954841faa5b5bf932a11ce8f7cfe70ed071d142f84d739097af575e37ebc7
-    type_inferenced_ast: 25d96687492f697cc03d2e33ea72e9002dc2a2f8883bae8c2b860059ed5f096c
+    initial_ast: 405c4feb62723fd057a5c48607083f5f4b1759d00ff8cdc5f98c94d32fa9e85e
+    canonicalized_ast: 405c4feb62723fd057a5c48607083f5f4b1759d00ff8cdc5f98c94d32fa9e85e
+    type_inferenced_ast: 6afa590ff464ad10a01dfb115a6975cafde1ee3a69c03a97e1226512bf8679ed
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
index 771f4234a3..393e6d292d 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 72cdb12999123312de44506f69f9af9ed7b3ef81e45a95e250d8f2789ac5cc00
-    canonicalized_ast: 72cdb12999123312de44506f69f9af9ed7b3ef81e45a95e250d8f2789ac5cc00
-    type_inferenced_ast: 6243dd13bbba533d36f4e229665e4f3d1b1dbac9a937d97b128128ec61020093
+    initial_ast: 3c96a559318d5e876326f4ceef8db9b0f90330206b0be63cc1fcd33963b8db3a
+    canonicalized_ast: 3c96a559318d5e876326f4ceef8db9b0f90330206b0be63cc1fcd33963b8db3a
+    type_inferenced_ast: e33caf2a6323f9e4926a29ebe4f566a1a4959afc48eaf50d80be3be8c3e18373
diff --git a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
index ac620bcb46..439b852dab 100644
--- a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4f93499d651e663a396044e2b971aaeefb824f6f828ad0512d027bab667c4b51
-    canonicalized_ast: 4f93499d651e663a396044e2b971aaeefb824f6f828ad0512d027bab667c4b51
-    type_inferenced_ast: 67e4684b11d2ca84c5227b9cf691c7f0a8f1697a5bd9b0b1430fcc3176d6f19d
+    initial_ast: b8bc1c1d83f538c7f2627dda8c7a274586cab99dcc8c819fca0f1985a39c9a0e
+    canonicalized_ast: b8bc1c1d83f538c7f2627dda8c7a274586cab99dcc8c819fca0f1985a39c9a0e
+    type_inferenced_ast: 0462f78b7aedf61b4f79b2cd3b8c61bc58782d79496188f4ad00bcb5026a6eaf
diff --git a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
index c29a29d1af..483edb8ccf 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e3eab05143c98c60086cf18f88916a24ff216a432ce8f6d4066bee7fcbb122f4
-    canonicalized_ast: e3eab05143c98c60086cf18f88916a24ff216a432ce8f6d4066bee7fcbb122f4
-    type_inferenced_ast: c4dac1a181bc4434de50d58b486d070462828381a70e47d1ea89362e1a6b6368
+    initial_ast: a3f58f20e2b332bf45444ee4b14b9c5e3680bb64301595bd9da7cc615aea117b
+    canonicalized_ast: a3f58f20e2b332bf45444ee4b14b9c5e3680bb64301595bd9da7cc615aea117b
+    type_inferenced_ast: b60128ddfb24ca1130e67082e31ffab0802b4b9ffd164cacc730390349237ee1
diff --git a/tests/expectations/compiler/compiler/integers/i64/add.leo.out b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
index efee455256..1c6882b2ad 100644
--- a/tests/expectations/compiler/compiler/integers/i64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a19d8f1eac8720b384e8e665854dd581c6e5965fc3e1134ca0deec3d8b92e270
-    canonicalized_ast: a19d8f1eac8720b384e8e665854dd581c6e5965fc3e1134ca0deec3d8b92e270
-    type_inferenced_ast: 4d1f7ccc44cc7a660a526b217896b37eaa419a3c7bba3be4d480472632fc5169
+    initial_ast: 043a24e3e8b53b5f647e12862256dc3bd2219d02cc51d746e4c9e85a57d152d7
+    canonicalized_ast: 043a24e3e8b53b5f647e12862256dc3bd2219d02cc51d746e4c9e85a57d152d7
+    type_inferenced_ast: b8e4f7de1c4065b327f08317bb9adef204cd09e9fe2cf0ee0875fa9f80e0334a
diff --git a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
index 455faacdae..f63fef5b87 100644
--- a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i64.in
         output:
           registers: {}
-    initial_ast: 7ba4c48f6d8235115072db500e4cb0b597ab7e70e351dce7e52af13deb62441d
-    canonicalized_ast: 8cd5a43be85a978ece3350162fb6e641d2751ca2deb5907df0721e43fa77930c
-    type_inferenced_ast: ae2673cc191cdf939bc04e83416ad1c00f145e811a38a2ed04929ff4bcccfcda
+    initial_ast: 28b6e3766452fc6f1ee10ae35662ede0a0f5c4d1b9ac2c619a17a6bc649f963a
+    canonicalized_ast: be257d374b10905b8737b8910364057fed4c9ec7e1bb80430b8e09b484d2089f
+    type_inferenced_ast: 2cbe65a1aa234a9157553e9bc2838c6115f080108cdd4b30a3a467d183e0f5ef
diff --git a/tests/expectations/compiler/compiler/integers/i64/div.leo.out b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
index b99b261785..2e038dbea8 100644
--- a/tests/expectations/compiler/compiler/integers/i64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a0adad68f7569e1150bd68f7d7f0b3324abbc5aee347224da28bf506cebeef6f
-    canonicalized_ast: a0adad68f7569e1150bd68f7d7f0b3324abbc5aee347224da28bf506cebeef6f
-    type_inferenced_ast: f79424932fe13d4fc5f1a8ff596baca4f203a879b44a8da07972d916c6d49642
+    initial_ast: b90fd305c5208bf3eaebfda1df40384bbcdc840104f9b235caa01529deb7c05c
+    canonicalized_ast: b90fd305c5208bf3eaebfda1df40384bbcdc840104f9b235caa01529deb7c05c
+    type_inferenced_ast: f4061210d2c0607e84ff49b75e28cb3181dda81da611701d0ad9879860d973b6
diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
index 354a5da6fc..bf5e107e7c 100644
--- a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6143bf42f68598d1ae4c6c10bec3c788589702de33f33363b4a85d204e8c2977
-    canonicalized_ast: 6143bf42f68598d1ae4c6c10bec3c788589702de33f33363b4a85d204e8c2977
-    type_inferenced_ast: a45fb0563c20062943b0d3fe9bb5a8f24d598b5b0c05c01faa34440c3ff526e2
+    initial_ast: 00666c43ec1897cd0758ef4c5fc5ac25dce6330abdd10da33c5546a9c05de888
+    canonicalized_ast: 00666c43ec1897cd0758ef4c5fc5ac25dce6330abdd10da33c5546a9c05de888
+    type_inferenced_ast: 58ebc8997dec1f429496dcf539b93ce08b4ddbd85b83f741153bd0bd6631db2c
diff --git a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
index 86446744dd..99893272b7 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3b96e46e730d9a2fc0d95818b8f35af66eeb84fcd08cb328ff47d6b6f77455fb
-    canonicalized_ast: 3b96e46e730d9a2fc0d95818b8f35af66eeb84fcd08cb328ff47d6b6f77455fb
-    type_inferenced_ast: 6f50970ff4132830a9f55e31bd8293459bbc1859869325f3c8d69eb15e92f579
+    initial_ast: f0ce8ad04c21417acd9b86eadabee54c3e63e1d902607883596e849aeffa51f9
+    canonicalized_ast: f0ce8ad04c21417acd9b86eadabee54c3e63e1d902607883596e849aeffa51f9
+    type_inferenced_ast: e38e74a0510712dda0b0e50b205a5ab31132dcb0e8622d215d1b3a1f7370844b
diff --git a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
index 0369121a94..fb0e09f293 100644
--- a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 172a1c3edcc6927668e1c5f38528b1f78c728874440adccd8c87f4b6a7ccc6af
-    canonicalized_ast: 172a1c3edcc6927668e1c5f38528b1f78c728874440adccd8c87f4b6a7ccc6af
-    type_inferenced_ast: 42573daadf62d4df3a9974a97edcd921d593cfb680723b4932c4bfe5baf1b432
+    initial_ast: 8bb288b0ec5e1330ccf9fef1a26a872295a79bf128fd566e3c14cdc4dbfc0bc4
+    canonicalized_ast: 8bb288b0ec5e1330ccf9fef1a26a872295a79bf128fd566e3c14cdc4dbfc0bc4
+    type_inferenced_ast: 96fdeedf1a1af69369792208228d4df5f3f2bfa98e33a026d658278470071bc9
diff --git a/tests/expectations/compiler/compiler/integers/i64/le.leo.out b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
index cdc58215c4..9b6cef7e16 100644
--- a/tests/expectations/compiler/compiler/integers/i64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0cc8b97a18efb078bd2b7c2bee2e7631d0a083ece45daa941329ec19763b8181
-    canonicalized_ast: 0cc8b97a18efb078bd2b7c2bee2e7631d0a083ece45daa941329ec19763b8181
-    type_inferenced_ast: eba243640565380ffe415b2cfe4a2abdcdb19c0d0d1f403751850d2e058eb2fc
+    initial_ast: 1f2b2def4134a9c6b6e4c1d2763c75ec517926fe8842e500b337da8e91e8d118
+    canonicalized_ast: 1f2b2def4134a9c6b6e4c1d2763c75ec517926fe8842e500b337da8e91e8d118
+    type_inferenced_ast: 26bf92382ad5c5dfbe5ad3b80fd3223398727da3cb1c46e5651fb09ce28370bf
diff --git a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
index ce06fd1d10..db0628ead8 100644
--- a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9e3ed2af071e49a800025960397ae2d5333fee559f0000af9ee0b4419a6f920c
-    canonicalized_ast: 9e3ed2af071e49a800025960397ae2d5333fee559f0000af9ee0b4419a6f920c
-    type_inferenced_ast: 5e14fe658cd961cd01024f00b47600963130f734511c28ac2a88e2433284096e
+    initial_ast: 7a72ead766ad1d8c40478170a0fb368b02a2f717030340d34c52a9ab078d106b
+    canonicalized_ast: 7a72ead766ad1d8c40478170a0fb368b02a2f717030340d34c52a9ab078d106b
+    type_inferenced_ast: 4e277d241e9083c6d49f07a0f7b923eeda50b3868953dbecd2d5e9ecccf873fb
diff --git a/tests/expectations/compiler/compiler/integers/i64/max.leo.out b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
index 8eb7c50d12..3df49b0549 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e2d6aeb825b3874930df4869f06158fa083e579e993eb763501b9697baf1f357
-    canonicalized_ast: e2d6aeb825b3874930df4869f06158fa083e579e993eb763501b9697baf1f357
-    type_inferenced_ast: f710ae7aa8fcfd5d24a8308b12f43d6cd026766019195d6b6c2a1a59ab967253
+    initial_ast: d9658434c1b68f4d19bb9e68696f2f8abd4669f5f199a526161dff7d01f3603d
+    canonicalized_ast: d9658434c1b68f4d19bb9e68696f2f8abd4669f5f199a526161dff7d01f3603d
+    type_inferenced_ast: 3be7d4fac8f7d61e044038ae0b93599b6293bb108f39244c3a60ea25426b0014
diff --git a/tests/expectations/compiler/compiler/integers/i64/min.leo.out b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
index 66ecb017a3..0ee662b3c0 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4e494a93f55d05a995e91a89ccfc91fad59fdec2591a450c86ccef6be8bbe8c2
-    canonicalized_ast: 4e494a93f55d05a995e91a89ccfc91fad59fdec2591a450c86ccef6be8bbe8c2
-    type_inferenced_ast: f83643f132cef898952fd3881dbebd34bdc6bc985c8c51c21444786185850dda
+    initial_ast: 95db7e46acbe1f4ef5a0050a2920f642b8ca12b5583126c0d41ad70dd527eab7
+    canonicalized_ast: 95db7e46acbe1f4ef5a0050a2920f642b8ca12b5583126c0d41ad70dd527eab7
+    type_inferenced_ast: 0a8aa38462d6c8388a5f90de48118bf4639276aaee62982befff0fc2c315a6e5
diff --git a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
index cd32086493..93d2f34237 100644
--- a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3bbc44a1b7f01881acadbcd6d894866fa9ed3c59396a57a00daf5cba1ba876ef
-    canonicalized_ast: 3bbc44a1b7f01881acadbcd6d894866fa9ed3c59396a57a00daf5cba1ba876ef
-    type_inferenced_ast: 5e5a00fe1293154a9fe59b4e9cd5aa3f534ba8ee0ea6a008af3c4d1581ec55ef
+    initial_ast: 08ed84d4fdd3cc1e18811bfd7e4ebd6470b77db0320156190fcc1633ea75d185
+    canonicalized_ast: 08ed84d4fdd3cc1e18811bfd7e4ebd6470b77db0320156190fcc1633ea75d185
+    type_inferenced_ast: 3745fc6450f24bd989409077819614e9188f9a0f7af9e8cdd0d6eed11bebca9f
diff --git a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
index e97c90e28c..d5b477955a 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fd372935c57e3b86ed7129f416049611bfd61aab5a1e758e2ad822900d707f20
-    canonicalized_ast: fd372935c57e3b86ed7129f416049611bfd61aab5a1e758e2ad822900d707f20
-    type_inferenced_ast: a0a016da3010338983bec3d55e4c94235b086f95ef0b56d26590c6f5ed960786
+    initial_ast: c1e15e7bf0b3a581f1740c3bc13a7f3b65018efee79a0fd2df8a9083ffe3fd8b
+    canonicalized_ast: c1e15e7bf0b3a581f1740c3bc13a7f3b65018efee79a0fd2df8a9083ffe3fd8b
+    type_inferenced_ast: 004a04b4a76998b0dbb3746af430587608229db3d7c6caec82f705abfdbf8d7f
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
index fd435b1852..9ddbf30cfa 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8ee56c3231d8e560ab6f6a3dae0171574e19ec5216cf30d0cda89f3a0cab90d9
-    canonicalized_ast: 8ee56c3231d8e560ab6f6a3dae0171574e19ec5216cf30d0cda89f3a0cab90d9
-    type_inferenced_ast: 1c15a351f8c97ddcea85e4c801bdf1d404fec0c7ffc33418d91a281386a644df
+    initial_ast: 4c2f1403554f27f5e437477dc86db86bc7888d0faa60983ce66a451ec08c5c6f
+    canonicalized_ast: 4c2f1403554f27f5e437477dc86db86bc7888d0faa60983ce66a451ec08c5c6f
+    type_inferenced_ast: a043ffc8fb3f8505916b04e51fbdb753ede14f012e838b267fa3f35c70b61fc4
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
index d8734bb928..a17009a849 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6deec000571afa23c066c2a3931468d7ed3e9bcb69e5322a8b99cd523beac2a2
-    canonicalized_ast: 6deec000571afa23c066c2a3931468d7ed3e9bcb69e5322a8b99cd523beac2a2
-    type_inferenced_ast: 806d1130f86aca58a3fe5b9cf34ebb901c54f358c70543cd50bc6e084f17c877
+    initial_ast: 49b9ce4d8db36da75cc9d1c219de09544211bb798ed732cf4e7ab3c3020bef46
+    canonicalized_ast: 49b9ce4d8db36da75cc9d1c219de09544211bb798ed732cf4e7ab3c3020bef46
+    type_inferenced_ast: 9b99d299dc2cf83b1f7d42b65f1c608cf2d8b643998519f86279c52ce753c9aa
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
index f86b09048a..ccf10ad146 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5679ed50a7a7ed7f1ab6a1d942ce24191fd29a6030daa5edf945e83879fdd6d9
-    canonicalized_ast: 5679ed50a7a7ed7f1ab6a1d942ce24191fd29a6030daa5edf945e83879fdd6d9
-    type_inferenced_ast: c93b0a2aa90366daf46f8fee9c13e8d83962222e14ac4aa844b229c5f467e12c
+    initial_ast: 080706861414ec2965a7d5cb3a9d09e8870fdf18ab9521f31b6f50f868b18d71
+    canonicalized_ast: 080706861414ec2965a7d5cb3a9d09e8870fdf18ab9521f31b6f50f868b18d71
+    type_inferenced_ast: 0fbe33071492a89813a64102acb80b8e55c2f5cc6710fe9a7b43fd514429d7cc
diff --git a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
index 621938508a..a2d9a8de4c 100644
--- a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9037d67a80b33da1f5ae77c7a29d0af5c8db3b5e7bcfac6793166acb65c500dc
-    canonicalized_ast: 9037d67a80b33da1f5ae77c7a29d0af5c8db3b5e7bcfac6793166acb65c500dc
-    type_inferenced_ast: 6deffd2dc3870849f06ffc0e2475931663d37e5137e4f41f4b0654b752c7e19f
+    initial_ast: 5570bb473f58cc6a5ddb788adf577cae71d57672bf185873faf1f1609472e4a2
+    canonicalized_ast: 5570bb473f58cc6a5ddb788adf577cae71d57672bf185873faf1f1609472e4a2
+    type_inferenced_ast: cb4a8e39015b686e3784c3e52ae2720168888b4d099136efb3459a0cbb49ebf1
diff --git a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
index 5732e45ebe..1e0c828501 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e14c37158974d8f108e5fd14e798ad1932f9f5c2996dc0179423ce32b7e87aac
-    canonicalized_ast: e14c37158974d8f108e5fd14e798ad1932f9f5c2996dc0179423ce32b7e87aac
-    type_inferenced_ast: 40d390225e762348d072fb46f81a57f35e117a0827701f83e52ef14bf4edbd00
+    initial_ast: ccb0e39c6789d3484f5511d3dfa2797deb2bc06d72d741f6782c8926a1de9c85
+    canonicalized_ast: ccb0e39c6789d3484f5511d3dfa2797deb2bc06d72d741f6782c8926a1de9c85
+    type_inferenced_ast: 80dae2513fecac5b28781bb03dea1f5e84325d8b7e09d89eb6415a2c55ef0544
diff --git a/tests/expectations/compiler/compiler/integers/i8/add.leo.out b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
index 536c64ce09..294e8ba6d7 100644
--- a/tests/expectations/compiler/compiler/integers/i8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 03abb91b9b5fd679775bb9898ffc6fdd80db136c1cf61e3676760a90c673691d
-    canonicalized_ast: 03abb91b9b5fd679775bb9898ffc6fdd80db136c1cf61e3676760a90c673691d
-    type_inferenced_ast: f1defb3b6cedd0f81a7b7b95cfeab974445db3e9c6667864293e7cd0f42919e1
+    initial_ast: 0345f356aa7f85a3f9ed679c405d7821e3f8e33cc0c2e384f6f363249d9ed1a7
+    canonicalized_ast: 0345f356aa7f85a3f9ed679c405d7821e3f8e33cc0c2e384f6f363249d9ed1a7
+    type_inferenced_ast: a26548a04ecbf21ebec0bbc0e82b6f4c90ed64fe8dd77f93262a92a9117d4308
diff --git a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
index 924579e3c9..01a72303c7 100644
--- a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
@@ -13,6 +13,6 @@ outputs:
       - input_file: i8.in
         output:
           registers: {}
-    initial_ast: 563e73d37eb34f862f8a2ba022712de63ce4b128f11a1ca95190e12406d9a691
-    canonicalized_ast: dcd71e3aa1d17917027474135e3063600603963ffae4b67c2ea19f29f7e82a04
-    type_inferenced_ast: 77dd4a7149f281d27dabf27255eb448c8230ed3beffeb21d30420ad8a5a66d63
+    initial_ast: 4d01f64027709ac40a2582307fdd9420e8b20bfd2cdb26d134b740e00e1f2d1a
+    canonicalized_ast: f01b1c5294c1f84e31961e0a55595f8bc3fcb213b979c47ff714d4999d157d47
+    type_inferenced_ast: 220a44664b251324980f86daba0146c3cb9bd42d315447a9348e3b7c25a2ee92
diff --git a/tests/expectations/compiler/compiler/integers/i8/div.leo.out b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
index d685eae49e..45817a7d12 100644
--- a/tests/expectations/compiler/compiler/integers/i8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8f8dedc9afb8ccf7cc795b498debab5e8d91f0f843e42fd879d41d69ef34f761
-    canonicalized_ast: 8f8dedc9afb8ccf7cc795b498debab5e8d91f0f843e42fd879d41d69ef34f761
-    type_inferenced_ast: 2ed36192a93a23d1a2902d0f81c157ee52f6743da7c857e8ca823ca853de7bd6
+    initial_ast: f045abe3e527251101929855c56f8e0ecac819cd98761f001f6361717518734d
+    canonicalized_ast: f045abe3e527251101929855c56f8e0ecac819cd98761f001f6361717518734d
+    type_inferenced_ast: 1d2512703b9c82f65115ef34db4272f744007eee3a45412267de55b88b8843ad
diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
index e70100770c..02704bad5e 100644
--- a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 00436aa2bdee5663abd3f9725ac5a67fd79aa302a84f4fe4e26d2c476e743aee
-    canonicalized_ast: 00436aa2bdee5663abd3f9725ac5a67fd79aa302a84f4fe4e26d2c476e743aee
-    type_inferenced_ast: 2b76542525989ed3b4ac13c4b38d987b99a050ee7540b202c5916964f722f39f
+    initial_ast: ff86399699f200f582d18157f4be094385b35b074b4e0a53db3a42903aa14865
+    canonicalized_ast: ff86399699f200f582d18157f4be094385b35b074b4e0a53db3a42903aa14865
+    type_inferenced_ast: 44a3ca635d4bee4bb390aaf0cd557bc7877df42eba9d2250a7a68b938ff30a7d
diff --git a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
index 6585a2b939..96123ae89c 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 990b0a7a061f5432965367871993fa98cdf83373a69682fa2444cc52d7327069
-    canonicalized_ast: 990b0a7a061f5432965367871993fa98cdf83373a69682fa2444cc52d7327069
-    type_inferenced_ast: 4920f0e45b73d43529d067fd2f2c0b3ee5713a9360f58d4f8ef68efde17613db
+    initial_ast: 22a0abfda74c125e32189496642194c191e2cd635324e218eb1d7a35266fef73
+    canonicalized_ast: 22a0abfda74c125e32189496642194c191e2cd635324e218eb1d7a35266fef73
+    type_inferenced_ast: 520d467a0676f3e7853c564f20c75493320d87f0858cc91ffa2ac432bb2cfa59
diff --git a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
index b854fc9b27..8da60e8cbe 100644
--- a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6580d2762f944bbcf73e69c371ee05a96e69e708a6397dce07cf68dbe984e1ff
-    canonicalized_ast: 6580d2762f944bbcf73e69c371ee05a96e69e708a6397dce07cf68dbe984e1ff
-    type_inferenced_ast: 79aada4a751c922cde858c31664deb51420e7236770729a6b954f436fe6518ba
+    initial_ast: 13935de7dc4809be1f09d9c2cc29b7f7123a90314d57f65be88eb606048d1dfa
+    canonicalized_ast: 13935de7dc4809be1f09d9c2cc29b7f7123a90314d57f65be88eb606048d1dfa
+    type_inferenced_ast: 45861e982dcab54a21b4d6042593a6d1b59f4307bc5214e3449d25ce573a0698
diff --git a/tests/expectations/compiler/compiler/integers/i8/le.leo.out b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
index e8adb81228..5acd05f876 100644
--- a/tests/expectations/compiler/compiler/integers/i8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 227a6821696967ec327032ca376e2a1535513c264f6cdc77935da9082b3ae829
-    canonicalized_ast: 227a6821696967ec327032ca376e2a1535513c264f6cdc77935da9082b3ae829
-    type_inferenced_ast: a0db98f872904d19812e1dea13b1fa545fdaaf62fdfd55dc61eba543b1528de5
+    initial_ast: 9e0661c28ed13a8f8d98c47be3ac659c42a9a1051e137bf47cf9ba5d454a553d
+    canonicalized_ast: 9e0661c28ed13a8f8d98c47be3ac659c42a9a1051e137bf47cf9ba5d454a553d
+    type_inferenced_ast: 4c9a74a84f87ccf73f441b5a8e369037b4656e6951fe27866ec7a10d486571e4
diff --git a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
index d9b903c42c..cd08676f9b 100644
--- a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0a92bdd56f315cf3e5bd49ba178995f2408f6ac26ec8389acbff79f75ec9987f
-    canonicalized_ast: 0a92bdd56f315cf3e5bd49ba178995f2408f6ac26ec8389acbff79f75ec9987f
-    type_inferenced_ast: 5575f689ce5d3e63ea05c159232a48b180b073ea9a1624191d65bf5fa5524dce
+    initial_ast: 0436a1435096db772c51a2914abe88d5134df442371a113ecee51027fa6a8041
+    canonicalized_ast: 0436a1435096db772c51a2914abe88d5134df442371a113ecee51027fa6a8041
+    type_inferenced_ast: c609d452b7b36ac987ad8dd5893d3a82f75c74f4f8e72b3d5c03c343057150df
diff --git a/tests/expectations/compiler/compiler/integers/i8/max.leo.out b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
index f50c3bbde6..b3ad88b9a8 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 25e7d0d30e781463bb5b95c3161cc6305fdb5bfe421489988a7cef76c27f9937
-    canonicalized_ast: 25e7d0d30e781463bb5b95c3161cc6305fdb5bfe421489988a7cef76c27f9937
-    type_inferenced_ast: 62efb6a42bea2b21af94c1bd9f16c0dacbb3d94d62964b18b92cd41fa0bd83df
+    initial_ast: 2540c69850521a04ce3f38303681df3331c89bc47322658d68d3605ff0c19253
+    canonicalized_ast: 2540c69850521a04ce3f38303681df3331c89bc47322658d68d3605ff0c19253
+    type_inferenced_ast: 1bf81474ffebc0bbc04a09366353dc6120baf4b68bfafa2c9c56ba9a3091801a
diff --git a/tests/expectations/compiler/compiler/integers/i8/min.leo.out b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
index c34b18b7fa..d489352194 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d9d99a5a68f5a5d514408205bc6e605e1426e554fc2e7dc2fe58a628284495b2
-    canonicalized_ast: d9d99a5a68f5a5d514408205bc6e605e1426e554fc2e7dc2fe58a628284495b2
-    type_inferenced_ast: eeb312bfef9e872c6b4507dcfb1cc4a9768b98e1242f72688e542cdb211671fb
+    initial_ast: 848bcd581f4f7b58b7eeccd1b9df9a8c37f66afe79681cdd7945c6b22603e1b9
+    canonicalized_ast: 848bcd581f4f7b58b7eeccd1b9df9a8c37f66afe79681cdd7945c6b22603e1b9
+    type_inferenced_ast: 1b18368ab78736280c3778888c21f08eee137611fb104ab5baee58a2843f7c35
diff --git a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
index f5b0ae431a..010598c77d 100644
--- a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: af68b638aa0a1d52ca6e81445822106602c1257045abe1141c547849c8bce988
-    canonicalized_ast: af68b638aa0a1d52ca6e81445822106602c1257045abe1141c547849c8bce988
-    type_inferenced_ast: 0aa3e4958301c364370a1fe5ea519a6b60689c8d5d76a5cfecb013a9a00deca3
+    initial_ast: f3888a0d49212fcfa415eed868ffd2a1101a406739ac71dab681be85c695ea86
+    canonicalized_ast: f3888a0d49212fcfa415eed868ffd2a1101a406739ac71dab681be85c695ea86
+    type_inferenced_ast: 00f94b33b1d62bf8519729caaea90f61b6c6ba5f3d0cbb8af4502fc52b334dc1
diff --git a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
index 2501744a22..ee78c1ce50 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 17fc07482f194dad40e690f5530568186aaef49e968a94ee4b9852e11e60072d
-    canonicalized_ast: 17fc07482f194dad40e690f5530568186aaef49e968a94ee4b9852e11e60072d
-    type_inferenced_ast: 7c7c88bdbe33f1697af94d955e89b2e33147f7d90cab39781c2a6de61a7b7ca1
+    initial_ast: 67a54d8e773b571783cd1f1a7adf30c1eb91cf371435e0c3ee8c1d036da7ff00
+    canonicalized_ast: 67a54d8e773b571783cd1f1a7adf30c1eb91cf371435e0c3ee8c1d036da7ff00
+    type_inferenced_ast: 93c7565072976d98e8084210cedd004dedc66dfc405eb2836ce9c014d851a232
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
index 981dddd021..7205e418ae 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f86abf581e24bd0b1bda4e24718e3a9da7d17c4e8248ee9be1ca1e71bd05855a
-    canonicalized_ast: f86abf581e24bd0b1bda4e24718e3a9da7d17c4e8248ee9be1ca1e71bd05855a
-    type_inferenced_ast: 1cb290d220e8d58a4f5b4f2122ad8684ae7ecf78314cbb8755fea46aa6a158b2
+    initial_ast: 8c288dff00a92efd14f4da90c3f49acb793ba083a4d2c209f00bb66237cfae86
+    canonicalized_ast: 8c288dff00a92efd14f4da90c3f49acb793ba083a4d2c209f00bb66237cfae86
+    type_inferenced_ast: 52153c3e1725d62fc6392a640ecbc35e37f977c17685ee556b3b5a26c0435b8a
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
index 4f519f59d3..7e7a3b3695 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 23002c8eab7438ce4a9a35d388536767e8ed8b83b019d756a4065e8f9e90090c
-    canonicalized_ast: 23002c8eab7438ce4a9a35d388536767e8ed8b83b019d756a4065e8f9e90090c
-    type_inferenced_ast: 875a3b4d1f341aab98aac5acba238576242129c69479c6a4c4c24485e690e5d8
+    initial_ast: f8995a120800a95ddaf61dfe7e4f31d5140b655d4a5b9e6a616c83b65092fe61
+    canonicalized_ast: f8995a120800a95ddaf61dfe7e4f31d5140b655d4a5b9e6a616c83b65092fe61
+    type_inferenced_ast: bc9ba5ac09deede1a1960236a1f20c0954c0fb4e06c2b54905d9b5f2cf877adf
diff --git a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
index 93942ccd19..d79a4f0422 100644
--- a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b48b706ace1cdb4e11fd9297d062646ea06eed8ae53fd8ce6e7a52d5f28a9a1e
-    canonicalized_ast: b48b706ace1cdb4e11fd9297d062646ea06eed8ae53fd8ce6e7a52d5f28a9a1e
-    type_inferenced_ast: 568f43a697e38a57740ae0b851641fe7db2ca8c7bd1a3306abb3f911bf8b9baf
+    initial_ast: 6ff82e799e64834c43399e51589e5b110a8ab179a1a7cf3a4210ae780515df54
+    canonicalized_ast: 6ff82e799e64834c43399e51589e5b110a8ab179a1a7cf3a4210ae780515df54
+    type_inferenced_ast: ec57c434abe046a57b5ae80b94f7118ee25ed52ce54e61f5210dba094591c17e
diff --git a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
index b278447991..3915ad46e9 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7ece294857f694a972ec04ad5bff2442b29d1fae512dfed73ffe3f7ae3318869
-    canonicalized_ast: 7ece294857f694a972ec04ad5bff2442b29d1fae512dfed73ffe3f7ae3318869
-    type_inferenced_ast: 528359e44c48a02b8b81b91e805ae47a8b18e323e71cbc87408e62b255ca5e8d
+    initial_ast: 256d3ed102c8a18d29515bbaea00dd9d1deb16d12474c5d75aa76f64cf7d691d
+    canonicalized_ast: 256d3ed102c8a18d29515bbaea00dd9d1deb16d12474c5d75aa76f64cf7d691d
+    type_inferenced_ast: fb3d90dac9be745eeb2ac5eb29f9ea91994cc074d3720d54cbc4f6d9bea8a26e
diff --git a/tests/expectations/compiler/compiler/integers/u128/add.leo.out b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
index e49f57c943..a2dbfa3408 100644
--- a/tests/expectations/compiler/compiler/integers/u128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fe567609ec0ee635d21cd1a1ba79fa2375f5e621c5ba2bbe9a1d80a84d2b8958
-    canonicalized_ast: fe567609ec0ee635d21cd1a1ba79fa2375f5e621c5ba2bbe9a1d80a84d2b8958
-    type_inferenced_ast: 020e42ad9c63628d0ef78d6d9dfdc1d700515b794d7166ae837833a4f8c48fd0
+    initial_ast: bc7eadb66a46463e9516afcdad00914bd3f17efe7bd100f839839c54e52d13a4
+    canonicalized_ast: bc7eadb66a46463e9516afcdad00914bd3f17efe7bd100f839839c54e52d13a4
+    type_inferenced_ast: b6f70ec62b9f4048cf7ca2990eb893dc940c6d3917718c13fb1a3df0eaf3543d
diff --git a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
index d5443bdaef..d5cd5e0a3d 100644
--- a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b2bd9e6bc99154e37c1eee5e8f4c13dddfcd427410a286ae9e100ea77eba9cf7
-    canonicalized_ast: b2bd9e6bc99154e37c1eee5e8f4c13dddfcd427410a286ae9e100ea77eba9cf7
-    type_inferenced_ast: 6a075c36725495700c1fdc78fab877419a3ebc1ec470e2b11d6138ffaf626e0b
+    initial_ast: 8e4d20b04881c26b369dc2a68ed15ed06d1b54d5459543cdb689f806bd1aa1d9
+    canonicalized_ast: 8e4d20b04881c26b369dc2a68ed15ed06d1b54d5459543cdb689f806bd1aa1d9
+    type_inferenced_ast: 9531660b5018c2f43a3d1ba0a40e029df6a50898ea3c74e469b1ab5634313df8
diff --git a/tests/expectations/compiler/compiler/integers/u128/div.leo.out b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
index dabdbf2a84..3014858d27 100644
--- a/tests/expectations/compiler/compiler/integers/u128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: aba286166cd3b380bdbb4ca3b10f8fed86b6a8bcfa0dc2a5d098d0e2b654cdd6
-    canonicalized_ast: aba286166cd3b380bdbb4ca3b10f8fed86b6a8bcfa0dc2a5d098d0e2b654cdd6
-    type_inferenced_ast: 6b652bb32bbb2eaf78d118683a51a5fcf7efb1da857347ae653e7d6032ba43b8
+    initial_ast: 2e06804b600a35de30eaaf59f33a28872576b91a5f09f1203893f02f1277b08a
+    canonicalized_ast: 2e06804b600a35de30eaaf59f33a28872576b91a5f09f1203893f02f1277b08a
+    type_inferenced_ast: 695abf8d7f279e561b4a89ca764c94ee730bdf8f653414664d7d664eb59fe830
diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
index a0b3b7384a..bd0f5a7899 100644
--- a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e8c09b425ef479076a22b423ce8fa547ad6829174f4c88ad86112f272164dc01
-    canonicalized_ast: e8c09b425ef479076a22b423ce8fa547ad6829174f4c88ad86112f272164dc01
-    type_inferenced_ast: 1aad0e51263bcac3073431b7c045592e2955b3c8331f1903bb2ce44553c280a2
+    initial_ast: c7b25869dfb1c128c5ff8f0f484e3b6de1a7dc5381b2f8807c943d0c92603669
+    canonicalized_ast: c7b25869dfb1c128c5ff8f0f484e3b6de1a7dc5381b2f8807c943d0c92603669
+    type_inferenced_ast: f6bafa99d7e108411b4e71edb2a981e0f9e730707a9ac2e2fce87100fb35ebf8
diff --git a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
index 892eeb96b1..7c3a463282 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6b79b1e4adea96ee82d19853a98f39c3e7b5cdbd043457e7cfba88c7c4fb47b1
-    canonicalized_ast: 6b79b1e4adea96ee82d19853a98f39c3e7b5cdbd043457e7cfba88c7c4fb47b1
-    type_inferenced_ast: 3fb57a72a3d0d62abf08d9aee73652c7e264a69e36812b2dc741370b53e386eb
+    initial_ast: bec3606816632c3ec6b912dedb2d10149380b68d6159792c603b866698175b2a
+    canonicalized_ast: bec3606816632c3ec6b912dedb2d10149380b68d6159792c603b866698175b2a
+    type_inferenced_ast: 440e113b6ebcf6ecbe2db5caa41e8f8b23538db7e0e7112ecc86629c0e9c7eab
diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
index ad566d770f..6afc52a0ea 100644
--- a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u128_f.in
         output:
           registers: {}
-    initial_ast: dcd89e09aa062ee35b00b58bb51e23c8d0316737e9c54fcd5e07d81414f1bafe
-    canonicalized_ast: 099ace0a1b90c06fceb549acea884d3b0bc4426ff1fe5c926d7018c7b5399713
-    type_inferenced_ast: 1b885f2c6093c3f22216f8d718d9cd1ed7ad1883140623917344520558de08b7
+    initial_ast: 61af6f965b2525b4ce424fdea87e53ca1e8e1b037bf5b50fc63d5d3ddf1ed877
+    canonicalized_ast: 5d9465b3594defa551a4573815c23600809c968ead6289253fd6e7de88f4f532
+    type_inferenced_ast: 57bd5776b3700331bee92e3bfafbe17fccf3a3acb13b943e2dda42a0600cd817
diff --git a/tests/expectations/compiler/compiler/integers/u128/input.leo.out b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
index d1241ea29a..e903add2ae 100644
--- a/tests/expectations/compiler/compiler/integers/u128/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e2d09b206478dd800312afca22ff247abb8ea46014aac2bfd6e4761ffd4f8d9b
-    canonicalized_ast: e2d09b206478dd800312afca22ff247abb8ea46014aac2bfd6e4761ffd4f8d9b
-    type_inferenced_ast: 9ea1c092a8ddced73f80cdf4aa8743e4cfd632291921e9b8ccacc12041127763
+    initial_ast: 9b6300874e2e40af3eeb288a3b0e2c96d77ed7b7819ebe4bdea4cf536d6e0f37
+    canonicalized_ast: 9b6300874e2e40af3eeb288a3b0e2c96d77ed7b7819ebe4bdea4cf536d6e0f37
+    type_inferenced_ast: 98799a27c60065022928365b4cf62115242d8071f5cc6a5ba2535c6edbae2c3a
diff --git a/tests/expectations/compiler/compiler/integers/u128/le.leo.out b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
index 06384bc0b6..e5b917c83c 100644
--- a/tests/expectations/compiler/compiler/integers/u128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: ebf9b66f8d0bb28e5da8d9abc664f49750ce7be8b8602bff34abd2f7637e84bc
-    canonicalized_ast: ebf9b66f8d0bb28e5da8d9abc664f49750ce7be8b8602bff34abd2f7637e84bc
-    type_inferenced_ast: 67e6bfa690f71aa50956375169cafd0cd9de325e6a48a25255b5c7ac6e7c8bf4
+    initial_ast: e71204309379c09b99849308c8fe2bcd4aca2b6d8795e6af2be608c6744ad8bb
+    canonicalized_ast: e71204309379c09b99849308c8fe2bcd4aca2b6d8795e6af2be608c6744ad8bb
+    type_inferenced_ast: 30318da869e64a0db90a17fd031d553fc5534922202f9c118989e9b3ebd53a60
diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
index eaa00972ed..f1997649e0 100644
--- a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 666249d417516ecca2153f4d6ca2ff6abfb842542920e899cf8e435f7c6da73a
-    canonicalized_ast: 666249d417516ecca2153f4d6ca2ff6abfb842542920e899cf8e435f7c6da73a
-    type_inferenced_ast: a8c70e3d1db9b8cd3cd0de5fc0d042ccf9800878c43bfdff0bc05c16d91b2462
+    initial_ast: 7db17e7a9cebbd8b889a36531da1af576816e9f679c23cedece8b0209c79001b
+    canonicalized_ast: 7db17e7a9cebbd8b889a36531da1af576816e9f679c23cedece8b0209c79001b
+    type_inferenced_ast: 291efe204cc4fedaf6b15248be5b9c621eb8f62e8b2033e206c0af3894c9c488
diff --git a/tests/expectations/compiler/compiler/integers/u128/max.leo.out b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
index cf0b0e393a..5293a8d37b 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 61b3183a8f258e9803da2549ecb69c68044b89b761eccc039a04570db7e1ed91
-    canonicalized_ast: 61b3183a8f258e9803da2549ecb69c68044b89b761eccc039a04570db7e1ed91
-    type_inferenced_ast: 10130f28b069d75d40df1c0cf198139aa86c7b6187cd9aa2326f9e7c40ab8a0f
+    initial_ast: 01d2d7a3271585174c439fd0b9e23be0f81139f44853fcae1c894f575a4d6d15
+    canonicalized_ast: 01d2d7a3271585174c439fd0b9e23be0f81139f44853fcae1c894f575a4d6d15
+    type_inferenced_ast: fc8cdcdf563aa94a281b4430dae898510666cc7dd39b60faba6d29039b971522
diff --git a/tests/expectations/compiler/compiler/integers/u128/min.leo.out b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
index 5828836c24..2c78c8f42c 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 880411caefc9b28a124fe351589e5ce4fb33536869cbe7ef452adc710f199fa8
-    canonicalized_ast: 880411caefc9b28a124fe351589e5ce4fb33536869cbe7ef452adc710f199fa8
-    type_inferenced_ast: d1b01670488ba52d693f049ba422c64ca332f32b6941840c322db2ab1515d93d
+    initial_ast: da001a51242f61b13d47e7ffc39908bf62ad3f7a48aebe2d0988d36c55216b00
+    canonicalized_ast: da001a51242f61b13d47e7ffc39908bf62ad3f7a48aebe2d0988d36c55216b00
+    type_inferenced_ast: cd24eeefb2a9af2bd3b320ed579b4c24e5b98a7fcef5ccf50b6a5406202676a7
diff --git a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
index d74fd91081..abeb69d5eb 100644
--- a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: a440dd468128a87613b72eba073c62aab90fd57a4341d01435ae64bcb80b7a69
-    canonicalized_ast: a440dd468128a87613b72eba073c62aab90fd57a4341d01435ae64bcb80b7a69
-    type_inferenced_ast: 744fe06d570fe2961da52b3cf7bab14c0698478012e01ecc130414b1b00edb1f
+    initial_ast: 1687f3a384ae14199fe9e97c2be6601457bb6a343cd35f8830ce0930a574f185
+    canonicalized_ast: 1687f3a384ae14199fe9e97c2be6601457bb6a343cd35f8830ce0930a574f185
+    type_inferenced_ast: bb06537b55adf805c601edaecc8d28e564fb366bb0e7274ba4c7b8198cd7d35e
diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
index 25a5f225ee..ccde2780fe 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0c784a865d913f926dabc2d843d7268dbf8b8f1a3ed110dfdcab986e2c0755ca
-    canonicalized_ast: 0c784a865d913f926dabc2d843d7268dbf8b8f1a3ed110dfdcab986e2c0755ca
-    type_inferenced_ast: f8aa6597e9bd71db4aa5c12c4cca6225339b769f0296ca4bd94be94fccb43502
+    initial_ast: ad54acce2fc40331a9b47e756375a8b56ba391c5f9ad6d46c5931d532bfba5a8
+    canonicalized_ast: ad54acce2fc40331a9b47e756375a8b56ba391c5f9ad6d46c5931d532bfba5a8
+    type_inferenced_ast: 136a6ca5ef187b479084e29e2a081146865f03b39a1e9c01cbf90644e20a0c8c
diff --git a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
index 5a4e130b53..4dfc46516a 100644
--- a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 243f793f61ca54672961816f4d771108cdd5dc2db37a555f28b12e40ca4fb72a
-    canonicalized_ast: 243f793f61ca54672961816f4d771108cdd5dc2db37a555f28b12e40ca4fb72a
-    type_inferenced_ast: 1f781a44e5883f5b455f4ea2eade31c8fcdd8e7db7437ead2963779457678f97
+    initial_ast: e76614a31a739252199317d02de4090bf38d89406e145239076c13f65af3d3bd
+    canonicalized_ast: e76614a31a739252199317d02de4090bf38d89406e145239076c13f65af3d3bd
+    type_inferenced_ast: 3ed54255089ab10b26df5429b5109d90b27fa6306b84e26018eca7659efe35c4
diff --git a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
index cbe675dab0..2e3d53d6ba 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f33e65c7ad580d9405880c08a744f20db103d859b79fe7e3310737e083597820
-    canonicalized_ast: f33e65c7ad580d9405880c08a744f20db103d859b79fe7e3310737e083597820
-    type_inferenced_ast: ee9b2f9b84de4498f6d484d879a24111ad8a0bc5ed321f6c21adf89e1761df21
+    initial_ast: 8e008c8133e8646f2fb89938541e8af8709de4e692c44cf7f8bea367f6225733
+    canonicalized_ast: 8e008c8133e8646f2fb89938541e8af8709de4e692c44cf7f8bea367f6225733
+    type_inferenced_ast: 124baed45ba7d5e053acf041a444d70348f15c01f4a374fa6bb42290d0bd1012
diff --git a/tests/expectations/compiler/compiler/integers/u16/add.leo.out b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
index 0adc7c1436..c8cb53965c 100644
--- a/tests/expectations/compiler/compiler/integers/u16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dbeb70f3b7bf7c602ee46098e75eedb0cc993c03eb8082043cb8c19ed877e707
-    canonicalized_ast: dbeb70f3b7bf7c602ee46098e75eedb0cc993c03eb8082043cb8c19ed877e707
-    type_inferenced_ast: 8c9c392f5b837b5048ed7e101aff3aacef235353501229e05acfacccbf57e213
+    initial_ast: e8e48cba56241044305c14a0d8e871b1be2495d271ba2a0f7ea3435dd75ad7b0
+    canonicalized_ast: e8e48cba56241044305c14a0d8e871b1be2495d271ba2a0f7ea3435dd75ad7b0
+    type_inferenced_ast: b004dc4f07683a68734b50e5a3ffb9ddb286be4f568cf78ac8d4fba71a910b48
diff --git a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
index 229e5fe457..f188189f86 100644
--- a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c74459109699fa5955e779a43d07d1ad6ce7781d89df58494a3b9bc1924d131b
-    canonicalized_ast: c74459109699fa5955e779a43d07d1ad6ce7781d89df58494a3b9bc1924d131b
-    type_inferenced_ast: 7e41b516a0a67492806b160982c162169a2df8e087f130a7b12103b0ea304851
+    initial_ast: a2bb9e2530828f0a8eb3e85b167e5041bdafe32da9b96e2b1eab20eb40b241bb
+    canonicalized_ast: a2bb9e2530828f0a8eb3e85b167e5041bdafe32da9b96e2b1eab20eb40b241bb
+    type_inferenced_ast: 075f11e9cbf0068748b01f5d0bfc405810af20119dbbd9093a1b2bd22203bd6d
diff --git a/tests/expectations/compiler/compiler/integers/u16/div.leo.out b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
index 341eb581af..9484be103c 100644
--- a/tests/expectations/compiler/compiler/integers/u16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4b431ad0fab5435693eb0248c0afe99bdb1c6967b499f2ce4aa9ba39e826679a
-    canonicalized_ast: 4b431ad0fab5435693eb0248c0afe99bdb1c6967b499f2ce4aa9ba39e826679a
-    type_inferenced_ast: 753f51cd6e1ab4f49d30a4183c93604b7d96c5474eb7533dbddc38b91eeaf882
+    initial_ast: fba1d259e91ced687201093a13bdb2a64a8619de11181dae8e678bafb266ab26
+    canonicalized_ast: fba1d259e91ced687201093a13bdb2a64a8619de11181dae8e678bafb266ab26
+    type_inferenced_ast: 6040d336454b607e2cb7d74b7acf7dec241b6cad880f8380f521d8f8528fa898
diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
index dd464fde09..8dc08afd48 100644
--- a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 59b976b8e20a63533044f18a1c7fd2388711d116853f497bb17b92c4926d6c28
-    canonicalized_ast: 59b976b8e20a63533044f18a1c7fd2388711d116853f497bb17b92c4926d6c28
-    type_inferenced_ast: 455417a0db81ae36be8fce9d119c91ef937f934268e4abaf5d980d571dfe10af
+    initial_ast: 7211ca407cddb5609fa674f2f1fb9b46c271f4ba84313a0e9b36cc577d8177f8
+    canonicalized_ast: 7211ca407cddb5609fa674f2f1fb9b46c271f4ba84313a0e9b36cc577d8177f8
+    type_inferenced_ast: 7a147bb829943a07cc27567a68da910bb308aae325566a2325e0c2705ff99f4f
diff --git a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
index b078dc9c90..bbdf8c36c5 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7eb3e99636c3d1887e756e274c2ef7444949413c0a3b538de691a2dfd72bf44a
-    canonicalized_ast: 7eb3e99636c3d1887e756e274c2ef7444949413c0a3b538de691a2dfd72bf44a
-    type_inferenced_ast: 9db0a393fbe80b0a1f8c3023a50dbd58102c983708fe8e486c4db5860255c3bb
+    initial_ast: 4277f9a10e6d860833a3a8913496647e8dae5c4c9a7f245aa90751c87eb86005
+    canonicalized_ast: 4277f9a10e6d860833a3a8913496647e8dae5c4c9a7f245aa90751c87eb86005
+    type_inferenced_ast: 4b164a7ae7660d5faffaabc481a6f15534971f72bed26ef32e180d4c2b5751c1
diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
index 0e0c57ec02..c64d0300c3 100644
--- a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u16_f.in
         output:
           registers: {}
-    initial_ast: 2eef468c77bb445336fdb1c2cf1039ea163f79a209fe90dc68d8d8e79f6f098c
-    canonicalized_ast: 53950c5ddba3a4ab20a27c1eb0f667edf43fb8bd976dd13f9bbb8d6acc0658f2
-    type_inferenced_ast: 0353a321ea76026c6ba7ff8894f2b1aa0313a76de9d7e2f64e766e772b91624b
+    initial_ast: 715529d38ecc6658e030e3cc9e4d102ab5639ba4fcd04d5d89f71d2fdce0c0bd
+    canonicalized_ast: 9ba94d2edcb9a646caf0c03096a519dda36756a621e1248a564c79e6643e50ef
+    type_inferenced_ast: a5ad7e6424b4e8e936757d419b7cefdae68a6fa0dcff9133bf74cfe65133142d
diff --git a/tests/expectations/compiler/compiler/integers/u16/input.leo.out b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
index 9b9e9e995b..98333bc834 100644
--- a/tests/expectations/compiler/compiler/integers/u16/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 25a98772dac7dd54e8ccc1f0a42782d1fff42800388dad29176483d8972af586
-    canonicalized_ast: 25a98772dac7dd54e8ccc1f0a42782d1fff42800388dad29176483d8972af586
-    type_inferenced_ast: fa2197e6e6ba2544f769b83ee098f4c07f47e5ada53081c9c055834c76473f12
+    initial_ast: 03ec5058648376b68253f8e1a2b62d5d00af93669195be90da09193f7cf249b8
+    canonicalized_ast: 03ec5058648376b68253f8e1a2b62d5d00af93669195be90da09193f7cf249b8
+    type_inferenced_ast: ca7657b4ec4e3df526a37c3168d74a76e043530e56f56491ff73a95590d6e608
diff --git a/tests/expectations/compiler/compiler/integers/u16/le.leo.out b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
index 89cd8354cf..4c0864f655 100644
--- a/tests/expectations/compiler/compiler/integers/u16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: dbf11e2743c493f58c608e22c3685bb4ad9edbda72521c6c4f288faf0188f5e6
-    canonicalized_ast: dbf11e2743c493f58c608e22c3685bb4ad9edbda72521c6c4f288faf0188f5e6
-    type_inferenced_ast: 21dd413a29bc3eb5973b235ff3fac74f5f5a71c95dce0b961002b3ecd24fe86f
+    initial_ast: 718c99fee53e9add1aafaf1692140151e05f6bbda2c91f28dff583591c25f885
+    canonicalized_ast: 718c99fee53e9add1aafaf1692140151e05f6bbda2c91f28dff583591c25f885
+    type_inferenced_ast: 9139f4ac9593bdc96d477f02270ca3e57949ce1503fe1db9113b45103c81fa5f
diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
index 16502c6b1f..7a6db1753f 100644
--- a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 70744f6edd0cdabceeaee3db5dd1d3c47be5ee41d6677225a28f234a11f2b6d2
-    canonicalized_ast: 70744f6edd0cdabceeaee3db5dd1d3c47be5ee41d6677225a28f234a11f2b6d2
-    type_inferenced_ast: afcf35c2c73786a005391d8546fdc24573593997076052ebdbc1c305f2d22012
+    initial_ast: 3f4455e62c862742538a8ea67eb3cdc88492aa7616a1691cad42e670fca20fc3
+    canonicalized_ast: 3f4455e62c862742538a8ea67eb3cdc88492aa7616a1691cad42e670fca20fc3
+    type_inferenced_ast: 3efe28c45a9fc97592c7d4ec7c36a6ca0cbb54be2dccc923e68021fbfbeedb1e
diff --git a/tests/expectations/compiler/compiler/integers/u16/max.leo.out b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
index 1632b67a3f..6a24e327b0 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 5a54d9671bf46db1449c140807e9f88fcecdb3f2656a5c231119663c24d10f1c
-    canonicalized_ast: 5a54d9671bf46db1449c140807e9f88fcecdb3f2656a5c231119663c24d10f1c
-    type_inferenced_ast: aa7ffec6855e0a3c9cfa17ec7cf35cdf3e60fb547e8655c254ced9df7a8bd5c9
+    initial_ast: 48357892c03a4ed6bfc71fbee106bef0c57939aa3f90d0b902e26133373d90d0
+    canonicalized_ast: 48357892c03a4ed6bfc71fbee106bef0c57939aa3f90d0b902e26133373d90d0
+    type_inferenced_ast: 6d33448fcb77a5789544c32ef26bdf9cb5dc357dea9e99c6444e137644e837ff
diff --git a/tests/expectations/compiler/compiler/integers/u16/min.leo.out b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
index 0dc9b54457..988ad9e314 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 92782e1cf3fceb2a3859abb64e0f520ee139612904757ab74b1258fd9f705ceb
-    canonicalized_ast: 92782e1cf3fceb2a3859abb64e0f520ee139612904757ab74b1258fd9f705ceb
-    type_inferenced_ast: 4bd0d3b5fe5f5396db4e5a0a9f4cf3a4fabd061ff4f33dcaf8be098d41be594f
+    initial_ast: 7400309603e4020cc0652a55937fd70bdf280ba8f7ae1fb9150b0da6c5024040
+    canonicalized_ast: 7400309603e4020cc0652a55937fd70bdf280ba8f7ae1fb9150b0da6c5024040
+    type_inferenced_ast: 6c842e1f5b09f2d65ebddc1ff0a32656184920b9e408cda403f801b43dceec1a
diff --git a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
index acd358c36c..a95b30f04e 100644
--- a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 73789d280de5b73d9a0137d330590e0886ce768e6f260ca50d4a7af9d6a0d3c8
-    canonicalized_ast: 73789d280de5b73d9a0137d330590e0886ce768e6f260ca50d4a7af9d6a0d3c8
-    type_inferenced_ast: 09669befc9ccf54752cdced15d4a619bac4ac2c2fdde47a135d858375d1f2ee7
+    initial_ast: c2e0b9bb222645fdaea216b5238168b32a41f7a84cf5ab438b566fb8a5de8a07
+    canonicalized_ast: c2e0b9bb222645fdaea216b5238168b32a41f7a84cf5ab438b566fb8a5de8a07
+    type_inferenced_ast: ed2bfbd8422254e12d01329641853001fef94e8de97bd71dba95d0f7c05763c8
diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
index 70650185e7..78866a8993 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 9eb8bb18c17ed1572677d922d47497aad8ff73d477de9955e4970c2453537e14
-    canonicalized_ast: 9eb8bb18c17ed1572677d922d47497aad8ff73d477de9955e4970c2453537e14
-    type_inferenced_ast: 1a7da1e44bcd6750d5d1212bb5d105dbf51fa5c133013919b728e9feb016d7f8
+    initial_ast: ce9bcbfa9b4a9445b5df9fd95765c97572fc9c0c8ec07619711bceb84685e972
+    canonicalized_ast: ce9bcbfa9b4a9445b5df9fd95765c97572fc9c0c8ec07619711bceb84685e972
+    type_inferenced_ast: 1bf0be499a5225eed5505672c01840fada9784d29430a9cbebbb2beb931cdf90
diff --git a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
index 0450c95270..a0137217f5 100644
--- a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: dc90daedac67b5f69d3b2881a4f31039b4d2214199c07c86bb80fae9f4759afb
-    canonicalized_ast: dc90daedac67b5f69d3b2881a4f31039b4d2214199c07c86bb80fae9f4759afb
-    type_inferenced_ast: a068b733628016d3ae9d98a7ca6e6d4ce513543f5324b8ae5d42f9a05a60d7d0
+    initial_ast: b67a2e773d463a9a22023e35db7533c2eb7d3114d945389869ab9652858ef86b
+    canonicalized_ast: b67a2e773d463a9a22023e35db7533c2eb7d3114d945389869ab9652858ef86b
+    type_inferenced_ast: 3b23e1f8b696bc24776da8bc0255aa12ea92d30853ab4fd65cd1ef6a9b2a4eae
diff --git a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
index 581d7231b6..7541604642 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: fb84b0f1790b33d4b739f72640977dbc975b86e2f55cec95320836805ba1aea8
-    canonicalized_ast: fb84b0f1790b33d4b739f72640977dbc975b86e2f55cec95320836805ba1aea8
-    type_inferenced_ast: 8c8286872318a8d18411f34942b03debb7f2c50a653260cd12b9ad44fffeee20
+    initial_ast: e441bec546c1972253e0ebf895c44a50f708139e5dbf89416cc05dabf4f4a6c4
+    canonicalized_ast: e441bec546c1972253e0ebf895c44a50f708139e5dbf89416cc05dabf4f4a6c4
+    type_inferenced_ast: ba45b5d07a22a70e60b431c4b1f592c4e363a1b6dab1e1c08729781eeafc6f17
diff --git a/tests/expectations/compiler/compiler/integers/u32/add.leo.out b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
index 78a330eeec..a070a8fb31 100644
--- a/tests/expectations/compiler/compiler/integers/u32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2d519bd1754db4a0cb0470f0ad905bc9cf703baa104b5d484e4fde38adab53ea
-    canonicalized_ast: 2d519bd1754db4a0cb0470f0ad905bc9cf703baa104b5d484e4fde38adab53ea
-    type_inferenced_ast: 371cd54fb4f7bde322f21b098f9e97d494ef7a64b8d6d326aadaff0ca5ab2dec
+    initial_ast: f10819ad044f53a8a3b671d0591b6e3a8f555080687525e06adc95188a80f71e
+    canonicalized_ast: f10819ad044f53a8a3b671d0591b6e3a8f555080687525e06adc95188a80f71e
+    type_inferenced_ast: 9cec0b625c5a8c2de17452989238aa20db015ae707d4a3042974b50381360224
diff --git a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
index 3b18dd87ef..42e33e1842 100644
--- a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1482da89f4793474ab4f940664b3ef5bac212ddbeda85203bb7166eca83387f7
-    canonicalized_ast: 1482da89f4793474ab4f940664b3ef5bac212ddbeda85203bb7166eca83387f7
-    type_inferenced_ast: e6965184cd858e73e3dc103228503e9935fcb5608a7b46a26044fe4a06d40fb0
+    initial_ast: 3d1a9a1636ee03ed67340d77be57cbfe6f90937af1a244eaf060d102ddab7e51
+    canonicalized_ast: 3d1a9a1636ee03ed67340d77be57cbfe6f90937af1a244eaf060d102ddab7e51
+    type_inferenced_ast: 484e7e0cff2392a2d43275369e22167a6d2cf5a0370961001cf99316c7873907
diff --git a/tests/expectations/compiler/compiler/integers/u32/div.leo.out b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
index d93a1894c5..88e64d268b 100644
--- a/tests/expectations/compiler/compiler/integers/u32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f240ea6127d832612096ee79cc3cf50476be0f022dc05976801784a89a8c1070
-    canonicalized_ast: f240ea6127d832612096ee79cc3cf50476be0f022dc05976801784a89a8c1070
-    type_inferenced_ast: 5b8938ae4ea7c64d8ef2c069047271b9e28cbe29893e029e69f922525e339109
+    initial_ast: 798cc70fe6a9278982e9a909162a64607c18320d67f2b69c986f12013c747015
+    canonicalized_ast: 798cc70fe6a9278982e9a909162a64607c18320d67f2b69c986f12013c747015
+    type_inferenced_ast: 39db1d36fd3893d40b5ab07a9e9cfa68a7cfe740d125ea86761f315cd49af950
diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
index 0eb8c32d4e..557e311e1b 100644
--- a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0a775de041dad61c1a1cd248a03b85f269737c4dbf0a7f2af51f6e56c2c3d5d8
-    canonicalized_ast: 0a775de041dad61c1a1cd248a03b85f269737c4dbf0a7f2af51f6e56c2c3d5d8
-    type_inferenced_ast: fba47a79c600f4641e675368ff9ee647601e4f9dda0831992d588a9168d7c421
+    initial_ast: ecd942a96ad98756ca2fa708167e33843806613ba636818e23d0991c165fb131
+    canonicalized_ast: ecd942a96ad98756ca2fa708167e33843806613ba636818e23d0991c165fb131
+    type_inferenced_ast: d654592bf733d63af723b43c0a08e5b93d8cd6e73ad25f1ec4ba1d44ce79e8c6
diff --git a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
index 6f92e43121..2dae0372fb 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 26d459f12f63580de5afe9f1d44622be8e61907cd85771084517a015c72eccdb
-    canonicalized_ast: 26d459f12f63580de5afe9f1d44622be8e61907cd85771084517a015c72eccdb
-    type_inferenced_ast: 166f31eef197184851db7780c9e5d46d810398a9efd0586c28e0f6beff5455f4
+    initial_ast: e6b610505dd516b2b145961540e2426d0e75c8b1f81b837cbda77f99edb4cbc4
+    canonicalized_ast: e6b610505dd516b2b145961540e2426d0e75c8b1f81b837cbda77f99edb4cbc4
+    type_inferenced_ast: a92ae1efacdcf3737670c23301dcb3fd45ccb65bf07327587f3bcb891544df17
diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
index 6c1c8bb7ee..4debf3e335 100644
--- a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u32_f.in
         output:
           registers: {}
-    initial_ast: 46369ff45f2a685122ba2af387cb95cc7c25d5a4575b0ef24e25a620dabe9a87
-    canonicalized_ast: ca7847ff8f13024b51b623c394aeeb6ec61abd6b4bf8f0f295044ef36c72eab6
-    type_inferenced_ast: 8055d5c155301f0bcef11d75d902f8469641e9467de9386812cd6b6d27a303b1
+    initial_ast: 7ff355da2848c6f06892c90a93e1f12095a329dd9fe935ea5c8e1b009b21fa13
+    canonicalized_ast: 31547c73b8283e8dc9007834657c9c8de55a0fe50f94d984e93569b9453bc9e7
+    type_inferenced_ast: 55d7111ec36845c585d6280723e495df997c058fdf4067c923df944f4903a76a
diff --git a/tests/expectations/compiler/compiler/integers/u32/input.leo.out b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
index 67f3f3cffc..053af4bb9f 100644
--- a/tests/expectations/compiler/compiler/integers/u32/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 7f820d31196b8c2d03bd0947593bb474375ec8d84c10f76ef050f07ad3e17ec2
-    canonicalized_ast: 7f820d31196b8c2d03bd0947593bb474375ec8d84c10f76ef050f07ad3e17ec2
-    type_inferenced_ast: d87f2d54e9b9bdfe20ef6d7ab202c596555986a391be48060676d203058105e1
+    initial_ast: 090c66945914ad5529e831599c526737da325f6a8a2850ca5b77e2b7e773765e
+    canonicalized_ast: 090c66945914ad5529e831599c526737da325f6a8a2850ca5b77e2b7e773765e
+    type_inferenced_ast: 8ce7db653b5ec60f5defef5c12bc6786c6177cef85f847a3420254803d1334ef
diff --git a/tests/expectations/compiler/compiler/integers/u32/le.leo.out b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
index 54d8751aef..48d355f00e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: ae892c06154d9f48a36358c7fdeaa0dd0f4bdbc2ee89deb89d2c7f7050acae98
-    canonicalized_ast: ae892c06154d9f48a36358c7fdeaa0dd0f4bdbc2ee89deb89d2c7f7050acae98
-    type_inferenced_ast: 541ac177e769d46f361b0dc5e0543ffcbfa1e42ed7a5e3f42ef328b8723837e2
+    initial_ast: fa56d415b885a524625c80c4ecb8b5248b7c0e9fc97e635940621bc35edd644c
+    canonicalized_ast: fa56d415b885a524625c80c4ecb8b5248b7c0e9fc97e635940621bc35edd644c
+    type_inferenced_ast: d7858764eaf0c79969bed850e695949547e7f728478f24f04cf7a129b8aae23c
diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
index cb3dde5410..bccd5c9570 100644
--- a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 0c7cf26ac46d09b65ad19ea51c972281a7e5db71cba2724e69ab1ab1ba59ea86
-    canonicalized_ast: 0c7cf26ac46d09b65ad19ea51c972281a7e5db71cba2724e69ab1ab1ba59ea86
-    type_inferenced_ast: cec211d394cc6ae0b95189332c89acbebd6c0a7421bdff5c797e757c5251e802
+    initial_ast: ddeff838aaf5674520256362240e9d5429ddf81c3fef3e0fabd649355ee835b4
+    canonicalized_ast: ddeff838aaf5674520256362240e9d5429ddf81c3fef3e0fabd649355ee835b4
+    type_inferenced_ast: 8c346798879aa2297adb5345d00f7f397e06f9470c9d0bf6ac7400045689adb7
diff --git a/tests/expectations/compiler/compiler/integers/u32/max.leo.out b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
index 3dfa14a592..f476068aa3 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0c99fd8ada0a44dd6bf589736d091b1f197c2b19a0c077e9f51dfefebb53c7cf
-    canonicalized_ast: 0c99fd8ada0a44dd6bf589736d091b1f197c2b19a0c077e9f51dfefebb53c7cf
-    type_inferenced_ast: a924a7713d2ab905403d3b83dd3613c9d54271d3aa798c18b472a1eb79de4078
+    initial_ast: aeb0761c396b19a2d4067ecfc8a7291e8391935c7573d02fa78cba8950573321
+    canonicalized_ast: aeb0761c396b19a2d4067ecfc8a7291e8391935c7573d02fa78cba8950573321
+    type_inferenced_ast: 899d5481e2f648e246c22e0118919721aa3289e307558695083e1a1d81178bc1
diff --git a/tests/expectations/compiler/compiler/integers/u32/min.leo.out b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
index 2833e959b7..cafb7cf89e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bab8be36b2fde5dd6972b0690d4a62ab19852729228a0b87c316e638ea85e583
-    canonicalized_ast: bab8be36b2fde5dd6972b0690d4a62ab19852729228a0b87c316e638ea85e583
-    type_inferenced_ast: 8b3e5c9c47063e3d3e48df8a8dab81b32af1afa3e90481692063533f3b9a966b
+    initial_ast: 9c2ffa0ce38d27afc091a6f70b06ac873bd8d8a1ac729581f1e8dded22bbc21e
+    canonicalized_ast: 9c2ffa0ce38d27afc091a6f70b06ac873bd8d8a1ac729581f1e8dded22bbc21e
+    type_inferenced_ast: a744410c84202b558cd1047c21fcc9d9a9a264dccc4320ffdd14c0794ac01fb7
diff --git a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
index f328ce7bb6..a652fb8dac 100644
--- a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: bc2a52c86f9c54151e95ab2fd8cc64e0df657924f813e6c3069422d544aaa3ce
-    canonicalized_ast: bc2a52c86f9c54151e95ab2fd8cc64e0df657924f813e6c3069422d544aaa3ce
-    type_inferenced_ast: 4a84eb2502cdbbbede712f2d9b404c49b769a25b4800b40c33f1f7eac87c2bbb
+    initial_ast: e30fe6132ab7cc5d0c379a8efa1b5d2cc11804aab0dc1f1e418669177b14a221
+    canonicalized_ast: e30fe6132ab7cc5d0c379a8efa1b5d2cc11804aab0dc1f1e418669177b14a221
+    type_inferenced_ast: 66befce06d14b7d2177435336a1b1a8cf8188ca87de6179d73d8fa50460a287b
diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
index d8f923c177..43629c277b 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b40043966d8d3db9a7e505a77241fc57394cb58df1da123282d66256a844a5a0
-    canonicalized_ast: b40043966d8d3db9a7e505a77241fc57394cb58df1da123282d66256a844a5a0
-    type_inferenced_ast: 77f17401240baeba8d17d1d750b54b0eec7dbc1a41761c0375ffa0a8f5d1ab3c
+    initial_ast: 44c8fedb883b67bedc8f0d89acd32fd9d89adff22c297e6e916c23f73ba2f658
+    canonicalized_ast: 44c8fedb883b67bedc8f0d89acd32fd9d89adff22c297e6e916c23f73ba2f658
+    type_inferenced_ast: 79c741c6750d6b62567323c5d03683afc13fe873bed95fbccd0a1afff0e05b77
diff --git a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
index 3a5f714402..98c34dec75 100644
--- a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: c51728b8c0193bf27571d7ca9d97c2bef7acd86f026ded5d729fd596f892f499
-    canonicalized_ast: c51728b8c0193bf27571d7ca9d97c2bef7acd86f026ded5d729fd596f892f499
-    type_inferenced_ast: b868b0c6673817781f4d44040e1be98585904dd6995a0d55c1ccc8753c795d5c
+    initial_ast: 9363bcdbcf89167438f75e5b5ae11f8e5968c4272dacecdb85d67d6627b38577
+    canonicalized_ast: 9363bcdbcf89167438f75e5b5ae11f8e5968c4272dacecdb85d67d6627b38577
+    type_inferenced_ast: edcb1c406e76f79ebf13bb46ce327e7cb9b0b8e86b1bc3affeaf69d574da9f06
diff --git a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
index e33b2f2ac1..5623951925 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 406cd139beeca292853b57e2677f3ca9caf0995482d64e9f0ea45c78a09dd374
-    canonicalized_ast: 406cd139beeca292853b57e2677f3ca9caf0995482d64e9f0ea45c78a09dd374
-    type_inferenced_ast: 6223cf0231143cbddb83eabaa72e4a12222be88a22f77e6920367b6db3367836
+    initial_ast: f9ef32ac860724ac62be23d9a9059a2b65cd19decda7e133e478951c9b2d220f
+    canonicalized_ast: f9ef32ac860724ac62be23d9a9059a2b65cd19decda7e133e478951c9b2d220f
+    type_inferenced_ast: 3ca5c353bf2c9b669e16c01055e96643b3ce99bd9cbb6932d97c2d4560d9f518
diff --git a/tests/expectations/compiler/compiler/integers/u64/add.leo.out b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
index c843b0c85a..226962df02 100644
--- a/tests/expectations/compiler/compiler/integers/u64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0c0e16e52f66b4d5a90408eef1b6e5d7dcdc0c992306524624f3c2beb96bebe2
-    canonicalized_ast: 0c0e16e52f66b4d5a90408eef1b6e5d7dcdc0c992306524624f3c2beb96bebe2
-    type_inferenced_ast: a2508e316b68aa7f001e34d65a7723efdfa2b02848dc0bd81dfe7c9f265b636d
+    initial_ast: 8ed9caa46664d975d35eb60f780cc2d3544924d0458b5cd2005262f42cb92120
+    canonicalized_ast: 8ed9caa46664d975d35eb60f780cc2d3544924d0458b5cd2005262f42cb92120
+    type_inferenced_ast: 1c5761507087bc2a5357df29e0a19f9ed1c5aeb4c72ccd314456d46a02704d3d
diff --git a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
index 204e574c8a..99fc709a17 100644
--- a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d2aaf9fa46481d0d0d7291e692c3a0f86f3e629664afd0e9e6efb0335fda7e8c
-    canonicalized_ast: d2aaf9fa46481d0d0d7291e692c3a0f86f3e629664afd0e9e6efb0335fda7e8c
-    type_inferenced_ast: 0a48472881b2d7b4680e0f8023dcce19e59a13aacfef6c9929779313d6edef72
+    initial_ast: daf304ae1131ed48f9ca749a7499f095d934bc2ad94cbefe314d0f86fdb4300c
+    canonicalized_ast: daf304ae1131ed48f9ca749a7499f095d934bc2ad94cbefe314d0f86fdb4300c
+    type_inferenced_ast: ce627c98acedf9702277dd9bd4d288afe7802a6a4ee5acac4b1f44ee24065800
diff --git a/tests/expectations/compiler/compiler/integers/u64/div.leo.out b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
index cb59a37515..f6f571b6cd 100644
--- a/tests/expectations/compiler/compiler/integers/u64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1ccae10c849bdba01024286582cdfa3c3c6176675d26b550f0f9a2cce4b6c393
-    canonicalized_ast: 1ccae10c849bdba01024286582cdfa3c3c6176675d26b550f0f9a2cce4b6c393
-    type_inferenced_ast: f61c02608fcf3ac5e6000d0f140f6e7cd895e17f27481e1db0e26666cc6d8464
+    initial_ast: eb289b91dade0e281729f77e79d0ab874871c55e6691545fb71d335710564ea3
+    canonicalized_ast: eb289b91dade0e281729f77e79d0ab874871c55e6691545fb71d335710564ea3
+    type_inferenced_ast: 59b56c3679803203430078cb0b7f8cb43cc687fb10255186493dd94336f93fcd
diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
index 53ae460c20..888715eae6 100644
--- a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0ab7e622869b60a383e3cab939244c22f10ec8fc11e603ce2bb6d8ebd69abc1f
-    canonicalized_ast: 0ab7e622869b60a383e3cab939244c22f10ec8fc11e603ce2bb6d8ebd69abc1f
-    type_inferenced_ast: 268372bc0a392e6ae2478f9a6790ea1c6d38230f8a228fde60345ebc5f34140d
+    initial_ast: 53edaeebce5575703624feee65798bfd25e4df0797a91d16108dc4843f1be02b
+    canonicalized_ast: 53edaeebce5575703624feee65798bfd25e4df0797a91d16108dc4843f1be02b
+    type_inferenced_ast: 79b5ea87295fa54684abace26c0557d87f3966ec08b887cff117bd7c35cb2754
diff --git a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
index d59b7d1155..8bbf4fec1f 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e63406cde78c9b3ab82462fc9b3e2bf2ebb740c9052aa08d5a07db521ff447e9
-    canonicalized_ast: e63406cde78c9b3ab82462fc9b3e2bf2ebb740c9052aa08d5a07db521ff447e9
-    type_inferenced_ast: 9cb61e96972f963bbfa5db20f0f7d57c2235db4aff62421cdeeabeb00552589a
+    initial_ast: 1754afabf1a32941b5b59c8c3e6fd6299067d6cec13d9a0e9e2a4bebb48113e7
+    canonicalized_ast: 1754afabf1a32941b5b59c8c3e6fd6299067d6cec13d9a0e9e2a4bebb48113e7
+    type_inferenced_ast: a2c0598451ec27d8297cd1348eb7b459d021e8a0a57111cef5afbb27952995b2
diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
index ef48bf0900..8088a00842 100644
--- a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u64_f.in
         output:
           registers: {}
-    initial_ast: e322befdec803036a054560f3a342cec2f619d6a112cef46a642959564e9c573
-    canonicalized_ast: 2dcd2aa3225e4426040fa610e5dfc340c4f22fbb686a5243101c038a53c1fb86
-    type_inferenced_ast: b417887c713a50ae745031234ee5d12ef1c408b08cc921df7203fde12500d387
+    initial_ast: 384354a0bccb67829fa7f3fd0e4dc1a1366678284e840d65e0c595828d0544ae
+    canonicalized_ast: 88e2646b980419e191f5423ee2fe73c863135c460cd36540f152c04a6d5a3a84
+    type_inferenced_ast: c1fbef1103029da2f839684e2d8472adafa83b3d666953d37dd24f1a964f05a9
diff --git a/tests/expectations/compiler/compiler/integers/u64/input.leo.out b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
index f9a75e2dba..37fafee1b5 100644
--- a/tests/expectations/compiler/compiler/integers/u64/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: e64a301f3ad6d2c06a0819ab92f7588ade4f9d2302dfc91b01df47b337e63733
-    canonicalized_ast: e64a301f3ad6d2c06a0819ab92f7588ade4f9d2302dfc91b01df47b337e63733
-    type_inferenced_ast: c14ff2200ef60d38e3b15ad7c31d2a308be388b0c287f794ffca3f049ca498bc
+    initial_ast: c99357fe991d4e17756a7efcc2770a693dc53e47a3fcfcdb44c2996b844c8cb2
+    canonicalized_ast: c99357fe991d4e17756a7efcc2770a693dc53e47a3fcfcdb44c2996b844c8cb2
+    type_inferenced_ast: f5bf4f3724634571b2b4f5f15402c0da5665983bf35d0e0724fb246e48fb8606
diff --git a/tests/expectations/compiler/compiler/integers/u64/le.leo.out b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
index c7b704b672..bdbb9e034c 100644
--- a/tests/expectations/compiler/compiler/integers/u64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 6a33a9ff988b31eef42228b68625f1e8a97516615fe8380d98eeff85969834a9
-    canonicalized_ast: 6a33a9ff988b31eef42228b68625f1e8a97516615fe8380d98eeff85969834a9
-    type_inferenced_ast: fb7052e33efbef5dff337f921217f32fc51935d747ab9549061814a7c97e499a
+    initial_ast: c2d16b3c14420d013ff5b1531c0a4e461053fd5e507f0031f428ae1b7ff213f5
+    canonicalized_ast: c2d16b3c14420d013ff5b1531c0a4e461053fd5e507f0031f428ae1b7ff213f5
+    type_inferenced_ast: 586cb64af9fadad9c01a4ea8b17655a8ef39a8362770a27d7ea280b030c49063
diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
index d56834a50a..716f94923c 100644
--- a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 3eed4192151567524d2c0c9e3002bedbb992e9b4195afedcf08c7315fbf86628
-    canonicalized_ast: 3eed4192151567524d2c0c9e3002bedbb992e9b4195afedcf08c7315fbf86628
-    type_inferenced_ast: 7b19c51fc009c5fc66c336b4d511ce02f9c99596ce78a999f5d5e14f4d53a548
+    initial_ast: d77a1d0ca39da7cd1b08d4f7ee064cd1592edd78fca87fbe633a92e8013c7010
+    canonicalized_ast: d77a1d0ca39da7cd1b08d4f7ee064cd1592edd78fca87fbe633a92e8013c7010
+    type_inferenced_ast: 5710ebb9c5ef7bf328a4f9a272a311bce64192f423097a707f08e55ae98915bc
diff --git a/tests/expectations/compiler/compiler/integers/u64/max.leo.out b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
index da6b45c35f..329bfca76c 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1d39069e0c4dc73a6c8176092ab4738e7c8d89cb7bc7821b2be9a88c25e5df56
-    canonicalized_ast: 1d39069e0c4dc73a6c8176092ab4738e7c8d89cb7bc7821b2be9a88c25e5df56
-    type_inferenced_ast: 279d5a452c5525321a74c992ede7d2c50731b81bf186c7c3f953fdcba8a8aab1
+    initial_ast: 450969fc4516c60af9708bdee8269cd5c69c28e2e3cc6169a73d13b992ba21bc
+    canonicalized_ast: 450969fc4516c60af9708bdee8269cd5c69c28e2e3cc6169a73d13b992ba21bc
+    type_inferenced_ast: 2e352f853185b84705dcc4b42090bee3d7c9a8f4cf637fd0513c7f0091a5cd33
diff --git a/tests/expectations/compiler/compiler/integers/u64/min.leo.out b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
index e7afbb4507..30843ae5e3 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: bacf1be9937eae3e8cf7950483e942bc534d7d22759dd95a80325ad1de679380
-    canonicalized_ast: bacf1be9937eae3e8cf7950483e942bc534d7d22759dd95a80325ad1de679380
-    type_inferenced_ast: ab087e5fb0a831a6854912d7092e49961cab6b2ad96cf571af61e277254a03a2
+    initial_ast: d7b255884235b2a8e507621b310294d3ebbf875fecc7c5322df3251cab6ded9c
+    canonicalized_ast: d7b255884235b2a8e507621b310294d3ebbf875fecc7c5322df3251cab6ded9c
+    type_inferenced_ast: 6933f229d9a8b5d464f20d8efa88354d82fb51e868db11ad37c32f12dc328540
diff --git a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
index efc021cfed..79538fd5ac 100644
--- a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: ca99df266c5790f8cda429674c08e860553206e92b86f199d0c96284791cd65d
-    canonicalized_ast: ca99df266c5790f8cda429674c08e860553206e92b86f199d0c96284791cd65d
-    type_inferenced_ast: 4f67ecbe147319f147980d7e7e6009acca7dd64b816905de0ae8a9236ccd7892
+    initial_ast: 036bcdf2738560a69431e37b7635bfcf562ca871a4bd13362b77a4e1e90cc0fd
+    canonicalized_ast: 036bcdf2738560a69431e37b7635bfcf562ca871a4bd13362b77a4e1e90cc0fd
+    type_inferenced_ast: 59d590d7091eb0c740a60de9895b98b9d70bd775f2fd00d9fe25beb3f39b0a8f
diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
index b4fadf3c32..8799e20d99 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 8886fef054b4cac1edd6a33d239299d43f6ac400e12008179121e4ea0ee94147
-    canonicalized_ast: 8886fef054b4cac1edd6a33d239299d43f6ac400e12008179121e4ea0ee94147
-    type_inferenced_ast: 94d957c091c065a8e79d6f5d2b3855d6e06abe4d12f197fe164165ebdf1bb153
+    initial_ast: 434048732d4e8ecf3ef871e262ab4349bca9184130868fc6f81bdb2f9f279eff
+    canonicalized_ast: 434048732d4e8ecf3ef871e262ab4349bca9184130868fc6f81bdb2f9f279eff
+    type_inferenced_ast: 0891a175cee05291ce0160ea7bd4d9a89e05bc8ad11aeb6854d5686ddc68b8c0
diff --git a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
index 452a624c4c..697bec4ddc 100644
--- a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f0c0d33e8d540c5e86751de9b2277756eb1e23692d6493ed14772fd2fb6dfcd8
-    canonicalized_ast: f0c0d33e8d540c5e86751de9b2277756eb1e23692d6493ed14772fd2fb6dfcd8
-    type_inferenced_ast: cfe146004d2b0ee005eb43d3d0ccc0d220004b6bfc2ad57bf85cef4b00bea822
+    initial_ast: e3d9d7e0777882927c0d62f969a00971eac702cc120a7228d495770b0508c8e2
+    canonicalized_ast: e3d9d7e0777882927c0d62f969a00971eac702cc120a7228d495770b0508c8e2
+    type_inferenced_ast: 1e073af4c2e020522743b359f27e62b2cdfef990ef3efde2e45eca72d1458694
diff --git a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
index 97924efdc7..8e564366c0 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 4d198dc2eadde9ee692f73b4a168e81ee53afb6d8e87516d7b80b8f83ce5d700
-    canonicalized_ast: 4d198dc2eadde9ee692f73b4a168e81ee53afb6d8e87516d7b80b8f83ce5d700
-    type_inferenced_ast: aa8a249857023d1abec61d807ba3eec677428fd7b17eee256455bb388792473c
+    initial_ast: 0f1eb365e0b6533a4f9e6ebd6915a66945409beeab6b534e9aa4ebfd7429bf98
+    canonicalized_ast: 0f1eb365e0b6533a4f9e6ebd6915a66945409beeab6b534e9aa4ebfd7429bf98
+    type_inferenced_ast: 0726efa0b131dc2baa5662ced11c1a1da0424496b853cb7a44f8f30682a9b9b8
diff --git a/tests/expectations/compiler/compiler/integers/u8/add.leo.out b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
index 4f9f8eda4b..5bb2bdc182 100644
--- a/tests/expectations/compiler/compiler/integers/u8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d53c9a614e6526855cf93a203ddfc3c57bf71373facbbe12e26ce01b8cc5e62a
-    canonicalized_ast: d53c9a614e6526855cf93a203ddfc3c57bf71373facbbe12e26ce01b8cc5e62a
-    type_inferenced_ast: 47ed01052c149963c7895068e5fb25d190d36ba2e7b26e67620da6e4647bddcf
+    initial_ast: ac6f907e0bde03b050a6a400ec75c9ba36c8ef71e7229b74f6584ca8d2b91947
+    canonicalized_ast: ac6f907e0bde03b050a6a400ec75c9ba36c8ef71e7229b74f6584ca8d2b91947
+    type_inferenced_ast: dbbc25669e47bc45b3de20bbfb30b2b0a08558a0cfd738a5cadc8ac7b439a822
diff --git a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
index b65c5ed5a1..63e75d5d83 100644
--- a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: f3b07f0e3421f20b94732dbf4303444f642c4b9c9e333426aa9576cc423a69e7
-    canonicalized_ast: f3b07f0e3421f20b94732dbf4303444f642c4b9c9e333426aa9576cc423a69e7
-    type_inferenced_ast: 04e635a435e144bca1a442bbbfe9a37feb83239d7c18f564d5dd5aef4c5b5430
+    initial_ast: 0d844d1f940b60507bf4756f3ec5d3ee7927c1b35f8625e6973da1c1cb7fc599
+    canonicalized_ast: 0d844d1f940b60507bf4756f3ec5d3ee7927c1b35f8625e6973da1c1cb7fc599
+    type_inferenced_ast: 6f643a6f222e06eb2f588ccecff5fe1dd4b037a9ac5ff340056dfd33093ae7a7
diff --git a/tests/expectations/compiler/compiler/integers/u8/div.leo.out b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
index ebc70777c2..7b8f66a81b 100644
--- a/tests/expectations/compiler/compiler/integers/u8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 234e75c599118d8348a795f453d72a0edc2366473aa108616862ba95d15e4d40
-    canonicalized_ast: 234e75c599118d8348a795f453d72a0edc2366473aa108616862ba95d15e4d40
-    type_inferenced_ast: dc38b28d319513687def3402ffea1b66fe736ea883341f98f793d9dd32f99392
+    initial_ast: b89d99a49767212fe042121c854f22669329d9c73b08894fe49e54b1d5364d20
+    canonicalized_ast: b89d99a49767212fe042121c854f22669329d9c73b08894fe49e54b1d5364d20
+    type_inferenced_ast: 51638eb70f7dddd16f8b12b97cd047b1c01161111e001aac2b578b697e15e375
diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
index 248f080e0b..727b23fe74 100644
--- a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 3cf870e5df71d351108f466e6f08e1f57f3a4629e3d63cc0c8d329637351ffd5
-    canonicalized_ast: 3cf870e5df71d351108f466e6f08e1f57f3a4629e3d63cc0c8d329637351ffd5
-    type_inferenced_ast: d11bae54b9eae60af1c4edf986b76406d7ea076ade6125850a128218c85bbdf0
+    initial_ast: e5f1208c5eeddea9529cb7d94abd8402deea7fb99403d30b993d20455c486005
+    canonicalized_ast: e5f1208c5eeddea9529cb7d94abd8402deea7fb99403d30b993d20455c486005
+    type_inferenced_ast: 4262889173a452f869821a1c5156b16df25938323a1029b9ac16b2d851f590ab
diff --git a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
index 5557bb66b6..f788e88307 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: b48e11d86e676e24af8601694a5c4d30c3b4fdbfb1f81edd418c43f860685ad9
-    canonicalized_ast: b48e11d86e676e24af8601694a5c4d30c3b4fdbfb1f81edd418c43f860685ad9
-    type_inferenced_ast: 03f30c07a95050083325fe8745a3872509a9f753ac36afc40375624ef119bab6
+    initial_ast: e112fdcf1e2d652ade77b4a66808e252bf380f9e0db3d4766828ea062fc4653f
+    canonicalized_ast: e112fdcf1e2d652ade77b4a66808e252bf380f9e0db3d4766828ea062fc4653f
+    type_inferenced_ast: 96f3e51cdf1f213854d70c733044bb1157391380fa4614e3ad604ce588ee2cfc
diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
index ae1da1d538..2d889a0bb7 100644
--- a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
@@ -16,6 +16,6 @@ outputs:
       - input_file: u8_f.in
         output:
           registers: {}
-    initial_ast: cc6c8863fef25605109d3ba3a8068102df07e66bf786e777c60f78d685dca8ed
-    canonicalized_ast: d2221d06c782fb9e312722bd29b778b92a859b61d69f1a0026a75554f9f13b8e
-    type_inferenced_ast: c685412a9dd2c684134cd21084cada1ad4140a153a27bd562c15b8739c5700d6
+    initial_ast: 367bd7c0e5be94e791a9d837ffd38b75346a717b6819180ac3f9de72252d27d5
+    canonicalized_ast: 6d52d5232ccd2c88404b6fa137aecb9d40b02c6330995f1060e5f27f5b8ca224
+    type_inferenced_ast: bdf5ecebb6a1522b6f2b94a2aab91550473604de2db6dc8d32ec19c2ab6ca590
diff --git a/tests/expectations/compiler/compiler/integers/u8/input.leo.out b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
index 6cd836f14d..a11b91c799 100644
--- a/tests/expectations/compiler/compiler/integers/u8/input.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/input.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0ecf577b271c6170017f61b86a6b7788dfefe2b80cdf9c06eff54b0d8c6182c8
-    canonicalized_ast: 0ecf577b271c6170017f61b86a6b7788dfefe2b80cdf9c06eff54b0d8c6182c8
-    type_inferenced_ast: 6dfe6118b1c0efac72eb0716cedb8208df836f760ead632752b071e0833ad1e9
+    initial_ast: 531f048a2b98e742368e050951fecd924e86bddc2434861a71727e9f56ef79cd
+    canonicalized_ast: 531f048a2b98e742368e050951fecd924e86bddc2434861a71727e9f56ef79cd
+    type_inferenced_ast: 2cd1ea5a7a527232d6b433796b486672bdd1eb9f29bedd492ddd88bc118bfac6
diff --git a/tests/expectations/compiler/compiler/integers/u8/le.leo.out b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
index b2da7f0464..c330c95df0 100644
--- a/tests/expectations/compiler/compiler/integers/u8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
@@ -28,6 +28,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 0a29783034e0298e8c0d26c92bbc72eda04124f49ab636208d8448fb80a19462
-    canonicalized_ast: 0a29783034e0298e8c0d26c92bbc72eda04124f49ab636208d8448fb80a19462
-    type_inferenced_ast: ed636957ef1a7920d8d1071f93cc463ae51dda0c5bbde1e77336b556e2a3e436
+    initial_ast: 90d394dcd275a98675d2dd533d85387205c32197f34dac27bf926eadf260c3a4
+    canonicalized_ast: 90d394dcd275a98675d2dd533d85387205c32197f34dac27bf926eadf260c3a4
+    type_inferenced_ast: 9ecdb7705455bb31f65809c1eb79f31d2b68f17e6aea5d1c4d6038c730e4f6a2
diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
index 1cbfeb4117..a3a0faa275 100644
--- a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 4b4f8d0a77d3ccf56596af66ae7611ebe996ad3f46878c1858ce40e0190390a4
-    canonicalized_ast: 4b4f8d0a77d3ccf56596af66ae7611ebe996ad3f46878c1858ce40e0190390a4
-    type_inferenced_ast: be01b71586f5bd0158c5df8ddd2b1c31984a38252e73d16181dc5529f7532b22
+    initial_ast: 61afedce9bcf1d0018a083b81bc3355cb161e9a92ed7519e52d027b83c2c0930
+    canonicalized_ast: 61afedce9bcf1d0018a083b81bc3355cb161e9a92ed7519e52d027b83c2c0930
+    type_inferenced_ast: 5f3d7fa99b36f82a7660a7ba7b6331c8eb2b805b1a46ea04c5b74ff1c32b6b93
diff --git a/tests/expectations/compiler/compiler/integers/u8/max.leo.out b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
index ee46afe0e7..6149ce792d 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 88c4d3735a0b8415c10ec173efb4777410d202ae6bb2264aacbf9e4633c9b548
-    canonicalized_ast: 88c4d3735a0b8415c10ec173efb4777410d202ae6bb2264aacbf9e4633c9b548
-    type_inferenced_ast: 5aba842dcded3dcba755c2804ab26be94e1077f549bfe59aef5a3cabe6abcc62
+    initial_ast: 6342b402bd6699b8bc7b7ae840c4d3812f8ee1f8b59913ab66353d54e5972893
+    canonicalized_ast: 6342b402bd6699b8bc7b7ae840c4d3812f8ee1f8b59913ab66353d54e5972893
+    type_inferenced_ast: e9db0cb3f6a2537b42553b4b998c746fb8eb65f8ad1af2e2dfb0ee60243f1418
diff --git a/tests/expectations/compiler/compiler/integers/u8/min.leo.out b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
index ae74474b54..de61365e09 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 2278587c13e7154a718aac3621073ace474d3d9d896aefd7d59de753dd294b7d
-    canonicalized_ast: 2278587c13e7154a718aac3621073ace474d3d9d896aefd7d59de753dd294b7d
-    type_inferenced_ast: 6b04630df2ab8c3aa55229faf594feb3e1217122ef0ce4caa1e1f3236f46183c
+    initial_ast: ab129b038cecc6772d826b2cf0ee5ed5379cff8550d245602e599ac25a894d86
+    canonicalized_ast: ab129b038cecc6772d826b2cf0ee5ed5379cff8550d245602e599ac25a894d86
+    type_inferenced_ast: b7bc9ee14a8d2e35faa657e8fb739494b6e76f04bffbb91072185049d51d1ecf
diff --git a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
index 851e22672c..acbba34889 100644
--- a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 3eaec0cbc660ca46f281a8bc7eab93cfd24069398498f25ee98b16d9f29b5aac
-    canonicalized_ast: 3eaec0cbc660ca46f281a8bc7eab93cfd24069398498f25ee98b16d9f29b5aac
-    type_inferenced_ast: 1c69cac9522b266de322a52070cb342ab322c366997c7b9ce21ca6d28f73c413
+    initial_ast: 4ddfc75bb5e02c95e9a0063a7252f710a762826edbf18a6e66f856a1952225aa
+    canonicalized_ast: 4ddfc75bb5e02c95e9a0063a7252f710a762826edbf18a6e66f856a1952225aa
+    type_inferenced_ast: fb7db5e925bdfd5819e60f9e62d550e212956bf9848e5c4396ffda535b73fd48
diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
index d4a9957d25..84570433b9 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6f017c906c07634ec46321c2d1c74512f5524533c433511ae41a6adb3d2e5645
-    canonicalized_ast: 6f017c906c07634ec46321c2d1c74512f5524533c433511ae41a6adb3d2e5645
-    type_inferenced_ast: b3c0792ab0be67554511d9849c1165da800afc23ffedce35b2e8adbcd9fd2f9b
+    initial_ast: cac942dae68f28bb032dee1b20345d38c4c1b948b1d9c77e02af98f2b17d3296
+    canonicalized_ast: cac942dae68f28bb032dee1b20345d38c4c1b948b1d9c77e02af98f2b17d3296
+    type_inferenced_ast: 9bd574d7862a1d10bdd1ca1096381d1fc2f1070433f189e48c8bfef3587da83f
diff --git a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
index dcd55bd33f..50ff8321c7 100644
--- a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 116e9f1d4cc0924eb66f7b41baf832fbe184289d49d724bc033184fabb032233
-    canonicalized_ast: 116e9f1d4cc0924eb66f7b41baf832fbe184289d49d724bc033184fabb032233
-    type_inferenced_ast: 6eab8576e793f71d3881be971921315f1950b5da913aee290adc3a792bd9cd15
+    initial_ast: 37f312fca99e18c20fc3b915d5e9691183e9c8a26facea674c94d18439f76419
+    canonicalized_ast: 37f312fca99e18c20fc3b915d5e9691183e9c8a26facea674c94d18439f76419
+    type_inferenced_ast: 184d52c1e60496d84b8ea7c99d47c4d61c54462ec876eb1ad9087d921e4bf4c2
diff --git a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
index 63524a0159..0556332f0b 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: d4f8e4e36924eb918382114af6c9685fc3468889ad4441c1f319e92f27472683
-    canonicalized_ast: d4f8e4e36924eb918382114af6c9685fc3468889ad4441c1f319e92f27472683
-    type_inferenced_ast: 2fdd7be19e953011c14ac5d646d37d1a4c6d0897ff84b62e953e5053596e8131
+    initial_ast: 12081a6268bceeb4d14340427a7d8786dee79834e8d0639530bda36405519f89
+    canonicalized_ast: 12081a6268bceeb4d14340427a7d8786dee79834e8d0639530bda36405519f89
+    type_inferenced_ast: 1dc21f41bccb8261f4d52ed0ea64b3dbea0a51b685afddb46692ccb3abd0aaef
diff --git a/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
index f34cae6da4..0b62259bc4 100644
--- a/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_dyn_mut.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: "[u32; 3]"
               value: "\"150\""
-    initial_ast: 14716b7665f37b1f24d1fa17a63d40f5b5530177ba3d46c978760f9780a80634
-    canonicalized_ast: 7cd7637f36b946909847129cbbbf55bb918a71496175580945965fb97b51f00b
-    type_inferenced_ast: 2b74a553d28c57a943f392ffc0331ab7dd8fe7ce18a3a9778346ac8b39fc8836
+    initial_ast: 1b9dd4d93877ba82b0f45fa9512946bbf07683c6ab239d93c4a9a18530cc1eb7
+    canonicalized_ast: 7b38858ddb99fd0e62727f508609aa05e68c7daf27429db5f2e0c59f137543ec
+    type_inferenced_ast: c492d1e3ec39f64c403105c5da177e6593c97ba93e71d187b040a095b1916f47
diff --git a/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out b/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out
index 8205e3d502..e583f33d7e 100644
--- a/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_dyn_mut_indirect.leo.out
@@ -22,6 +22,6 @@ outputs:
             r0:
               type: "[(u32, u32); 3]"
               value: "\"(1, 1)(2, 2)(0, 1)\""
-    initial_ast: eb582af3ced3976038599fbc9f2f24e79704e72c1ef57954134dce9e40f99d00
-    canonicalized_ast: eb582af3ced3976038599fbc9f2f24e79704e72c1ef57954134dce9e40f99d00
-    type_inferenced_ast: c64b4a21fbb3085952141dcd7d1239cbdb7dcda5169832de724dbab9f7a1ac9b
+    initial_ast: 1c99d10e887a1d5127c01ea8e30b83e1ff063074c995dbfe4be8600af27e46be
+    canonicalized_ast: 1c99d10e887a1d5127c01ea8e30b83e1ff063074c995dbfe4be8600af27e46be
+    type_inferenced_ast: f78c73953ee24462f3f623cad8661e2a892901193ffedd93f030c49a7225cfe7
diff --git a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
index 09d058b480..540a93fedf 100644
--- a/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a16958d522d28eaf7afc55a5f44ed2c49511e50e58aa8d32b9eb6620a0e5ee55
-    canonicalized_ast: a16958d522d28eaf7afc55a5f44ed2c49511e50e58aa8d32b9eb6620a0e5ee55
-    type_inferenced_ast: 8a2d6cad8ed06b84a38478d024c9577b14398b04705484ecd3662b1fc7d6b174
+    initial_ast: d1d84eaa70d3a5bc85b399d5cd16f62d78566638c9840e85c0eaed2c6a7218ac
+    canonicalized_ast: d1d84eaa70d3a5bc85b399d5cd16f62d78566638c9840e85c0eaed2c6a7218ac
+    type_inferenced_ast: 0c2bda504db5b7d1d4868ad20a3c70fa0e86dd1ec90c514c7a67161997495970
diff --git a/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
index ac9836c789..b0bf42402a 100644
--- a/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_splice_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 722145cd544cd78e7fe71e1ddfc3e760c4f59aee292321f88c9f00833d2fce11
-    canonicalized_ast: 722145cd544cd78e7fe71e1ddfc3e760c4f59aee292321f88c9f00833d2fce11
-    type_inferenced_ast: b5f94d881dfe06f9ed969e2f5764ddc7be2078926283580425fbbe516d27f119
+    initial_ast: 319d0e6e9e914b85e84803c5ac0c0bee32e5238e89fdcf2e7ac28c88b3386f3c
+    canonicalized_ast: 319d0e6e9e914b85e84803c5ac0c0bee32e5238e89fdcf2e7ac28c88b3386f3c
+    type_inferenced_ast: afce2509e7ecc4c7edb35a0d7536fd425171d9b0477c5f7ad731f7bba716c310
diff --git a/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out b/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
index 9d06c1e290..4ad3154498 100644
--- a/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/array_tuple_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 1df058bb963cf38b415c8b39484070d90fcbf0f97e2527c10e4c48aacb1968e5
-    canonicalized_ast: 1df058bb963cf38b415c8b39484070d90fcbf0f97e2527c10e4c48aacb1968e5
-    type_inferenced_ast: ba6c50a419d25aa6e21161ab194da0f2867363c1808b182ed70abd3e230b3767
+    initial_ast: c34cb6ced1870107558689bad9fcf1a6ec465b0db85c2b6f10ddcecf9d5cae25
+    canonicalized_ast: c34cb6ced1870107558689bad9fcf1a6ec465b0db85c2b6f10ddcecf9d5cae25
+    type_inferenced_ast: 984811782861d636221d6b3ee89f13e8489d0b4ff8ec2f4a01feb5c940ebb8a7
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
index f304799cf3..fe01ab791e 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_function_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: a761274f02370204ee81f13ec53e70e546a3af708f2c4dbd57301d83ad943921
-    canonicalized_ast: 684b991ce89ec7a9b0a3ff9a69928f4fce8f1f7311e64e39bf628f0d6d74cc70
-    type_inferenced_ast: 740e913caef569001b77d13319647af4b4449375349dc186621152825f3f1b3f
+    initial_ast: afde0187f805e33f804917815a52421a2662aa029b182be76c39f4ce5f3f453a
+    canonicalized_ast: 9dfd8d93fa20899e9d146d65b2564f1275cfb73158d8d96ed09f7157ff327e39
+    type_inferenced_ast: e59a2cba730871aba6258b78f469b9df7763f8d78ad6bbda5c6026a989bc3d88
diff --git a/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out b/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
index e05be96986..2658736d93 100644
--- a/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/circuit_variable_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 873238c253123be620267b8fdd74d9412fbbdd6796f7d32be76a3a72c47b6050
-    canonicalized_ast: 873238c253123be620267b8fdd74d9412fbbdd6796f7d32be76a3a72c47b6050
-    type_inferenced_ast: b46d7dcca53a2ea800751e5458ec69252c16b7a55190da89d40d548973782b8b
+    initial_ast: db9400fc979f1cfd8eea30945594b0e8d2f4138bb32021b9086021b492e2e246
+    canonicalized_ast: db9400fc979f1cfd8eea30945594b0e8d2f4138bb32021b9086021b492e2e246
+    type_inferenced_ast: 24783ef52315a02bb2f2e34f5a4020f09f4573ae6d182cab699bf45235e1c4a3
diff --git a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
index 9bb7092c9c..2c8c19daca 100644
--- a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 75d40f30a5bee2f28540b9741ac13501a0e78052dc3940492316b98355c88300
-    canonicalized_ast: b43e5e2155e81c0de944ce44e7f0019fc5459bc132dd559567e3fe72058a6778
-    type_inferenced_ast: 249d5ef9db2e4764dc27ce4c327e34b36852cfc96375db80aed1bb1364beabc5
+    initial_ast: 1f9ad1f3e19f31a5e7195eb91ec9617e07d5eaf146fd1654eb4a5188f0268cbd
+    canonicalized_ast: 5ff794b8a47377190bb0a834df5c858bee7b6136204677e71db99b395a158d41
+    type_inferenced_ast: 1555a60ba172865b0689ca934416a7840a678950f800a33825cb455fa101627c
diff --git a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
index 5c6952b579..c397be906c 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: df85a5635f1dd8a74a62dbdab2c14d287541854ff27eb85c236576dcdc3e998f
-    canonicalized_ast: df85a5635f1dd8a74a62dbdab2c14d287541854ff27eb85c236576dcdc3e998f
-    type_inferenced_ast: 4491ad6b2e1875671bc35e62917044ac9eb6e82a7f042a83eaab63a79b552c48
+    initial_ast: 198667d742dfeb7ff2e5a4aff4effeb9290682574faa7c4aa16ea9ea1f63975a
+    canonicalized_ast: 198667d742dfeb7ff2e5a4aff4effeb9290682574faa7c4aa16ea9ea1f63975a
+    type_inferenced_ast: 27b6e28e2f604e34e860b2c380efeed816b5c5009acc4072deb006d3efcd005f
diff --git a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
index a13754c8fa..8861d55252 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 820a5f784b2654fda078f6c456830e270c0596f3e4e5a9502a3d3b55909bb696
-    canonicalized_ast: 820a5f784b2654fda078f6c456830e270c0596f3e4e5a9502a3d3b55909bb696
-    type_inferenced_ast: 307f4fb80f5f7753972056c6e88caa399cf4ca9cbb3e70b77dc925f5951e8f45
+    initial_ast: fe19b0b255803d40b89cc69970126c016c9978a529472be4bfdb71af6bf74128
+    canonicalized_ast: fe19b0b255803d40b89cc69970126c016c9978a529472be4bfdb71af6bf74128
+    type_inferenced_ast: fc8cc3c7fbad2d163ad8f78a4c4deeebbc062df3b26a4388fd8550ad51ac0ece
diff --git a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
index 2497d4073c..7d3f3d7992 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6040f153585cfa3c3a1d3f6adf7f99689ed815374d3df0a3cc6d7390e60fd5ec
-    canonicalized_ast: 6040f153585cfa3c3a1d3f6adf7f99689ed815374d3df0a3cc6d7390e60fd5ec
-    type_inferenced_ast: b377d1df3d92d9ee05907088ae131454b48bbc7f36f9b6f1a17ceb3b53f25f64
+    initial_ast: 372f591679b8d314412a010f32be0082aa999c7016e761499da8317c12b13750
+    canonicalized_ast: 372f591679b8d314412a010f32be0082aa999c7016e761499da8317c12b13750
+    type_inferenced_ast: 8409be43d93bebe4ba303fc14b55ef95f987f8723051ddc963febebaeeb75e79
diff --git a/tests/expectations/compiler/compiler/mutability/swap.leo.out b/tests/expectations/compiler/compiler/mutability/swap.leo.out
index 06cde2a2d7..289ab26c8a 100644
--- a/tests/expectations/compiler/compiler/mutability/swap.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/swap.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "false"
-    initial_ast: 7ebc13e9db4a339cbfb42c90ba4b642ef0aae43741f13309f6388ec3da9a7404
-    canonicalized_ast: 7ebc13e9db4a339cbfb42c90ba4b642ef0aae43741f13309f6388ec3da9a7404
-    type_inferenced_ast: 6e8bc8c404188408836a85f7a0342857c321c80cc199da5d9d66e26e06644d14
+    initial_ast: d242fc681e75003adf2e36aecbca50f8c338f8b40b4cf53342857cc672c753a2
+    canonicalized_ast: d242fc681e75003adf2e36aecbca50f8c338f8b40b4cf53342857cc672c753a2
+    type_inferenced_ast: 21e2566f3ed62dc1bd39cb3b9a7b37bb84c5a621bbb5ee77c4af08412e321e94
diff --git a/tests/expectations/compiler/compiler/statements/all_loops.leo.out b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
index 4e1594057f..b2a11d740c 100644
--- a/tests/expectations/compiler/compiler/statements/all_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: ef03a9e7eeed0a80db7460f7f20472bfd001e456242d1abc746a02ea75d524fa
-    canonicalized_ast: 540da0a1cad9e3d08f8b4db729452fd65a057fde6a3e2bad7cbe4470ba1d8570
-    type_inferenced_ast: 7934657497349fe137be1f4b3afd8933028718c28f9ab6ebcbe7a6d831ec75e0
+    initial_ast: 16484d1177234086a3e8a1c32d2b82e0f1b8d3d93a659aba714d6cd5479bbe8b
+    canonicalized_ast: da9bcca9fe3e363b62bec3be7f446dd416f72a18aeb91e83c30d2314d67b1881
+    type_inferenced_ast: 6d31a33082f9dd2e9a54dcbb90bca315ac328cd93d7979d48b696ba39f6e6f38
diff --git a/tests/expectations/compiler/compiler/statements/block.leo.out b/tests/expectations/compiler/compiler/statements/block.leo.out
index 0afd92c39f..3d0900fcc5 100644
--- a/tests/expectations/compiler/compiler/statements/block.leo.out
+++ b/tests/expectations/compiler/compiler/statements/block.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 4ac2ff62513f6a6fd4e7c241a46c8392778d49837983372e93629e98a4611ee8
-    canonicalized_ast: 2954fd2f74fe8eca3cb6d1f50fbf664649831eb042a514eee72f98a8d29d3b81
-    type_inferenced_ast: 19815ae04b63a15c84151aeecb658534923ef87749ecc7d6b031be21f4da9eac
+    initial_ast: 0126e151faacae24bc508e67a5c8d1d78024fed8da226238ad6436851e5b025e
+    canonicalized_ast: 34e85a0c78e50ee4718fa07458bbdb433399f71833479af414cdb7e7f6b482c2
+    type_inferenced_ast: f92fcf546c8559c31db54cf6b19b17f955e568132a12280f7c3804f57fb339d4
diff --git a/tests/expectations/compiler/compiler/statements/chain.leo.out b/tests/expectations/compiler/compiler/statements/chain.leo.out
index 40213ebf81..a16e4872ea 100644
--- a/tests/expectations/compiler/compiler/statements/chain.leo.out
+++ b/tests/expectations/compiler/compiler/statements/chain.leo.out
@@ -28,6 +28,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: b39f1f2b4c314bb3dde18560288d2aff8db93c0e13f1fb429260bac821eea521
-    canonicalized_ast: b39f1f2b4c314bb3dde18560288d2aff8db93c0e13f1fb429260bac821eea521
-    type_inferenced_ast: 272d80f0d95469b8b0d304eb59c062d8df55793ea175f97fe09da9e6b495c2f3
+    initial_ast: 07fb0d55368685050d065a7b7cc7e19e7fa119754bbf10a4aab46580ae74c51a
+    canonicalized_ast: 07fb0d55368685050d065a7b7cc7e19e7fa119754bbf10a4aab46580ae74c51a
+    type_inferenced_ast: eaa4797908d50053ba52f7ead813fe071aeacf4a24d1b57ed77188f58c3f5348
diff --git a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
index 3497d6802f..c171430d72 100644
--- a/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
+++ b/tests/expectations/compiler/compiler/statements/compound_assignment.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 6ed63ca447d6b2929e4fcda22f691c0c28b4370b98ea7cad2c2c7c2906f0a931
-    canonicalized_ast: 29a6c2fa33aa9163c17c8a607b0e7e560d91288360023f45400f442e4d14653d
-    type_inferenced_ast: 07d7177148120b72e4c1ba53feddc4d52124cc8a2e5252afd759b0cf3c7c321a
+    initial_ast: b260517dc70a401c68acfc09bd6434b55b61446e27bd940ad339987eb22ff85e
+    canonicalized_ast: eb5f37501878e5f97180a6f289f29795e09cb2da6fb031ed7ccb83681b407123
+    type_inferenced_ast: 3abe1f8136d17844e2d11db603945fc06365cf91b51b9df0a2f700be94df8766
diff --git a/tests/expectations/compiler/compiler/statements/for_loop.leo.out b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
index b88dd41663..55dd2ce7ba 100644
--- a/tests/expectations/compiler/compiler/statements/for_loop.leo.out
+++ b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: a890e3e551566e2cdd795853886d77b6f2c51aba81a29a632a30f53db42e5681
-    canonicalized_ast: 7d6c6159c6616e37524747ce2f286f676d1414bd6afae0593ab48541b4a51454
-    type_inferenced_ast: ef79ca5cb8dee89b6df046cb15fb5bdc82ad22b7f3450aff1376178f46731dbd
+    initial_ast: 15072d280d783640c9810be541201c6f71708687ffe7242503ec03012cf9ab67
+    canonicalized_ast: 26d817bfd0168ac3aa31b7f197cf8f9273ca4c94b25b9df5a7112c228047cc7b
+    type_inferenced_ast: 1f5484f5993b7993ac6f10aaef884fbf502ae0efeabf5c9044c38bc7a4dc3011
diff --git a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
index b32b9446e2..8958ce64ff 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 84dd73f4b7a624d7dc4decd0c5d8d700a117d47202ea1fe306baf8eb1539bebb
-    canonicalized_ast: 2dc3cfabebd95eee40315bc8d5235bee1972453be6f95e722fb109e0740ec946
-    type_inferenced_ast: 07e46085a75fb8660fe12b9f01b26455f09cda3f0ef809c90e0b51e8b4fd3550
+    initial_ast: 7352861b3e7107ec349b2fd905e95fd78bdc79829ecec90eafa2c3bfa36e0716
+    canonicalized_ast: bcb00069768d5ce3902d0ee802aa8b1f23132619ca627b5aadc01200565870c1
+    type_inferenced_ast: 35cc981849af0cb83ed968b6dd466efbf7c7733cf9fed2e9a0880e2771640ce1
diff --git a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
index caa8f9ffee..811d97f278 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
@@ -16,6 +16,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: 7cc6d6722d1660082ac6becc9f67c7b1cfd3f62a9fdfe38e2ddbe92c194588d5
-    canonicalized_ast: ad5b7a770161132b7c6908d9fabc6722bb8bee73c33a970712d55f35b75aa017
-    type_inferenced_ast: 1385fa17eb53b0ba18f9afde2d338a86d10955011da087e75f5e3a27edeb9d5b
+    initial_ast: 4c020866d910371924bfa7f24761e022b658ac7f38ff6348fc837fb026b43b22
+    canonicalized_ast: dfc10c9e46558ebf7654a49fb87a61bae5fa3d5f8384b4e144761518a762f0d1
+    type_inferenced_ast: 3aef844b36c18ec04f9f6cacf679182b752a720ac038b71569791e7e12e5eca5
diff --git a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
index afb4279519..8ed2ee0809 100644
--- a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: ce2d4c3eed6d94b96094e3adcf736b38630e99733effb290b6f67b9a9f4bcc45
-    canonicalized_ast: ce2d4c3eed6d94b96094e3adcf736b38630e99733effb290b6f67b9a9f4bcc45
-    type_inferenced_ast: 75cf948d34c6d4b4ccff5489c0f86f6cffcaf949b89bd445e70dbe47e8dfce3a
+    initial_ast: 3e1bc14f1bc7e4b083bde21cfd0e833333142bfbcf247b60e77d0ffb8a159e98
+    canonicalized_ast: 3e1bc14f1bc7e4b083bde21cfd0e833333142bfbcf247b60e77d0ffb8a159e98
+    type_inferenced_ast: 927f1640868f0a50f30ac3a9604dc99f9ec5e7906884007cfea7a10333bb06d8
diff --git a/tests/expectations/compiler/compiler/statements/mutate.leo.out b/tests/expectations/compiler/compiler/statements/mutate.leo.out
index 8bc7ac5893..030ff12ccd 100644
--- a/tests/expectations/compiler/compiler/statements/mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/mutate.leo.out
@@ -22,6 +22,6 @@ outputs:
             a:
               type: bool
               value: "true"
-    initial_ast: af885844f2423d9694fc10c0ced30fa121e5c829ff6a47bee110b20e9d6a0109
-    canonicalized_ast: af885844f2423d9694fc10c0ced30fa121e5c829ff6a47bee110b20e9d6a0109
-    type_inferenced_ast: ecaa5694f982748c5ec885ce21cff5c67bb64b1683797b2818749f0cb09dc4ef
+    initial_ast: 2ac096dbb8840a8a71cb14365272088509094ffae32f1bcd44618a5fa9abc35e
+    canonicalized_ast: 2ac096dbb8840a8a71cb14365272088509094ffae32f1bcd44618a5fa9abc35e
+    type_inferenced_ast: cb7037b631e1a9994a7dc347bf834804acd1e28e5f4ace536aef36ae41695e20
diff --git a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
index c042238389..ebb4ab1cce 100644
--- a/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/nested_mutate.leo.out
@@ -28,6 +28,6 @@ outputs:
             a:
               type: bool
               value: "false"
-    initial_ast: 376b076978ab1dc197db1e883eb303af4f54e4c5da42f3f70b813689a7020de1
-    canonicalized_ast: 57f161fb0212d024f63298577379f57ad88a91677106c282c2bd2073a3ba1b06
-    type_inferenced_ast: 78a0a8ade96e6d1e1e20668b5f78884f108c956ae717890d442ea0e723aaf502
+    initial_ast: 45eb01ab83d086d7e6a07c03e47b01d6e0d07f668e3b76138283a64b1e0c5760
+    canonicalized_ast: 6c426c224bd59f40be37e044750db2de10527168924a85aae9c90bb6d8fd7c5f
+    type_inferenced_ast: 7510f5f6eba668e63befb0b9f4119e28382caac699d0da21587a62fe4746b6c9
diff --git a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
index 59b218a195..fe35d557f9 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_loops.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 172cb3ca8dadc4f2f7a67e77a00e8d3e832ed15f8996a6b57352d9e98fd11d36
-    canonicalized_ast: 64bd366c390e2837d2c739cbd4175fa71846ddd228fb1e0a612ae80539d50b89
-    type_inferenced_ast: 2d4a666a45c4c6ecccd922bf5166c8db2eb49a600519fca68e751d4b763ab1ab
+    initial_ast: 6bbf937830bb2dfbd2f308f47ca8ff50a405aed0cec27aca4de4f83ed1ee8186
+    canonicalized_ast: 0ba1c0416d295b92a9747cbf7f9d263c9b45b269bce23a0ab4afd932219b7950
+    type_inferenced_ast: f00d268715b94de26102bc7d54b7238fec08fc7c4a01a713e1162b9d52e097e3
diff --git a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
index 2f76e5c829..7517a30218 100644
--- a/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
+++ b/tests/expectations/compiler/compiler/statements/reverse_one.leo.out
@@ -16,6 +16,6 @@ outputs:
             r0:
               type: bool
               value: "true"
-    initial_ast: 0314ac2650bd7cad7f90f929a21a643e895de24da72829a22c2d481e3fe16bcc
-    canonicalized_ast: 7cb323958fb7b3e91f8b0c7da7b6354a85ab9ea0123b32a34d389f03883fc457
-    type_inferenced_ast: 01dfade707b4f836382f40f3fba760a96febfde52b26931508eede793aed28f9
+    initial_ast: fef6eef9955869631e3cc48ce5127e519a8f3483a440d243e12ff241f0f24b67
+    canonicalized_ast: 88939f0afb3e09a85f48ae2022c97128a260bd4eee667dc26e32f48d8b3253e5
+    type_inferenced_ast: c10090137663610771d6e8144806b5899f23a881dd810432559848bf3e48bc82
diff --git a/tests/expectations/compiler/compiler/string/circuit.leo.out b/tests/expectations/compiler/compiler/string/circuit.leo.out
index 93de89e7f8..00776b17f3 100644
--- a/tests/expectations/compiler/compiler/string/circuit.leo.out
+++ b/tests/expectations/compiler/compiler/string/circuit.leo.out
@@ -16,6 +16,6 @@ outputs:
             out:
               type: "[char; 13]"
               value: "\"Hello, World!\""
-    initial_ast: de12485742001f61c8b7cf50385def19389159ce135576a9249244cb10e28af5
-    canonicalized_ast: 93e31f5eb6d4d5f74895f649c4f2fca337000548860f395ec2b1ab5f2a75a815
-    type_inferenced_ast: bdab7de3392691c4193c83543cb7290c191830164b6007038a798110306d0ceb
+    initial_ast: 3ece39236ca03d9f6e4a89ae1a5f27cdbc8036eb1485913a2043d1e0a44beb3c
+    canonicalized_ast: b3df972e5b9658b6addba6f82e972043620a591f5981ac009b56fb6965742695
+    type_inferenced_ast: 22fdc2ba01f04dbe8140df231d6f8c77ad4b5e62a12dfb45a67686830ebee455
diff --git a/tests/expectations/compiler/compiler/string/equality.leo.out b/tests/expectations/compiler/compiler/string/equality.leo.out
index b1d5215766..75e85e5ed4 100644
--- a/tests/expectations/compiler/compiler/string/equality.leo.out
+++ b/tests/expectations/compiler/compiler/string/equality.leo.out
@@ -22,6 +22,6 @@ outputs:
             out:
               type: bool
               value: "false"
-    initial_ast: 1f5b8fda209b42fc4a299a77e5184a4929b8a1d734e60ad459a167e5446f53b0
-    canonicalized_ast: c30505d9da2a178268c2d4ff45816a90bfa487266bb6f68a660cb6ccf9c91863
-    type_inferenced_ast: 3fd2d61cfd97263dc8dc0476d42be3d897a0d201b61ed602e8aaad1ec56827bf
+    initial_ast: cb656e2f6fdbf4250957c867db059168afb7240fb085f8a850a0f0d7857a80e9
+    canonicalized_ast: 7b67543fdb551982c7da1eb3f89ef5c68a4c85de9c6e01259df61532c763e236
+    type_inferenced_ast: 4b4fe877cfe562d1c86b0936025390241a26cf21956d2a00cab1c04e0c5ea73b
diff --git a/tests/expectations/compiler/compiler/string/replace.leo.out b/tests/expectations/compiler/compiler/string/replace.leo.out
index bc62d1e934..34c380ca0e 100644
--- a/tests/expectations/compiler/compiler/string/replace.leo.out
+++ b/tests/expectations/compiler/compiler/string/replace.leo.out
@@ -22,6 +22,6 @@ outputs:
             out:
               type: bool
               value: "true"
-    initial_ast: 62f1928217809d9ad03b4a7b33e57f958a94e2ae8fd30e651528d859aa3555b5
-    canonicalized_ast: 837f6eac27b9b50729f94095b3bc3d3529b3362834fa7769b228a8ea0bcde0d2
-    type_inferenced_ast: 623248c36159cba2b448fdf1fde3b17f0c6e6ffd5e6dbd60ef1509bbb4571b33
+    initial_ast: c0e04242e6a567cdfb4df87912d8c7ab31a19883c3cf0d953b29a767304adba9
+    canonicalized_ast: 98bfa17b9e22ad3a06ff41acd60be67b8f34597d89d38abb3b122b22a38f52d8
+    type_inferenced_ast: 6598fc525d9b2fed0db8c741ce90820196d1514d6cc739b957f4f133c46592f4
diff --git a/tests/expectations/compiler/compiler/string/string_transformation.leo.out b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
index b2ecc72e58..e504e3b6bb 100644
--- a/tests/expectations/compiler/compiler/string/string_transformation.leo.out
+++ b/tests/expectations/compiler/compiler/string/string_transformation.leo.out
@@ -16,6 +16,6 @@ outputs:
             out:
               type: bool
               value: "true"
-    initial_ast: 31a98820f6b162317a3fa69924df8b8d784a9d5ded3c790622f64f0dfa438997
-    canonicalized_ast: 0bc86b996359a0767253e1ec18c09ffc83da3d71b1dadbde9e22846751f8e0bc
-    type_inferenced_ast: 142e9fd6e7009bf840f0bb08365cad239008b66510eb2c1015ca0afc8455be60
+    initial_ast: 09f60770cc5c2d3765eaaaff677e6b0241693db4fb2355859a8787fc837e3b6d
+    canonicalized_ast: 38b83b23c154e103c0a8564a1845ff75bf270519a87a2d36db659ba616adea38
+    type_inferenced_ast: 8090cc48aa49d2a70270c3d2aa8614830a73be2369a1ad91fe57d83aeb7afbb8
diff --git a/tests/expectations/compiler/compiler/tuples/access.leo.out b/tests/expectations/compiler/compiler/tuples/access.leo.out
index 682a7ca359..a8a592cf15 100644
--- a/tests/expectations/compiler/compiler/tuples/access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/access.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: 4a7cf5f45f1dd0ed886ade721c89a238da47f2387069de9d0557aad4b9a1b75b
-    canonicalized_ast: 4a7cf5f45f1dd0ed886ade721c89a238da47f2387069de9d0557aad4b9a1b75b
-    type_inferenced_ast: 20cec96ebfe04679ebb9f3082316d13bfea9b58ae966f9d89b3706d523f63068
+    initial_ast: 26ccb648c843da2de819fa0451bb2aff8e187d2cda920aaccf43e1d2d7f0e95b
+    canonicalized_ast: 26ccb648c843da2de819fa0451bb2aff8e187d2cda920aaccf43e1d2d7f0e95b
+    type_inferenced_ast: 7bba16bcec82e82bce1892a9401b2a7c7529f20d25a32c77d727251e2844869d
diff --git a/tests/expectations/compiler/compiler/tuples/basic.leo.out b/tests/expectations/compiler/compiler/tuples/basic.leo.out
index 3e5e39622d..e0bad6c1f6 100644
--- a/tests/expectations/compiler/compiler/tuples/basic.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/basic.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: 16df9dc4ece6b3514b5c61a4b6a28a8a679e1746cc8f74cd34cedd276568a640
-    canonicalized_ast: 16df9dc4ece6b3514b5c61a4b6a28a8a679e1746cc8f74cd34cedd276568a640
-    type_inferenced_ast: 94ab82dfdc57d744e56bcc405e94449a6702f22045a8bcd3f1b20da312655bce
+    initial_ast: b8ecc455d0eb34031adea3dd2f74dc4eaeecd0a47fb3143db786c672015383ca
+    canonicalized_ast: b8ecc455d0eb34031adea3dd2f74dc4eaeecd0a47fb3143db786c672015383ca
+    type_inferenced_ast: 77ece65393296b71964354ac6915049d5f40d5a22288c3c47bb3889e17cca692
diff --git a/tests/expectations/compiler/compiler/tuples/dependent.leo.out b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
index 9b8f204ff1..2663bf4676 100644
--- a/tests/expectations/compiler/compiler/tuples/dependent.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/dependent.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: 153f83411b21a2696171a6eab83c81b40643fe9608ae61291858fbc0e256ea93
-    canonicalized_ast: 153f83411b21a2696171a6eab83c81b40643fe9608ae61291858fbc0e256ea93
-    type_inferenced_ast: 075b22f579fb7bebf6ed9af1e0cfddf27756d78ae5f39205b34898359658359c
+    initial_ast: a2a6a6b41de694d8203c33d3f90fc2c1526b604fb57ee4883b993e446b81e648
+    canonicalized_ast: a2a6a6b41de694d8203c33d3f90fc2c1526b604fb57ee4883b993e446b81e648
+    type_inferenced_ast: 2a1ef0e8fa141193320610df76dc78e6fb3db99f9db8f4ffa8221a90f90f7f40
diff --git a/tests/expectations/compiler/compiler/tuples/destructured.leo.out b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
index eabdddda6e..1363798751 100644
--- a/tests/expectations/compiler/compiler/tuples/destructured.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/destructured.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "true"
-    initial_ast: c39e1fc8bfa14ea666318da537826586eb930b9e9d97ee66742023eb2ff9ad4c
-    canonicalized_ast: c39e1fc8bfa14ea666318da537826586eb930b9e9d97ee66742023eb2ff9ad4c
-    type_inferenced_ast: db258d6cb1ddd585f603830905284d2a5c24d716116ce12c861b1a7f8e292ec7
+    initial_ast: 98996bc72276bc5cbf211e7559997e8e73a85fce60afd49aa88aee17d1634973
+    canonicalized_ast: 98996bc72276bc5cbf211e7559997e8e73a85fce60afd49aa88aee17d1634973
+    type_inferenced_ast: 664df8d84cc5ff6bcd4300df23227871ec938459b991d86384fdd1f15b3a89ca
diff --git a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
index a611960f44..c4af57aaf4 100644
--- a/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
+++ b/tests/expectations/compiler/compiler/tuples/nested_access.leo.out
@@ -19,6 +19,6 @@ outputs:
             c:
               type: bool
               value: "false"
-    initial_ast: f7a51cb79dbcebfecf8ae6fac14031ca7e6b72d7fa15281b9a0cc71500f02507
-    canonicalized_ast: f7a51cb79dbcebfecf8ae6fac14031ca7e6b72d7fa15281b9a0cc71500f02507
-    type_inferenced_ast: 837c32d828eb32b08e0378113a06d7c7483bfe6f40ee8322a3900749aa80d012
+    initial_ast: ef3718fc909a28703e2487661aafb3fc24a858428d79d2ab7bb3743a162ed6a1
+    canonicalized_ast: ef3718fc909a28703e2487661aafb3fc24a858428d79d2ab7bb3743a162ed6a1
+    type_inferenced_ast: 14e0a6cf8847f1a292a5b22db1173b6c5181e5d49d8f6046d072620a0e94ff07
diff --git a/tests/expectations/parser/parser/circuits/big_self.leo.out b/tests/expectations/parser/parser/circuits/big_self.leo.out
index 4d67804a46..7ab99429ca 100644
--- a/tests/expectations/parser/parser/circuits/big_self.leo.out
+++ b/tests/expectations/parser/parser/circuits/big_self.leo.out
@@ -41,13 +41,13 @@ outputs:
                   col_start: 26
                   col_stop: 6
                   path: ""
-                  content: "    function x() -> Self {\n...\n    }"
+                  content: "    function x() -> Self {\n         ...\n    }"
               span:
                 line_start: 4
                 line_stop: 6
                 col_start: 5
                 col_stop: 6
                 path: ""
-                content: "    function x() -> Self {\n...\n    }"
+                content: "    function x() -> Self {\n         ...\n    }"
     global_consts: {}
     functions: {}
diff --git a/tests/expectations/parser/parser/circuits/field_and_functions.leo.out b/tests/expectations/parser/parser/circuits/field_and_functions.leo.out
index 0a8efde0b0..2001535836 100644
--- a/tests/expectations/parser/parser/circuits/field_and_functions.leo.out
+++ b/tests/expectations/parser/parser/circuits/field_and_functions.leo.out
@@ -46,14 +46,14 @@ outputs:
                   col_start: 18
                   col_stop: 6
                   path: ""
-                  content: "    function x() {\n...\n    }"
+                  content: "    function x() {\n         ...\n    }"
               span:
                 line_start: 6
                 line_stop: 8
                 col_start: 5
                 col_stop: 6
                 path: ""
-                content: "    function x() {\n...\n    }"
+                content: "    function x() {\n         ...\n    }"
           - CircuitFunction:
               annotations: []
               identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":14,\\\"col_stop\\\":15,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    function y() {\\\"}\"}"
@@ -85,13 +85,13 @@ outputs:
                   col_start: 18
                   col_stop: 6
                   path: ""
-                  content: "    function y() {\n...\n    }"
+                  content: "    function y() {\n         ...\n    }"
               span:
                 line_start: 9
                 line_stop: 11
                 col_start: 5
                 col_stop: 6
                 path: ""
-                content: "    function y() {\n...\n    }"
+                content: "    function y() {\n         ...\n    }"
     global_consts: {}
     functions: {}
diff --git a/tests/expectations/parser/parser/circuits/functions.leo.out b/tests/expectations/parser/parser/circuits/functions.leo.out
index de67732577..456134649f 100644
--- a/tests/expectations/parser/parser/circuits/functions.leo.out
+++ b/tests/expectations/parser/parser/circuits/functions.leo.out
@@ -40,14 +40,14 @@ outputs:
                   col_start: 18
                   col_stop: 6
                   path: ""
-                  content: "    function x() {\n...\n    }"
+                  content: "    function x() {\n         ...\n    }"
               span:
                 line_start: 4
                 line_stop: 6
                 col_start: 5
                 col_stop: 6
                 path: ""
-                content: "    function x() {\n...\n    }"
+                content: "    function x() {\n         ...\n    }"
           - CircuitFunction:
               annotations: []
               identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":14,\\\"col_stop\\\":15,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    function y() {\\\"}\"}"
@@ -79,13 +79,13 @@ outputs:
                   col_start: 18
                   col_stop: 6
                   path: ""
-                  content: "    function y() {\n...\n    }"
+                  content: "    function y() {\n         ...\n    }"
               span:
                 line_start: 7
                 line_stop: 9
                 col_start: 5
                 col_stop: 6
                 path: ""
-                content: "    function y() {\n...\n    }"
+                content: "    function y() {\n         ...\n    }"
     global_consts: {}
     functions: {}
diff --git a/tests/expectations/parser/parser/circuits/mut_self.leo.out b/tests/expectations/parser/parser/circuits/mut_self.leo.out
index bbd0410f66..5aac598fe5 100644
--- a/tests/expectations/parser/parser/circuits/mut_self.leo.out
+++ b/tests/expectations/parser/parser/circuits/mut_self.leo.out
@@ -41,13 +41,13 @@ outputs:
                   col_start: 26
                   col_stop: 6
                   path: ""
-                  content: "    function x(mut self) {\n...\n    }"
+                  content: "    function x(mut self) {\n         ...\n    }"
               span:
                 line_start: 4
                 line_stop: 6
                 col_start: 5
                 col_stop: 6
                 path: ""
-                content: "    function x(mut self) {\n...\n    }"
+                content: "    function x(mut self) {\n         ...\n    }"
     global_consts: {}
     functions: {}
diff --git a/tests/expectations/parser/parser/circuits/self.leo.out b/tests/expectations/parser/parser/circuits/self.leo.out
index bf8a1bfaf7..728f595922 100644
--- a/tests/expectations/parser/parser/circuits/self.leo.out
+++ b/tests/expectations/parser/parser/circuits/self.leo.out
@@ -41,13 +41,13 @@ outputs:
                   col_start: 22
                   col_stop: 6
                   path: ""
-                  content: "    function x(self) {\n...\n    }"
+                  content: "    function x(self) {\n         ...\n    }"
               span:
                 line_start: 4
                 line_stop: 6
                 col_start: 5
                 col_stop: 6
                 path: ""
-                content: "    function x(self) {\n...\n    }"
+                content: "    function x(self) {\n         ...\n    }"
     global_consts: {}
     functions: {}
diff --git a/tests/expectations/parser/parser/functions/annotated.leo.out b/tests/expectations/parser/parser/functions/annotated.leo.out
index 447958aff6..36507df8ff 100644
--- a/tests/expectations/parser/parser/functions/annotated.leo.out
+++ b/tests/expectations/parser/parser/functions/annotated.leo.out
@@ -48,11 +48,11 @@ outputs:
             col_start: 14
             col_stop: 2
             path: ""
-            content: "function x() {\n...\n}"
+            content: "function x() {\n     ...\n}"
         span:
           line_start: 4
           line_stop: 6
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x() {\n...\n}"
+          content: "function x() {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/annotated_param.leo.out b/tests/expectations/parser/parser/functions/annotated_param.leo.out
index c3103b64c2..a2654b5268 100644
--- a/tests/expectations/parser/parser/functions/annotated_param.leo.out
+++ b/tests/expectations/parser/parser/functions/annotated_param.leo.out
@@ -49,11 +49,11 @@ outputs:
             col_start: 14
             col_stop: 2
             path: ""
-            content: "function x() {\n...\n}"
+            content: "function x() {\n     ...\n}"
         span:
           line_start: 4
           line_stop: 6
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x() {\n...\n}"
+          content: "function x() {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/annotated_twice.leo.out b/tests/expectations/parser/parser/functions/annotated_twice.leo.out
index 9ca087d95b..2d67d2236c 100644
--- a/tests/expectations/parser/parser/functions/annotated_twice.leo.out
+++ b/tests/expectations/parser/parser/functions/annotated_twice.leo.out
@@ -57,11 +57,11 @@ outputs:
             col_start: 14
             col_stop: 2
             path: ""
-            content: "function x() {\n...\n}"
+            content: "function x() {\n     ...\n}"
         span:
           line_start: 4
           line_stop: 6
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x() {\n...\n}"
+          content: "function x() {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/const_param.leo.out b/tests/expectations/parser/parser/functions/const_param.leo.out
index eecb5eb51d..1a7d0c68dd 100644
--- a/tests/expectations/parser/parser/functions/const_param.leo.out
+++ b/tests/expectations/parser/parser/functions/const_param.leo.out
@@ -65,14 +65,14 @@ outputs:
             col_start: 34
             col_stop: 2
             path: ""
-            content: "function x(x: u32, const y: i32) {\n...\n}"
+            content: "function x(x: u32, const y: i32) {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(x: u32, const y: i32) {\n...\n}"
+          content: "function x(x: u32, const y: i32) {\n     ...\n}"
       "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u32, y: i32) {\\\"}\"}":
         annotations: []
         identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u32, y: i32) {\\\"}\"}"
@@ -130,11 +130,11 @@ outputs:
             col_start: 34
             col_stop: 2
             path: ""
-            content: "function x(const x: u32, y: i32) {\n...\n}"
+            content: "function x(const x: u32, y: i32) {\n     ...\n}"
         span:
           line_start: 7
           line_stop: 9
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(const x: u32, y: i32) {\n...\n}"
+          content: "function x(const x: u32, y: i32) {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/const_self_bad.leo.out b/tests/expectations/parser/parser/functions/const_self_bad.leo.out
index 60b7a2fbda..0bce0f5a14 100644
--- a/tests/expectations/parser/parser/functions/const_self_bad.leo.out
+++ b/tests/expectations/parser/parser/functions/const_self_bad.leo.out
@@ -40,11 +40,11 @@ outputs:
             col_start: 24
             col_stop: 2
             path: ""
-            content: "function x(const self) {\n...\n}"
+            content: "function x(const self) {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(const self) {\n...\n}"
+          content: "function x(const self) {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/empty.leo.out b/tests/expectations/parser/parser/functions/empty.leo.out
index eed8a3d595..74f3b12e79 100644
--- a/tests/expectations/parser/parser/functions/empty.leo.out
+++ b/tests/expectations/parser/parser/functions/empty.leo.out
@@ -39,11 +39,11 @@ outputs:
             col_start: 14
             col_stop: 2
             path: ""
-            content: "function x() {\n...\n}"
+            content: "function x() {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x() {\n...\n}"
+          content: "function x() {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/param_array.leo.out b/tests/expectations/parser/parser/functions/param_array.leo.out
index 115a79fe88..367878395b 100644
--- a/tests/expectations/parser/parser/functions/param_array.leo.out
+++ b/tests/expectations/parser/parser/functions/param_array.leo.out
@@ -54,11 +54,11 @@ outputs:
             col_start: 25
             col_stop: 2
             path: ""
-            content: "function x(x: [u8; 12]) {\n...\n}"
+            content: "function x(x: [u8; 12]) {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(x: [u8; 12]) {\n...\n}"
+          content: "function x(x: [u8; 12]) {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/param_circuit.leo.out b/tests/expectations/parser/parser/functions/param_circuit.leo.out
index cbfae352d5..45bb7dcde7 100644
--- a/tests/expectations/parser/parser/functions/param_circuit.leo.out
+++ b/tests/expectations/parser/parser/functions/param_circuit.leo.out
@@ -52,11 +52,11 @@ outputs:
             col_start: 26
             col_stop: 2
             path: ""
-            content: "function x(x: MyCircuit) {\n...\n}"
+            content: "function x(x: MyCircuit) {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(x: MyCircuit) {\n...\n}"
+          content: "function x(x: MyCircuit) {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/param_tuple.leo.out b/tests/expectations/parser/parser/functions/param_tuple.leo.out
index c6c615f19f..ef7a74d3de 100644
--- a/tests/expectations/parser/parser/functions/param_tuple.leo.out
+++ b/tests/expectations/parser/parser/functions/param_tuple.leo.out
@@ -54,11 +54,11 @@ outputs:
             col_start: 27
             col_stop: 2
             path: ""
-            content: "function x(x: (u32, i32)) {\n...\n}"
+            content: "function x(x: (u32, i32)) {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(x: (u32, i32)) {\n...\n}"
+          content: "function x(x: (u32, i32)) {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/params.leo.out b/tests/expectations/parser/parser/functions/params.leo.out
index c4f953e3ab..d1ea6ac6c4 100644
--- a/tests/expectations/parser/parser/functions/params.leo.out
+++ b/tests/expectations/parser/parser/functions/params.leo.out
@@ -65,11 +65,11 @@ outputs:
             col_start: 28
             col_stop: 2
             path: ""
-            content: "function x(x: u32, y: i32) {\n...\n}"
+            content: "function x(x: u32, y: i32) {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(x: u32, y: i32) {\n...\n}"
+          content: "function x(x: u32, y: i32) {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/params_return.leo.out b/tests/expectations/parser/parser/functions/params_return.leo.out
index 39a67ccd35..194d6069d2 100644
--- a/tests/expectations/parser/parser/functions/params_return.leo.out
+++ b/tests/expectations/parser/parser/functions/params_return.leo.out
@@ -66,11 +66,11 @@ outputs:
             col_start: 35
             col_stop: 2
             path: ""
-            content: "function x(x: u32, y: i32) -> u32 {\n...\n}"
+            content: "function x(x: u32, y: i32) -> u32 {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x(x: u32, y: i32) -> u32 {\n...\n}"
+          content: "function x(x: u32, y: i32) -> u32 {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/return.leo.out b/tests/expectations/parser/parser/functions/return.leo.out
index a608443be1..9d8f155ffa 100644
--- a/tests/expectations/parser/parser/functions/return.leo.out
+++ b/tests/expectations/parser/parser/functions/return.leo.out
@@ -40,11 +40,11 @@ outputs:
             col_start: 21
             col_stop: 2
             path: ""
-            content: "function x() -> u32 {\n...\n}"
+            content: "function x() -> u32 {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x() -> u32 {\n...\n}"
+          content: "function x() -> u32 {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/functions/return_tuple.leo.out b/tests/expectations/parser/parser/functions/return_tuple.leo.out
index ab2ed0316a..cd07553041 100644
--- a/tests/expectations/parser/parser/functions/return_tuple.leo.out
+++ b/tests/expectations/parser/parser/functions/return_tuple.leo.out
@@ -42,11 +42,11 @@ outputs:
             col_start: 28
             col_stop: 2
             path: ""
-            content: "function x() -> (u32, u32) {\n...\n}"
+            content: "function x() -> (u32, u32) {\n     ...\n}"
         span:
           line_start: 3
           line_stop: 5
           col_start: 1
           col_stop: 2
           path: ""
-          content: "function x() -> (u32, u32) {\n...\n}"
+          content: "function x() -> (u32, u32) {\n     ...\n}"
diff --git a/tests/expectations/parser/parser/import/many_import.leo.out b/tests/expectations/parser/parser/import/many_import.leo.out
index 2354a64596..fe11e6dc50 100644
--- a/tests/expectations/parser/parser/import/many_import.leo.out
+++ b/tests/expectations/parser/parser/import/many_import.leo.out
@@ -35,14 +35,14 @@ outputs:
               col_start: 8
               col_stop: 8
               path: ""
-              content: "import test-import.( // local import\n...\n    foo,"
+              content: "import test-import.( // local import\n         ...\n    foo,"
         span:
           line_start: 3
           line_stop: 5
           col_start: 8
           col_stop: 8
           path: ""
-          content: "import test-import.( // local import\n...\n    foo,"
+          content: "import test-import.( // local import\n         ...\n    foo,"
       - package_or_packages:
           Packages:
             name: "{\"name\":\"bar\",\"span\":\"{\\\"line_start\\\":8,\\\"line_stop\\\":8,\\\"col_start\\\":8,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"import bar.( // imports directory import\\\"}\"}"
@@ -123,14 +123,14 @@ outputs:
               col_start: 8
               col_stop: 16
               path: ""
-              content: "import bar.( // imports directory import\n...\n    bat.bat.Bat,"
+              content: "import bar.( // imports directory import\n         ...\n         ...\n    bat.bat.Bat,"
         span:
           line_start: 8
           line_stop: 11
           col_start: 8
           col_stop: 16
           path: ""
-          content: "import bar.( // imports directory import\n...\n    bat.bat.Bat,"
+          content: "import bar.( // imports directory import\n         ...\n         ...\n    bat.bat.Bat,"
     circuits: {}
     global_consts: {}
     functions: {}
diff --git a/tests/expectations/parser/parser/statement/block.leo.out b/tests/expectations/parser/parser/statement/block.leo.out
index 29ec5fe1f8..4ad226b576 100644
--- a/tests/expectations/parser/parser/statement/block.leo.out
+++ b/tests/expectations/parser/parser/statement/block.leo.out
@@ -37,7 +37,7 @@ outputs:
         col_start: 1
         col_stop: 2
         path: ""
-        content: "{\n...\n}"
+        content: "{\n     ...\n}"
   - Block:
       statements:
         - Block:
@@ -84,14 +84,14 @@ outputs:
               col_start: 1
               col_stop: 2
               path: ""
-              content: "{\n...\n}"
+              content: "{\n     ...\n}"
       span:
         line_start: 1
         line_stop: 5
         col_start: 1
         col_stop: 2
         path: ""
-        content: "{\n...\n}"
+        content: "{\n     ...\n     ...\n     ...\n}"
   - Block:
       statements:
         - Conditional:
@@ -123,7 +123,7 @@ outputs:
                 col_start: 6
                 col_stop: 2
                 path: ""
-                content: "if x {\n...\n}"
+                content: "if x {\n     ...\n}"
             next: ~
             span:
               line_start: 2
@@ -131,11 +131,11 @@ outputs:
               col_start: 1
               col_stop: 2
               path: ""
-              content: "if x {\n...\n}"
+              content: "if x {\n     ...\n}"
       span:
         line_start: 1
         line_stop: 5
         col_start: 1
         col_stop: 2
         path: ""
-        content: "{\n...\n}"
+        content: "{\n     ...\n     ...\n     ...\n}"
diff --git a/tests/expectations/parser/parser/statement/conditional.leo.out b/tests/expectations/parser/parser/statement/conditional.leo.out
index dcac2a651e..3fd8752374 100644
--- a/tests/expectations/parser/parser/statement/conditional.leo.out
+++ b/tests/expectations/parser/parser/statement/conditional.leo.out
@@ -31,7 +31,7 @@ outputs:
           col_start: 6
           col_stop: 2
           path: ""
-          content: "if x {\n...\n}"
+          content: "if x {\n     ...\n}"
       next: ~
       span:
         line_start: 1
@@ -39,7 +39,7 @@ outputs:
         col_start: 1
         col_stop: 2
         path: ""
-        content: "if x {\n...\n}"
+        content: "if x {\n     ...\n}"
   - Conditional:
       condition:
         Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if Self {\\\"}\"}"
@@ -69,7 +69,7 @@ outputs:
           col_start: 9
           col_stop: 2
           path: ""
-          content: "if Self {\n...\n}"
+          content: "if Self {\n     ...\n}"
       next: ~
       span:
         line_start: 1
@@ -77,7 +77,7 @@ outputs:
         col_start: 1
         col_stop: 2
         path: ""
-        content: "if Self {\n...\n}"
+        content: "if Self {\n     ...\n}"
   - Conditional:
       condition:
         Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if (x) {\\\"}\"}"
@@ -107,7 +107,7 @@ outputs:
           col_start: 8
           col_stop: 2
           path: ""
-          content: "if (x) {\n...\n}"
+          content: "if (x) {\n     ...\n}"
       next: ~
       span:
         line_start: 1
@@ -115,7 +115,7 @@ outputs:
         col_start: 1
         col_stop: 2
         path: ""
-        content: "if (x) {\n...\n}"
+        content: "if (x) {\n     ...\n}"
   - Conditional:
       condition:
         Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if (x) {} else {}\\\"}\"}"
@@ -269,7 +269,7 @@ outputs:
           col_start: 8
           col_stop: 2
           path: ""
-          content: "if x+y {\n...\n}"
+          content: "if x+y {\n     ...\n     ...\n}"
       next: ~
       span:
         line_start: 1
@@ -277,4 +277,4 @@ outputs:
         col_start: 1
         col_stop: 2
         path: ""
-        content: "if x+y {\n...\n}\n"
+        content: "if x+y {\n     ...\n     ...\n}"
diff --git a/tests/expectations/parser/parser/statement/iteration.leo.out b/tests/expectations/parser/parser/statement/iteration.leo.out
index 93945a6d4a..77c4649a09 100644
--- a/tests/expectations/parser/parser/statement/iteration.leo.out
+++ b/tests/expectations/parser/parser/statement/iteration.leo.out
@@ -90,14 +90,14 @@ outputs:
           col_start: 15
           col_stop: 2
           path: ""
-          content: "for x in 0..7 {\n...\n}"
+          content: "for x in 0..7 {\n     ...\n}"
       span:
         line_start: 1
         line_stop: 3
         col_start: 1
         col_stop: 2
         path: ""
-        content: "for x in 0..7 {\n...\n}"
+        content: "for x in 0..7 {\n     ...\n}"
   - Iteration:
       variable: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"for x in 0..99u8 {\\\"}\"}"
       start:
@@ -148,14 +148,14 @@ outputs:
           col_start: 18
           col_stop: 2
           path: ""
-          content: "for x in 0..99u8 {\n...\n}"
+          content: "for x in 0..99u8 {\n     ...\n}"
       span:
         line_start: 1
         line_stop: 3
         col_start: 1
         col_stop: 2
         path: ""
-        content: "for x in 0..99u8 {\n...\n}"
+        content: "for x in 0..99u8 {\n     ...\n}"
   - Iteration:
       variable: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"for x in 0..Self {\\\"}\"}"
       start:
@@ -197,11 +197,11 @@ outputs:
           col_start: 18
           col_stop: 2
           path: ""
-          content: "for x in 0..Self {\n...\n}"
+          content: "for x in 0..Self {\n     ...\n}"
       span:
         line_start: 1
         line_stop: 3
         col_start: 1
         col_stop: 2
         path: ""
-        content: "for x in 0..Self {\n...\n}"
+        content: "for x in 0..Self {\n     ...\n}"