diff --git a/compiler/compiler/src/test.rs b/compiler/compiler/src/test.rs
index 45743e4205..5993fae442 100644
--- a/compiler/compiler/src/test.rs
+++ b/compiler/compiler/src/test.rs
@@ -194,13 +194,12 @@ fn compile_and_process<'a>(parsed: &'a mut Compiler<'a>, handler: &Handler) -> R
     let st = parsed.symbol_table_pass()?;
     let st = parsed.type_checker_pass(st)?;
     let st = parsed.loop_unrolling_pass(st)?;
+
     parsed.static_single_assignment_pass(&st)?;
 
     // Compile Leo program to bytecode.
     let bytecode = CodeGenerator::do_pass((&parsed.ast, handler))?;
 
-    println!("\n{}\n", bytecode);
-
     Ok(bytecode)
 }
 
diff --git a/compiler/passes/src/loop_unrolling/unroll_program.rs b/compiler/passes/src/loop_unrolling/unroll_program.rs
index 0fc42f9efd..18090cf9fb 100644
--- a/compiler/passes/src/loop_unrolling/unroll_program.rs
+++ b/compiler/passes/src/loop_unrolling/unroll_program.rs
@@ -22,15 +22,38 @@ use crate::Unroller;
 
 impl ProgramReconstructor for Unroller<'_> {
     fn reconstruct_function(&mut self, function: Function) -> Function {
-        let function_name = function.name();
+        // Lookup function metadata in the symbol table.
+        // Note that this unwrap is safe since function metadata is stored in a prior pass.
+        let function_index = self
+            .symbol_table
+            .borrow()
+            .lookup_fn_symbol(function.identifier.name)
+            .unwrap()
+            .id;
 
-        // Grab our function scope.
-        let prev_st = std::mem::take(&mut self.symbol_table);
-        self.symbol_table
-            .swap(prev_st.borrow().lookup_fn_scope(function_name).unwrap());
-        self.symbol_table.borrow_mut().parent = Some(Box::new(prev_st.into_inner()));
-        // Set our current block scope index to 0
-        self.block_index = 0;
+        // Enter the function's scope.
+        let previous_function_index = self.enter_scope(function_index);
+
+        let previous_scope_index = self.enter_scope(self.scope_index);
+
+        let block = self.reconstruct_block(function.block);
+
+        self.exit_scope(previous_scope_index);
+
+        let finalize = function.finalize.map(|finalize| {
+            let previous_scope_index = self.enter_scope(self.scope_index);
+
+            let block = self.reconstruct_block(finalize.block);
+
+            self.exit_scope(previous_scope_index);
+
+            Finalize {
+                input: finalize.input,
+                output: finalize.output,
+                block,
+                span: finalize.span,
+            }
+        });
 
         // Reconstruct the function block.
         let reconstructed_function = Function {
@@ -38,15 +61,13 @@ impl ProgramReconstructor for Unroller<'_> {
             identifier: function.identifier,
             input: function.input,
             output: function.output,
-            block: self.reconstruct_block(function.block),
-            finalize: function.finalize,
+            block,
+            finalize,
             span: function.span,
         };
 
-        // Pop back to parent scope.
-        let prev_st = *self.symbol_table.borrow_mut().parent.take().unwrap();
-        self.symbol_table.swap(prev_st.lookup_fn_scope(function_name).unwrap());
-        self.symbol_table = RefCell::new(prev_st);
+        // Exit the function's scope.
+        self.exit_scope(previous_function_index);
 
         reconstructed_function
     }
diff --git a/compiler/passes/src/loop_unrolling/unroll_statement.rs b/compiler/passes/src/loop_unrolling/unroll_statement.rs
index 37c605c56f..744f46dcdf 100644
--- a/compiler/passes/src/loop_unrolling/unroll_statement.rs
+++ b/compiler/passes/src/loop_unrolling/unroll_statement.rs
@@ -24,8 +24,7 @@ impl StatementReconstructor for Unroller<'_> {
         let scope_index = self.current_scope_index();
 
         // Enter the block scope.
-        self.enter_block_scope(scope_index);
-        self.block_index = 0;
+        let previous_scope_index = self.enter_scope(scope_index);
 
         let block = Block {
             statements: input
@@ -37,8 +36,7 @@ impl StatementReconstructor for Unroller<'_> {
         };
 
         // Exit the block scope.
-        self.exit_block_scope(scope_index);
-        self.block_index = scope_index + 1;
+        self.exit_scope(previous_scope_index);
 
         block
     }
diff --git a/compiler/passes/src/loop_unrolling/unroller.rs b/compiler/passes/src/loop_unrolling/unroller.rs
index 5e30affe9f..98801d0de2 100644
--- a/compiler/passes/src/loop_unrolling/unroller.rs
+++ b/compiler/passes/src/loop_unrolling/unroller.rs
@@ -27,8 +27,8 @@ use crate::{Clusivity, LoopBound, RangeIterator, SymbolTable};
 pub struct Unroller<'a> {
     /// The symbol table for the function being processed.
     pub(crate) symbol_table: RefCell<SymbolTable>,
-    /// The index of the current block scope.
-    pub(crate) block_index: usize,
+    /// The index of the current scope.
+    pub(crate) scope_index: usize,
     /// An error handler used for any errors found during unrolling.
     pub(crate) handler: &'a Handler,
     /// Are we in the midst of unrolling a loop?
@@ -39,7 +39,7 @@ impl<'a> Unroller<'a> {
     pub(crate) fn new(symbol_table: SymbolTable, handler: &'a Handler) -> Self {
         Self {
             symbol_table: RefCell::new(symbol_table),
-            block_index: 0,
+            scope_index: 0,
             handler,
             is_unrolling: false,
         }
@@ -51,23 +51,25 @@ impl<'a> Unroller<'a> {
         if self.is_unrolling {
             self.symbol_table.borrow_mut().insert_block()
         } else {
-            self.block_index
+            self.scope_index
         }
     }
 
-    /// Enters a child block scope.
-    pub(crate) fn enter_block_scope(&mut self, index: usize) {
+    /// Enters a child scope.
+    pub(crate) fn enter_scope(&mut self, index: usize) -> usize {
         let previous_symbol_table = std::mem::take(&mut self.symbol_table);
         self.symbol_table
             .swap(previous_symbol_table.borrow().lookup_scope_by_index(index).unwrap());
         self.symbol_table.borrow_mut().parent = Some(Box::new(previous_symbol_table.into_inner()));
+        core::mem::replace(&mut self.scope_index, 0)
     }
 
     /// Exits the current block scope.
-    pub(crate) fn exit_block_scope(&mut self, index: usize) {
+    pub(crate) fn exit_scope(&mut self, index: usize) {
         let prev_st = *self.symbol_table.borrow_mut().parent.take().unwrap();
         self.symbol_table.swap(prev_st.lookup_scope_by_index(index).unwrap());
         self.symbol_table = RefCell::new(prev_st);
+        self.scope_index = index + 1;
     }
 
     /// Unrolls an IterationStatement.
@@ -104,8 +106,7 @@ impl<'a> Unroller<'a> {
         let scope_index = self.current_scope_index();
 
         // Enter the scope of the loop body.
-        self.enter_block_scope(scope_index);
-        self.block_index = 0;
+        let previous_scope_index = self.enter_scope(scope_index);
 
         // Clear the symbol table for the loop body.
         // This is necessary because loop unrolling transforms the program, which requires reconstructing the symbol table.
@@ -132,8 +133,7 @@ impl<'a> Unroller<'a> {
         });
 
         // Exit the scope of the loop body.
-        self.exit_block_scope(scope_index);
-        self.block_index = scope_index + 1;
+        self.exit_scope(previous_scope_index);
 
         iter_blocks
     }
@@ -142,7 +142,7 @@ impl<'a> Unroller<'a> {
     fn unroll_single_iteration<I: LoopBound>(&mut self, input: &IterationStatement, iteration_count: I) -> Statement {
         // Create a scope for a single unrolling of the `IterationStatement`.
         let scope_index = self.symbol_table.borrow_mut().insert_block();
-        self.enter_block_scope(scope_index);
+        let previous_scope_index = self.enter_scope(scope_index);
 
         let prior_is_unrolling = self.is_unrolling;
         self.is_unrolling = true;
@@ -206,7 +206,7 @@ impl<'a> Unroller<'a> {
         self.is_unrolling = prior_is_unrolling;
 
         // Exit the scope.
-        self.exit_block_scope(scope_index);
+        self.exit_scope(previous_scope_index);
 
         block
     }
diff --git a/compiler/passes/src/static_single_assignment/rename_expression.rs b/compiler/passes/src/static_single_assignment/rename_expression.rs
index 3ce4bd6c1f..5d66179dfd 100644
--- a/compiler/passes/src/static_single_assignment/rename_expression.rs
+++ b/compiler/passes/src/static_single_assignment/rename_expression.rs
@@ -17,7 +17,11 @@
 use crate::StaticSingleAssigner;
 use itertools::Itertools;
 
-use leo_ast::{AccessExpression, AssociatedFunction, BinaryExpression, CallExpression, CircuitExpression, CircuitMember, CircuitVariableInitializer, ErrExpression, Expression, ExpressionConsumer, Identifier, Literal, MemberAccess, Statement, TernaryExpression, TupleAccess, TupleExpression, UnaryExpression};
+use leo_ast::{
+    AccessExpression, AssociatedFunction, BinaryExpression, CallExpression, CircuitExpression, CircuitMember,
+    CircuitVariableInitializer, ErrExpression, Expression, ExpressionConsumer, Identifier, Literal, MemberAccess,
+    Statement, TernaryExpression, TupleAccess, TupleExpression, UnaryExpression,
+};
 
 impl ExpressionConsumer for StaticSingleAssigner<'_> {
     type Output = (Expression, Vec<Statement>);
@@ -162,7 +166,7 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
 
         // Add the variable to the set of circuit variables.
         match place {
-            Expression::Identifier(identifier) => self.circuits.insert(identifier.name),
+            Expression::Identifier(identifier) => self.circuits.insert(identifier.name, input.name.name),
             _ => unreachable!("`place` is always an identifier"),
         };
 
@@ -187,10 +191,11 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
             }
             // Otherwise, we look up the previous name in the `RenameTable`.
             false => *self.rename_table.lookup(identifier.name).unwrap_or_else(|| {
-                panic!(
-                    "SSA Error: An entry in the `RenameTable` for {} should exist.",
-                    identifier.name
-                )
+                &identifier.name
+                // panic!(
+                //     "SSA Error: An entry in the `RenameTable` for {} should exist.",
+                //     identifier.name
+                // )
             }),
         };
 
@@ -245,31 +250,47 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
             }
             // If the `true` and `false` cases are circuits, handle the appropriately.
             // Note that type checking guarantees that both expressions have the same same type.
-            (Expression::Identifier(first), Expression::Identifier(second)) if self.circuits.contains(&first.name) && self.circuits.contains(&second.name) => {
-                let first_circuit = self.symbol_table.lookup_circuit(first.name).unwrap();
-                let second_circuit = self.symbol_table.lookup_circuit(second.name).unwrap();
+            (Expression::Identifier(first), Expression::Identifier(second))
+                if self.circuits.contains_key(&first.name) && self.circuits.contains_key(&second.name) =>
+            {
+                // TODO: Document.
+                let first_circuit = self
+                    .symbol_table
+                    .lookup_circuit(*self.circuits.get(&first.name).unwrap())
+                    .unwrap();
+                let second_circuit = self
+                    .symbol_table
+                    .lookup_circuit(*self.circuits.get(&second.name).unwrap())
+                    .unwrap();
                 assert_eq!(first_circuit, second_circuit);
 
                 // For each circuit member, construct a new ternary expression.
-                let members = first_circuit.members.iter().map(|CircuitMember::CircuitVariable(id, _)| {
-                    let (expression, stmts) = self.consume_ternary(TernaryExpression {
-                        condition: Box::new(cond_expr.clone()),
-                        if_true: Box::new(Expression::Access(AccessExpression::Member(MemberAccess {
-                            inner: Box::new(Expression::Identifier(first)),
-                            name: *id,
-                            span: Default::default()
-                        }))),
-                        if_false: Box::new(Expression::Access(AccessExpression::Member(MemberAccess {
-                            inner: Box::new(Expression::Identifier(second)),
-                            name: *id,
-                            span: Default::default()
-                        }))),
-                        span: Default::default(),
-                    });
-                    statements.extend(stmts);
+                let members = first_circuit
+                    .members
+                    .iter()
+                    .map(|CircuitMember::CircuitVariable(id, _)| {
+                        let (expression, stmts) = self.consume_ternary(TernaryExpression {
+                            condition: Box::new(cond_expr.clone()),
+                            if_true: Box::new(Expression::Access(AccessExpression::Member(MemberAccess {
+                                inner: Box::new(Expression::Identifier(first)),
+                                name: *id,
+                                span: Default::default(),
+                            }))),
+                            if_false: Box::new(Expression::Access(AccessExpression::Member(MemberAccess {
+                                inner: Box::new(Expression::Identifier(second)),
+                                name: *id,
+                                span: Default::default(),
+                            }))),
+                            span: Default::default(),
+                        });
+                        statements.extend(stmts);
 
-                    CircuitVariableInitializer { identifier: *id, expression: Some(expression) }
-                }).collect();
+                        CircuitVariableInitializer {
+                            identifier: *id,
+                            expression: Some(expression),
+                        }
+                    })
+                    .collect();
 
                 let (expr, stmts) = self.consume_circuit_init(CircuitExpression {
                     name: first_circuit.identifier,
diff --git a/compiler/passes/src/static_single_assignment/static_single_assigner.rs b/compiler/passes/src/static_single_assignment/static_single_assigner.rs
index 605eda1828..7b689750a7 100644
--- a/compiler/passes/src/static_single_assignment/static_single_assigner.rs
+++ b/compiler/passes/src/static_single_assignment/static_single_assigner.rs
@@ -16,14 +16,11 @@
 
 use crate::{RenameTable, SymbolTable};
 
-use leo_ast::{
-    AssignStatement, Expression, ExpressionConsumer, Identifier,
-    Statement, TernaryExpression,
-};
+use leo_ast::{AssignStatement, Circuit, Expression, ExpressionConsumer, Identifier, Statement, TernaryExpression};
 use leo_errors::emitter::Handler;
 use leo_span::Symbol;
 
-use indexmap::IndexSet;
+use indexmap::{IndexMap, IndexSet};
 use std::fmt::Display;
 
 pub struct StaticSingleAssigner<'a> {
@@ -38,7 +35,7 @@ pub struct StaticSingleAssigner<'a> {
     /// A flag to determine whether or not the traversal is on the left-hand side of a definition or an assignment.
     pub(crate) is_lhs: bool,
     /// The set of variables that are circuits.
-    pub(crate) circuits: IndexSet<Symbol>,
+    pub(crate) circuits: IndexMap<Symbol, Symbol>,
     /// A stack of condition `Expression`s visited up to the current point in the AST.
     pub(crate) condition_stack: Vec<Expression>,
     /// A list containing tuples of guards and expressions associated with early `ReturnStatement`s.
@@ -57,7 +54,7 @@ impl<'a> StaticSingleAssigner<'a> {
             _handler: handler,
             counter: 0,
             is_lhs: false,
-            circuits: IndexSet::new(),
+            circuits: IndexMap::new(),
             condition_stack: Vec::new(),
             early_returns: Vec::new(),
             early_finalizes: Vec::new(),
@@ -73,10 +70,13 @@ impl<'a> StaticSingleAssigner<'a> {
     /// Constructs the assignment statement `place = expr;`.
     /// This function should be the only place where `AssignStatement`s are constructed.
     pub(crate) fn simple_assign_statement(&mut self, identifier: Identifier, value: Expression) -> Statement {
-        if matches!(value, Expression::Circuit(_)) {
-            self.circuits.insert(identifier.name);
+        if let Expression::Circuit(expr) = &value {
+            self.circuits.insert(identifier.name, expr.name.name);
         }
 
+        // Update the rename table.
+        self.rename_table.update(identifier.name, identifier.name);
+
         Statement::Assign(Box::new(AssignStatement {
             place: Expression::Identifier(identifier),
             value,
@@ -95,9 +95,6 @@ impl<'a> StaticSingleAssigner<'a> {
             span: Default::default(),
         };
 
-        // Update the rename table.
-        self.rename_table.update(name, name);
-
         (Expression::Identifier(place), self.simple_assign_statement(place, expr))
     }
 
diff --git a/compiler/passes/src/type_checking/check_statements.rs b/compiler/passes/src/type_checking/check_statements.rs
index b846c8df8c..16e75288b1 100644
--- a/compiler/passes/src/type_checking/check_statements.rs
+++ b/compiler/passes/src/type_checking/check_statements.rs
@@ -72,7 +72,13 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> {
     }
 
     fn visit_block(&mut self, input: &'a Block) {
+        // Create a new scope for the then-block.
+        let scope_index = self.create_child_scope();
+
         input.statements.iter().for_each(|stmt| self.visit_statement(stmt));
+
+        // Exit the scope for the then-block.
+        self.exit_scope(scope_index);
     }
 
     fn visit_conditional(&mut self, input: &'a ConditionalStatement) {
@@ -89,14 +95,8 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> {
         // Set the `has_finalize` flag for the then-block.
         let previous_has_finalize = core::mem::replace(&mut self.has_finalize, then_block_has_finalize);
 
-        // Create a new scope for the then-block.
-        let scope_index = self.symbol_table.borrow_mut().insert_block();
-
         self.visit_block(&input.then);
 
-        // Exit the scope for the then-block.
-        self.exit_scope(scope_index);
-
         // Store the `has_return` flag for the then-block.
         then_block_has_return = self.has_return;
         // Store the `has_finalize` flag for the then-block.
@@ -110,14 +110,8 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> {
 
             match &**otherwise {
                 Statement::Block(stmt) => {
-                    // Create a new scope for the otherwise-block.
-                    let scope_index = self.symbol_table.borrow_mut().insert_block();
-
                     // Visit the otherwise-block.
                     self.visit_block(stmt);
-
-                    // Exit the scope for the otherwise-block.
-                    self.exit_scope(scope_index);
                 }
                 Statement::Conditional(stmt) => self.visit_conditional(stmt),
                 _ => unreachable!("Else-case can only be a block or conditional statement."),
diff --git a/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo b/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo
index 5ced98b02d..c024676521 100644
--- a/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo
+++ b/tests/compiler/circuits/circuit_function_namespace_conflict_fail.leo
@@ -1,8 +1,6 @@
 /*
 namespace: Compile
 expectation: Fail
-input_file:
- - inputs/dummy.in
 */
 
 circuit Foo {
@@ -13,4 +11,4 @@ function Foo() {}
 
 function main(y: bool) -> bool {
     return y;
-}
\ No newline at end of file
+}
diff --git a/tests/compiler/circuits/input/dummy.in b/tests/compiler/circuits/input/dummy.in
index d63f21e6b5..0723a5f44a 100644
--- a/tests/compiler/circuits/input/dummy.in
+++ b/tests/compiler/circuits/input/dummy.in
@@ -2,5 +2,3 @@
 y: bool = true;
 x: bool = false;
 
-[registers]
-r0: bool = true;
diff --git a/tests/expectations/compiler/address/binary.out b/tests/expectations/compiler/address/binary.out
index 70db288b16..7f26602236 100644
--- a/tests/expectations/compiler/address/binary.out
+++ b/tests/expectations/compiler/address/binary.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ef995e1b03c6e17ab0a2f908f4cd7957ea281fdc38834cbaed1dac75086b6eef
-    initial_ast: b18b6656785a42de8426a6eb1ca6d7bce97c885365ba466898392b6842b6a151
-    unrolled_ast: b18b6656785a42de8426a6eb1ca6d7bce97c885365ba466898392b6842b6a151
-    ssa_ast: 89cb569bf12119c2433f69a7df2ac78d480a211ec881e7c98f30dfd333bd9ba9
+    initial_ast: a63e068c986377bf8be47478cd7207659e7f6e0e593c3e53c8a7a5fdc1024adb
+    unrolled_ast: a63e068c986377bf8be47478cd7207659e7f6e0e593c3e53c8a7a5fdc1024adb
+    ssa_ast: d98d07f2ba62b90a97d14cb35b3a37864ca18e7d2c21d95c75a876cba65827a3
diff --git a/tests/expectations/compiler/address/branch.out b/tests/expectations/compiler/address/branch.out
index 10e981691e..20eb77d86b 100644
--- a/tests/expectations/compiler/address/branch.out
+++ b/tests/expectations/compiler/address/branch.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8a386677fc570d7f57e8e5259334608ddef2d04d55e1aea9aa591c1d95bc84b7
-    initial_ast: 959683622f187f0d14be8023aa94d86c836ee4954cbafaed859d4e327289a4c3
-    unrolled_ast: 959683622f187f0d14be8023aa94d86c836ee4954cbafaed859d4e327289a4c3
-    ssa_ast: 5bb86cd353de0d19c5d631d3fa33c9da9eec8fa4dc6cd1d262d911b353d31177
+    initial_ast: 9488ef190b07367671f4cd9f2ba72a8c1f76c2b41d463aa45ea6cc859c86bcfd
+    unrolled_ast: 9488ef190b07367671f4cd9f2ba72a8c1f76c2b41d463aa45ea6cc859c86bcfd
+    ssa_ast: 8b30085d66e86f415865cc5b0329125b38031e713845b4a5221dede9b4288e95
diff --git a/tests/expectations/compiler/address/equal.out b/tests/expectations/compiler/address/equal.out
index 6a3f517a2c..e86b23fa3e 100644
--- a/tests/expectations/compiler/address/equal.out
+++ b/tests/expectations/compiler/address/equal.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 7223f540c91cd639cc122936a41fc896f821e2d57c9f6f086eb4d555dc9c9217
-    initial_ast: 270a8b6e2196ea6e4b59c4150df71f421cb41c29350298a8529f9711ef03ffdb
-    unrolled_ast: 270a8b6e2196ea6e4b59c4150df71f421cb41c29350298a8529f9711ef03ffdb
-    ssa_ast: f764781055301d8465d3b7c79706db7cf54391532c40aabb463fa84f243ae47d
+    initial_ast: a20290c4bbe6ffd82971cbf16bd44d157da3defca33e15b63c7e95cd60f46927
+    unrolled_ast: a20290c4bbe6ffd82971cbf16bd44d157da3defca33e15b63c7e95cd60f46927
+    ssa_ast: 56f06aa007a99045955400b4f023384fce7c8c2fe1084be5bfa3c11710534480
diff --git a/tests/expectations/compiler/address/ternary.out b/tests/expectations/compiler/address/ternary.out
index a0fd3d7ffb..6df9f3d7f1 100644
--- a/tests/expectations/compiler/address/ternary.out
+++ b/tests/expectations/compiler/address/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 5cb9782988c5736339747224b8ed4a38ee869231d131a55515cfa1f98de065cc
       - initial_input_ast: 079946da42e7c73ef17f4385e8ca310259a5e0f1e6471abee30b6175f413e480
-    initial_ast: 77980202a08b5089b6dee028160b9cd64c154c8b79f5f2e4d84b7bbe832d6300
-    unrolled_ast: 77980202a08b5089b6dee028160b9cd64c154c8b79f5f2e4d84b7bbe832d6300
-    ssa_ast: 211d01fa7b0fefd8a68ca9740961774c1647471fd8089f2067fe1329be44a5b0
+    initial_ast: 492cdd5fb900bf59ddf1acb0274508d4878fed206d5fb2d53fbb7fbcfa8cf7f4
+    unrolled_ast: 492cdd5fb900bf59ddf1acb0274508d4878fed206d5fb2d53fbb7fbcfa8cf7f4
+    ssa_ast: 912eb26fe974172e14fb709eb2d561c3153482d8ab08f3e163a9652ffb0e892c
diff --git a/tests/expectations/compiler/boolean/and.out b/tests/expectations/compiler/boolean/and.out
index bd7df0bc77..615a2d04b8 100644
--- a/tests/expectations/compiler/boolean/and.out
+++ b/tests/expectations/compiler/boolean/and.out
@@ -7,6 +7,6 @@ outputs:
       - initial_input_ast: f049b2866e2ec8e876ccaa3221109137b3d895d7ebfa0917506009861c15c687
       - initial_input_ast: e047d07a8d39dbab50f3b02256ff7a58f9ba2a8b9128ef7f79867add3fd4416e
       - initial_input_ast: 5dd6a99b2d55a543947f75934bbbc7f32ab8478a5b1a567e6c917aaa1800d4ec
-    initial_ast: d9579474face4609f4dddc1f6552d89312fba21bbabcb074f48ab9a20cb608de
-    unrolled_ast: d9579474face4609f4dddc1f6552d89312fba21bbabcb074f48ab9a20cb608de
-    ssa_ast: 7f890cb3db3ba894063511d6f3e05990fdba21b8f476c9d7310f277eedce237d
+    initial_ast: a4b0395978f1e425ce59636555b5f43fddb0f4435a8e0ae2e9e3f1a0805ea271
+    unrolled_ast: a4b0395978f1e425ce59636555b5f43fddb0f4435a8e0ae2e9e3f1a0805ea271
+    ssa_ast: 4ee55846a0e61c331c5788ffc1ebc2d23a03c7923cbaa061f45020286b99e19a
diff --git a/tests/expectations/compiler/boolean/conditional.out b/tests/expectations/compiler/boolean/conditional.out
index c7c45a3c81..96ba5b4312 100644
--- a/tests/expectations/compiler/boolean/conditional.out
+++ b/tests/expectations/compiler/boolean/conditional.out
@@ -7,6 +7,6 @@ outputs:
       - initial_input_ast: 7a6c45e7cac800efe7f8d73af2fb9e926f49c62073a5cb13c463670ca0234ff7
       - initial_input_ast: 0ac5a86e326e8f5f561e1030162ee1a307bdf56425abe3cafe38b8bda4aad86b
       - initial_input_ast: 9eebe7b8b91000400e94d9513f5be1c50c51207e0e5105248f68789e74aa82c5
-    initial_ast: c6bcb3448a3b19d26d97d604acd74a3a85009a45f3a44e1530afa0542d49b064
-    unrolled_ast: c6bcb3448a3b19d26d97d604acd74a3a85009a45f3a44e1530afa0542d49b064
-    ssa_ast: c8814275b1915e558b28b21a7bbd54a0a9e068d7e615b67335da8eee4a014812
+    initial_ast: 442f9881b6e7fba9626cb20829b71029b40ecf5bef67959591476112d1490b19
+    unrolled_ast: 442f9881b6e7fba9626cb20829b71029b40ecf5bef67959591476112d1490b19
+    ssa_ast: 240add9a6ed502bd65f14c6236d6e10317c5f17074da2bca71bfc4f44cba6ca2
diff --git a/tests/expectations/compiler/boolean/equal.out b/tests/expectations/compiler/boolean/equal.out
index d8dcab1ebe..ee1f9c1caa 100644
--- a/tests/expectations/compiler/boolean/equal.out
+++ b/tests/expectations/compiler/boolean/equal.out
@@ -7,6 +7,6 @@ outputs:
       - initial_input_ast: f049b2866e2ec8e876ccaa3221109137b3d895d7ebfa0917506009861c15c687
       - initial_input_ast: e047d07a8d39dbab50f3b02256ff7a58f9ba2a8b9128ef7f79867add3fd4416e
       - initial_input_ast: 5dd6a99b2d55a543947f75934bbbc7f32ab8478a5b1a567e6c917aaa1800d4ec
-    initial_ast: a3c0e79ae341adfa7a29d29d5fa4d502b12ac7c07c0d97aa2cee85f976111f10
-    unrolled_ast: a3c0e79ae341adfa7a29d29d5fa4d502b12ac7c07c0d97aa2cee85f976111f10
-    ssa_ast: 2f7aebc7c50608925044440a8d7640f69d1269dd6b2b10aac6a3744cede00f10
+    initial_ast: 62d6ea485fe217108d62d0b06da0c3cd437b2b753f195cc4d15dba3a7cbd2109
+    unrolled_ast: 62d6ea485fe217108d62d0b06da0c3cd437b2b753f195cc4d15dba3a7cbd2109
+    ssa_ast: 376d863b987701226940de67c7e2b55aefb99588a76074c86e8c2d4e38195985
diff --git a/tests/expectations/compiler/boolean/not_equal.out b/tests/expectations/compiler/boolean/not_equal.out
index 5d789e761b..3bd3236136 100644
--- a/tests/expectations/compiler/boolean/not_equal.out
+++ b/tests/expectations/compiler/boolean/not_equal.out
@@ -7,6 +7,6 @@ outputs:
       - initial_input_ast: f049b2866e2ec8e876ccaa3221109137b3d895d7ebfa0917506009861c15c687
       - initial_input_ast: e047d07a8d39dbab50f3b02256ff7a58f9ba2a8b9128ef7f79867add3fd4416e
       - initial_input_ast: 5dd6a99b2d55a543947f75934bbbc7f32ab8478a5b1a567e6c917aaa1800d4ec
-    initial_ast: e5e3ec16babdcb3b9d8777e8838b285357c789c20b338b450a00077894c833da
-    unrolled_ast: e5e3ec16babdcb3b9d8777e8838b285357c789c20b338b450a00077894c833da
-    ssa_ast: b3c12b1e5bbd98346e0379895838cbaf6317c70e21f1cf2cad141b31c7a2a0d8
+    initial_ast: edbecb94d31948ff752a50b044b0c78bc4fef39104c994a5b83501f1dff82d9c
+    unrolled_ast: edbecb94d31948ff752a50b044b0c78bc4fef39104c994a5b83501f1dff82d9c
+    ssa_ast: ca92d8b0421e9646f63efd30295d0a773d328f6a0e62d88d6b0330074fd09edb
diff --git a/tests/expectations/compiler/boolean/operator_methods.out b/tests/expectations/compiler/boolean/operator_methods.out
index 879d0a0482..a7a68522a5 100644
--- a/tests/expectations/compiler/boolean/operator_methods.out
+++ b/tests/expectations/compiler/boolean/operator_methods.out
@@ -7,6 +7,6 @@ outputs:
       - initial_input_ast: 6da90d928d023c26a92106b9ef3bbf3d6e1ee2fcf67b16aa9c8477477cb4b064
       - initial_input_ast: d82ff0fb53ab27ed095ea5bbb4e118fbde50d4508caed65cb8029ad7441ef0fd
       - initial_input_ast: 07a295a1403e9020a1fb03ddcaf92b18a3237d1d4ad70b1549db77f1e2d1e6b0
-    initial_ast: f52206792f78b73d1eed2b734a82b5be355c1a3856e73cd0bdeb2f457c4ca94d
-    unrolled_ast: f52206792f78b73d1eed2b734a82b5be355c1a3856e73cd0bdeb2f457c4ca94d
-    ssa_ast: 5d948aa8dca3a50ae0f001fdec92dbdeb9a7a64dad20d64efc4852ca35bad8ab
+    initial_ast: 579dd792d88e16dd58a934b4e5b7ade4c134e4ed7fb706c8b6af58c25aa71541
+    unrolled_ast: 579dd792d88e16dd58a934b4e5b7ade4c134e4ed7fb706c8b6af58c25aa71541
+    ssa_ast: b9062bd4c5da7a138c10b0032445eea5b04bc1477b2d129e9235b5fef558a448
diff --git a/tests/expectations/compiler/boolean/or.out b/tests/expectations/compiler/boolean/or.out
index 163f1dcf3d..bb08207707 100644
--- a/tests/expectations/compiler/boolean/or.out
+++ b/tests/expectations/compiler/boolean/or.out
@@ -7,6 +7,6 @@ outputs:
       - initial_input_ast: f049b2866e2ec8e876ccaa3221109137b3d895d7ebfa0917506009861c15c687
       - initial_input_ast: e047d07a8d39dbab50f3b02256ff7a58f9ba2a8b9128ef7f79867add3fd4416e
       - initial_input_ast: 5dd6a99b2d55a543947f75934bbbc7f32ab8478a5b1a567e6c917aaa1800d4ec
-    initial_ast: 8c71f149c82208f93d7f6181328beb1840171f7a58667f3a597a1f356c9809b9
-    unrolled_ast: 8c71f149c82208f93d7f6181328beb1840171f7a58667f3a597a1f356c9809b9
-    ssa_ast: 02afe8a6f2ac65ea8d9ed1b2167aa1de379af91f62ab13df8f748225ad11c922
+    initial_ast: b1acbe2a1f31877c4cb06a31ebac71ee68caf5db01b9108d73e3412c9afbf8c9
+    unrolled_ast: b1acbe2a1f31877c4cb06a31ebac71ee68caf5db01b9108d73e3412c9afbf8c9
+    ssa_ast: e418eb941b3ad8edc7523457a81342705335dea5f71e48c4c6ba099bec232eaf
diff --git a/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out b/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out
index 6db7ce9cdb..a32152dd64 100644
--- a/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out
+++ b/tests/expectations/compiler/circuits/circuit_function_namespace_conflict_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:7:16\n     |\n   7 | function Foo() {}\n     |                ^"
+  - "Error [EAST0372009]: circuit `Foo` shadowed by\n    --> compiler-test:7:1\n     |\n   7 | function Foo() {}\n     | ^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/circuits/inline.out b/tests/expectations/compiler/circuits/inline.out
index 72ecff4e4d..3edb4a872d 100644
--- a/tests/expectations/compiler/circuits/inline.out
+++ b/tests/expectations/compiler/circuits/inline.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 4b84d4b1ec844d075cfafdb9916934245925a3c70330002441b701b9677809d9
-    unrolled_ast: 4b84d4b1ec844d075cfafdb9916934245925a3c70330002441b701b9677809d9
-    ssa_ast: f2a789f97a95bb8ced247f2cb825752bfea377baa41cba696b6f03b346f3ad37
+    initial_ast: b07811fc840afb7615b6f7acad5b66d41a8210a93a343d545016be5ca5e8340e
+    unrolled_ast: b07811fc840afb7615b6f7acad5b66d41a8210a93a343d545016be5ca5e8340e
+    ssa_ast: 718cbd073e17121620c137ef3412da2df6894fc057af469738f75a84f2f675c5
diff --git a/tests/expectations/compiler/circuits/inline_fail.out b/tests/expectations/compiler/circuits/inline_fail.out
index 98cea7a383..8f400dcef2 100644
--- a/tests/expectations/compiler/circuits/inline_fail.out
+++ b/tests/expectations/compiler/circuits/inline_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:7:17\n     |\n   7 | function main() {\n     |                 ^"
+  - "Error [ETYC0372013]: Circuit initialization expression for `Foo` is missing member `x`.\n    --> compiler-test:9:20\n     |\n   9 |     const a: Foo = Foo { y: 0u32 };\n     |                    ^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/circuits/inline_member_fail.out b/tests/expectations/compiler/circuits/inline_member_fail.out
index 98cea7a383..eac4dcbfe4 100644
--- a/tests/expectations/compiler/circuits/inline_member_fail.out
+++ b/tests/expectations/compiler/circuits/inline_member_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:7:17\n     |\n   7 | function main() {\n     |                 ^"
+  - "Error [EPAR0370018]: Could not parse the implicit value: 1.\n    --> compiler-test:8:19\n     |\n   8 |     const y: u8 = 1;\n     |                   ^"
diff --git a/tests/expectations/compiler/circuits/inline_undefined.out b/tests/expectations/compiler/circuits/inline_undefined.out
index 9ac75fd08d..e90564518c 100644
--- a/tests/expectations/compiler/circuits/inline_undefined.out
+++ b/tests/expectations/compiler/circuits/inline_undefined.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372017]: The type `Foo` is not found in the current scope.\n    --> compiler-test:4:5\n     |\n   4 |     const a: Foo = Foo { };\n     |     ^^^^^^^^^^^^^^^^^^^^^^\nError [ETYC0372005]: Unknown circuit `Foo`\n    --> compiler-test:4:20\n     |\n   4 |     const a: Foo = Foo { };\n     |                    ^^^\n"
diff --git a/tests/expectations/compiler/circuits/member_variable.out b/tests/expectations/compiler/circuits/member_variable.out
index 7e8ab1fa76..04fe724b80 100644
--- a/tests/expectations/compiler/circuits/member_variable.out
+++ b/tests/expectations/compiler/circuits/member_variable.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3ad7f9e1a4aa5edb8ab4cc1eb0d4baa189f8d388eb90565a269098cee9b06d3c
-    initial_ast: 908a8a45b6918aaf1120ba33125b9e0b2fbdb649e3a7b032f1301ac148b44745
-    unrolled_ast: 908a8a45b6918aaf1120ba33125b9e0b2fbdb649e3a7b032f1301ac148b44745
-    ssa_ast: 8b83b94a764964a35b0964cc797a59ec2ae224c70b77470ad816e4f58f831379
+      - initial_input_ast: 8fbdc7881fb5e917ccec6859b63f376841069ddada687114f1ff6f364e282e8c
+    initial_ast: 2a44fc23e7ead7f07873d3e511e98ed13fa689e0ec3eeaa31a08887580b7adfe
+    unrolled_ast: 2a44fc23e7ead7f07873d3e511e98ed13fa689e0ec3eeaa31a08887580b7adfe
+    ssa_ast: ac4365bd4c50cb5e345eb7b64fd4a97a452d5f110e6dd2fd89329c0bc2a98285
diff --git a/tests/expectations/compiler/circuits/member_variable_fail.out b/tests/expectations/compiler/circuits/member_variable_fail.out
index 98cea7a383..b19b28f3d8 100644
--- a/tests/expectations/compiler/circuits/member_variable_fail.out
+++ b/tests/expectations/compiler/circuits/member_variable_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:7:17\n     |\n   7 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:9:15\n     |\n   9 |     const err = a.y;\n     |               ^"
diff --git a/tests/expectations/compiler/console/assert.out b/tests/expectations/compiler/console/assert.out
index c403c365eb..7dd9617212 100644
--- a/tests/expectations/compiler/console/assert.out
+++ b/tests/expectations/compiler/console/assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 00ae278f2e47685455a873498a580f06abfcb7bae93cc5844c2616a7da7d03db
-    initial_ast: 2216cf3de7af52158a50f90f60a0a5b06ba73df17f8ef42b32a650acc5233a1f
-    unrolled_ast: 2216cf3de7af52158a50f90f60a0a5b06ba73df17f8ef42b32a650acc5233a1f
-    ssa_ast: 6cb54f506bc7cfef8a87839d5221c64ea77027a6cd07ed82ad98c8dc54b3b4cb
+    initial_ast: 98fb5a67d0ac8a32a7f36fd24feb94d8421d902e73b039c530621a54165a81f8
+    unrolled_ast: 98fb5a67d0ac8a32a7f36fd24feb94d8421d902e73b039c530621a54165a81f8
+    ssa_ast: cbda8e40452b01368ec6424bc582d53f171e5a5a03cdcb76bd143292bded38d1
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_commit.out b/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
index d6008a1031..173d167dda 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_commit.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e2bfa0e0050ddd8f84ce1a20c2ffc199a98ca3cbf8127be7981ac6a9bf6cad17
-    initial_ast: 38fe117ee1a28309f64ccecd6d8c9d87e5580a3d446b663166321d99cb7c1850
-    unrolled_ast: 38fe117ee1a28309f64ccecd6d8c9d87e5580a3d446b663166321d99cb7c1850
-    ssa_ast: 36f6f758fe31edfef3e9f307a421496bdd63e035ece8b31e04c178918b8891f7
+    initial_ast: 4aa1950adacaed9f812c3317e72dc89cdcdc2fb2f6892c4d0264f65b954bfac1
+    unrolled_ast: 4aa1950adacaed9f812c3317e72dc89cdcdc2fb2f6892c4d0264f65b954bfac1
+    ssa_ast: 107ad6d8790f61817607b3c50f4f4f41a21f92a39d456dcecbd46de0af2aef19
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_hash.out b/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
index 0d31cc06ff..23354cd3a4 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: fbfd0e7729a170e9ad5edbe89d81a834f80286bdac7386e976bef82006266241
-    initial_ast: 0fde98b0e13caa97f0cec7da00cede4cdda2ff4f471938019b97c35cb34f1c7c
-    unrolled_ast: 0fde98b0e13caa97f0cec7da00cede4cdda2ff4f471938019b97c35cb34f1c7c
-    ssa_ast: 4c7a16c0fc59fab0d91542d1846626a252bea09116e3f5b635816f65e2a939a5
+    initial_ast: f127ac675243d3880838f7bb565c75373db03c4fc75a61e27b6ced77b3899ded
+    unrolled_ast: f127ac675243d3880838f7bb565c75373db03c4fc75a61e27b6ced77b3899ded
+    ssa_ast: c9cb7883c3d40bcffa3b702806770543d8b4809e12cfbe9ad63a6b365b130900
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_commit.out b/tests/expectations/compiler/core/algorithms/bhp256_commit.out
index 9456ac855d..158d19f877 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_commit.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 30bcdf9e3064f59cff10bde5c59834ff95d21da38a9f0db7f12dee3017ae5887
-    initial_ast: 26ecaa6e3fa1ef58bb93ac179c644c7ad5833f215a09999c6c7c2492f9b2d7ce
-    unrolled_ast: 26ecaa6e3fa1ef58bb93ac179c644c7ad5833f215a09999c6c7c2492f9b2d7ce
-    ssa_ast: b9a4d33bef0f07a9064af28d6c338db27a4b9e2ff083cd63ee702952b36107e7
+    initial_ast: afdeb7a5ca2fd7a4f8fdf0ab978eddb34a83e7a4b0f295b2c8be9fb5d0039a2c
+    unrolled_ast: afdeb7a5ca2fd7a4f8fdf0ab978eddb34a83e7a4b0f295b2c8be9fb5d0039a2c
+    ssa_ast: 5d38f20fc3ea0585dbb3ab4c7ba3e74bc5d84697c239f944a7826a1e0cae4eb9
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_hash.out b/tests/expectations/compiler/core/algorithms/bhp256_hash.out
index b59754db1e..e90713c25e 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8c88aa92e2f75c9e87085f5f02553aa660cecd69581cbcaccd29b27fd2d075a8
-    initial_ast: b701c48b1028ebe40484e123f3f261922ef92caaabbd03088c94b5b6d9e45c3c
-    unrolled_ast: b701c48b1028ebe40484e123f3f261922ef92caaabbd03088c94b5b6d9e45c3c
-    ssa_ast: 889912287ffc2ad98cb15644a25e849abbf5594e8fb654b0fbeb288c4eb649cd
+    initial_ast: e92fdbde7e485bf83ec1932c6264e1c184063caa5fd584ad38377912587a08d8
+    unrolled_ast: e92fdbde7e485bf83ec1932c6264e1c184063caa5fd584ad38377912587a08d8
+    ssa_ast: b875dd57c8b3236c99b35d810fd25b3d0d232fede47746c510e214f2c2e39fc6
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_commit.out b/tests/expectations/compiler/core/algorithms/bhp512_commit.out
index ccb818962c..d44a4cce38 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_commit.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 30bcdf9e3064f59cff10bde5c59834ff95d21da38a9f0db7f12dee3017ae5887
-    initial_ast: 21f7a61cb432af07952721be54a3a898585d1da69f087681e2a6d5867b202b9f
-    unrolled_ast: 21f7a61cb432af07952721be54a3a898585d1da69f087681e2a6d5867b202b9f
-    ssa_ast: 5e19bb1d8152b5b36962dda08bf75b1bb97b55ed71791f152a3069814398028c
+    initial_ast: 52ff447723f170312c9d2ee225422334488760ceda1b3379f102b45d0ad80ab9
+    unrolled_ast: 52ff447723f170312c9d2ee225422334488760ceda1b3379f102b45d0ad80ab9
+    ssa_ast: 66d80f3de475a218dfb6422436239e9a7789ef5a9f3e93a8159950dd9868affa
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_hash.out b/tests/expectations/compiler/core/algorithms/bhp512_hash.out
index 8ec1f87467..3a114fc4e2 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8c88aa92e2f75c9e87085f5f02553aa660cecd69581cbcaccd29b27fd2d075a8
-    initial_ast: 771632d75ec6a252a9139d4165dc6d039da2a8647deac5d85f24b2cc6c3af814
-    unrolled_ast: 771632d75ec6a252a9139d4165dc6d039da2a8647deac5d85f24b2cc6c3af814
-    ssa_ast: 437cde923ce1fe2c01c86ec3b14396da36f05454da981aae27a9f9d6f7753d8c
+    initial_ast: 287627304674a7aaaf69b0065d6130c5bce1825b176b3d16141bc1ff4af92609
+    unrolled_ast: 287627304674a7aaaf69b0065d6130c5bce1825b176b3d16141bc1ff4af92609
+    ssa_ast: a9d1728575f359e8dbb88d9c913a7889be9325c033fdae8b210f8c54b46781e0
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_commit.out b/tests/expectations/compiler/core/algorithms/bhp768_commit.out
index 93f99773a8..b1b0a375e0 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_commit.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_commit.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 30bcdf9e3064f59cff10bde5c59834ff95d21da38a9f0db7f12dee3017ae5887
-    initial_ast: 1e5bebfa4cd4be8614da4251d94073a4aa4fae3caca89694148938c22f042566
-    unrolled_ast: 1e5bebfa4cd4be8614da4251d94073a4aa4fae3caca89694148938c22f042566
-    ssa_ast: a9b8180d278d08a829ac2be4902137598018fd82d5909fa04907d98820034ff0
+    initial_ast: b56245ebe6249967be5f3dbcd26d7b70cbcac2428942fe83e42c89bbebd1cf85
+    unrolled_ast: b56245ebe6249967be5f3dbcd26d7b70cbcac2428942fe83e42c89bbebd1cf85
+    ssa_ast: f0fc3a42a33ef6e051776d18352b3cbe21642efdcc9f271af007396342df949f
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_hash.out b/tests/expectations/compiler/core/algorithms/bhp768_hash.out
index a9d4987ca4..931d8c74e1 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_hash.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8c88aa92e2f75c9e87085f5f02553aa660cecd69581cbcaccd29b27fd2d075a8
-    initial_ast: 45abb6fcd90ab857f03d7a1ae2ea2d80c48f31e297b3f8a504e106e183aa4668
-    unrolled_ast: 45abb6fcd90ab857f03d7a1ae2ea2d80c48f31e297b3f8a504e106e183aa4668
-    ssa_ast: 13f358893a058af80198d2a78ba4de99bf8bae596713e5ee5fd91e0ff6e38340
+    initial_ast: 47b9557c8c4262ebf9515fc05ed056161fc3cb8afc0f4b8e34eeb0f9a3e1f657
+    unrolled_ast: 47b9557c8c4262ebf9515fc05ed056161fc3cb8afc0f4b8e34eeb0f9a3e1f657
+    ssa_ast: cf2662727c60dcb9f5cb5307e26e1bf2700f35bcfdb6a1bdd558a4533f505591
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_commit.out b/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
index f85487cc29..8fce37f73f 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_commit.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5ea1607a031b1eaecb1b6aac13dae8c78f3fc15c5f9c7d8db94001539426f7eb
-    initial_ast: 2bd7a020fb8974e9dc0c81a93e6a33487c67fc4e534362401219397b81b78df7
-    unrolled_ast: 2bd7a020fb8974e9dc0c81a93e6a33487c67fc4e534362401219397b81b78df7
-    ssa_ast: c59339d502a3e3008ea6291e9f74f4af69a0ea545e0deeaf16987eff5f95827b
+    initial_ast: cb045e26a564c8083debb9b84718cf4164d202dcd91ffe4e77dda9fcac3f5155
+    unrolled_ast: cb045e26a564c8083debb9b84718cf4164d202dcd91ffe4e77dda9fcac3f5155
+    ssa_ast: d468ee8b942d38057081d9072622b19c2d8856a286ea586ade1f0c772f5e7361
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_hash.out b/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
index 9d23285d6b..e27e8ef662 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 43e7c413d898dd18070456e6875adbf73a93f3cd2703fc7f6bc7c793d8063bbd
-    initial_ast: 4680a18de0fd1b0a7ce2754bb75043d253934c7759a21bc2f17a31b0f1e33c67
-    unrolled_ast: 4680a18de0fd1b0a7ce2754bb75043d253934c7759a21bc2f17a31b0f1e33c67
-    ssa_ast: 141bf8f5039e0f69436da0d549a9a6dd473c69d5df4c669a5ba57b93f4505b1e
+    initial_ast: 8787ba2a281b63be734aefa39a59c2140d4959065ede2ac7e3fe4b8e6bbfdfb6
+    unrolled_ast: 8787ba2a281b63be734aefa39a59c2140d4959065ede2ac7e3fe4b8e6bbfdfb6
+    ssa_ast: 0adbef96c215fa32a0d5b93fd0eaf9de9e69556bb39d61417832ba927562c5a4
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_commit.out b/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
index c9e6b16872..8690b348ca 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_commit.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e3f5a66af9a0c987403e9ff8c0e084c127a374827259aca0e5b8f877a72700cf
-    initial_ast: b51bf3ad485dbda653d9ced0fb896790679d0306e484e6d6d573e83b5306187d
-    unrolled_ast: b51bf3ad485dbda653d9ced0fb896790679d0306e484e6d6d573e83b5306187d
-    ssa_ast: b972d70826d1afc087c692d0609408dc76ed6e74e00a13cc23b9b3b9faa2bd5f
+    initial_ast: 138bbbf88d9a19f76a06e5605175b10778e72e074080574fad2fc3136fcd98b5
+    unrolled_ast: 138bbbf88d9a19f76a06e5605175b10778e72e074080574fad2fc3136fcd98b5
+    ssa_ast: 9c39380c549a299335d10b471b0cb0487cf07e73f27201c1165310a592693190
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_hash.out b/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
index 3d3d936cbe..a3f82130ba 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e4ca07cbf83cbb0689e77f23f535f3e207b95e02ced7b97c0e54181109e4e435
-    initial_ast: 94006e9992e2b1d65fee22df4670ff27479de95b2d9265df17e45694a7611cc0
-    unrolled_ast: 94006e9992e2b1d65fee22df4670ff27479de95b2d9265df17e45694a7611cc0
-    ssa_ast: eba9469fa5c92833858f81c6123b605f210be2f9cc815a17d8e7405bcd6a28d8
+    initial_ast: 7b65c42ff833ee859decbcf47e23be50976f6825d51fc861d2ee7fb064812cff
+    unrolled_ast: 7b65c42ff833ee859decbcf47e23be50976f6825d51fc861d2ee7fb064812cff
+    ssa_ast: 7b3ab836782e725db9bbab31124ed28465255f3e4212ba34cee9d12541fe9bcc
diff --git a/tests/expectations/compiler/core/algorithms/poseidon2_hash.out b/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
index 68f6fdb910..f0fe92f236 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon2_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 320bf92be1f73a8faef64838d58c78d2c1b3bb305d4eff603e032995d9b4bca2
-    initial_ast: adea812b9bf5303dcfc8ea1594842ca1567bb55b21123e9abc9a38c4caad66e4
-    unrolled_ast: adea812b9bf5303dcfc8ea1594842ca1567bb55b21123e9abc9a38c4caad66e4
-    ssa_ast: eb916b89d7ca7333df51da88071d4cc54996c7f2eab36c0e07c96c64de24a899
+    initial_ast: ce5fa32a67580e3c52652f173496bb0cd4f4c2092c7f97836cdabf575620d259
+    unrolled_ast: ce5fa32a67580e3c52652f173496bb0cd4f4c2092c7f97836cdabf575620d259
+    ssa_ast: 1cf3666a8c000a1bcb530a02603a83644a3ab5f8cfa752a8cea571afbef9583f
diff --git a/tests/expectations/compiler/core/algorithms/poseidon4_hash.out b/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
index f1e4805c5f..06b169dd90 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon4_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 320bf92be1f73a8faef64838d58c78d2c1b3bb305d4eff603e032995d9b4bca2
-    initial_ast: 2beea9db79877dd7334667b8371f1afc580590432a370a5e7c28284ff2551a13
-    unrolled_ast: 2beea9db79877dd7334667b8371f1afc580590432a370a5e7c28284ff2551a13
-    ssa_ast: 16e48885aad580578b7f4f721bcf9f89c054fd8b9249243d43b0f77ba7bf04ef
+    initial_ast: 02bae4651c36939b9af8d7aa6d6dc2a1cec90c74de0c2b398e2d9e538836aac5
+    unrolled_ast: 02bae4651c36939b9af8d7aa6d6dc2a1cec90c74de0c2b398e2d9e538836aac5
+    ssa_ast: bea5d093b2b691ec681e27dc71dc81f50a536f6ec7bb8d87cc83f55dade14cf2
diff --git a/tests/expectations/compiler/core/algorithms/poseidon8_hash.out b/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
index 2fab701362..91e9e98842 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon8_hash.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 320bf92be1f73a8faef64838d58c78d2c1b3bb305d4eff603e032995d9b4bca2
-    initial_ast: 286e8b83e4903554f67c87712e38b92fd0a77952232766a14e25abf06164f62c
-    unrolled_ast: 286e8b83e4903554f67c87712e38b92fd0a77952232766a14e25abf06164f62c
-    ssa_ast: 9a28bad26b95f5fd7f7293decb413121df6fe41877d36d61d91807ead32f9120
+    initial_ast: 7c81c5af5db97988ae2d460f563abcdbbbd4bd1673e494be147d00bcbb208f4d
+    unrolled_ast: 7c81c5af5db97988ae2d460f563abcdbbbd4bd1673e494be147d00bcbb208f4d
+    ssa_ast: c029e430279a17a05eac17c05229191a2466a275bcf3903429ccfa6c448dcb4f
diff --git a/tests/expectations/compiler/definition/out_of_order.out b/tests/expectations/compiler/definition/out_of_order.out
index 1ec55f904f..b07d9de893 100644
--- a/tests/expectations/compiler/definition/out_of_order.out
+++ b/tests/expectations/compiler/definition/out_of_order.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 19bd7efeaa5dee077b8d47a087ceadc2ba287507268fd8586f4e6f5881b71c39
-    initial_ast: 65c91c5e7b6eac3e6d12a830c4a286e24946c435a8b259f76b61af4550aeaa7b
-    unrolled_ast: 65c91c5e7b6eac3e6d12a830c4a286e24946c435a8b259f76b61af4550aeaa7b
-    ssa_ast: 4dddfd6f6ce6498f73d1c55ff0a0987f319321722667fe56621d42f83216563e
+    initial_ast: 98a4ef8b854507d4350090d3104421e57c549f90a6fc2e78a7c48dc518b71197
+    unrolled_ast: 98a4ef8b854507d4350090d3104421e57c549f90a6fc2e78a7c48dc518b71197
+    ssa_ast: 36a803262d8ec69f8e8c0862bad31e0b4cb67a35b1ff526e902e5419fe16e8c9
diff --git a/tests/expectations/compiler/field/add.out b/tests/expectations/compiler/field/add.out
index 2bc97cd845..54fca7584c 100644
--- a/tests/expectations/compiler/field/add.out
+++ b/tests/expectations/compiler/field/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 38e152ef2d3449f93d8c1858a916854228a76dd18885b01cb4a88c14d84308bf
-    initial_ast: 21ded94da5e90a18f59acc5518d2bc59c45c9b00cd4908ac32f872ad1c1fdd74
-    unrolled_ast: 21ded94da5e90a18f59acc5518d2bc59c45c9b00cd4908ac32f872ad1c1fdd74
-    ssa_ast: a6d7aae0771b8a9966f24f81306880751dcb732109547f3d1e228ad65e04aaa8
+    initial_ast: 125d74b48a20751be83aff6d71ad766f23205a0c8445e6fd06482eee11ef69af
+    unrolled_ast: 125d74b48a20751be83aff6d71ad766f23205a0c8445e6fd06482eee11ef69af
+    ssa_ast: 0e5897880ff3c7fe7020645b56845d5f521e319c92ea259d8ef780afc1d876e7
diff --git a/tests/expectations/compiler/field/div.out b/tests/expectations/compiler/field/div.out
index a706a9a36f..3ee74b5c0f 100644
--- a/tests/expectations/compiler/field/div.out
+++ b/tests/expectations/compiler/field/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 413788ce5f6dc8aa19af5360bedfca93c33a2a6464ede476e59b75e84a8a4e4a
-    initial_ast: 96cf0d164ef3954ede3c95c6261f8417df2f7bc6072b6ea75eaa3300e0b22a19
-    unrolled_ast: 96cf0d164ef3954ede3c95c6261f8417df2f7bc6072b6ea75eaa3300e0b22a19
-    ssa_ast: f5f941cc45458c13ada072026f1c6ced63f55116befd2f37b5db1713b97200ff
+    initial_ast: 3b8635f39692b88d75e2b77d77f89b7ecef142d0b67e107feb1ac7c7a1599cb6
+    unrolled_ast: 3b8635f39692b88d75e2b77d77f89b7ecef142d0b67e107feb1ac7c7a1599cb6
+    ssa_ast: 114d04b1bf92c98d8dbb008c44f200b42a5bf7ce1c7e652644f2a301b62bbe48
diff --git a/tests/expectations/compiler/field/eq.out b/tests/expectations/compiler/field/eq.out
index bd9412e476..0738d5e3a9 100644
--- a/tests/expectations/compiler/field/eq.out
+++ b/tests/expectations/compiler/field/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d88a843c0a3851c805f7eeae282a16b12eba4febde134aa0ea86415f6561565d
-    initial_ast: 8494a2170c2abab825d14677e0871bdb991548e292153c7de7d609ad12fcafa3
-    unrolled_ast: 8494a2170c2abab825d14677e0871bdb991548e292153c7de7d609ad12fcafa3
-    ssa_ast: f27588cd26483aeed7d00c0800fcc7c09a9a5bf5413e1387fc57af07e1fd4a22
+    initial_ast: 34f7c3ff1c20edabb6f435276b5e50fa59ee1d2df3449a5636b70501f2a54dca
+    unrolled_ast: 34f7c3ff1c20edabb6f435276b5e50fa59ee1d2df3449a5636b70501f2a54dca
+    ssa_ast: f00a53452b9e3a386c43f8caf9bba346deb4ada611d03df5876215b700bda401
diff --git a/tests/expectations/compiler/field/field.out b/tests/expectations/compiler/field/field.out
index 1580f0b3c1..b248de8576 100644
--- a/tests/expectations/compiler/field/field.out
+++ b/tests/expectations/compiler/field/field.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 1bd243c2ca8a51ee50f45823a283d506ee506e168e5332af8c271ef6b52468a4
-    initial_ast: eb15a802f9a736fe50d28a99a25b55dc2bd431700aeb9f4370c22b75bd3dab20
-    unrolled_ast: eb15a802f9a736fe50d28a99a25b55dc2bd431700aeb9f4370c22b75bd3dab20
-    ssa_ast: fa8cd576c60e987d9885cb5dd26261924546cb9de448673d9b87147a45569a39
+    initial_ast: 5d5f041037aab63ff4bbb642fd8362a730f25186ed368168c8da40bd2e1fb11d
+    unrolled_ast: 5d5f041037aab63ff4bbb642fd8362a730f25186ed368168c8da40bd2e1fb11d
+    ssa_ast: da5370ef480f4a5cab149edb73dfbcc9cc5c5c6e3ad6e2cc82726b87963c63b9
diff --git a/tests/expectations/compiler/field/mul.out b/tests/expectations/compiler/field/mul.out
index e031648657..7d9a8f3a30 100644
--- a/tests/expectations/compiler/field/mul.out
+++ b/tests/expectations/compiler/field/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 38e152ef2d3449f93d8c1858a916854228a76dd18885b01cb4a88c14d84308bf
-    initial_ast: 16eacf96ed15b6675bd62dda8aba0b98b5af5cc551973f05b8ba00dc93584f07
-    unrolled_ast: 16eacf96ed15b6675bd62dda8aba0b98b5af5cc551973f05b8ba00dc93584f07
-    ssa_ast: af08b8c069dabb29c20cc3e16e66ca6a6068d9a7ffe3ccba86afec7a3b2c1bd4
+    initial_ast: bb5c1f965ecb951c1e50089aee9d807e2e74bc65407955bd36034cd4a59ff847
+    unrolled_ast: bb5c1f965ecb951c1e50089aee9d807e2e74bc65407955bd36034cd4a59ff847
+    ssa_ast: 5f065d737ce91d4f89f3d9f19a2943a2a0e0008d6d9130646229ccfa4e939771
diff --git a/tests/expectations/compiler/field/negate.out b/tests/expectations/compiler/field/negate.out
index ec847b31fd..93ccfff4b8 100644
--- a/tests/expectations/compiler/field/negate.out
+++ b/tests/expectations/compiler/field/negate.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c0c942faa92a5c747fab2d776e6dd0067de317c69003493147610a09878843c4
-    initial_ast: 0d4f38f323442c2a291be0f444766f1fa1ad946a73e5be728c29e9454e0ecac3
-    unrolled_ast: 0d4f38f323442c2a291be0f444766f1fa1ad946a73e5be728c29e9454e0ecac3
-    ssa_ast: a18faf280c8113e6e91388405d6fda9cb8952a17ffda57af01e79a21007a9692
+    initial_ast: 8608b48cc889f9b591b51718090fd4c35ad102eae6b348dccc0e9d79e0423b60
+    unrolled_ast: 8608b48cc889f9b591b51718090fd4c35ad102eae6b348dccc0e9d79e0423b60
+    ssa_ast: 9d94e6c0f69df4682e6258f98b10c859440c22c27b1e5a182f01fd981d0e8e82
diff --git a/tests/expectations/compiler/field/no_space_between_literal.out b/tests/expectations/compiler/field/no_space_between_literal.out
index 9ac75fd08d..88eafec4b7 100644
--- a/tests/expectations/compiler/field/no_space_between_literal.out
+++ b/tests/expectations/compiler/field/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:11\n     |\n   4 |   const f = 1 field;\n     |           ^"
diff --git a/tests/expectations/compiler/field/operator_methods.out b/tests/expectations/compiler/field/operator_methods.out
index 1e2b9d5a19..6752bb3ac4 100644
--- a/tests/expectations/compiler/field/operator_methods.out
+++ b/tests/expectations/compiler/field/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ea8e9817122af3fa825b175438a1af4943d31c5c893a3af31b96964f80ec5850
-    initial_ast: 84dfc37ce251434d679b17e796c7387f5f0ef64e6fe8618035f166675e5d07aa
-    unrolled_ast: 84dfc37ce251434d679b17e796c7387f5f0ef64e6fe8618035f166675e5d07aa
-    ssa_ast: a2cadd111a8cdedf3833e5535f4eb21622faf2ef8dde9ebe20ec10b8248fdab7
+    initial_ast: 326ed9aecf5792807a74a9239e66c396e0f89a95c4e1a4ef70168df8b3057429
+    unrolled_ast: 326ed9aecf5792807a74a9239e66c396e0f89a95c4e1a4ef70168df8b3057429
+    ssa_ast: bc08ee49f61f942a4df5a829bc35695ed2f3f13756697b67d07c0ab7f588e3cf
diff --git a/tests/expectations/compiler/field/pow.out b/tests/expectations/compiler/field/pow.out
index 2f6d200abb..644787bd38 100644
--- a/tests/expectations/compiler/field/pow.out
+++ b/tests/expectations/compiler/field/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 30267abd65849fc218532e602d0e60eefb1dd235972106400258e3d9e54c2c10
-    initial_ast: f755983542579fcf427b2a7cac6ed8e8ab549318dc4b97dacf26581217225032
-    unrolled_ast: f755983542579fcf427b2a7cac6ed8e8ab549318dc4b97dacf26581217225032
-    ssa_ast: 2202bfa475e1db7c55fad37e9769c8df6916f2e5c63a42f7040ac94964f34500
+    initial_ast: aeb33eeda02520f59b6771e90968d1c5bce2a5e01f669aaeb1112f9735a46b50
+    unrolled_ast: aeb33eeda02520f59b6771e90968d1c5bce2a5e01f669aaeb1112f9735a46b50
+    ssa_ast: 5147f44b87fccf8fa0987a26259160fab7b5e61e9f3de549b6cacff11b00cd10
diff --git a/tests/expectations/compiler/field/sub.out b/tests/expectations/compiler/field/sub.out
index dcca282700..2da39d281d 100644
--- a/tests/expectations/compiler/field/sub.out
+++ b/tests/expectations/compiler/field/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 413788ce5f6dc8aa19af5360bedfca93c33a2a6464ede476e59b75e84a8a4e4a
-    initial_ast: aa39b8496523c37407b512dc06c0ae06fd9aa96f3d0a103fa668ad1cfc16ed3a
-    unrolled_ast: aa39b8496523c37407b512dc06c0ae06fd9aa96f3d0a103fa668ad1cfc16ed3a
-    ssa_ast: bda007396cea5e0fa1b8004fe2ccd611bc99a82cb410f4d1377a3ec8f976e1d3
+    initial_ast: 75192dff58eadb82fde4b5a7e7049d030b96ee486664cba902a0e21a46d40b51
+    unrolled_ast: 75192dff58eadb82fde4b5a7e7049d030b96ee486664cba902a0e21a46d40b51
+    ssa_ast: 99dc123594b38cf6e46bfc7f466db543c8e899f2bd97791e6a36accc0f49d000
diff --git a/tests/expectations/compiler/field/ternary.out b/tests/expectations/compiler/field/ternary.out
index c55127a991..6cdb37d464 100644
--- a/tests/expectations/compiler/field/ternary.out
+++ b/tests/expectations/compiler/field/ternary.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e0d887adc24d86b1ddd1b6b7fee99e39c4def4850dc6afa7765a2d45089d39cd
-    initial_ast: 15e7dfb11294425094f3e889f76e67ab6a60ee6ab5e5afa9cb36016bf190c7b2
-    unrolled_ast: 15e7dfb11294425094f3e889f76e67ab6a60ee6ab5e5afa9cb36016bf190c7b2
-    ssa_ast: c505349ea0c47587775852512272b922dd38172f59b1322def5d026e5c7428ca
+    initial_ast: 2223eef112de306aa69ef7015f861b203d73023488667ee3ad89a2d585274844
+    unrolled_ast: 2223eef112de306aa69ef7015f861b203d73023488667ee3ad89a2d585274844
+    ssa_ast: 264dc388d6e195ea1f09888bb000238befb145c7683f0cf459882cad955fc48b
diff --git a/tests/expectations/compiler/function/conditional_return.out b/tests/expectations/compiler/function/conditional_return.out
index a0b487c83c..16c7e9072a 100644
--- a/tests/expectations/compiler/function/conditional_return.out
+++ b/tests/expectations/compiler/function/conditional_return.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e742fe16a7df15d6f9c6b514f28746a9a5a48fda7e0bf6628601e84782878dd1
-    initial_ast: 39a364088d7a924b10a9c299968a57fda0cc337bd28e26e00fe84ff5d32cf753
-    unrolled_ast: 39a364088d7a924b10a9c299968a57fda0cc337bd28e26e00fe84ff5d32cf753
-    ssa_ast: 3e544e4d924d2552f6427f0da30b3276ee8c37f51cf94331490a26c92cbb01d1
+    initial_ast: f3f64ded8c2dc7f6a15a9583f28c75e142c633642c66756e99d4ecea7bbbd0bc
+    unrolled_ast: f3f64ded8c2dc7f6a15a9583f28c75e142c633642c66756e99d4ecea7bbbd0bc
+    ssa_ast: 5896a15259c59cec1a2f434119fca975ddb5fd6614d63220726d7f035d9605c9
diff --git a/tests/expectations/compiler/function/function_call.out b/tests/expectations/compiler/function/function_call.out
index cf0ac0fb70..25f768f4c9 100644
--- a/tests/expectations/compiler/function/function_call.out
+++ b/tests/expectations/compiler/function/function_call.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d25b5d30496f06387198d06e44a771e142f8e6592347c3849a8b3b957287f1b6
-    initial_ast: 51c2a8c38c6f5ac885f74c52bcdc67e0fc914d2d8e40ac247c6d5e23936024e7
-    unrolled_ast: 51c2a8c38c6f5ac885f74c52bcdc67e0fc914d2d8e40ac247c6d5e23936024e7
-    ssa_ast: 822eccdf7f3e1ca5bd120b971224b7e7517e427f3b52bc94249de26053a1ba00
+    initial_ast: 44e69b8884ea77593c9b4cbd864c8d6b9127a698079c56f57184dc53cc4fc02c
+    unrolled_ast: 44e69b8884ea77593c9b4cbd864c8d6b9127a698079c56f57184dc53cc4fc02c
+    ssa_ast: 7590a1508ee415d154122261f3ed1c4ae9638e9bb351cc0f6eca5d1c3aef417a
diff --git a/tests/expectations/compiler/function/no_return_fail.out b/tests/expectations/compiler/function/no_return_fail.out
index 90b17b9e98..eb91575b3d 100644
--- a/tests/expectations/compiler/function/no_return_fail.out
+++ b/tests/expectations/compiler/function/no_return_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372011]: The function main has no return statement.\n    --> compiler-test:3:1\n     |\n   3 | function main() -> u8 {}\n     | ^^^^^^^^^^^^^^^^^^^^^^^^\n"
+  - "Failed to parse string. Parsing Error: VerboseError { errors: [(\"closure main:\\n\\n\\n\", Nom(Tag)), (\"closure main:\\n\\n\\n\", Nom(Alt)), (\"closure main:\\n\\n\\n\", Nom(Many1))] }"
diff --git a/tests/expectations/compiler/function/record_in_conditional_return.out b/tests/expectations/compiler/function/record_in_conditional_return.out
index e6103565d0..d23a354db4 100644
--- a/tests/expectations/compiler/function/record_in_conditional_return.out
+++ b/tests/expectations/compiler/function/record_in_conditional_return.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 253c751b3259b82291268a41b068825b0f365c0c2dcf1e75163bfc9b1c471680
-    unrolled_ast: 253c751b3259b82291268a41b068825b0f365c0c2dcf1e75163bfc9b1c471680
-    ssa_ast: 4b0ceaa16a095d6e5e6fced2d6c92c3802c997c7fe43186104537fee34808518
+    initial_ast: dd9e8dd09ccc4280e249af9cec84bdbdd03b53d6a5e177ec6e706e11a49b03ef
+    unrolled_ast: dd9e8dd09ccc4280e249af9cec84bdbdd03b53d6a5e177ec6e706e11a49b03ef
+    ssa_ast: 38ca5ceac9c91c679ec44a89a85533ea614202e74da004893881cc6d2cb61c89
diff --git a/tests/expectations/compiler/group/add.out b/tests/expectations/compiler/group/add.out
index 53ab081a83..6994d0e060 100644
--- a/tests/expectations/compiler/group/add.out
+++ b/tests/expectations/compiler/group/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b6634f935bedb2e2c2a3c2786c76903e2b1b726a43b08fa4bfb8fcac2c812cc8
-    initial_ast: 413bd27bdb48557c7a8beb9332f18551edcc198e4a507c1aa5a920b85b9e0e5c
-    unrolled_ast: 413bd27bdb48557c7a8beb9332f18551edcc198e4a507c1aa5a920b85b9e0e5c
-    ssa_ast: 0940441f30f569f3f87742f588ed2878a248d92ad0fb9f5cbb34762def67f385
+    initial_ast: 8d2b007cd1182ef59d2f556afd23bbbfa520669cceccb08b2336a97d11cd86ef
+    unrolled_ast: 8d2b007cd1182ef59d2f556afd23bbbfa520669cceccb08b2336a97d11cd86ef
+    ssa_ast: 0f7c47432b8119f50117668adf320519743f82d5981aa322e7f4b112df3834e2
diff --git a/tests/expectations/compiler/group/assert_eq.out b/tests/expectations/compiler/group/assert_eq.out
index 8ddcdc129f..cdcd0fba61 100644
--- a/tests/expectations/compiler/group/assert_eq.out
+++ b/tests/expectations/compiler/group/assert_eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ff9d503fc3496fd0c7f2b8c6eaeb66fdd0a0085f501068ccc30d2b00d4b02b27
-    initial_ast: 12173d34212b63d35adbe6b6eb15c200138c3fc076d982c0e4b5d2c182ec00c7
-    unrolled_ast: 12173d34212b63d35adbe6b6eb15c200138c3fc076d982c0e4b5d2c182ec00c7
-    ssa_ast: 8ffa9ff1f4a412af3b950120890cf03fa99f39a1f5db89e0e1e36623c1482bb0
+    initial_ast: f652c711da462b14ed2f8712d54c58c4f1cdb9e4afe4fbcee9ab0408f0485849
+    unrolled_ast: f652c711da462b14ed2f8712d54c58c4f1cdb9e4afe4fbcee9ab0408f0485849
+    ssa_ast: 31be3c89536dbcacb18f5c33d408666b3028010e553dd42e2d0e680c6c2c4345
diff --git a/tests/expectations/compiler/group/eq.out b/tests/expectations/compiler/group/eq.out
index 8ddcdc129f..cdcd0fba61 100644
--- a/tests/expectations/compiler/group/eq.out
+++ b/tests/expectations/compiler/group/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ff9d503fc3496fd0c7f2b8c6eaeb66fdd0a0085f501068ccc30d2b00d4b02b27
-    initial_ast: 12173d34212b63d35adbe6b6eb15c200138c3fc076d982c0e4b5d2c182ec00c7
-    unrolled_ast: 12173d34212b63d35adbe6b6eb15c200138c3fc076d982c0e4b5d2c182ec00c7
-    ssa_ast: 8ffa9ff1f4a412af3b950120890cf03fa99f39a1f5db89e0e1e36623c1482bb0
+    initial_ast: f652c711da462b14ed2f8712d54c58c4f1cdb9e4afe4fbcee9ab0408f0485849
+    unrolled_ast: f652c711da462b14ed2f8712d54c58c4f1cdb9e4afe4fbcee9ab0408f0485849
+    ssa_ast: 31be3c89536dbcacb18f5c33d408666b3028010e553dd42e2d0e680c6c2c4345
diff --git a/tests/expectations/compiler/group/group_mul.out b/tests/expectations/compiler/group/group_mul.out
index e89883e0af..bf210ca39d 100644
--- a/tests/expectations/compiler/group/group_mul.out
+++ b/tests/expectations/compiler/group/group_mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 66b7c5856db24994113cd4b094c52c941630f0f4923eb13891a40f9bf9f49d53
-    initial_ast: dd5757e5df2b968a9618bcc949c1f9c28824318ccc3072afbc9bfcfb24bc9a8f
-    unrolled_ast: dd5757e5df2b968a9618bcc949c1f9c28824318ccc3072afbc9bfcfb24bc9a8f
-    ssa_ast: c9e0373da4a14ffe607b54c090f793e1ba08c079cc8c74f8e418f534a751ca4e
+    initial_ast: 1ea6fc8e736e33b5da68e637ff1ca7a1968da11c8e3d229c7c29ce5070fcb172
+    unrolled_ast: 1ea6fc8e736e33b5da68e637ff1ca7a1968da11c8e3d229c7c29ce5070fcb172
+    ssa_ast: 5355d1d094817c9b90037f7bfb96718520fdccaae2f82e35ac86dddbb52aae85
diff --git a/tests/expectations/compiler/group/input.out b/tests/expectations/compiler/group/input.out
index 0d5c513b38..af1374c308 100644
--- a/tests/expectations/compiler/group/input.out
+++ b/tests/expectations/compiler/group/input.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: a572009d5f41a3f8e45fa4dd4bed89f86df99a536caa13fe8527c3fa2302998a
-    initial_ast: 12173d34212b63d35adbe6b6eb15c200138c3fc076d982c0e4b5d2c182ec00c7
-    unrolled_ast: 12173d34212b63d35adbe6b6eb15c200138c3fc076d982c0e4b5d2c182ec00c7
-    ssa_ast: 8ffa9ff1f4a412af3b950120890cf03fa99f39a1f5db89e0e1e36623c1482bb0
+    initial_ast: f652c711da462b14ed2f8712d54c58c4f1cdb9e4afe4fbcee9ab0408f0485849
+    unrolled_ast: f652c711da462b14ed2f8712d54c58c4f1cdb9e4afe4fbcee9ab0408f0485849
+    ssa_ast: 31be3c89536dbcacb18f5c33d408666b3028010e553dd42e2d0e680c6c2c4345
diff --git a/tests/expectations/compiler/group/mul.out b/tests/expectations/compiler/group/mul.out
index 27e33d4380..a509c1a38a 100644
--- a/tests/expectations/compiler/group/mul.out
+++ b/tests/expectations/compiler/group/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c4cd9adb78c217713c55b0c703a5feb71bcf57bf4f08a7bc8f194ac04f2ccb2d
-    initial_ast: db87b4c90587f8e1a30a9db75f847bfbaee7d3cad97cbf00ed71e6c41060261d
-    unrolled_ast: db87b4c90587f8e1a30a9db75f847bfbaee7d3cad97cbf00ed71e6c41060261d
-    ssa_ast: 29c58ed809245c1b7634c29a41f6ab57eb15e17aeee769298a247c5383fcf68b
+    initial_ast: f4e07d4d72c3388440c38baa44febb34a592aebcc9a996f73ae050e8f704d8b7
+    unrolled_ast: f4e07d4d72c3388440c38baa44febb34a592aebcc9a996f73ae050e8f704d8b7
+    ssa_ast: 600ca07745dc935bc96a3eb25a6ff03f0d45009f07f2f270ff2c1140b10726fd
diff --git a/tests/expectations/compiler/group/mult_by_scalar.out b/tests/expectations/compiler/group/mult_by_scalar.out
index 7a9ae013b8..6ac1443851 100644
--- a/tests/expectations/compiler/group/mult_by_scalar.out
+++ b/tests/expectations/compiler/group/mult_by_scalar.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: fdd1fd7e4382e3349e14966ee065723e881a88906b9008fb05f2281cf07a3f6a
-    initial_ast: d578f35a81675b8b0154cf784853f9b66b05d6142494465d2be2a211fe12a19f
-    unrolled_ast: d578f35a81675b8b0154cf784853f9b66b05d6142494465d2be2a211fe12a19f
-    ssa_ast: 958a2b9551fa3ecbfb25d77d044688a9eeece313554983128ab2ac1fbf98e17f
+    initial_ast: 1033764e95c9d4d3fed66f0a10b074d22536aeda41e5ca2cb9a2dd6e30bde118
+    unrolled_ast: 1033764e95c9d4d3fed66f0a10b074d22536aeda41e5ca2cb9a2dd6e30bde118
+    ssa_ast: 58f4eeccba8a06bf0261b3a9d81a9b652025ec0e0404607ebb25414d080cd494
diff --git a/tests/expectations/compiler/group/negate.out b/tests/expectations/compiler/group/negate.out
index f15d3a2a35..2c8767a236 100644
--- a/tests/expectations/compiler/group/negate.out
+++ b/tests/expectations/compiler/group/negate.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b77a849a5acf27cbcf1b1b638e3ea3dc8a0cbad74af16af4277adf3de16c4f6b
-    initial_ast: 436e1ec985f1cb1c825365763cccbce78d1f085bab5af1237d72e909dbd7f815
-    unrolled_ast: 436e1ec985f1cb1c825365763cccbce78d1f085bab5af1237d72e909dbd7f815
-    ssa_ast: 3b7f6d70825588912d71e417621d8be0a3bf0582ca90c2b38e1e0fcd2d056e09
+    initial_ast: 6bf8377a5e6c0b77c497b1d40c87abbec2924ce3de859b480864363fc6b4bdc1
+    unrolled_ast: 6bf8377a5e6c0b77c497b1d40c87abbec2924ce3de859b480864363fc6b4bdc1
+    ssa_ast: 8e359839b8fdd3f9fded25efe323c26dfd9dc9c7bd466d68a854d7a78741ce0d
diff --git a/tests/expectations/compiler/group/operator_methods.out b/tests/expectations/compiler/group/operator_methods.out
index 96982c0641..6ac1ee7659 100644
--- a/tests/expectations/compiler/group/operator_methods.out
+++ b/tests/expectations/compiler/group/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 42e1554b8e61a0b38abc274aa0948ce145779aa163012954b2577081fd9b6310
-    initial_ast: 27035cf53a21ceb28e8375e911e6be7916bbcb07e4f01d03712f90be7139cba4
-    unrolled_ast: 27035cf53a21ceb28e8375e911e6be7916bbcb07e4f01d03712f90be7139cba4
-    ssa_ast: 0722471a64f6dc25f0188a2f435eba74123d4c3572260f766d2019de2970f833
+    initial_ast: fcf6dde99f8cd356645cd833f151e1f097b8e213553f1eb2795153fbadec623d
+    unrolled_ast: fcf6dde99f8cd356645cd833f151e1f097b8e213553f1eb2795153fbadec623d
+    ssa_ast: 903baffa5a82b444d217a59de19756d367fbe9c94f1b2bd521f4de7b789d32fa
diff --git a/tests/expectations/compiler/group/point_input.out b/tests/expectations/compiler/group/point_input.out
index 5803a29364..36fac1cb11 100644
--- a/tests/expectations/compiler/group/point_input.out
+++ b/tests/expectations/compiler/group/point_input.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 21450ea2d3ba27a57383c5547860e5cd9d9624d4315f5232e8200ae725f20cd1
-    initial_ast: de793c44fffbf168820fb3688d7e836278402f15a1a3f9d88669e43069de56eb
-    unrolled_ast: de793c44fffbf168820fb3688d7e836278402f15a1a3f9d88669e43069de56eb
-    ssa_ast: b6b07211cd2349d98f8cd14548ef33968902bd9e91ac428f5d641a6e84920d61
+    initial_ast: b98a6a8fc56caa30e26eba8f371678e00aaef8909c9b8aee1b576c50e74f6441
+    unrolled_ast: b98a6a8fc56caa30e26eba8f371678e00aaef8909c9b8aee1b576c50e74f6441
+    ssa_ast: c51c05fe97980565ce1d0cd15c93694364b636155375513d0bdeaf7421bab4bc
diff --git a/tests/expectations/compiler/group/sub.out b/tests/expectations/compiler/group/sub.out
index e6bad511f1..dc5ec6445d 100644
--- a/tests/expectations/compiler/group/sub.out
+++ b/tests/expectations/compiler/group/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b6634f935bedb2e2c2a3c2786c76903e2b1b726a43b08fa4bfb8fcac2c812cc8
-    initial_ast: 7a5ecdffb1d5fd5b4e81a3ea7458b0c20d327fedbd3f9e54e35a33846f317ad2
-    unrolled_ast: 7a5ecdffb1d5fd5b4e81a3ea7458b0c20d327fedbd3f9e54e35a33846f317ad2
-    ssa_ast: 3cf55759f1687c94184d2591a1e1de3a5a5b8c735d9837063b4fdc9fdb627626
+    initial_ast: 3d3950241bcbbaea0ad50c4ce33a5bcb36a3e0381d181f5f5b73b724d1be5284
+    unrolled_ast: 3d3950241bcbbaea0ad50c4ce33a5bcb36a3e0381d181f5f5b73b724d1be5284
+    ssa_ast: be9800a51af5bd7b819932529d48d0ece1880931e075ca95561fa413879f1b7a
diff --git a/tests/expectations/compiler/group/ternary.out b/tests/expectations/compiler/group/ternary.out
index 281edbea24..70fb41731a 100644
--- a/tests/expectations/compiler/group/ternary.out
+++ b/tests/expectations/compiler/group/ternary.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 336580f3b1cd3da7ee881c492da25d869813eeaf9391a97b828ebdc259dca85d
-    initial_ast: a1560f054871574ff59241d024013bc6efd7c00d52a68765328ce5a0cfd6436e
-    unrolled_ast: a1560f054871574ff59241d024013bc6efd7c00d52a68765328ce5a0cfd6436e
-    ssa_ast: 260d06b7b055557d9917f954043b239e199cd77c9207bbef1795e54286d1e76d
+    initial_ast: 3df5e6d95b3a6224e6575ba260d470ac6a232b2c8455f9ada651fb0a84363f48
+    unrolled_ast: 3df5e6d95b3a6224e6575ba260d470ac6a232b2c8455f9ada651fb0a84363f48
+    ssa_ast: 021b1a8dd32d60c0491ce1f4fdb7c9c48dcfce8b976df98d4721f1d2d8e30eaf
diff --git a/tests/expectations/compiler/group/x_and_y.out b/tests/expectations/compiler/group/x_and_y.out
index 583c146f04..fdfc01d1db 100644
--- a/tests/expectations/compiler/group/x_and_y.out
+++ b/tests/expectations/compiler/group/x_and_y.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 6d52d239556a3f5040f33f7d915a1936af5c2517f075bcfdff81310bbe111e2d
-    initial_ast: b8265d425b1c224d040b952159c157c774d7877863d3af23cdc2f46903112120
-    unrolled_ast: b8265d425b1c224d040b952159c157c774d7877863d3af23cdc2f46903112120
-    ssa_ast: 0ea844702ebf72d0acc75d8b0c4159f89c01790d0eca5091f237e1ade28aa8ac
+    initial_ast: 1c5a58b5a9e05a4833bed51b92099b5e8f0fe19c13eee686397e904223a80cc5
+    unrolled_ast: 1c5a58b5a9e05a4833bed51b92099b5e8f0fe19c13eee686397e904223a80cc5
+    ssa_ast: caa82b0c06e48b24aa1e75d1dd856133c58e56fa62ddaeddbb0c46a0c3c24bfd
diff --git a/tests/expectations/compiler/group/x_sign_high.out b/tests/expectations/compiler/group/x_sign_high.out
index c3b0b2f2c4..6612760b51 100644
--- a/tests/expectations/compiler/group/x_sign_high.out
+++ b/tests/expectations/compiler/group/x_sign_high.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: cab4ec0e19e08134d51cd4c8546d13a6a0848c3d783e376473512ae558155443
-    initial_ast: 8d5722f840a1bd8e0225d84e390a84945440a45fa9491431966cb1df8b19f7de
-    unrolled_ast: 8d5722f840a1bd8e0225d84e390a84945440a45fa9491431966cb1df8b19f7de
-    ssa_ast: fe7b9a73fd55be20d5d1e84455ca1a19c30a4b45afdf85767fd8bd4f5ca3e05f
+    initial_ast: 52b18cfd0e5ee9e83d1a836526418e1a1a3198e3fe3baed13ba7f66741d97ad7
+    unrolled_ast: 52b18cfd0e5ee9e83d1a836526418e1a1a3198e3fe3baed13ba7f66741d97ad7
+    ssa_ast: 4a53d42ba8a40971c53be4c471765af8b94aca94ba0a283f2a5dba7ec2de59d3
diff --git a/tests/expectations/compiler/group/x_sign_inferred.out b/tests/expectations/compiler/group/x_sign_inferred.out
index 0f300629bf..843f823eb7 100644
--- a/tests/expectations/compiler/group/x_sign_inferred.out
+++ b/tests/expectations/compiler/group/x_sign_inferred.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: cab4ec0e19e08134d51cd4c8546d13a6a0848c3d783e376473512ae558155443
-    initial_ast: 5a6cf82bd97dcf2e99dbb112b9de9008e808b0ce228adc7dc32c2241e1004213
-    unrolled_ast: 5a6cf82bd97dcf2e99dbb112b9de9008e808b0ce228adc7dc32c2241e1004213
-    ssa_ast: 49d2101ca81e29a4865133504b0315ff7befeb1bee2eeb9ef2e40b034527eead
+    initial_ast: 6afcf0624c65899760b391204c2ca413a718b70933bbb7ea72ac9cfed53e4d9a
+    unrolled_ast: 6afcf0624c65899760b391204c2ca413a718b70933bbb7ea72ac9cfed53e4d9a
+    ssa_ast: 0c9be6b391e1eeeaaacef6de03944a20836e8c2f30dc9418768cb7ba57738340
diff --git a/tests/expectations/compiler/group/x_sign_low.out b/tests/expectations/compiler/group/x_sign_low.out
index a3a7ee64a0..9adcd44f4f 100644
--- a/tests/expectations/compiler/group/x_sign_low.out
+++ b/tests/expectations/compiler/group/x_sign_low.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: cab4ec0e19e08134d51cd4c8546d13a6a0848c3d783e376473512ae558155443
-    initial_ast: 730211ac9cac3681a984f6382bfe762c59e44e0a7937cd2c53e5873ed6adadf5
-    unrolled_ast: 730211ac9cac3681a984f6382bfe762c59e44e0a7937cd2c53e5873ed6adadf5
-    ssa_ast: c9b763af0bdddcfd858f286405a41707820f7752548200ccd1d2d3fcd8850394
+    initial_ast: 5a9390e8f104af651235e189a696b74ebbe95fcd5e02e5d24f5125426ed6a586
+    unrolled_ast: 5a9390e8f104af651235e189a696b74ebbe95fcd5e02e5d24f5125426ed6a586
+    ssa_ast: 1fcf1b4e0bf1501598706c01b940b49f9bf5a42b7371bd78f61966bd1a6b90cb
diff --git a/tests/expectations/compiler/group/zero.out b/tests/expectations/compiler/group/zero.out
index ef1678b689..b7ec655902 100644
--- a/tests/expectations/compiler/group/zero.out
+++ b/tests/expectations/compiler/group/zero.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: a220b4ebad69e490bf4a2471e4c4ecde9207f9806df90c3ba99f7f77d99eb97f
-    initial_ast: 9593dc7cf5bd56eaa2987cbec90badad818671a9b1eb03ce29641918e83ad376
-    unrolled_ast: 9593dc7cf5bd56eaa2987cbec90badad818671a9b1eb03ce29641918e83ad376
-    ssa_ast: 2c4d7b42e87625d0e845a750ef8a5945a7021e3ed12b6d0b9d0180d0403afc42
+    initial_ast: ce8da1456caa57d5ac75e52b8e7ef204c3306927c6361feddb60b00850f6021d
+    unrolled_ast: ce8da1456caa57d5ac75e52b8e7ef204c3306927c6361feddb60b00850f6021d
+    ssa_ast: ee0629e43ec23122484f61f14270a5cf35892e4cf442ee2901a061154085e104
diff --git a/tests/expectations/compiler/input/main.out b/tests/expectations/compiler/input/main.out
index 3ca4f265d3..60619903ec 100644
--- a/tests/expectations/compiler/input/main.out
+++ b/tests/expectations/compiler/input/main.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ec0d9b73b85bd860413bd3311ab45dd458e2750376357bd5c684b9e74d04c8fe
-    initial_ast: b2ba1edfcfd9b0e19c1a0458eec9949481cafd1139af73f422e6047e661c97b5
-    unrolled_ast: b2ba1edfcfd9b0e19c1a0458eec9949481cafd1139af73f422e6047e661c97b5
-    ssa_ast: 56e2c04a8662b07d73cff4f7adda94314d47dbb8725ded9389009bae75df07f2
+    initial_ast: 1255763f4cb116b93459359173e62caec6f965d8258e7b197661d0c9f02186c8
+    unrolled_ast: 1255763f4cb116b93459359173e62caec6f965d8258e7b197661d0c9f02186c8
+    ssa_ast: 89020ff070055c8ec9168c40316ebdbfea2bbbf882749c90df570363d0ac80f8
diff --git a/tests/expectations/compiler/input/main_field.out b/tests/expectations/compiler/input/main_field.out
index e1f70677c7..452962ea22 100644
--- a/tests/expectations/compiler/input/main_field.out
+++ b/tests/expectations/compiler/input/main_field.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 7fb6654aa7bd306bf6cad4947c013f389be8b4ae0b6f85780c9cb3ecaf2e3363
-    initial_ast: d8af42660bc99805296fb1c66d879ec1baf2ca9e673533ea9a3a3fd9803f8654
-    unrolled_ast: d8af42660bc99805296fb1c66d879ec1baf2ca9e673533ea9a3a3fd9803f8654
-    ssa_ast: 6ef3dbe90744b8d678d720398c4e24a481ab617c2d078b2f1579700433fca565
+    initial_ast: f92e672d7eb8dae37c495e31fb773f5c1aff1d0ca7d580b5631602ab3299a391
+    unrolled_ast: f92e672d7eb8dae37c495e31fb773f5c1aff1d0ca7d580b5631602ab3299a391
+    ssa_ast: 3b3864303fdc24cb68d1917145c13344ce7d9479756f6705424e23080c462d8a
diff --git a/tests/expectations/compiler/integers/i128/add.out b/tests/expectations/compiler/integers/i128/add.out
index af00636d3d..dbc125df31 100644
--- a/tests/expectations/compiler/integers/i128/add.out
+++ b/tests/expectations/compiler/integers/i128/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 039af54743c15033383282d9a4fbada1272039efbb8248abad2667a472268038
-    initial_ast: 8cb41ea7e4548c85d13da826e471f238045432ed2726b2891bfb860cd2b0d1cd
-    unrolled_ast: 8cb41ea7e4548c85d13da826e471f238045432ed2726b2891bfb860cd2b0d1cd
-    ssa_ast: 483ff07317ebc123e67c550cb45065b070e656969330a6c2e5940003fb329f54
+    initial_ast: d3a296cab27b8d6de6cdc3f4af4befbdbe31efd6157557ce8f0ab1898b8622df
+    unrolled_ast: d3a296cab27b8d6de6cdc3f4af4befbdbe31efd6157557ce8f0ab1898b8622df
+    ssa_ast: b2d54b55595de3c59d532380afbd075cca80820d5ad335db18a1afa765118e98
diff --git a/tests/expectations/compiler/integers/i128/and.out b/tests/expectations/compiler/integers/i128/and.out
index c27ea0c335..6f063e0ed5 100644
--- a/tests/expectations/compiler/integers/i128/and.out
+++ b/tests/expectations/compiler/integers/i128/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 039af54743c15033383282d9a4fbada1272039efbb8248abad2667a472268038
-    initial_ast: ebbe1eae683d1d4699d99b9a1202df862c44ac1f9b9355ad3341ebe11bc7ab9d
-    unrolled_ast: ebbe1eae683d1d4699d99b9a1202df862c44ac1f9b9355ad3341ebe11bc7ab9d
-    ssa_ast: d304441ba209e3b55397acdd2b465ad485051d2006f9f07c81b50470bb01a047
+    initial_ast: 23cf26e2716094b2a7f61375e180e7bc2e04715f1f4e5653b0f6e50e032381f2
+    unrolled_ast: 23cf26e2716094b2a7f61375e180e7bc2e04715f1f4e5653b0f6e50e032381f2
+    ssa_ast: 5ea0428f4c61997e6a8fb63a2d376c5758596886ad111db8e4a4625ccd97e4d9
diff --git a/tests/expectations/compiler/integers/i128/console_assert.out b/tests/expectations/compiler/integers/i128/console_assert.out
index 5140f70028..0557bf99a6 100644
--- a/tests/expectations/compiler/integers/i128/console_assert.out
+++ b/tests/expectations/compiler/integers/i128/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 79308811ede3a2d4c490aadba0d40a914b4efdb8cd97ab3c9677f806673aec8d
-    initial_ast: 21c3be96ac53c32241fb10fb02571a8c5ab037977a0703b2f0df0cd60df7135b
-    unrolled_ast: 21c3be96ac53c32241fb10fb02571a8c5ab037977a0703b2f0df0cd60df7135b
-    ssa_ast: 40100e4f5b81ee30c00c7d10ee8313e09012bf3912869e40b36930f540522b24
+    initial_ast: 2400ffcfb50474edda0ed122017a5d48b41bcfcba939c793fa0b6280f5dede5a
+    unrolled_ast: 2400ffcfb50474edda0ed122017a5d48b41bcfcba939c793fa0b6280f5dede5a
+    ssa_ast: c60884d501c02180c050d3a66b7c15abaf77662623fe8c559544dbe8f6587584
diff --git a/tests/expectations/compiler/integers/i128/div.out b/tests/expectations/compiler/integers/i128/div.out
index 33ffaa026b..50fd992e80 100644
--- a/tests/expectations/compiler/integers/i128/div.out
+++ b/tests/expectations/compiler/integers/i128/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 15e7c9d93b79f6ac900148264525a556e783fa4a482030968c0749a0f69b035e
-    initial_ast: d34f6fcd18c1cd5a7e1fbba0f04d60ae4448db4f751d43b3a6e26782d2803947
-    unrolled_ast: d34f6fcd18c1cd5a7e1fbba0f04d60ae4448db4f751d43b3a6e26782d2803947
-    ssa_ast: a9aa2a6a1fdb08dd2702e6a94e562d6293c3b37558f2828426d465816053a8af
+    initial_ast: 7360785b22318638f23a80f9a1f5f77d4dccfc4be238b85343c3489bed223135
+    unrolled_ast: 7360785b22318638f23a80f9a1f5f77d4dccfc4be238b85343c3489bed223135
+    ssa_ast: efee956a8cd79ebb618549a61b1911b71f76a46a2a10facde17f29792038de36
diff --git a/tests/expectations/compiler/integers/i128/eq.out b/tests/expectations/compiler/integers/i128/eq.out
index f6fe95c454..2c046a1169 100644
--- a/tests/expectations/compiler/integers/i128/eq.out
+++ b/tests/expectations/compiler/integers/i128/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 50c9794b0377757b37b71027a8f6264e9c2e1bdde040b3946b89521ce9a2fda6
-    initial_ast: 89fad1f78bb87849be6e9a9e648bf43158ba932dca576b7f9be4a708ae121cd8
-    unrolled_ast: 89fad1f78bb87849be6e9a9e648bf43158ba932dca576b7f9be4a708ae121cd8
-    ssa_ast: ea3d6f34370dd02957bfe2c6fe7a1d8cb1b38bd6940b216b3f4f462dec38d931
+    initial_ast: 6b7a83a099118a49ef0888ead091db2cb3c18e91582f00ed3ab336ab2f03e451
+    unrolled_ast: 6b7a83a099118a49ef0888ead091db2cb3c18e91582f00ed3ab336ab2f03e451
+    ssa_ast: d129daafc66bbe2f9a3204f61b66b34259ffa62f25594747ea7033e295cb0600
diff --git a/tests/expectations/compiler/integers/i128/ge.out b/tests/expectations/compiler/integers/i128/ge.out
index b1ffc2c362..0c68badcc7 100644
--- a/tests/expectations/compiler/integers/i128/ge.out
+++ b/tests/expectations/compiler/integers/i128/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 3c529c8d7cc460b8b3c2594fcc404fc454a6f9f6bf404f6e58ef0b9d0ac0bcea
       - initial_input_ast: adf28e234235b1bd389c5d33b44d415423d7f6e55321fb82f6b70be1810de213
-    initial_ast: 9be9bf6745d7790d6d4799698bb381b1e4af0c4165ce89fdd63dae15f2db3962
-    unrolled_ast: 9be9bf6745d7790d6d4799698bb381b1e4af0c4165ce89fdd63dae15f2db3962
-    ssa_ast: 890ee0021dba245d70ed01b9a728adbc96cb0fe44740d3b3b4b250e904377055
+    initial_ast: 9360c1895df506a320f62af6e2c44c0cfb47352b23ee40bd6b6b12c4f46740ec
+    unrolled_ast: 9360c1895df506a320f62af6e2c44c0cfb47352b23ee40bd6b6b12c4f46740ec
+    ssa_ast: f2e1887832db647aefc3a3de666784d75862407d087053c25224a39ae48eb06e
diff --git a/tests/expectations/compiler/integers/i128/gt.out b/tests/expectations/compiler/integers/i128/gt.out
index d1ecf07a26..8f732c4dc2 100644
--- a/tests/expectations/compiler/integers/i128/gt.out
+++ b/tests/expectations/compiler/integers/i128/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: d5091be026ee55218e4b4f064008f87bc05e1052fed135b68c3e3014d448d319
       - initial_input_ast: eb0db3f61bc7199a31443d1bb3a75c62678b3da03c299a984cb1e1ede94aa507
-    initial_ast: c6c337f1b6a62dde85eb46ac671a5b240c23d65669d4ddb5bc834293b6cd8091
-    unrolled_ast: c6c337f1b6a62dde85eb46ac671a5b240c23d65669d4ddb5bc834293b6cd8091
-    ssa_ast: 5302297d7fc4832f697d50f2fe1ea930013fe17692416afd6da41ece41d7569c
+    initial_ast: bf0febf93724def35b7b8ff4a6837a85cbc17d1eceef8be3f2ca8aab5bf8c89e
+    unrolled_ast: bf0febf93724def35b7b8ff4a6837a85cbc17d1eceef8be3f2ca8aab5bf8c89e
+    ssa_ast: ba61a1200b0093982f0ab86656880802818e4cc58715aaab42fd68a8a9f98918
diff --git a/tests/expectations/compiler/integers/i128/le.out b/tests/expectations/compiler/integers/i128/le.out
index 909753616f..4951ebe892 100644
--- a/tests/expectations/compiler/integers/i128/le.out
+++ b/tests/expectations/compiler/integers/i128/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 3c529c8d7cc460b8b3c2594fcc404fc454a6f9f6bf404f6e58ef0b9d0ac0bcea
       - initial_input_ast: 4e63736fd3aecff398414ac7d2625d79ab5fb81ee9eec0e3e28eeadd95d12e56
-    initial_ast: 6a829b275eb4ce7fbebd760a5d3e6635c6fbe2ff6e074cfdb824f14fcb59acc5
-    unrolled_ast: 6a829b275eb4ce7fbebd760a5d3e6635c6fbe2ff6e074cfdb824f14fcb59acc5
-    ssa_ast: 482beec26be12cc2831e87c1fc4e31ed736619c146c76e70efaf608af3e3edd6
+    initial_ast: b3d21dce106721afaa5f5dd793ca416cb46bd76add34fbafacdd67bb1e64b074
+    unrolled_ast: b3d21dce106721afaa5f5dd793ca416cb46bd76add34fbafacdd67bb1e64b074
+    ssa_ast: 012bd928b96692c70c40fb5dfb2513c8b551707e845c7367c1721b9e21b511aa
diff --git a/tests/expectations/compiler/integers/i128/lt.out b/tests/expectations/compiler/integers/i128/lt.out
index 71668ce4bf..e80a92733e 100644
--- a/tests/expectations/compiler/integers/i128/lt.out
+++ b/tests/expectations/compiler/integers/i128/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 6cbc303a565783de6a9aa6f963e27659d89d56c4106803e4387bdf5158df114d
       - initial_input_ast: 5d6aa3cebc88676c91bf621ae27eaf39fbb9babec171b2df88d8970d5fea5d9b
-    initial_ast: 82dc64e989b82e86ecf418c6ad078d09bbd781813bd1bfd006c7eb1ff18be035
-    unrolled_ast: 82dc64e989b82e86ecf418c6ad078d09bbd781813bd1bfd006c7eb1ff18be035
-    ssa_ast: a865cac6c6ff82cd556bba5c44cd39c94baeef11d61862db65062e801535c884
+    initial_ast: 99f2a8462b62ba043d46acbb288ede40e16b6868a7f7192197e2696c12a3e6b9
+    unrolled_ast: 99f2a8462b62ba043d46acbb288ede40e16b6868a7f7192197e2696c12a3e6b9
+    ssa_ast: d8d7e5224f9aebbe0e997347ffb77c5e12bd28ab157fab69c6c8167d516da52a
diff --git a/tests/expectations/compiler/integers/i128/max.out b/tests/expectations/compiler/integers/i128/max.out
index e4e5f863e2..a339474f65 100644
--- a/tests/expectations/compiler/integers/i128/max.out
+++ b/tests/expectations/compiler/integers/i128/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 79da2a39d3ce373fda219a5f4d946dfde01a8dbee50e2dfcffbfc892bf6d123f
-    initial_ast: 49031863e1088fbb7ed52434c9511656c7f020fed712646e08926148e343d55d
-    unrolled_ast: 49031863e1088fbb7ed52434c9511656c7f020fed712646e08926148e343d55d
-    ssa_ast: a7878e182eb6001dcce5061bcdb8f6096b6c5fcd546eebe8d82fb1b4e5949e80
+    initial_ast: 5fd865a496657eb246475364118b1c09f91bdbb69e50406f95f66d67418a09fb
+    unrolled_ast: 5fd865a496657eb246475364118b1c09f91bdbb69e50406f95f66d67418a09fb
+    ssa_ast: 2fba4371a78c6dba303d6bfe56cf402687dc9728372b66cbd69853afd8ba4db3
diff --git a/tests/expectations/compiler/integers/i128/max_fail.out b/tests/expectations/compiler/integers/i128/max_fail.out
index 9ac75fd08d..a8acd31da7 100644
--- a/tests/expectations/compiler/integers/i128/max_fail.out
+++ b/tests/expectations/compiler/integers/i128/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 170141183460469231731687303715884105728 is not a valid `i128`\n    --> compiler-test:4:21\n     |\n   4 |     const a: i128 = 170141183460469231731687303715884105728i128;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/i128/min.out b/tests/expectations/compiler/integers/i128/min.out
index 5fba583292..5aec33e023 100644
--- a/tests/expectations/compiler/integers/i128/min.out
+++ b/tests/expectations/compiler/integers/i128/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: a7f556e6d66a954ec5c7b4a8f326257e7c5535125bcb62db30aeb9668d4a4019
-    initial_ast: e4ee5e01149da67bbf01ef6829e33e3752c8a3df596fa31c94daa6a0463acc5d
-    unrolled_ast: e4ee5e01149da67bbf01ef6829e33e3752c8a3df596fa31c94daa6a0463acc5d
-    ssa_ast: af3ddff5b449c7dbf0f7ebcecdc8cd6dbfbfa874f1d820485220d28a4f184922
+    initial_ast: 6c6217f2316dc73f662e26bf11b5f6b1a6f9966444e105298a83006579832b20
+    unrolled_ast: 6c6217f2316dc73f662e26bf11b5f6b1a6f9966444e105298a83006579832b20
+    ssa_ast: af21a908ddb571bfc24d3fb98f61cbb4a01f78f8bbcd916918f3c96844b3dafb
diff --git a/tests/expectations/compiler/integers/i128/min_fail.out b/tests/expectations/compiler/integers/i128/min_fail.out
index 80b2e85d16..257394b8cd 100644
--- a/tests/expectations/compiler/integers/i128/min_fail.out
+++ b/tests/expectations/compiler/integers/i128/min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c73d747914473c57db75df7fd1672a0675b56394dca1ed1fb3536f6777c86d80
-    initial_ast: 795e9f24a9367289e91dc733ab1003241b325a1a80a7a1b45977f53d0ebe1bff
-    unrolled_ast: 795e9f24a9367289e91dc733ab1003241b325a1a80a7a1b45977f53d0ebe1bff
-    ssa_ast: d176a33c1b9e889e0b6a1fb5cb2a9b7f3f06f17a45551e965fe01b455176df62
+    initial_ast: 70d1743717b0d7d3ee2a920e3e639a5848d3c2bd23b35515ff7b7788aac119cc
+    unrolled_ast: 70d1743717b0d7d3ee2a920e3e639a5848d3c2bd23b35515ff7b7788aac119cc
+    ssa_ast: a8a553266cf51296a22f1dbd4682acef1430f3af6fab59c60a33d481291de8ce
diff --git a/tests/expectations/compiler/integers/i128/mul.out b/tests/expectations/compiler/integers/i128/mul.out
index f90f7ab0d6..b7c07eb6b3 100644
--- a/tests/expectations/compiler/integers/i128/mul.out
+++ b/tests/expectations/compiler/integers/i128/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: cc4bb320d4e0a99758a94b8f64a2e3da7469cd00db94156b05b3dc7d97173dc0
-    initial_ast: eca78eaf67756576a40e050afe2977b811cee929bfc82dbbf901c0c376dbca50
-    unrolled_ast: eca78eaf67756576a40e050afe2977b811cee929bfc82dbbf901c0c376dbca50
-    ssa_ast: 6857493c2f67f4a2e5a0fc4d8ed135651b6a4d16038cc691a9481ca4793b5063
+    initial_ast: 871bf92aa117fc935b3a0b5da90a6a2c7f9c999146063de4254806b176615757
+    unrolled_ast: 871bf92aa117fc935b3a0b5da90a6a2c7f9c999146063de4254806b176615757
+    ssa_ast: 8973099ea268dd6077dc25a1ded8088d5d29e2d71999d3b432a17b91783172a6
diff --git a/tests/expectations/compiler/integers/i128/ne.out b/tests/expectations/compiler/integers/i128/ne.out
index 1d7ad88fa8..03a377e5cc 100644
--- a/tests/expectations/compiler/integers/i128/ne.out
+++ b/tests/expectations/compiler/integers/i128/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: cb902874c03a9409774f0e1f3c2225d392f49ff46774d795599dd72bbe44f9cd
       - initial_input_ast: a1857946296862e584d879ddb5d5901b22cae5ea864bafc43de453ba9d99eb38
-    initial_ast: bed13d53e8578217b4a5455451fd5cada67882c2bc1cad251261c93776081a4d
-    unrolled_ast: bed13d53e8578217b4a5455451fd5cada67882c2bc1cad251261c93776081a4d
-    ssa_ast: 160e834f9a9c7fc4bad122933a2a027a34a960636ed82cfc43cd41bc9ac05998
+    initial_ast: 5ec3cb7fd57cb76ac1418ab448b5100d642706f920a4755dff4dc1c23008937d
+    unrolled_ast: 5ec3cb7fd57cb76ac1418ab448b5100d642706f920a4755dff4dc1c23008937d
+    ssa_ast: 045797d2354e6c77f78e24a4bd1bcfb437f35d8b66a2f2b67cadada89bed329b
diff --git a/tests/expectations/compiler/integers/i128/negate.out b/tests/expectations/compiler/integers/i128/negate.out
index d0f0e63b06..c075ab85eb 100644
--- a/tests/expectations/compiler/integers/i128/negate.out
+++ b/tests/expectations/compiler/integers/i128/negate.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 03f9c9174959a180ab0cff4fd139efad96ca1e9e63c78acada0097a065a1afff
       - initial_input_ast: 4537564bdc7b22346f16c5bb36ed4dbacafa3bc973f4cca857b7a9fa4e148ba4
-    initial_ast: 1198e8802889a565dc9a71ce43a500ec690c31289dc23808f2346b2b681bfc4d
-    unrolled_ast: 1198e8802889a565dc9a71ce43a500ec690c31289dc23808f2346b2b681bfc4d
-    ssa_ast: 2ebca81daeaca64bd88b3638763b57f68df2046fad75c2646a1e2e27dba84721
+    initial_ast: a0f484fe25697cb741f2264fd34e207a00a16eca14a481bee0304dd77e8512be
+    unrolled_ast: a0f484fe25697cb741f2264fd34e207a00a16eca14a481bee0304dd77e8512be
+    ssa_ast: 4fd397be6d277b0dace237d7775a0fe64da2b1920593c4dd8286b4d9f4b59b5a
diff --git a/tests/expectations/compiler/integers/i128/negate_min_fail.out b/tests/expectations/compiler/integers/i128/negate_min_fail.out
index 73b8c82ff0..ca2be30a18 100644
--- a/tests/expectations/compiler/integers/i128/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i128/negate_min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: bebb28a7f8a3f608d135f8e25ddff07a36e01448741c59b662c8d6f98a7f302c
-    initial_ast: 29b70d7d561c891f270b42427aef9b457ee76e69336b959ff012cf8f9e2c80f3
-    unrolled_ast: 29b70d7d561c891f270b42427aef9b457ee76e69336b959ff012cf8f9e2c80f3
-    ssa_ast: 2b6f8d67825b8d5ba98a0fafd2359d842ca4597859135641b5b99936f046596a
+    initial_ast: cfd67c38955673ce1cc8676aab96c6728bc8a9765842c628d85d88cde32a98f6
+    unrolled_ast: cfd67c38955673ce1cc8676aab96c6728bc8a9765842c628d85d88cde32a98f6
+    ssa_ast: d7f3e0a8c569b4ddcb0bb21de2d44a7044465c60b768e3fa4a8137c31e2e3ca6
diff --git a/tests/expectations/compiler/integers/i128/negate_zero.out b/tests/expectations/compiler/integers/i128/negate_zero.out
index e374bff073..a16b70cf79 100644
--- a/tests/expectations/compiler/integers/i128/negate_zero.out
+++ b/tests/expectations/compiler/integers/i128/negate_zero.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5b85c589bd5729444d6aad8fa52e8f17f93b026a8e3991766fa304ed7a57aa78
-    initial_ast: 8835babb37405c0500b5afdc7398e9e2af4846ad2bd28069cbc970b049ac3263
-    unrolled_ast: 8835babb37405c0500b5afdc7398e9e2af4846ad2bd28069cbc970b049ac3263
-    ssa_ast: 451c0a28809a5c4f8c2f91039c31e5f803b38b0382ee6e8d395d8b61cce60bff
+    initial_ast: 6162d2ef385084767ea8bb4e22113e1ca6ef356c3539d0ebb78bec34a20d56d1
+    unrolled_ast: 6162d2ef385084767ea8bb4e22113e1ca6ef356c3539d0ebb78bec34a20d56d1
+    ssa_ast: 40b323c054b55534a55375c689a6ac00b574f5ff9591a20d82aa3a4754db52b8
diff --git a/tests/expectations/compiler/integers/i128/no_space_between_literal.out b/tests/expectations/compiler/integers/i128/no_space_between_literal.out
index 9ac75fd08d..6b7cf9240a 100644
--- a/tests/expectations/compiler/integers/i128/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/i128/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 i128;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/i128/operator_methods.out b/tests/expectations/compiler/integers/i128/operator_methods.out
index 7f927c7ca6..e3c844b70c 100644
--- a/tests/expectations/compiler/integers/i128/operator_methods.out
+++ b/tests/expectations/compiler/integers/i128/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 0177c7eed02c77740d71258108323ec082e7625abdf9cf5d3e9a2c5151262d99
-    initial_ast: f2440654b91cb9c2533040471585afd33b3f70326999dce763d3f1e5dd65768b
-    unrolled_ast: f2440654b91cb9c2533040471585afd33b3f70326999dce763d3f1e5dd65768b
-    ssa_ast: 7a252e263887b0d6519fe4d2122a5cc28498aa39882b011b7d40635051d4cc43
+    initial_ast: 3f03123932fbeb8430125091bc0e6424d97cfbacdc1f7015ce50800e854154d4
+    unrolled_ast: 3f03123932fbeb8430125091bc0e6424d97cfbacdc1f7015ce50800e854154d4
+    ssa_ast: 7978ed068ef09594f5479c1f379b906356c48b21debeb3dcffa18888ae73f2f3
diff --git a/tests/expectations/compiler/integers/i128/or.out b/tests/expectations/compiler/integers/i128/or.out
index de80f981b0..7bc2fd5b88 100644
--- a/tests/expectations/compiler/integers/i128/or.out
+++ b/tests/expectations/compiler/integers/i128/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 039af54743c15033383282d9a4fbada1272039efbb8248abad2667a472268038
-    initial_ast: 3f70d81b08637e25905b47bc8d980edf1fefc6410c03211fce13139a0f52ed99
-    unrolled_ast: 3f70d81b08637e25905b47bc8d980edf1fefc6410c03211fce13139a0f52ed99
-    ssa_ast: f0d0d4d67da5847054fd4e988c938c697c983a182b2e41b09a8666c1b6637ead
+    initial_ast: 044d61d9e197a87dc52057ff9fb3adf4b63dfb05a7008ea5d31a53b6638f6788
+    unrolled_ast: 044d61d9e197a87dc52057ff9fb3adf4b63dfb05a7008ea5d31a53b6638f6788
+    ssa_ast: bb0974774c1b316652ecc4a94612abe563c5610df7bfd146c6bb225025fa104c
diff --git a/tests/expectations/compiler/integers/i128/pow.out b/tests/expectations/compiler/integers/i128/pow.out
index 480aed2f6e..471eaa0e5b 100644
--- a/tests/expectations/compiler/integers/i128/pow.out
+++ b/tests/expectations/compiler/integers/i128/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: fc1e1ab7acff26b62b719506922cd02b116f446510fafb1181186474528de408
-    initial_ast: 084a8e8dbfd98f10f91ee5f7a4d4affab7cee84087c81df43290239c32da36ee
-    unrolled_ast: 084a8e8dbfd98f10f91ee5f7a4d4affab7cee84087c81df43290239c32da36ee
-    ssa_ast: 73834d430207284818cae25c39c573f095d712c274db88fa1f4dfa8b3288932d
+    initial_ast: 2e8f46340be1e0e90de6b45f7683ee9929c671e984d9358bd40bf990c1455f6f
+    unrolled_ast: 2e8f46340be1e0e90de6b45f7683ee9929c671e984d9358bd40bf990c1455f6f
+    ssa_ast: d26811162ae3efaefabb83aa301ccfd62141db111229fb7fb90abecaf87f2ae8
diff --git a/tests/expectations/compiler/integers/i128/rem.out b/tests/expectations/compiler/integers/i128/rem.out
index 9ba53583fb..766ffb6015 100644
--- a/tests/expectations/compiler/integers/i128/rem.out
+++ b/tests/expectations/compiler/integers/i128/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 15e7c9d93b79f6ac900148264525a556e783fa4a482030968c0749a0f69b035e
-    initial_ast: a742ff29fca7b7ba04eee4a2a2d4e061f2abbb6b78f171b6fca1ad66a6b20fe1
-    unrolled_ast: a742ff29fca7b7ba04eee4a2a2d4e061f2abbb6b78f171b6fca1ad66a6b20fe1
-    ssa_ast: b9c781c47501253976067473a2e28f30b0d4674602d338adc9fc4422aeb485c9
+    initial_ast: 76344a3b9d8076287bd507e9b0dbf57dc96e689ff46eb6d7bb7b22d668258e02
+    unrolled_ast: 76344a3b9d8076287bd507e9b0dbf57dc96e689ff46eb6d7bb7b22d668258e02
+    ssa_ast: 0fd497a86eb78e0cf193701d7e6796ac9d4d4cc2c7623b8c2b173bb93e732a89
diff --git a/tests/expectations/compiler/integers/i128/shl.out b/tests/expectations/compiler/integers/i128/shl.out
index 57e8941ac8..df5b006ea4 100644
--- a/tests/expectations/compiler/integers/i128/shl.out
+++ b/tests/expectations/compiler/integers/i128/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: dcc462f54ea6ca5718527bd01c96bafa3a9d8d42b539db23b6f570867441b2c0
-    initial_ast: 6b22b73cdb78e3ab476ef31b0eabc99c54e2972c59ddead6a98ac1d78e2b38b4
-    unrolled_ast: 6b22b73cdb78e3ab476ef31b0eabc99c54e2972c59ddead6a98ac1d78e2b38b4
-    ssa_ast: 24071729cb82aa208fc8326897e15b083fd9ceb0024699e23dc129b727021ffd
+    initial_ast: a6a7afe2ebc2296c06600fd0238301e4bba981e6b40adb080c98ed8f0e7bac21
+    unrolled_ast: a6a7afe2ebc2296c06600fd0238301e4bba981e6b40adb080c98ed8f0e7bac21
+    ssa_ast: 5236ac917180929bad687964da90c1eb2b72410feb6a7f857cecb4af26151cc0
diff --git a/tests/expectations/compiler/integers/i128/shr.out b/tests/expectations/compiler/integers/i128/shr.out
index 82c9c36984..e5ed01087f 100644
--- a/tests/expectations/compiler/integers/i128/shr.out
+++ b/tests/expectations/compiler/integers/i128/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: dcc462f54ea6ca5718527bd01c96bafa3a9d8d42b539db23b6f570867441b2c0
-    initial_ast: ddd0347d2d97e89b2be0e612203633b9cd52076a2f7147e63df8f31d7bbc458a
-    unrolled_ast: ddd0347d2d97e89b2be0e612203633b9cd52076a2f7147e63df8f31d7bbc458a
-    ssa_ast: e85d1909f826905db4b25097ff2ce02d85725fd3ea83b762e7895caac579dbf6
+    initial_ast: dc7bf4c1e71b84df0693118c1e1a15d6b7029976aaf387656e1c2aaa7852c4ad
+    unrolled_ast: dc7bf4c1e71b84df0693118c1e1a15d6b7029976aaf387656e1c2aaa7852c4ad
+    ssa_ast: c554323383fe68cf6e27308723c4b1253e96f8bbf612ef90def62ce9c788ba68
diff --git a/tests/expectations/compiler/integers/i128/sub.out b/tests/expectations/compiler/integers/i128/sub.out
index 307019a5d8..dce0389720 100644
--- a/tests/expectations/compiler/integers/i128/sub.out
+++ b/tests/expectations/compiler/integers/i128/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 1a5fe4b85de6981afcc4c53e54ddfc72e5898e737875b4108d495fce8aa23194
-    initial_ast: e6c2c7feccb82574d356b256f3a2c0725d0d4bc98507ea3c9ea1edae756e1b0f
-    unrolled_ast: e6c2c7feccb82574d356b256f3a2c0725d0d4bc98507ea3c9ea1edae756e1b0f
-    ssa_ast: 5cc3dabe141e111a8e111cf7a97d555dd5ee675f6e6855c419827f6ff747dd0d
+    initial_ast: 44fd7939507c17c124244b769516d846565fb7167e7d3a9917e65cbb11e543a9
+    unrolled_ast: 44fd7939507c17c124244b769516d846565fb7167e7d3a9917e65cbb11e543a9
+    ssa_ast: a3ecfb1c747f4191886f044e627ff463d6cfd66ee317734f1bd9d95bb37b8e17
diff --git a/tests/expectations/compiler/integers/i128/ternary.out b/tests/expectations/compiler/integers/i128/ternary.out
index 9768e5cd44..9d3348fca1 100644
--- a/tests/expectations/compiler/integers/i128/ternary.out
+++ b/tests/expectations/compiler/integers/i128/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 90608a4dc4fe1c76f2ca875129ae9038d3d0585a6c671e4efca827af29dbdfc1
       - initial_input_ast: 579a49a1239e4c5e70cc3d3f40256a55f1d4f4d250dc9e71dab89b292f77bce5
-    initial_ast: 014b67f6534901d1ee9e9cb2856c690f3b9d8fe20c33354683086d63fb5e3b2a
-    unrolled_ast: 014b67f6534901d1ee9e9cb2856c690f3b9d8fe20c33354683086d63fb5e3b2a
-    ssa_ast: 078a5ba750cb5ebc4f4ee115f5ca9b632a7e493e443ceba90a677fdff53a870c
+    initial_ast: 0cfc2bad37cdb6578ccaa105f81ba689694af462d22f5fe306803a4d87ca4304
+    unrolled_ast: 0cfc2bad37cdb6578ccaa105f81ba689694af462d22f5fe306803a4d87ca4304
+    ssa_ast: bccea5226658e4677ea21784cf4e63ef2ed5cb72a6ba6e4eec8eeca2aab4467e
diff --git a/tests/expectations/compiler/integers/i128/xor.out b/tests/expectations/compiler/integers/i128/xor.out
index cbc81d8bc3..f5eef2e885 100644
--- a/tests/expectations/compiler/integers/i128/xor.out
+++ b/tests/expectations/compiler/integers/i128/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3b6b12b624fce460422e119724836696bf4446f9f26feff0e5d76f7e345f4573
-    initial_ast: 70b62f7098c5f41f96565542d01884b52ec66266c299ef39e7998904acbf05c6
-    unrolled_ast: 70b62f7098c5f41f96565542d01884b52ec66266c299ef39e7998904acbf05c6
-    ssa_ast: 5ecacfc9e6d204609e7f593b9cde179cf47d52f4c565a21b8edee76b5353c3e6
+    initial_ast: 347c05346c278630ee40bd07c0ab1ea32e438be360b11cd6f52dbb9adcaf9fa8
+    unrolled_ast: 347c05346c278630ee40bd07c0ab1ea32e438be360b11cd6f52dbb9adcaf9fa8
+    ssa_ast: 11f6d91f79ce529a0fa4ef0c73ad90e6f6be24115f63ea203ba9873ac2c07abc
diff --git a/tests/expectations/compiler/integers/i16/add.out b/tests/expectations/compiler/integers/i16/add.out
index a1a5ad136f..a247553e8e 100644
--- a/tests/expectations/compiler/integers/i16/add.out
+++ b/tests/expectations/compiler/integers/i16/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 40307e11e7c825f8af2ba9d98ba89534834e5816500737ac4d4d2507063f0497
-    initial_ast: 8985c105b525f7385714f6b229a5cba90669eeafbe9df7de0ebb89cd8a5d5955
-    unrolled_ast: 8985c105b525f7385714f6b229a5cba90669eeafbe9df7de0ebb89cd8a5d5955
-    ssa_ast: 530c6750a860cb8501014eaa3a4ee449d120cc2ba02398d440a5f6bd1fa1e2a7
+    initial_ast: 827415a0c8e1df27ec63bb2fdb2596683b321565e7c0d01b19b75692225280b5
+    unrolled_ast: 827415a0c8e1df27ec63bb2fdb2596683b321565e7c0d01b19b75692225280b5
+    ssa_ast: 9305c9dfd4da1f6cf16127824b7edd1da49d439615cf08b83533c99dee0849ff
diff --git a/tests/expectations/compiler/integers/i16/and.out b/tests/expectations/compiler/integers/i16/and.out
index 16de485da0..b27c5187ed 100644
--- a/tests/expectations/compiler/integers/i16/and.out
+++ b/tests/expectations/compiler/integers/i16/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 40307e11e7c825f8af2ba9d98ba89534834e5816500737ac4d4d2507063f0497
-    initial_ast: b0f9902f2fd821f50f79d8d5f6b5939920d73cf86f800ead76e79ae625eaa096
-    unrolled_ast: b0f9902f2fd821f50f79d8d5f6b5939920d73cf86f800ead76e79ae625eaa096
-    ssa_ast: c7db04ca6968f9bbf6ff81bce453f1806b56eb205e60e4c01ff0083641c98897
+    initial_ast: 46cfb3f3994f667aadf09ab25af5f1d995b40b0f1f5e9f4437ea98bc6d1a7d58
+    unrolled_ast: 46cfb3f3994f667aadf09ab25af5f1d995b40b0f1f5e9f4437ea98bc6d1a7d58
+    ssa_ast: 25b8cf85f231288e278a9889c7566e2a698fff9179bbb396b0e6533c664ed22d
diff --git a/tests/expectations/compiler/integers/i16/console_assert.out b/tests/expectations/compiler/integers/i16/console_assert.out
index 85527faf55..9f831b09dc 100644
--- a/tests/expectations/compiler/integers/i16/console_assert.out
+++ b/tests/expectations/compiler/integers/i16/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: aabcbfbe3c7ad948859c5594b0a8aa0da06f84502dab69e1f74cbf15964169bc
-    initial_ast: 3eccea2d4f47a2bd1eeacb96e8448a4345a538c101a874a2893a6ba0f5f60aa9
-    unrolled_ast: 3eccea2d4f47a2bd1eeacb96e8448a4345a538c101a874a2893a6ba0f5f60aa9
-    ssa_ast: fe5c25b91b27e2190adc792767b9f85bee8f1fb4055fef34a636b352a7fa31d1
+    initial_ast: 67a6b47438e335801dfa5bd47c2b9db492b97ee79f0e637efc817aca72961e36
+    unrolled_ast: 67a6b47438e335801dfa5bd47c2b9db492b97ee79f0e637efc817aca72961e36
+    ssa_ast: 4747a85469e34bb0da0b386f6f9372e36669f417bea56662e39c59a991df262c
diff --git a/tests/expectations/compiler/integers/i16/div.out b/tests/expectations/compiler/integers/i16/div.out
index 9f94bfd8e5..66003e8653 100644
--- a/tests/expectations/compiler/integers/i16/div.out
+++ b/tests/expectations/compiler/integers/i16/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d176e8f3f8e1c2fdba4f650075f34212caad33f2d09ec00cf99e806ed08f7d01
-    initial_ast: fc8f10942610cdbef3836f1c381e6124fcc073f6126f5d9a085951b16d90d9a0
-    unrolled_ast: fc8f10942610cdbef3836f1c381e6124fcc073f6126f5d9a085951b16d90d9a0
-    ssa_ast: c1fa6f21db73403aaf1703f47fad9c21fdce1f13acd858ac6a27774b85acc1bd
+    initial_ast: f421ee1fbc57034a8e959bef579142fc785637d17d21ecafcbf8d026e83a7029
+    unrolled_ast: f421ee1fbc57034a8e959bef579142fc785637d17d21ecafcbf8d026e83a7029
+    ssa_ast: ee154526a87abd688a9f6f92689611a0de93f98a2da5d4b1fdf8334ccc39aa33
diff --git a/tests/expectations/compiler/integers/i16/eq.out b/tests/expectations/compiler/integers/i16/eq.out
index e260f197a2..8e8ec529fb 100644
--- a/tests/expectations/compiler/integers/i16/eq.out
+++ b/tests/expectations/compiler/integers/i16/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9f4e840f09f05a9d5a333a7556c1e06fa92a9285b2b100e15e845c0728d0b1d1
-    initial_ast: 3f8d8e8605e6b8a739ce9b6ed4cd16e289c66c4d41e6e05b4e4c1ed8276cc3a4
-    unrolled_ast: 3f8d8e8605e6b8a739ce9b6ed4cd16e289c66c4d41e6e05b4e4c1ed8276cc3a4
-    ssa_ast: 17197bb6f8ad36e6861a7757f0392ef837a444a61862fd1907ece70bb6f4b673
+    initial_ast: c3345e719fbc47d25da62fed136e34dbd1456cfae6dccec9b32d9e05148be38e
+    unrolled_ast: c3345e719fbc47d25da62fed136e34dbd1456cfae6dccec9b32d9e05148be38e
+    ssa_ast: 5395012e446043c35e7d54aac0fe56f1ce502c3ece2db2f86f38bf39fdbd0870
diff --git a/tests/expectations/compiler/integers/i16/ge.out b/tests/expectations/compiler/integers/i16/ge.out
index efea966ca5..405df52c75 100644
--- a/tests/expectations/compiler/integers/i16/ge.out
+++ b/tests/expectations/compiler/integers/i16/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 1e3bc80186397460f0d7fdbca7bfc8c4a2c65ea8f544f12f8cbf987520327a70
       - initial_input_ast: c5c783e56584d35218b1794b0cc2b78527e882c2d120abff2f6f62a9bd9f4d1b
-    initial_ast: c49350d64779995af1b2bffe13f675d52e43693168f3645be08162fb787d0167
-    unrolled_ast: c49350d64779995af1b2bffe13f675d52e43693168f3645be08162fb787d0167
-    ssa_ast: cf33d80c133b8f5bb9b8e98f6e27e2b6c70be216c208a448450775b7371c0621
+    initial_ast: 4b0f7308780f9fc35a86bcfa6fc17974823fad772a68c671d8ffdb2a29217c89
+    unrolled_ast: 4b0f7308780f9fc35a86bcfa6fc17974823fad772a68c671d8ffdb2a29217c89
+    ssa_ast: c48202eef478015fe84c62a9dca64f322a94c227b9863235594a717adbf6c3a8
diff --git a/tests/expectations/compiler/integers/i16/gt.out b/tests/expectations/compiler/integers/i16/gt.out
index 8355990c0a..f8deb2aac4 100644
--- a/tests/expectations/compiler/integers/i16/gt.out
+++ b/tests/expectations/compiler/integers/i16/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 96bd5d5fadb142f2d4584560f23c06453171ac46bce758962d3fa62d3de826b9
       - initial_input_ast: 55d6f4c3055a015f300fddd93616965b5a8c6339ee3c8a052a1a3ca43131c75e
-    initial_ast: 42798019e2fd5fc8745a7d3c76e8be7af2a2e75d50832bdf7065852e4a5918ef
-    unrolled_ast: 42798019e2fd5fc8745a7d3c76e8be7af2a2e75d50832bdf7065852e4a5918ef
-    ssa_ast: 22e15980e6e22903b4e26092646654bcb850edeb3a033e5f2acc54a829c92ef7
+    initial_ast: 5bbb8a90de27ffd02f86acc6207ba99da9ec35546e242429720883ec0865e248
+    unrolled_ast: 5bbb8a90de27ffd02f86acc6207ba99da9ec35546e242429720883ec0865e248
+    ssa_ast: 74ee843db46dd55d019ce8b6763c061a042859533a04167a7f2529c56a6183b6
diff --git a/tests/expectations/compiler/integers/i16/le.out b/tests/expectations/compiler/integers/i16/le.out
index 72a41caeae..c858a74330 100644
--- a/tests/expectations/compiler/integers/i16/le.out
+++ b/tests/expectations/compiler/integers/i16/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 1e3bc80186397460f0d7fdbca7bfc8c4a2c65ea8f544f12f8cbf987520327a70
       - initial_input_ast: ab2559f6d78ee4c41a3d7e181ee872eca6139dd7f6defa981decc3c7c3173e86
-    initial_ast: b24c462126fe92d422e5e7db07143f4173b2d5ab5b574eb6a036cfa19ff51278
-    unrolled_ast: b24c462126fe92d422e5e7db07143f4173b2d5ab5b574eb6a036cfa19ff51278
-    ssa_ast: ef1285ef68a9ae67a859e4d2d1a369df99818af0ccafc997324a3bb8b17f69cc
+    initial_ast: 6aecfad96bfb116ff503ec98d2c14e5a828ccca93b38ff94dbc863deb59b5494
+    unrolled_ast: 6aecfad96bfb116ff503ec98d2c14e5a828ccca93b38ff94dbc863deb59b5494
+    ssa_ast: f369f682e0b59e3594c37e9e5abf8ea78ab8dedbe859e24db1eb11110b44c298
diff --git a/tests/expectations/compiler/integers/i16/lt.out b/tests/expectations/compiler/integers/i16/lt.out
index 55c522b9bb..f6018a3ce2 100644
--- a/tests/expectations/compiler/integers/i16/lt.out
+++ b/tests/expectations/compiler/integers/i16/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: bf5506bb148ebd276e006d26957cb9d1482319cce03716eae74e4e973c7e3c53
       - initial_input_ast: b5f8e0f060ee0428c214f242e56679137c1fb661fedbb792a16207b2e5ea3faf
-    initial_ast: aedce9023089d97fe6a3ec4e31925861f0c63db55b2948ee4eff1e4906758128
-    unrolled_ast: aedce9023089d97fe6a3ec4e31925861f0c63db55b2948ee4eff1e4906758128
-    ssa_ast: 23f24e56184db47fdf9a811eb0d6015b194934d80c74df7ef8299249f340c6cd
+    initial_ast: d5b5296be675ed2e76bad5255261d5dba280acce10df2c0a745f0344509bfb8f
+    unrolled_ast: d5b5296be675ed2e76bad5255261d5dba280acce10df2c0a745f0344509bfb8f
+    ssa_ast: 954e6ae3ebdf74fecb4d0f72b006a46e97478029e2fdd616e410d20629698c3c
diff --git a/tests/expectations/compiler/integers/i16/max.out b/tests/expectations/compiler/integers/i16/max.out
index 69a1ae1af0..f42e4df0c8 100644
--- a/tests/expectations/compiler/integers/i16/max.out
+++ b/tests/expectations/compiler/integers/i16/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 42c3ea30914e89eb47ce7d31a96d47f6d1cd364a7fb5cd0d27e49735bae4cc00
-    initial_ast: 34b7710d3851f0028a85a9b26a4ad715eab46619894ce03806b10a4f1cbb8498
-    unrolled_ast: 34b7710d3851f0028a85a9b26a4ad715eab46619894ce03806b10a4f1cbb8498
-    ssa_ast: b4d546e6ee5e6795a579417f7420b295524bda80ca11c9a1d211990d4966e080
+    initial_ast: ce11b98005f976ac7b80980c44361fe42ffca737106b3ecddc8f0e9711b33914
+    unrolled_ast: ce11b98005f976ac7b80980c44361fe42ffca737106b3ecddc8f0e9711b33914
+    ssa_ast: 2efac811601617e8da1123444aecec51bdec78109293283cd76ae85ca2fe536c
diff --git a/tests/expectations/compiler/integers/i16/min.out b/tests/expectations/compiler/integers/i16/min.out
index 3db23f46cb..9b4c40e700 100644
--- a/tests/expectations/compiler/integers/i16/min.out
+++ b/tests/expectations/compiler/integers/i16/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3659f083f005fb393c9ae234061a976d0cb989def72f50688dd09eb6505a5e88
-    initial_ast: 45dea5c2198b67fad9e3b2fbc5f5552636ee6c25a0bea79f43a2bd80d612bb7a
-    unrolled_ast: 45dea5c2198b67fad9e3b2fbc5f5552636ee6c25a0bea79f43a2bd80d612bb7a
-    ssa_ast: 7587aeec0b6da97898c35786afe62a415ce7ef57ee2a1e82ac0b5222351f48d0
+    initial_ast: 3c94127179fd57c7296255e7fb8b4ad44083bf21b4e65039c480dcc1478f3d96
+    unrolled_ast: 3c94127179fd57c7296255e7fb8b4ad44083bf21b4e65039c480dcc1478f3d96
+    ssa_ast: a7d3d161f0afd27397d1e383b465a258549f215c1b3e2bd03266b56492c00b47
diff --git a/tests/expectations/compiler/integers/i16/min_fail.out b/tests/expectations/compiler/integers/i16/min_fail.out
index 1789f6110c..efdd89f10d 100644
--- a/tests/expectations/compiler/integers/i16/min_fail.out
+++ b/tests/expectations/compiler/integers/i16/min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 79bcbe7e9238a5693c7767022694c80ac5b120c8a165666d22d3a84b31c1a561
-    initial_ast: 4c062ea11c57aee7ada847c877c13fbc87480bb753e8f2ed1e8cebf738bb0bb9
-    unrolled_ast: 4c062ea11c57aee7ada847c877c13fbc87480bb753e8f2ed1e8cebf738bb0bb9
-    ssa_ast: 911df6fe27651bab5848641ce59cfabfccfd7a97982a97432d26dd36d0e6a0a7
+    initial_ast: d90e06b094412c0b380abb7c2aac5da5903f1a659517037f46969a26e0ec5fab
+    unrolled_ast: d90e06b094412c0b380abb7c2aac5da5903f1a659517037f46969a26e0ec5fab
+    ssa_ast: f204ca0632dd7f144447b01d600015848a551efaf4cd7dde74776b1a9880a840
diff --git a/tests/expectations/compiler/integers/i16/mul.out b/tests/expectations/compiler/integers/i16/mul.out
index f297bf2308..69dd44f2a3 100644
--- a/tests/expectations/compiler/integers/i16/mul.out
+++ b/tests/expectations/compiler/integers/i16/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9722cdeff84adc4cdb69b06d4a24ccdca73b41ba1c8b0ee49a2bc0f7e7b69785
-    initial_ast: 41a4c3e19d24b7a5534691754ef19b54f99249fc0d763ecd2ddac9a6948611f7
-    unrolled_ast: 41a4c3e19d24b7a5534691754ef19b54f99249fc0d763ecd2ddac9a6948611f7
-    ssa_ast: abc03900013dba940f1e3e5b2ac83b96a3ae9405a1af6cbd919ecbf31ca5dace
+    initial_ast: fc14260f7db984e80f2cbdda5ce3f9a392b76d8ea426cd63c585636c9041d4fe
+    unrolled_ast: fc14260f7db984e80f2cbdda5ce3f9a392b76d8ea426cd63c585636c9041d4fe
+    ssa_ast: 7c30ba71e1d7e0974d972144e194158f8761ee74c0746fe390145458087e5aef
diff --git a/tests/expectations/compiler/integers/i16/ne.out b/tests/expectations/compiler/integers/i16/ne.out
index be8855e93e..9343c96b84 100644
--- a/tests/expectations/compiler/integers/i16/ne.out
+++ b/tests/expectations/compiler/integers/i16/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 8f4c093de1f74f3bdac1881fd891906c77d3afe8a8b374ffd5bd84f0f392945e
       - initial_input_ast: d0df3c351200469c617f5c31e0c41ca9a54ed97b690aca511a5427359dbbaed9
-    initial_ast: 0b139b14a2e1a93eb9a8dc8dacfaac839d246e0934bfcac1f08b577a3a3e3daf
-    unrolled_ast: 0b139b14a2e1a93eb9a8dc8dacfaac839d246e0934bfcac1f08b577a3a3e3daf
-    ssa_ast: 36a2227f51241a05abc24bcdf533fb1cade6f8258075881d6c0bf4f787afefff
+    initial_ast: 9fc3f0d05510ea1e0e729c6d3e215e46d80d428ec640e52af99fc8072b7917ed
+    unrolled_ast: 9fc3f0d05510ea1e0e729c6d3e215e46d80d428ec640e52af99fc8072b7917ed
+    ssa_ast: 30cb9bee1799ccc4b0bdaf2176488c1a21f58c9ea43704a7086ed451b2c84a89
diff --git a/tests/expectations/compiler/integers/i16/negate.out b/tests/expectations/compiler/integers/i16/negate.out
index 38a59d1caa..874710a7e9 100644
--- a/tests/expectations/compiler/integers/i16/negate.out
+++ b/tests/expectations/compiler/integers/i16/negate.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 6148c63792d2df4234dae1e3a094c87e461afdf10b2761c0b2ecbb143b4aeaf0
       - initial_input_ast: c19503821db7d2fe797e97f0c3b0a969e575de996efa0f63e3ba87ec8ed2afdc
-    initial_ast: 5523fe724ef6c36b7015611a29988f6b8c48601676d29c79709eacbbba4826e3
-    unrolled_ast: 5523fe724ef6c36b7015611a29988f6b8c48601676d29c79709eacbbba4826e3
-    ssa_ast: 51688043295760d6bd198eb075dee831a54e783675e1c9379d301d783f27618c
+    initial_ast: f882ab7db3294a1d9f7c6ea7fadb3a275049cd3a42d36f4001eaf26e336ddd20
+    unrolled_ast: f882ab7db3294a1d9f7c6ea7fadb3a275049cd3a42d36f4001eaf26e336ddd20
+    ssa_ast: c90abbb49ab83437083edde4ba85e3a7b04a6303a671694d827c4b2cb70db3aa
diff --git a/tests/expectations/compiler/integers/i16/negate_min_fail.out b/tests/expectations/compiler/integers/i16/negate_min_fail.out
index 7f3ed1901b..5e650d6d15 100644
--- a/tests/expectations/compiler/integers/i16/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i16/negate_min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 7d7d24b1f2f5007157bd3955352c5c5a27447c23c7c5c9d0760aaddec8de6c6b
-    initial_ast: 35dd31b63d998a50fe7b90b0b7757a8e01ba0297216101dd8f5ac260cd0b15c8
-    unrolled_ast: 35dd31b63d998a50fe7b90b0b7757a8e01ba0297216101dd8f5ac260cd0b15c8
-    ssa_ast: b845954686080176bec1993190f544945b3e7bc41e528988d2ecdf96beb2e77e
+    initial_ast: d49b10aa8d2191039e7e14fbf596d9aed43e1a57d477054ab169b8bab37edfb8
+    unrolled_ast: d49b10aa8d2191039e7e14fbf596d9aed43e1a57d477054ab169b8bab37edfb8
+    ssa_ast: fa73096d958bc95147e6a9e7d874a278dc814b8f0ff9a7d26276134f514c456c
diff --git a/tests/expectations/compiler/integers/i16/negate_zero.out b/tests/expectations/compiler/integers/i16/negate_zero.out
index 5f12abf2d3..aabf335fc9 100644
--- a/tests/expectations/compiler/integers/i16/negate_zero.out
+++ b/tests/expectations/compiler/integers/i16/negate_zero.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d7efb950b283e8043cb74d699f193749324f2fb6714df5fde527c348f849a179
-    initial_ast: a18d4fab16bc79da6e814142c5e14b9e4862544838f6baf1fb0169ccbb24c6d3
-    unrolled_ast: a18d4fab16bc79da6e814142c5e14b9e4862544838f6baf1fb0169ccbb24c6d3
-    ssa_ast: 9f9d523d705f53899433ae0005ded17bb25d11e78ef355eda0e0c4701b412ce3
+    initial_ast: cab3cd15580ad7dc9983dcededaf99edb02431ae542e0a9b36b2ff0ea7b50c4c
+    unrolled_ast: cab3cd15580ad7dc9983dcededaf99edb02431ae542e0a9b36b2ff0ea7b50c4c
+    ssa_ast: e92e0fa1f519beed2e5c0101662ce7f85819b97e696f894b1c3fda3b2b68a404
diff --git a/tests/expectations/compiler/integers/i16/no_space_between_literal.out b/tests/expectations/compiler/integers/i16/no_space_between_literal.out
index 9ac75fd08d..f05d413a3d 100644
--- a/tests/expectations/compiler/integers/i16/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/i16/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 i16;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/i16/operator_methods.out b/tests/expectations/compiler/integers/i16/operator_methods.out
index 10efe55194..60cd3e792c 100644
--- a/tests/expectations/compiler/integers/i16/operator_methods.out
+++ b/tests/expectations/compiler/integers/i16/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: f340494ce3be84e4198d8615b02c7c1c3ca14fbcf1bf0750350dd61211302cdb
-    initial_ast: 62363f765d86c7947442ceb6752b2f289556a689963d2fcd17df66d80bf4d93f
-    unrolled_ast: 62363f765d86c7947442ceb6752b2f289556a689963d2fcd17df66d80bf4d93f
-    ssa_ast: ec0f5c6bdab8eed8e7809cf6e5fd7d666f04225fd7c81a5f8ef227ffa505c37e
+    initial_ast: c500e4162d58a0d098b69d974f4c7a97cbc52250e26a244e07d6957954af8a0c
+    unrolled_ast: c500e4162d58a0d098b69d974f4c7a97cbc52250e26a244e07d6957954af8a0c
+    ssa_ast: 2bc61666467c4f61269589696be6c1f044b6aa898c5f38a096bdb049899fc475
diff --git a/tests/expectations/compiler/integers/i16/or.out b/tests/expectations/compiler/integers/i16/or.out
index 28ac03b670..d513183a02 100644
--- a/tests/expectations/compiler/integers/i16/or.out
+++ b/tests/expectations/compiler/integers/i16/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 40307e11e7c825f8af2ba9d98ba89534834e5816500737ac4d4d2507063f0497
-    initial_ast: 02b8f55dfbe35129b8756d74dca23a0bded26d2d9e6b2669c81427838c4b3737
-    unrolled_ast: 02b8f55dfbe35129b8756d74dca23a0bded26d2d9e6b2669c81427838c4b3737
-    ssa_ast: 5264b76962c6e41f1eab4748a39674ba12587e989c6a7c980843d967a0e5b9d8
+    initial_ast: 2bccf8807c4f474a4243e2718df17d13e84b167c7dbaa69d6deadb42a038dc00
+    unrolled_ast: 2bccf8807c4f474a4243e2718df17d13e84b167c7dbaa69d6deadb42a038dc00
+    ssa_ast: b3449cba8c86847c2309f131424402bba3ad4531b25b6961c75d616f13aba339
diff --git a/tests/expectations/compiler/integers/i16/pow.out b/tests/expectations/compiler/integers/i16/pow.out
index 70285b3ca4..91a2206bbe 100644
--- a/tests/expectations/compiler/integers/i16/pow.out
+++ b/tests/expectations/compiler/integers/i16/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e3629375749944fc640359e2e871b50137d6a40fd22301134f7c708c24438365
-    initial_ast: 1fa0350da2b96d6443d1ee887306921a092036aac71bfdcf87f3342912a0e327
-    unrolled_ast: 1fa0350da2b96d6443d1ee887306921a092036aac71bfdcf87f3342912a0e327
-    ssa_ast: 941d0e4c9f10c1c9969463e13353723965278e82b05db2a849a175438de07bad
+    initial_ast: 1836c6ad9ae30c7e7b8786233bd31d27fb03ed2747dcbe45e991f4daed1804cc
+    unrolled_ast: 1836c6ad9ae30c7e7b8786233bd31d27fb03ed2747dcbe45e991f4daed1804cc
+    ssa_ast: 11684c2839457fa1b573e83ced202e0849cf510f5714737747739808543bb69f
diff --git a/tests/expectations/compiler/integers/i16/rem.out b/tests/expectations/compiler/integers/i16/rem.out
index e71c68e0f0..ac01ace360 100644
--- a/tests/expectations/compiler/integers/i16/rem.out
+++ b/tests/expectations/compiler/integers/i16/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d176e8f3f8e1c2fdba4f650075f34212caad33f2d09ec00cf99e806ed08f7d01
-    initial_ast: e067cced4470108d16488d1f36b9cb5147ce440f66aceb319622c758c597b796
-    unrolled_ast: e067cced4470108d16488d1f36b9cb5147ce440f66aceb319622c758c597b796
-    ssa_ast: c1106046865cbaac38a712930935305719a298de4175661db10fe78918cb50c3
+    initial_ast: ba03804337d980cc3ea8feff5bbf6b9c8921ba52b071553ed2ac2ecce963bf8b
+    unrolled_ast: ba03804337d980cc3ea8feff5bbf6b9c8921ba52b071553ed2ac2ecce963bf8b
+    ssa_ast: 609c712b7a9b96f3dc3a8301208eb9220096e717d9fc98c05a2426c7f2830cf6
diff --git a/tests/expectations/compiler/integers/i16/shl.out b/tests/expectations/compiler/integers/i16/shl.out
index be76c3d534..32608c8008 100644
--- a/tests/expectations/compiler/integers/i16/shl.out
+++ b/tests/expectations/compiler/integers/i16/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 011c30fafe5e5b8fc33a71cac58c44075184ab0cceb337388285a0bb5d4254f4
-    initial_ast: 2e3024b53179c38e1eff480d4aa80f2cb0af72e0dac9fd5f549846eb5bb6846c
-    unrolled_ast: 2e3024b53179c38e1eff480d4aa80f2cb0af72e0dac9fd5f549846eb5bb6846c
-    ssa_ast: 17189de3f92631c4d89858adc926ac4818a75f81ba4b279b476ad1f8bad86b14
+    initial_ast: f7b86dd9b68f84596237bd6bbc292f811613eb286a7353054b390514c29598cc
+    unrolled_ast: f7b86dd9b68f84596237bd6bbc292f811613eb286a7353054b390514c29598cc
+    ssa_ast: f2e09e1133b0689516b202d3f68f39bfe6f079a0c2942944a854153088dbff0e
diff --git a/tests/expectations/compiler/integers/i16/shr.out b/tests/expectations/compiler/integers/i16/shr.out
index a0ac16e962..3ce59599e8 100644
--- a/tests/expectations/compiler/integers/i16/shr.out
+++ b/tests/expectations/compiler/integers/i16/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 011c30fafe5e5b8fc33a71cac58c44075184ab0cceb337388285a0bb5d4254f4
-    initial_ast: 7870e4441e1deb8460fc2ab499ae3de988a03e700c97a22af1b88ad9f6d5cde6
-    unrolled_ast: 7870e4441e1deb8460fc2ab499ae3de988a03e700c97a22af1b88ad9f6d5cde6
-    ssa_ast: f350ce9c72a95436eb198102433723d0d808c9527c7543eba2e2980150875c17
+    initial_ast: d075d223d02d3c667c7ea7a262c65b0f0e5fab13c16d5c4a46b601d5a2874c4b
+    unrolled_ast: d075d223d02d3c667c7ea7a262c65b0f0e5fab13c16d5c4a46b601d5a2874c4b
+    ssa_ast: b5249e7fdc5dcea8a56b49bf734eb13df4b4924a0af8955783fbb55a7a2a7382
diff --git a/tests/expectations/compiler/integers/i16/sub.out b/tests/expectations/compiler/integers/i16/sub.out
index e2127cd352..a393449536 100644
--- a/tests/expectations/compiler/integers/i16/sub.out
+++ b/tests/expectations/compiler/integers/i16/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: f29c7d2e431dde3de3c970179105ab02912cf0aecd0ef180d452a0af37677534
-    initial_ast: 16ec5a24002a7c273947547b6126c81d77e5ad5264f4c67bad4b9fbebd934831
-    unrolled_ast: 16ec5a24002a7c273947547b6126c81d77e5ad5264f4c67bad4b9fbebd934831
-    ssa_ast: 2acfc025379c3e063a88b7e5a0720b5a2b512e91212250f2754a50f80a4d0e32
+    initial_ast: 35e608adbe8c159b8ae5428a60e07f9aa8dcd2c42433b124b635cbd7adf18e73
+    unrolled_ast: 35e608adbe8c159b8ae5428a60e07f9aa8dcd2c42433b124b635cbd7adf18e73
+    ssa_ast: ef5ca9f6e15f9d7035783e3ed77e8b43bc36f4a5a0bf2591d616ba8225edc7b0
diff --git a/tests/expectations/compiler/integers/i16/ternary.out b/tests/expectations/compiler/integers/i16/ternary.out
index 5a76659714..010658764a 100644
--- a/tests/expectations/compiler/integers/i16/ternary.out
+++ b/tests/expectations/compiler/integers/i16/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: a1af7a4643cac81ced12af9c07c21529b6ccdc821f401fc219796fea8e2bbee5
       - initial_input_ast: e2e39a4d263ee686e6dc45d22a01806c565cf251757cad894ab48dda6af88729
-    initial_ast: 1a0ea05e17c3ce0d76cb18b782e34e02602ad7bd6974bed18bd05077cce1f0a8
-    unrolled_ast: 1a0ea05e17c3ce0d76cb18b782e34e02602ad7bd6974bed18bd05077cce1f0a8
-    ssa_ast: a974c2d821787e73b4d81ed320ab819fd4982db15b52c1aeae023f27171efd6a
+    initial_ast: 6079bf5caf862cd4d8d81b0adf0918ef8af5075fc1da2888bd3be01c70ec6273
+    unrolled_ast: 6079bf5caf862cd4d8d81b0adf0918ef8af5075fc1da2888bd3be01c70ec6273
+    ssa_ast: 504a36b36842701d8e3d2ef21591abce9c38c856d1fda38c3d13fe6d3ecd06d3
diff --git a/tests/expectations/compiler/integers/i16/xor.out b/tests/expectations/compiler/integers/i16/xor.out
index 4652c1d074..a076a7ac0e 100644
--- a/tests/expectations/compiler/integers/i16/xor.out
+++ b/tests/expectations/compiler/integers/i16/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 39d44e875fc43ef0d828d99321b682becf9a4589682d9b151e4c491c1a0de1eb
-    initial_ast: 3f82b6ddabcaf9bea260aa7c711ff7d2debfe2df5fe8e7a33629edba4f2dc4d5
-    unrolled_ast: 3f82b6ddabcaf9bea260aa7c711ff7d2debfe2df5fe8e7a33629edba4f2dc4d5
-    ssa_ast: 73bb669a6bdda8ab0299f308bd4aaa2a2910394c6f98f571ed4dacc251707dc5
+    initial_ast: c8de57f0314c28998d14abcf4a0af97115d87983e7b18071fa2e093fbd769145
+    unrolled_ast: c8de57f0314c28998d14abcf4a0af97115d87983e7b18071fa2e093fbd769145
+    ssa_ast: a204236cf86fe26320d2bbadc213a272c4f2fb956c88d4b9573fd0e7c69ed46e
diff --git a/tests/expectations/compiler/integers/i32/add.out b/tests/expectations/compiler/integers/i32/add.out
index 10fdce1f4a..1509b1b707 100644
--- a/tests/expectations/compiler/integers/i32/add.out
+++ b/tests/expectations/compiler/integers/i32/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 115a6d30ecb5cb1da8947c891164f05b134b1b1ec674a4ad7347dc9a0e29bba5
-    initial_ast: e1721b6654ebe85b76b9778d9c22fbbed76373a52fbff87b433193a9bb511bf0
-    unrolled_ast: e1721b6654ebe85b76b9778d9c22fbbed76373a52fbff87b433193a9bb511bf0
-    ssa_ast: 7ff42863d987bd5213e2fd4419521b08147bc07109a5b630b850681d438a41b9
+    initial_ast: a94fbeee38ecb7bcd8a033861cf98f126a0a4b74213fe856b400fbde8b37af07
+    unrolled_ast: a94fbeee38ecb7bcd8a033861cf98f126a0a4b74213fe856b400fbde8b37af07
+    ssa_ast: e34d70a442356bc5c7842c7a3a9b031577d7109e71581c07ba4ed536857678ec
diff --git a/tests/expectations/compiler/integers/i32/and.out b/tests/expectations/compiler/integers/i32/and.out
index 60255a0fcf..7d290f19a1 100644
--- a/tests/expectations/compiler/integers/i32/and.out
+++ b/tests/expectations/compiler/integers/i32/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 115a6d30ecb5cb1da8947c891164f05b134b1b1ec674a4ad7347dc9a0e29bba5
-    initial_ast: dfef26887e9435adaf002108323be8bc93056a768c3707949cba7f84f24d9f3c
-    unrolled_ast: dfef26887e9435adaf002108323be8bc93056a768c3707949cba7f84f24d9f3c
-    ssa_ast: 87f9337b55b53fc9ce0e53c77329774b895ca751b4dd06f7a39e5d9fa16c66c5
+    initial_ast: d104f7ef9a2de7a112f8222e8cb118bd809c37cefeeffd09ee9f9a2e664ad515
+    unrolled_ast: d104f7ef9a2de7a112f8222e8cb118bd809c37cefeeffd09ee9f9a2e664ad515
+    ssa_ast: 9f9427e8d543510056e1940fd54ff69c35243d419955e018bff65eb37fd1628f
diff --git a/tests/expectations/compiler/integers/i32/console_assert.out b/tests/expectations/compiler/integers/i32/console_assert.out
index 85452c6d14..c785ff29ac 100644
--- a/tests/expectations/compiler/integers/i32/console_assert.out
+++ b/tests/expectations/compiler/integers/i32/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 2d9e24f0eff681efa2b8314ac499e01e459c0410f9198551ba0eb10acc001bbc
-    initial_ast: dedc73a0c2e5badb2c64679073cc21dc4e4d6699e2fa1276db20aae83acb0bdb
-    unrolled_ast: dedc73a0c2e5badb2c64679073cc21dc4e4d6699e2fa1276db20aae83acb0bdb
-    ssa_ast: 88836ba9feedf44e9f30b52cfad308b0a72ce38bd2adda32c291518167f48ef3
+    initial_ast: 1e32dad42f34f28a000c106c1e9497d9e8314d7e680983e4b2ec4b374ea41e94
+    unrolled_ast: 1e32dad42f34f28a000c106c1e9497d9e8314d7e680983e4b2ec4b374ea41e94
+    ssa_ast: fd1af98217685b42991d3b3773f3d6d6f350f58f2f136db97f16a34f55350102
diff --git a/tests/expectations/compiler/integers/i32/div.out b/tests/expectations/compiler/integers/i32/div.out
index ad4cadc379..a4563aa885 100644
--- a/tests/expectations/compiler/integers/i32/div.out
+++ b/tests/expectations/compiler/integers/i32/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: fe4ab50a782b6c0845f8aad4f6fc15552e8535ef1d9a2577244472922e574c29
-    initial_ast: 2e59600ba64983e795870b2fb3af730ed8a730f124cc3446b5986fb1ecf8a29b
-    unrolled_ast: 2e59600ba64983e795870b2fb3af730ed8a730f124cc3446b5986fb1ecf8a29b
-    ssa_ast: 0d09db8b686f1e14fc9d92c91670bc1d90fda2ca2a087466573f59c79b31d985
+    initial_ast: cc68095da39dee424db38c5ac76d24d190a989d80a4f77f2510f03aa09e6210b
+    unrolled_ast: cc68095da39dee424db38c5ac76d24d190a989d80a4f77f2510f03aa09e6210b
+    ssa_ast: c4fd294251fed86eccd2c23b8c974b9da713e888ea6d965545fc2c798465df0b
diff --git a/tests/expectations/compiler/integers/i32/eq.out b/tests/expectations/compiler/integers/i32/eq.out
index 6881a17846..5ff9f85b96 100644
--- a/tests/expectations/compiler/integers/i32/eq.out
+++ b/tests/expectations/compiler/integers/i32/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9bc3ddb569ee0fdc3124bc962fae2f3847c6f774977fbab344f83dbc5843e155
-    initial_ast: 173b23a5d86dceb185e7bd8f128f638daac9185357ae97858456d8dd8705a44c
-    unrolled_ast: 173b23a5d86dceb185e7bd8f128f638daac9185357ae97858456d8dd8705a44c
-    ssa_ast: c54250bddceb2f7dbd1d502d0097ed69d7702ec996998131e8e4eeb79282bd9e
+    initial_ast: 3a713bf120470e053eb1ba9a666202a428f7c38accea88ef7ba4441506895166
+    unrolled_ast: 3a713bf120470e053eb1ba9a666202a428f7c38accea88ef7ba4441506895166
+    ssa_ast: 3ef755ce3a6072e5d831c3a7bcee8991e9b445040e573732293e27ad244509d0
diff --git a/tests/expectations/compiler/integers/i32/ge.out b/tests/expectations/compiler/integers/i32/ge.out
index df00440074..36791728c4 100644
--- a/tests/expectations/compiler/integers/i32/ge.out
+++ b/tests/expectations/compiler/integers/i32/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 1fa88a06cb7904bb6ea38bcb43cbbfc1d6ee6b006b17df3163c364f7e243a3dc
       - initial_input_ast: 7a74980e5da40040f4780fbf4dfd669822a27ccd0f969e61eaf9b1e417c514a2
-    initial_ast: 869209c2cd09d779eeadc2ebeab8a6232a68b8b6f69d24e53b8df10dba28a920
-    unrolled_ast: 869209c2cd09d779eeadc2ebeab8a6232a68b8b6f69d24e53b8df10dba28a920
-    ssa_ast: 9868c612ad1c146d3ccfb44e53e23d57919252589b94c5a22e02f20c873e371c
+    initial_ast: 3846ef10902ef2eedcd08b2478c68f2e7ba12e17513e75fe007d1b10ce24efe0
+    unrolled_ast: 3846ef10902ef2eedcd08b2478c68f2e7ba12e17513e75fe007d1b10ce24efe0
+    ssa_ast: 41a0b62582adaded1840fb0525e56f912a9d8338560eca7c3deced7a00eb70db
diff --git a/tests/expectations/compiler/integers/i32/gt.out b/tests/expectations/compiler/integers/i32/gt.out
index 5eaf4772dd..4cc10c741e 100644
--- a/tests/expectations/compiler/integers/i32/gt.out
+++ b/tests/expectations/compiler/integers/i32/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 6fb06b89859fe3226d58feb5de4308e41bd94f1f353b714b78b5e9e9f8e59067
       - initial_input_ast: 6c356448bc6553c91445af7b202407784666d13b43b1d5b6cb7f46507e7dce64
-    initial_ast: dc1d1d597314ac619e5e8513d4400f40262796c095ad7da660dd004a4b63da51
-    unrolled_ast: dc1d1d597314ac619e5e8513d4400f40262796c095ad7da660dd004a4b63da51
-    ssa_ast: 7e4da494b25e930c6e1aa877f49aa8e6d46baf8f6bad0196ae465fbe900c0513
+    initial_ast: bac1b78c75c7d1fe1c76842cdacf4e15fc3b2d11aee6598ecfae4e95a7e99f23
+    unrolled_ast: bac1b78c75c7d1fe1c76842cdacf4e15fc3b2d11aee6598ecfae4e95a7e99f23
+    ssa_ast: cd577af16b8bd3cde98a9556933cc70303794ffedd9027c7844e0c73cbda7df2
diff --git a/tests/expectations/compiler/integers/i32/le.out b/tests/expectations/compiler/integers/i32/le.out
index e108b69009..aa057b6c64 100644
--- a/tests/expectations/compiler/integers/i32/le.out
+++ b/tests/expectations/compiler/integers/i32/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 1fa88a06cb7904bb6ea38bcb43cbbfc1d6ee6b006b17df3163c364f7e243a3dc
       - initial_input_ast: 34fca992b4e36972940eab79a622a8eacea6767d3396dd1d3ae9a7c3374429b8
-    initial_ast: db63fb0495282be89071f8cd91ece4fe704f9ad49efd9edcf6db2dedc810f15d
-    unrolled_ast: db63fb0495282be89071f8cd91ece4fe704f9ad49efd9edcf6db2dedc810f15d
-    ssa_ast: c16bc0973a798f6b3c65db6f4937394d0792080f03bf31a30964e7f65eae8ecb
+    initial_ast: 2f58f27dbbfe202b16f6c80390ac53640ec42dcd63865f7122b7a172f463be00
+    unrolled_ast: 2f58f27dbbfe202b16f6c80390ac53640ec42dcd63865f7122b7a172f463be00
+    ssa_ast: 0200f7cffadb6ef5e5c33c57e79c658577393ecd494ada0e1353167acd0bad93
diff --git a/tests/expectations/compiler/integers/i32/lt.out b/tests/expectations/compiler/integers/i32/lt.out
index 953c76f96b..c8d69bb8a1 100644
--- a/tests/expectations/compiler/integers/i32/lt.out
+++ b/tests/expectations/compiler/integers/i32/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 5e260199130a28cb0fe68b9b99907af0abc64b197ad290518e286382b6583e9f
       - initial_input_ast: 101d5088f3e20acaef900756e1dd82deb3bcef96515ec9e29451000acb93f574
-    initial_ast: bc94de50034f88bcac9ce4adee333c5b159275f98ca1bfb8c622a559751f7858
-    unrolled_ast: bc94de50034f88bcac9ce4adee333c5b159275f98ca1bfb8c622a559751f7858
-    ssa_ast: 838cc41f804ba00b2b173fd2221016df4ce5e5d8261f044908291d3377c821fd
+    initial_ast: 8d6d5f178299842e733e91bdda9f7b1f5d769399708091b7d901cc0774708eea
+    unrolled_ast: 8d6d5f178299842e733e91bdda9f7b1f5d769399708091b7d901cc0774708eea
+    ssa_ast: 4b7c0979db346c665140a02e86be85726ff629a013c5335f28e5b20225db6aee
diff --git a/tests/expectations/compiler/integers/i32/max.out b/tests/expectations/compiler/integers/i32/max.out
index de9a61a21a..9792908649 100644
--- a/tests/expectations/compiler/integers/i32/max.out
+++ b/tests/expectations/compiler/integers/i32/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9c83d769040080581099af69372dfe6e214a24ac5a525b7ec2ea847a6bad0510
-    initial_ast: 3556d31a46db4c3b7a222459011cbc346f11c1d7a2ded6f11bc6844084865b0c
-    unrolled_ast: 3556d31a46db4c3b7a222459011cbc346f11c1d7a2ded6f11bc6844084865b0c
-    ssa_ast: 23700b0ddfa66288487323efd93c505fe5917d9dd5f86aa7c7f53ced04feec5b
+    initial_ast: 54db1fa964e63ad932ecb793fe57636331e05f477db0211b5de67e5caf34655c
+    unrolled_ast: 54db1fa964e63ad932ecb793fe57636331e05f477db0211b5de67e5caf34655c
+    ssa_ast: 73c24e311451181a6dd479723fd1660775710009fe14bd3889140bcb54f6d917
diff --git a/tests/expectations/compiler/integers/i32/max_fail.out b/tests/expectations/compiler/integers/i32/max_fail.out
index 9ac75fd08d..9c561f28a5 100644
--- a/tests/expectations/compiler/integers/i32/max_fail.out
+++ b/tests/expectations/compiler/integers/i32/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 2147483648 is not a valid `i32`\n    --> compiler-test:4:20\n     |\n   4 |     const a: i32 = 2147483648i32;\n     |                    ^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/i32/min.out b/tests/expectations/compiler/integers/i32/min.out
index 2f3d60bcef..7d29ffa687 100644
--- a/tests/expectations/compiler/integers/i32/min.out
+++ b/tests/expectations/compiler/integers/i32/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 79b30b487a7c4c687b0b97e1dcaf1b979a57f5a2a995c8b716941ce243694fb2
-    initial_ast: 079e2d621a8f7aa52a443e4cb2f6b541f0c6479c549b1185e3931a0e2262c4c7
-    unrolled_ast: 079e2d621a8f7aa52a443e4cb2f6b541f0c6479c549b1185e3931a0e2262c4c7
-    ssa_ast: d8a86cad8b02603c803c1b40740507fd08e7e3ad080f3e44568336c9ec495979
+    initial_ast: bf31b9137a295e68ff681265c7c74106eeb385d750688b5840d115c35c896d5a
+    unrolled_ast: bf31b9137a295e68ff681265c7c74106eeb385d750688b5840d115c35c896d5a
+    ssa_ast: 7d620b780e7a77270f8fc9fb8308253cd8a5fb4eb11896b623960bfc5a114a1a
diff --git a/tests/expectations/compiler/integers/i32/min_fail.out b/tests/expectations/compiler/integers/i32/min_fail.out
index 46a3543725..21070fe681 100644
--- a/tests/expectations/compiler/integers/i32/min_fail.out
+++ b/tests/expectations/compiler/integers/i32/min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 50f33fa362d3ae6db603da995505be6967495258db78476959871136723a651a
-    initial_ast: b967181deec5a33f5711d71d03c6935e18d5ed25b25205c373c895f3745cb6be
-    unrolled_ast: b967181deec5a33f5711d71d03c6935e18d5ed25b25205c373c895f3745cb6be
-    ssa_ast: 50788b5f9fd1b7de7046868998c65391ba65f7957118de9fa168557554f51e01
+    initial_ast: 0fe538cdec1f60fc7561947a042c8710c6e4c4d431010acf0e82050802cbad2f
+    unrolled_ast: 0fe538cdec1f60fc7561947a042c8710c6e4c4d431010acf0e82050802cbad2f
+    ssa_ast: 302198c16263f2d7cb82137c165c6218efc9f46576b1878c180084620a7dd717
diff --git a/tests/expectations/compiler/integers/i32/mul.out b/tests/expectations/compiler/integers/i32/mul.out
index b75633c991..45f1281a2c 100644
--- a/tests/expectations/compiler/integers/i32/mul.out
+++ b/tests/expectations/compiler/integers/i32/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 74714a64482769e3a2d83ab594136b153299176d59e0011a58f65e92255aaf56
-    initial_ast: efbec8258abee4fbb065b5a7f90f53b82d94c49a16d0669a7a2aeaebaecf4a84
-    unrolled_ast: efbec8258abee4fbb065b5a7f90f53b82d94c49a16d0669a7a2aeaebaecf4a84
-    ssa_ast: d0f7f9e1ad73f080704c12ab876d58591f876f926063c2c5009326b9220ed621
+    initial_ast: b7a3d3a48f1c019b277cc42ec61bd80d498ffd964c830b50c27739f50433d9df
+    unrolled_ast: b7a3d3a48f1c019b277cc42ec61bd80d498ffd964c830b50c27739f50433d9df
+    ssa_ast: 996a046818ffd7a8097758323101a2be0a27ad38bcdc4ffe590194462f31f1ae
diff --git a/tests/expectations/compiler/integers/i32/ne.out b/tests/expectations/compiler/integers/i32/ne.out
index 34a6d46755..21529da9d2 100644
--- a/tests/expectations/compiler/integers/i32/ne.out
+++ b/tests/expectations/compiler/integers/i32/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: d85745dddc74c432c15e81c93dc3af0e28a95fa711bc78029c9db537168e1684
       - initial_input_ast: 62919447bb6ae8f7dd9c65be206a631f352ac43ffe8a12c14fbf160311c321d6
-    initial_ast: e1898acb70fcb2fdaa2da7321cf96dce6fbcd74de6b72e3628611123936b1bd6
-    unrolled_ast: e1898acb70fcb2fdaa2da7321cf96dce6fbcd74de6b72e3628611123936b1bd6
-    ssa_ast: c0e48cd63f4bb1cc90e2f237ec310e5979e47970523bb56aa0b777269c7ba05c
+    initial_ast: 70a7cf17cbf41b8da246dd6b1aba66beb3695456b46265e8c9a6d7b586ad89f0
+    unrolled_ast: 70a7cf17cbf41b8da246dd6b1aba66beb3695456b46265e8c9a6d7b586ad89f0
+    ssa_ast: 38174750093c3b4fc0ae07b8f15f0237cd15d00af79837e31a06c3873ae9ff1b
diff --git a/tests/expectations/compiler/integers/i32/negate.out b/tests/expectations/compiler/integers/i32/negate.out
index a4e8b10c9f..811840ef27 100644
--- a/tests/expectations/compiler/integers/i32/negate.out
+++ b/tests/expectations/compiler/integers/i32/negate.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 7d02099f52dd4b4c853372b4eaadee788915bec063ffd5e3229cd66fcea83931
       - initial_input_ast: e9433083cfadc9e5340a4359e6cbff511a853d3e1ab24b9093c7bbaa96f06f13
-    initial_ast: 25451e149c0c5ee2518d825f6d7e036f83f9a86e5f9956c1258fd00c909c9431
-    unrolled_ast: 25451e149c0c5ee2518d825f6d7e036f83f9a86e5f9956c1258fd00c909c9431
-    ssa_ast: 55aa7af79ab4b104c4b07e6cec2f99760231335c1aab0fa7dcaa4de4901fb82f
+    initial_ast: ab981933c430f859dd7aaad9441055bc01351dff7d592485450c3ed0622358f2
+    unrolled_ast: ab981933c430f859dd7aaad9441055bc01351dff7d592485450c3ed0622358f2
+    ssa_ast: 72c10b603db21be08f3b25561306f9a38ff39f96a54300000e1b05de06552368
diff --git a/tests/expectations/compiler/integers/i32/negate_min_fail.out b/tests/expectations/compiler/integers/i32/negate_min_fail.out
index 54b82053ed..3cdfe19db4 100644
--- a/tests/expectations/compiler/integers/i32/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i32/negate_min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 83b4ce2489e23f80e3cfbcecbde6664a9c98966c4b0ceff53c41d4ac9f1aa5d4
-    initial_ast: 8255e0064487a704097915cc2f2ad2793940e79fd21bb155e375679565bab9c3
-    unrolled_ast: 8255e0064487a704097915cc2f2ad2793940e79fd21bb155e375679565bab9c3
-    ssa_ast: 0848b09929bff47991b04f2901fe6623d92d70ef830e70cbaa868773b5d312a4
+    initial_ast: 610b220a6877d3f8a2c91ce2db85d227b48903ce53a294572208314f4686893a
+    unrolled_ast: 610b220a6877d3f8a2c91ce2db85d227b48903ce53a294572208314f4686893a
+    ssa_ast: b25ffab271584472be9e39f0cfd72b4f53efbf04af47b8900de898dede5d804e
diff --git a/tests/expectations/compiler/integers/i32/negate_zero.out b/tests/expectations/compiler/integers/i32/negate_zero.out
index a8e32f11c8..ed0344d6e4 100644
--- a/tests/expectations/compiler/integers/i32/negate_zero.out
+++ b/tests/expectations/compiler/integers/i32/negate_zero.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d7efb950b283e8043cb74d699f193749324f2fb6714df5fde527c348f849a179
-    initial_ast: a8cb13663e81c004ee1681fc40fe215c2f06bcbc5decf77debbc511f58c417a4
-    unrolled_ast: a8cb13663e81c004ee1681fc40fe215c2f06bcbc5decf77debbc511f58c417a4
-    ssa_ast: f6d35175c274dd04f540d1a5ccd66c8c9ac5704a2d6258cb230be976b5d08fc9
+    initial_ast: 04e55d2eb1da34712a58d07374cf6b506ee0ec024e7b621042dc0db46a67798d
+    unrolled_ast: 04e55d2eb1da34712a58d07374cf6b506ee0ec024e7b621042dc0db46a67798d
+    ssa_ast: a7529f968bdc323fc7de289ebdb1e22a841e4a90e1809be0cb3623766d6d9263
diff --git a/tests/expectations/compiler/integers/i32/no_space_between_literal.out b/tests/expectations/compiler/integers/i32/no_space_between_literal.out
index 9ac75fd08d..f780f401df 100644
--- a/tests/expectations/compiler/integers/i32/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/i32/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 i32;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/i32/operator_methods.out b/tests/expectations/compiler/integers/i32/operator_methods.out
index 2d1d631e54..4fe5775056 100644
--- a/tests/expectations/compiler/integers/i32/operator_methods.out
+++ b/tests/expectations/compiler/integers/i32/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: f17c9c37498de762a3900d8d33b939195120a97dea62589903fb55fa085c5b12
-    initial_ast: 53f38ace0634be9896900f25cbf3e2d82fc8a6cb9bf825e35d6ee0cb370cd4c5
-    unrolled_ast: 53f38ace0634be9896900f25cbf3e2d82fc8a6cb9bf825e35d6ee0cb370cd4c5
-    ssa_ast: b04aa4f96f17b8066c250ec83e6971837434922c88c13bb5f565f12332e23681
+    initial_ast: f692f8c116f84e26f0a5597e37aafefd1f211d4172e56b94fbd8bcfaddba69a9
+    unrolled_ast: f692f8c116f84e26f0a5597e37aafefd1f211d4172e56b94fbd8bcfaddba69a9
+    ssa_ast: af2826682989e9c73ce8b1b9d4735ec624ea33b9ece19405cc01705a2b650a63
diff --git a/tests/expectations/compiler/integers/i32/or.out b/tests/expectations/compiler/integers/i32/or.out
index ab422372e1..70ab858ac6 100644
--- a/tests/expectations/compiler/integers/i32/or.out
+++ b/tests/expectations/compiler/integers/i32/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 115a6d30ecb5cb1da8947c891164f05b134b1b1ec674a4ad7347dc9a0e29bba5
-    initial_ast: 6f9956e1da1291f06b071f024a9a7d02710fd7059681ebf66e4a2882906181a1
-    unrolled_ast: 6f9956e1da1291f06b071f024a9a7d02710fd7059681ebf66e4a2882906181a1
-    ssa_ast: 091d73c6dc7595238bf6b3b3070b6798f87d488da03b2be26ac98e9e8abf001d
+    initial_ast: 7c6b7e2df96f31edac374090e8bf72906c976337df7fa0de27e7d9ced05f0ebb
+    unrolled_ast: 7c6b7e2df96f31edac374090e8bf72906c976337df7fa0de27e7d9ced05f0ebb
+    ssa_ast: 4d29b321c9ef7176a32cdae290a6daaad23985f2f171c5a996537d5dfc2fb522
diff --git a/tests/expectations/compiler/integers/i32/pow.out b/tests/expectations/compiler/integers/i32/pow.out
index dbe665e5ca..046f389143 100644
--- a/tests/expectations/compiler/integers/i32/pow.out
+++ b/tests/expectations/compiler/integers/i32/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b85ca75790be46091fc6688e15edb349d2a20687795e9172943372d181ad2952
-    initial_ast: fa98a7d5679b46359d69142eee2ed456626e1377210cf4c9df8a4de7da0742c5
-    unrolled_ast: fa98a7d5679b46359d69142eee2ed456626e1377210cf4c9df8a4de7da0742c5
-    ssa_ast: cb9e41635e14a34292213dceb04b8f81666feaff02bead90d65ff18d23e94dfc
+    initial_ast: d9d2aaccb52fd2f7d4bd44a690c96f888a483cb54133e908bdb1f353f76285b3
+    unrolled_ast: d9d2aaccb52fd2f7d4bd44a690c96f888a483cb54133e908bdb1f353f76285b3
+    ssa_ast: 0ef34215d1e7747a5fdf1b913f491f22926908a06abd50e89b9c255abecab3eb
diff --git a/tests/expectations/compiler/integers/i32/rem.out b/tests/expectations/compiler/integers/i32/rem.out
index e4f109ddde..9fbd889646 100644
--- a/tests/expectations/compiler/integers/i32/rem.out
+++ b/tests/expectations/compiler/integers/i32/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: fe4ab50a782b6c0845f8aad4f6fc15552e8535ef1d9a2577244472922e574c29
-    initial_ast: 14e858616f9d8ccab6ba0890eb0a5296b7e5344a6d0d3728019e80350a7a7235
-    unrolled_ast: 14e858616f9d8ccab6ba0890eb0a5296b7e5344a6d0d3728019e80350a7a7235
-    ssa_ast: 55e6f1da199b6ba7f8406bd7462037edaa139d3df8d335375e445f5b9687d907
+    initial_ast: 2ece8b33966edfb9f235317a89f1dbad5e69dc780a80e0ee9ce93a1110ac94fe
+    unrolled_ast: 2ece8b33966edfb9f235317a89f1dbad5e69dc780a80e0ee9ce93a1110ac94fe
+    ssa_ast: bd2c9fb90ad3cae8cf7086b86c8ee48151c13a9fc486029e667a5a5f3ade6d5b
diff --git a/tests/expectations/compiler/integers/i32/shl.out b/tests/expectations/compiler/integers/i32/shl.out
index 7d674a9e17..2ef1584fe2 100644
--- a/tests/expectations/compiler/integers/i32/shl.out
+++ b/tests/expectations/compiler/integers/i32/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 79b30b487a7c4c687b0b97e1dcaf1b979a57f5a2a995c8b716941ce243694fb2
-    initial_ast: 03dee9324767b5e370737b6e8fbd6fa890258e1a41ed2b751857815af1e3648c
-    unrolled_ast: 03dee9324767b5e370737b6e8fbd6fa890258e1a41ed2b751857815af1e3648c
-    ssa_ast: 4bcec0fcc7cb7ae04e5a7b6deead89f4adef79528593859c8ad99558d8124b86
+    initial_ast: e7a942e69eeb675d4a874f8e11c27a40aa9a5dc15f653a45531a59ad2da2af61
+    unrolled_ast: e7a942e69eeb675d4a874f8e11c27a40aa9a5dc15f653a45531a59ad2da2af61
+    ssa_ast: 5043ac8eb2f0f7209108f7a895801ff1f9e7a3669b8cfd460aa2f340e11e75c2
diff --git a/tests/expectations/compiler/integers/i32/shr.out b/tests/expectations/compiler/integers/i32/shr.out
index 976db2cac7..b8d88bc8af 100644
--- a/tests/expectations/compiler/integers/i32/shr.out
+++ b/tests/expectations/compiler/integers/i32/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 79b30b487a7c4c687b0b97e1dcaf1b979a57f5a2a995c8b716941ce243694fb2
-    initial_ast: a0a28836192fb8be1adbb9ed29c91ab49948089265020ca1c8d870abff186a3b
-    unrolled_ast: a0a28836192fb8be1adbb9ed29c91ab49948089265020ca1c8d870abff186a3b
-    ssa_ast: f95669b87a17f955c030011360851d403558baed38b4b8b905032abd6cc8d907
+    initial_ast: 301fcb166a7a97a2b640d8eec2bcdd752aaf66591b3b202d112aaf1391bf7711
+    unrolled_ast: 301fcb166a7a97a2b640d8eec2bcdd752aaf66591b3b202d112aaf1391bf7711
+    ssa_ast: dbe715a1877af7d3710e6cbcd41795a7981fb5d8022b0c635bac248497a8a2d7
diff --git a/tests/expectations/compiler/integers/i32/sub.out b/tests/expectations/compiler/integers/i32/sub.out
index cd8be6c76d..04e05d8cb7 100644
--- a/tests/expectations/compiler/integers/i32/sub.out
+++ b/tests/expectations/compiler/integers/i32/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 604a4578e0523e2ddb38aeeedaee3d2e03ffb926e86c7b41abcfa4acbf0a36b1
-    initial_ast: 55dd4c5689ce049774f02cb2b2423195bc74c576c59fa28b3651d825a962bf9b
-    unrolled_ast: 55dd4c5689ce049774f02cb2b2423195bc74c576c59fa28b3651d825a962bf9b
-    ssa_ast: 3e9af2d796776f16904c352e1356d127899932287555e2fd1f20fa08d9d347b5
+    initial_ast: 33d1da63b0e641a20a6ec6a959052c484c6e2ab0bfd5251a9e8531f93fd28af7
+    unrolled_ast: 33d1da63b0e641a20a6ec6a959052c484c6e2ab0bfd5251a9e8531f93fd28af7
+    ssa_ast: 1836b4db84d4fc82e59f2620ce959bc93ccad2d354c973f508f457c87edd4ceb
diff --git a/tests/expectations/compiler/integers/i32/ternary.out b/tests/expectations/compiler/integers/i32/ternary.out
index aad90a48a1..cec1ffdf3f 100644
--- a/tests/expectations/compiler/integers/i32/ternary.out
+++ b/tests/expectations/compiler/integers/i32/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 4e62f141b67203605d32079bce0b9ec6e15daf344fc859e74fdbc3303d905ee0
       - initial_input_ast: 0b63552977276f07dd66655887e2229892221de404045ed8c241862911209a53
-    initial_ast: 29eabf8a599d84e4276bbb658c05381cea5f4dcb0cc2cb8bd0ff8c578b871ae3
-    unrolled_ast: 29eabf8a599d84e4276bbb658c05381cea5f4dcb0cc2cb8bd0ff8c578b871ae3
-    ssa_ast: a91e730341c0691eb2171a69ea95e92b636a0e0658bbefb511b9274bad5a94fd
+    initial_ast: dc47462611b11253ca7373c7a89c5198314cdb6081a5d45b53bc7bfab4705e1d
+    unrolled_ast: dc47462611b11253ca7373c7a89c5198314cdb6081a5d45b53bc7bfab4705e1d
+    ssa_ast: 0bf038c4f98c597c23a5feea3636b15dca34b6c0aa0983201cfd1a2c6ec70c04
diff --git a/tests/expectations/compiler/integers/i32/xor.out b/tests/expectations/compiler/integers/i32/xor.out
index b008c17750..c16b6bc4cd 100644
--- a/tests/expectations/compiler/integers/i32/xor.out
+++ b/tests/expectations/compiler/integers/i32/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 13988c7cc9981328d79ed311c53b3b8bc5bebc5f1c6dbcb00f3b9994c51574a6
-    initial_ast: ce9d3c8a32f3bd96dc1e25a06f456ced11cf3b0defb21092e2307c453ddd495b
-    unrolled_ast: ce9d3c8a32f3bd96dc1e25a06f456ced11cf3b0defb21092e2307c453ddd495b
-    ssa_ast: 29033cb203cbc87402cc74842fa5f821dc8d3816f8d8b84d41a676008149d1fa
+    initial_ast: 9ba70d08bdf2b13f7c31c29453d6884aa77d3b5c86a2413bc2ce9bfd61579965
+    unrolled_ast: 9ba70d08bdf2b13f7c31c29453d6884aa77d3b5c86a2413bc2ce9bfd61579965
+    ssa_ast: 4073edc750806c8625fca83c7dbeea2683bef984dfb6bf89712e4e0cb6e1b71c
diff --git a/tests/expectations/compiler/integers/i64/add.out b/tests/expectations/compiler/integers/i64/add.out
index 8f713908bd..dbb07253c0 100644
--- a/tests/expectations/compiler/integers/i64/add.out
+++ b/tests/expectations/compiler/integers/i64/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 6fc33f607dbe5193ab8d46e6f9a005e71951aaade01779089cf7a6494ac02fa1
-    initial_ast: fe3e85893034d8ad52b7da77e7c3ca7ec156e5fd8ee79447518779ebc19af623
-    unrolled_ast: fe3e85893034d8ad52b7da77e7c3ca7ec156e5fd8ee79447518779ebc19af623
-    ssa_ast: 30fcb5d061916c080a2a0f78bfb388a5272eb334f27185df33431ca0667a598b
+    initial_ast: 21fc5fe605a4894ddb89436a6b2ccd67e4a9bc083c75336c37f3d3a72de54b93
+    unrolled_ast: 21fc5fe605a4894ddb89436a6b2ccd67e4a9bc083c75336c37f3d3a72de54b93
+    ssa_ast: 86c50fc7ac9a4a3a6d6437369bf0a40df107c8352c68f670c5124b1de5863218
diff --git a/tests/expectations/compiler/integers/i64/and.out b/tests/expectations/compiler/integers/i64/and.out
index 14ef016200..91d738a9a3 100644
--- a/tests/expectations/compiler/integers/i64/and.out
+++ b/tests/expectations/compiler/integers/i64/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 6fc33f607dbe5193ab8d46e6f9a005e71951aaade01779089cf7a6494ac02fa1
-    initial_ast: 536cbe4e6eab78b790aa0945105a8a3b4ba16b208751613279392aea9824ddde
-    unrolled_ast: 536cbe4e6eab78b790aa0945105a8a3b4ba16b208751613279392aea9824ddde
-    ssa_ast: 256f421d88d2f073d81a62b0ba20e730ad9247f371ea8147077fbbd326e88729
+    initial_ast: 523cd3da0023b2562b9e21ded4af9931bb1cf72e9b85035ba1a022d4977ac1aa
+    unrolled_ast: 523cd3da0023b2562b9e21ded4af9931bb1cf72e9b85035ba1a022d4977ac1aa
+    ssa_ast: 66167a34df625a3a9426d266e319de1de3722bc7789c34536f206e8bf11fdc62
diff --git a/tests/expectations/compiler/integers/i64/console_assert.out b/tests/expectations/compiler/integers/i64/console_assert.out
index b45bb69be8..46c57cda36 100644
--- a/tests/expectations/compiler/integers/i64/console_assert.out
+++ b/tests/expectations/compiler/integers/i64/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3fd31c4a34229737feee0dae0ec9c498ac4b62100b7cb853bc34382b24fe5b7c
-    initial_ast: 20b2f901ed1c20117c9150af6b02b8ad8125ca87de45989e660d79f941a3b8a6
-    unrolled_ast: 20b2f901ed1c20117c9150af6b02b8ad8125ca87de45989e660d79f941a3b8a6
-    ssa_ast: b674da8b874071a2f2cc135148d2c0eb6e8fd92fde84323cc6f3d3cdccb848ac
+    initial_ast: 0260c262cb058910c57e80ee19f058c5dd38dfcd851e072f2380c34d8adb28c5
+    unrolled_ast: 0260c262cb058910c57e80ee19f058c5dd38dfcd851e072f2380c34d8adb28c5
+    ssa_ast: b344bfb82a4c9e178a4f4efde9689e98efe8b81d9e69a39534f3e0edf935df71
diff --git a/tests/expectations/compiler/integers/i64/div.out b/tests/expectations/compiler/integers/i64/div.out
index d3a2ec5676..8fb07e3086 100644
--- a/tests/expectations/compiler/integers/i64/div.out
+++ b/tests/expectations/compiler/integers/i64/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d2e3fe44006c568658f67f08eda96db15b8d7e13b719ffad9905b892782249b3
-    initial_ast: fd520587bbce4b32a53af5bdd9c97a2ee8c61f120b4944615672ec5f845768cd
-    unrolled_ast: fd520587bbce4b32a53af5bdd9c97a2ee8c61f120b4944615672ec5f845768cd
-    ssa_ast: f8c96d8bb4bfc8c7a38dad4329d367e97c508392ea92524e2ad8cfcfaf6b3204
+    initial_ast: 987cf653392f8bd319e76e2abe6f481dc6f2f5a9a5a0c65c8d43443573d2b730
+    unrolled_ast: 987cf653392f8bd319e76e2abe6f481dc6f2f5a9a5a0c65c8d43443573d2b730
+    ssa_ast: 97222c2adf3b063d40147f735bc7944116de4288a68101943647f33589574085
diff --git a/tests/expectations/compiler/integers/i64/eq.out b/tests/expectations/compiler/integers/i64/eq.out
index 57dbea4f11..8965e5f0ba 100644
--- a/tests/expectations/compiler/integers/i64/eq.out
+++ b/tests/expectations/compiler/integers/i64/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 335672c73f4108e2fbfc2938c861d7a269d46607d085a6ad1b1dc828c0417019
-    initial_ast: 66c6fbcefcd142fbc4f415466589294c4d93dba95cb9614eefaba74438109b05
-    unrolled_ast: 66c6fbcefcd142fbc4f415466589294c4d93dba95cb9614eefaba74438109b05
-    ssa_ast: 4970a2651135d1c9952b38a82a59bbfb316d8bffdf611a3b37e24957eacde404
+    initial_ast: 3d397eb33fb7bfe0c9346013ae9fc0e3b21644f1e5cd9184f460487e7f72aed9
+    unrolled_ast: 3d397eb33fb7bfe0c9346013ae9fc0e3b21644f1e5cd9184f460487e7f72aed9
+    ssa_ast: 25c0dd5fa84c637bc363772f00a32c95f4be107497b68d7943ecaed4157b77f1
diff --git a/tests/expectations/compiler/integers/i64/ge.out b/tests/expectations/compiler/integers/i64/ge.out
index e28b6a5093..4dfb9c5a87 100644
--- a/tests/expectations/compiler/integers/i64/ge.out
+++ b/tests/expectations/compiler/integers/i64/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: d379c7c64e9478a70dae21b62eba562b5777c16b7ad753d0f89b17c4af4b26c6
       - initial_input_ast: 3854fb2a758050e03219f041ad29a643c00140a816b563dfbdd3f5456a6b15f0
-    initial_ast: 9d6c531c8794ce97286c7c7b6a7ec7237963df6fefc78f5020658526abf1debf
-    unrolled_ast: 9d6c531c8794ce97286c7c7b6a7ec7237963df6fefc78f5020658526abf1debf
-    ssa_ast: 81b7d32b56548fa3008847ad6bc9c8c62739115dfe28b3d95f6cf8259abfea3c
+    initial_ast: c6ddf7a9e3e18a03f20cfe8b9ad376f60849ab8f1f98f600354d785d91fd8e31
+    unrolled_ast: c6ddf7a9e3e18a03f20cfe8b9ad376f60849ab8f1f98f600354d785d91fd8e31
+    ssa_ast: 77ffeea6a77cb6bf6364455ed8265a56fb4d1d809dcf1de13a68cdc61a30b5c6
diff --git a/tests/expectations/compiler/integers/i64/gt.out b/tests/expectations/compiler/integers/i64/gt.out
index 3036b89762..8b035dbb42 100644
--- a/tests/expectations/compiler/integers/i64/gt.out
+++ b/tests/expectations/compiler/integers/i64/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 99992561f24eed5a9b3010d7953c92e48407e37816a819404f60f977b382506a
       - initial_input_ast: 957ab5092605c323e2b4c22a18e0dfc2c2beed23df7c909d11cba866fe23ff5d
-    initial_ast: c9409639ebd7d0fbae238ab19318191847be6134f555d1dc76b908987781e5af
-    unrolled_ast: c9409639ebd7d0fbae238ab19318191847be6134f555d1dc76b908987781e5af
-    ssa_ast: cff042f4cea96f91985cfd10f96f2c800df64c33e03a4f59b70cf975ae1596ef
+    initial_ast: 3e257f276d393dd08b16bb7abb4d1c2bea0943592714f1d18eed730b0414b1fa
+    unrolled_ast: 3e257f276d393dd08b16bb7abb4d1c2bea0943592714f1d18eed730b0414b1fa
+    ssa_ast: a324f13f6173d2b4f0e079aa0dbeff777fc4f81548c5d2f5f3f02f8a291aba85
diff --git a/tests/expectations/compiler/integers/i64/le.out b/tests/expectations/compiler/integers/i64/le.out
index d4dd91f58b..71888899b6 100644
--- a/tests/expectations/compiler/integers/i64/le.out
+++ b/tests/expectations/compiler/integers/i64/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: d379c7c64e9478a70dae21b62eba562b5777c16b7ad753d0f89b17c4af4b26c6
       - initial_input_ast: 251c542549844c8861fee0a7cf32f1a8bd386bd88ab61ea945c5aad7d24f8738
-    initial_ast: 88be821ffb3b16b7faf119fe9473f35757da1bd7ef8d58462b56d87e06636b63
-    unrolled_ast: 88be821ffb3b16b7faf119fe9473f35757da1bd7ef8d58462b56d87e06636b63
-    ssa_ast: 082bb54eff2ec56ffe7cc3bc4b90fb7b5e426c4f264ea296961df831db095b92
+    initial_ast: 0c6525ee3c54c225417d0d2caf26cb314b316beba71a469dec0a48ae348a4ffd
+    unrolled_ast: 0c6525ee3c54c225417d0d2caf26cb314b316beba71a469dec0a48ae348a4ffd
+    ssa_ast: a4f295f74a61dfa972269e8b78880a8fdb6333c76093df88d7cc4279b5546e6b
diff --git a/tests/expectations/compiler/integers/i64/lt.out b/tests/expectations/compiler/integers/i64/lt.out
index ac1a378301..8e544c1d23 100644
--- a/tests/expectations/compiler/integers/i64/lt.out
+++ b/tests/expectations/compiler/integers/i64/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 86682dc056299cdcb5c229c5d778e7fdb34d9a7576494b875ddbfd74696845c2
       - initial_input_ast: 3d68ca3f6005feb1e9466048ac4fe403156a2fddc7e12ffe2d56bb95779a63f1
-    initial_ast: a95d6e55bf429c7fd295f83c2122019a47248dc5e671b7bd4aa086442e02a8c4
-    unrolled_ast: a95d6e55bf429c7fd295f83c2122019a47248dc5e671b7bd4aa086442e02a8c4
-    ssa_ast: a29c1acbd6fc98e674d71e234c776af2c21cc44eae4d7f960fe59f5a0fdc478c
+    initial_ast: 1e7f3fe6df1530f2a553393ef2a20c89c7ae8a3a2edc78265a4a73f7951f0440
+    unrolled_ast: 1e7f3fe6df1530f2a553393ef2a20c89c7ae8a3a2edc78265a4a73f7951f0440
+    ssa_ast: 0aa63d2288f8ee0dbaf4740f3766153858434e760925bf95f2cf869bb8a7c25a
diff --git a/tests/expectations/compiler/integers/i64/max.out b/tests/expectations/compiler/integers/i64/max.out
index 553c7761d5..05992c95a5 100644
--- a/tests/expectations/compiler/integers/i64/max.out
+++ b/tests/expectations/compiler/integers/i64/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 6fd6be744bea2b602eba62ceedb46e3625c5acc07d0bf681bf1900682b31ac35
-    initial_ast: c9fcee7fcc547aa118db69dc552ccd2025d6eb94249285898ea64b44d2cf422e
-    unrolled_ast: c9fcee7fcc547aa118db69dc552ccd2025d6eb94249285898ea64b44d2cf422e
-    ssa_ast: 1b80eb31f282257a5d41e6b8310d5f9e586800680b8afc5baeda2c77f32029bb
+    initial_ast: 313a010190623d25e96fd3a70d21f1c47aa05631ac11a34ff51f4a2c998f0b36
+    unrolled_ast: 313a010190623d25e96fd3a70d21f1c47aa05631ac11a34ff51f4a2c998f0b36
+    ssa_ast: 5eece523a094cb51e4f234f5eb24d41e257bbf75634c7bd99e899f4638631aa9
diff --git a/tests/expectations/compiler/integers/i64/max_fail.out b/tests/expectations/compiler/integers/i64/max_fail.out
index 9ac75fd08d..3f02ec0274 100644
--- a/tests/expectations/compiler/integers/i64/max_fail.out
+++ b/tests/expectations/compiler/integers/i64/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 9223372036854775808 is not a valid `i64`\n    --> compiler-test:4:20\n     |\n   4 |     const a: i64 = 9223372036854775808i64;\n     |                    ^^^^^^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/i64/min.out b/tests/expectations/compiler/integers/i64/min.out
index 8debe86992..449fc3d82c 100644
--- a/tests/expectations/compiler/integers/i64/min.out
+++ b/tests/expectations/compiler/integers/i64/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 7582ae4f8c653f9037b47edecd134af42b9a1d459551e343408b2c6dc94c68e9
-    initial_ast: 3b6fb75bdf8a13355d356dd423fdbe5b785eea4f28d895fcb3ef0aea020701d5
-    unrolled_ast: 3b6fb75bdf8a13355d356dd423fdbe5b785eea4f28d895fcb3ef0aea020701d5
-    ssa_ast: 082f6600ed12f9789606b9e9e8b630cf37467740598f5599c2a6faddff8e8d02
+    initial_ast: 0044173a304a459c47fc1105eb9e0652d8921c34b7c171c10fcede6a8e37ced8
+    unrolled_ast: 0044173a304a459c47fc1105eb9e0652d8921c34b7c171c10fcede6a8e37ced8
+    ssa_ast: 457566eb930adc1c8b4d19e7b8850a7befceafc79d733f82f3fb1bbe6575bc47
diff --git a/tests/expectations/compiler/integers/i64/min_fail.out b/tests/expectations/compiler/integers/i64/min_fail.out
index f39dc5e10a..394bb6a10f 100644
--- a/tests/expectations/compiler/integers/i64/min_fail.out
+++ b/tests/expectations/compiler/integers/i64/min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: f34404634c932da950bef25437cdfb41606af09de9ef6ca2f1d347977e2c9170
-    initial_ast: f615a3a5072ae2fd801818b19ab2ccedc7285fe07b8fd7164d255ddf319514ef
-    unrolled_ast: f615a3a5072ae2fd801818b19ab2ccedc7285fe07b8fd7164d255ddf319514ef
-    ssa_ast: 72f3e952eea5b84c91204935ee88b5a10d99f9329584334c5c5b9ae251604c6c
+    initial_ast: 9acae0ed9db4d69fee443e79c4bcf5076d7856e5d9c4747a86659d42f01cfba4
+    unrolled_ast: 9acae0ed9db4d69fee443e79c4bcf5076d7856e5d9c4747a86659d42f01cfba4
+    ssa_ast: e53aef3b2e0a9f9a3f57929aeaebf5c30465a222baf42735a539ed357d8431ff
diff --git a/tests/expectations/compiler/integers/i64/mul.out b/tests/expectations/compiler/integers/i64/mul.out
index 053fb8f966..8b6eda38d8 100644
--- a/tests/expectations/compiler/integers/i64/mul.out
+++ b/tests/expectations/compiler/integers/i64/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 23aa90f2bc68a3842201144d02e5a38c51198317cb182c39e78110f0775a346f
-    initial_ast: fc71c6a35aed489f0e3b4295f0eaf22c6ef70b122aa99734ef23b8c193732cb2
-    unrolled_ast: fc71c6a35aed489f0e3b4295f0eaf22c6ef70b122aa99734ef23b8c193732cb2
-    ssa_ast: f40ae377be7e92f8e5731ab73b92d809177a79537738e5ad9b0d5c208adc4e54
+    initial_ast: 6ec74c728f5eb5e69fa0e4eeea36b2e6f1b09f3fbe39c123d335d7f96d05b842
+    unrolled_ast: 6ec74c728f5eb5e69fa0e4eeea36b2e6f1b09f3fbe39c123d335d7f96d05b842
+    ssa_ast: 8ffcdd7b90447422e6cac0448f0dc9a1bdb4114cf452d38395c8d4f85a392472
diff --git a/tests/expectations/compiler/integers/i64/ne.out b/tests/expectations/compiler/integers/i64/ne.out
index 544e4d57f0..3475e84232 100644
--- a/tests/expectations/compiler/integers/i64/ne.out
+++ b/tests/expectations/compiler/integers/i64/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: dcfaecfb50139b6eddcc846679be87b91da6293d3201e44f2d339fee3cc29af0
       - initial_input_ast: b21ea5f69a6f9456bbd82a3d2d02c4e8eda130ea189a2549224b3e62239ab9cf
-    initial_ast: ea4b652050022c73fff856c1eca570b99ab55813a871e6addab5615e449a64d1
-    unrolled_ast: ea4b652050022c73fff856c1eca570b99ab55813a871e6addab5615e449a64d1
-    ssa_ast: 03b70269dbc7897ffd55e112a89fe3f9eab3c620b63c02cb4bac5c4ab7954bfd
+    initial_ast: b94551791c9af8cfdc0d6da6c2e8dd3eb5f7507d82987605d7d2c1f52ec667ae
+    unrolled_ast: b94551791c9af8cfdc0d6da6c2e8dd3eb5f7507d82987605d7d2c1f52ec667ae
+    ssa_ast: 82b69ecadb84ea707ada71cd24247a853bdcf72a187ae46fea00351e041c7054
diff --git a/tests/expectations/compiler/integers/i64/negate.out b/tests/expectations/compiler/integers/i64/negate.out
index b42c4b5444..98161651b2 100644
--- a/tests/expectations/compiler/integers/i64/negate.out
+++ b/tests/expectations/compiler/integers/i64/negate.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 4e832e2a1d5bc619f878460528f4ce2966113fa79784078490821efdc2da0fbd
       - initial_input_ast: 694086f29eaf0a2b2c76912c4dc80138809ecff84e6ee94047bafc536e4ad24b
-    initial_ast: 9e05a727707cc86f096604280af19e4e7dd4310f5a54df1c914931a4ef14b8a9
-    unrolled_ast: 9e05a727707cc86f096604280af19e4e7dd4310f5a54df1c914931a4ef14b8a9
-    ssa_ast: 5115ddf404e6125942573b1f6820158ba97b7b7fac523a1a7fad6948bf2ca197
+    initial_ast: 4b709dc39761e1e8e321cb3cc2776feeaa9e11d23ba1a01cc9c395345c6824a2
+    unrolled_ast: 4b709dc39761e1e8e321cb3cc2776feeaa9e11d23ba1a01cc9c395345c6824a2
+    ssa_ast: 05ee250030f8f0e5cc2545668fce52b1bf42f8bc10c0887249766d71e619ace9
diff --git a/tests/expectations/compiler/integers/i64/negate_min_fail.out b/tests/expectations/compiler/integers/i64/negate_min_fail.out
index af1477c2bf..36245d40af 100644
--- a/tests/expectations/compiler/integers/i64/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i64/negate_min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3ca155c33debfdfb0192a7bddb387e5e7fafeeaf31f0ef5089be2352d74faed3
-    initial_ast: e34840189fa73ddaca7ecc3c9c37cb6139dd81c7da33519b77202f092ee52fa7
-    unrolled_ast: e34840189fa73ddaca7ecc3c9c37cb6139dd81c7da33519b77202f092ee52fa7
-    ssa_ast: 0d1fbd4bf3df3eed72a095eb011a55d6459699da2b4834e2317ece5ae594d0d8
+    initial_ast: 0faad005cc77f5e92a43e86e8ea758f239c377f86ba3489e36c775f35dce719d
+    unrolled_ast: 0faad005cc77f5e92a43e86e8ea758f239c377f86ba3489e36c775f35dce719d
+    ssa_ast: fa17d97cd62348a97fe49ead374a0add6106d1e648bbafc7427f1a6827cb90f4
diff --git a/tests/expectations/compiler/integers/i64/negate_zero.out b/tests/expectations/compiler/integers/i64/negate_zero.out
index f10f459b91..6c8aca79dd 100644
--- a/tests/expectations/compiler/integers/i64/negate_zero.out
+++ b/tests/expectations/compiler/integers/i64/negate_zero.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d7efb950b283e8043cb74d699f193749324f2fb6714df5fde527c348f849a179
-    initial_ast: 2d8aa01f9b58bc871e1e1e99121573adeffc4aae8917dca95edf6dd8351e9980
-    unrolled_ast: 2d8aa01f9b58bc871e1e1e99121573adeffc4aae8917dca95edf6dd8351e9980
-    ssa_ast: 03c640d612b728c0f192a9d08134c04bf264e337898b2401ba7cb5217c72ed3c
+    initial_ast: a530201aeb14af3a66fe6565fd12a5f2b9aed1e57934783a99537d97477a5da9
+    unrolled_ast: a530201aeb14af3a66fe6565fd12a5f2b9aed1e57934783a99537d97477a5da9
+    ssa_ast: 9decdb4a4ff44ff7c1f17342b78886200c1727307c83981f6c885e5ab93b1910
diff --git a/tests/expectations/compiler/integers/i64/no_space_between_literal.out b/tests/expectations/compiler/integers/i64/no_space_between_literal.out
index 9ac75fd08d..60656d870e 100644
--- a/tests/expectations/compiler/integers/i64/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/i64/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 i64;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/i64/operator_methods.out b/tests/expectations/compiler/integers/i64/operator_methods.out
index feda8858c1..d970ecd5d7 100644
--- a/tests/expectations/compiler/integers/i64/operator_methods.out
+++ b/tests/expectations/compiler/integers/i64/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: de07b6b28270e1e477b9e4e1040e2f82c18218b0eb1cc0f4057e1ca0aac8a933
-    initial_ast: 028703e15ce21f38b9118120b093aa905622ad06cb5757b94bb270cf6ed35e31
-    unrolled_ast: 028703e15ce21f38b9118120b093aa905622ad06cb5757b94bb270cf6ed35e31
-    ssa_ast: d67eed2e0bc42bd23b178acfb0a5467d341ed0653942e9980f1358e8ec3b1e1a
+    initial_ast: 65c66c235fe7002c2e8a01e97437efc5930abef2db317d83c310c6a481a8989e
+    unrolled_ast: 65c66c235fe7002c2e8a01e97437efc5930abef2db317d83c310c6a481a8989e
+    ssa_ast: dbc7478c85c7c653b8e3f5c5a853d5a2f84a0734d7d72efbbb8649b5abcfb21c
diff --git a/tests/expectations/compiler/integers/i64/or.out b/tests/expectations/compiler/integers/i64/or.out
index 6aa02b16bb..108811b3f6 100644
--- a/tests/expectations/compiler/integers/i64/or.out
+++ b/tests/expectations/compiler/integers/i64/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 6fc33f607dbe5193ab8d46e6f9a005e71951aaade01779089cf7a6494ac02fa1
-    initial_ast: d075d04c2f80a242547d5ed15ca9a0f64ffeb566ca8b852cb4f16045c55be553
-    unrolled_ast: d075d04c2f80a242547d5ed15ca9a0f64ffeb566ca8b852cb4f16045c55be553
-    ssa_ast: e774c3bde198a68b7c88530bc48d1406ae9327c162eac501e177d59302bb0afe
+    initial_ast: ef8c74560da58e2dea38e0d33bf55a263789bd9a0ff4ba3d560611a62457c2f0
+    unrolled_ast: ef8c74560da58e2dea38e0d33bf55a263789bd9a0ff4ba3d560611a62457c2f0
+    ssa_ast: c53bcf96f4e033739a9d66b767847390b903c8f4cbb6244fa88501ae08c21b6a
diff --git a/tests/expectations/compiler/integers/i64/pow.out b/tests/expectations/compiler/integers/i64/pow.out
index ba9ec5e9c1..f7425b3976 100644
--- a/tests/expectations/compiler/integers/i64/pow.out
+++ b/tests/expectations/compiler/integers/i64/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 0da70c2f24624227869305a4261b1df30da723d2fba03591f2815f2cd1bd3a55
-    initial_ast: f340f7cb6f1b36ac2d3eb06347f369bda834dde328af8c5398a8e24db08c74ee
-    unrolled_ast: f340f7cb6f1b36ac2d3eb06347f369bda834dde328af8c5398a8e24db08c74ee
-    ssa_ast: f4b371da2cc3ea3eb3d226a066a37b89d6cb78fd1650cdc7cbcb5edfd44ad177
+    initial_ast: ac69f22795b52b096862c2bd2d6f91daed6a30d5965da44612cd44cdd199c81e
+    unrolled_ast: ac69f22795b52b096862c2bd2d6f91daed6a30d5965da44612cd44cdd199c81e
+    ssa_ast: c6e527cd696d5102f2c770e7210abc78a07609f6a99c7c32e2ba007ac7cd57ca
diff --git a/tests/expectations/compiler/integers/i64/rem.out b/tests/expectations/compiler/integers/i64/rem.out
index 1b8bc951bf..9bf900fc28 100644
--- a/tests/expectations/compiler/integers/i64/rem.out
+++ b/tests/expectations/compiler/integers/i64/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d2e3fe44006c568658f67f08eda96db15b8d7e13b719ffad9905b892782249b3
-    initial_ast: 35e6b89b9cd433077f0eb899dcd2c4dbcf08d73cf8de83ded1389acd99434cef
-    unrolled_ast: 35e6b89b9cd433077f0eb899dcd2c4dbcf08d73cf8de83ded1389acd99434cef
-    ssa_ast: 2a56dec8dc99c53923ada69e37f6c4b4223632a1d96079b1c007087e6ec09f4b
+    initial_ast: de846a7243203773ec1d7b67632f75b0babce397eddd11c092d93e2b2dada90f
+    unrolled_ast: de846a7243203773ec1d7b67632f75b0babce397eddd11c092d93e2b2dada90f
+    ssa_ast: d4c05c17cbbcc9d1659a5d9735e9293fcbccde0a5d7c8089a7636e06e2d89907
diff --git a/tests/expectations/compiler/integers/i64/shl.out b/tests/expectations/compiler/integers/i64/shl.out
index c1f7e14ccd..189d8da40d 100644
--- a/tests/expectations/compiler/integers/i64/shl.out
+++ b/tests/expectations/compiler/integers/i64/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 44e3e3627853e3f3a20bb0b9f213b6af266a6a2d228eaa0689cebf4a2fb7c051
-    initial_ast: 677e030d77e94201d4edfbaf34c63aafafb0644b7f37987b654bbd5d8274dc83
-    unrolled_ast: 677e030d77e94201d4edfbaf34c63aafafb0644b7f37987b654bbd5d8274dc83
-    ssa_ast: 4f7acc1da8e2b2c07cd3213b1a88d7843b24382c49b47a680516d4a5bf1fe275
+    initial_ast: 5a35cbd7879bb881d3f32f3dd93a1f46552ddc8ddb44d3607fe0ae792e1147f9
+    unrolled_ast: 5a35cbd7879bb881d3f32f3dd93a1f46552ddc8ddb44d3607fe0ae792e1147f9
+    ssa_ast: c1d85133dcfa54997d6015f231e4715680fd5f1e36861e5299c696d49a95ffb8
diff --git a/tests/expectations/compiler/integers/i64/shr.out b/tests/expectations/compiler/integers/i64/shr.out
index 0c65904758..1c411f6fbc 100644
--- a/tests/expectations/compiler/integers/i64/shr.out
+++ b/tests/expectations/compiler/integers/i64/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 44e3e3627853e3f3a20bb0b9f213b6af266a6a2d228eaa0689cebf4a2fb7c051
-    initial_ast: 3737bcd5d13ffec82ab8458f83be98f8423d9ff4bb04681d57134d525b31ec3f
-    unrolled_ast: 3737bcd5d13ffec82ab8458f83be98f8423d9ff4bb04681d57134d525b31ec3f
-    ssa_ast: 5673fa283601d3550c72dbe3b12a26f27106c1fc306316b0488b607a9f792e0f
+    initial_ast: d38c04a2c04dfcf16254a33655f723283c59639baff071d9cf703f0c96a540d9
+    unrolled_ast: d38c04a2c04dfcf16254a33655f723283c59639baff071d9cf703f0c96a540d9
+    ssa_ast: 938fd4252a0339e283b6f8b7afd1f34f3822c532f49f657ab9ce6f8c12ff4ab4
diff --git a/tests/expectations/compiler/integers/i64/sub.out b/tests/expectations/compiler/integers/i64/sub.out
index 7d81c3e6b9..535ce97a05 100644
--- a/tests/expectations/compiler/integers/i64/sub.out
+++ b/tests/expectations/compiler/integers/i64/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b6b4f785068a4b898ec9b8efd801b7251f11b13d396b7b0e64f44ff9c3e9560a
-    initial_ast: 8aaa8c23aa6ef3cd0d2da9adaf8e2c9f8919dda5311f18b49b51afbd7ffac934
-    unrolled_ast: 8aaa8c23aa6ef3cd0d2da9adaf8e2c9f8919dda5311f18b49b51afbd7ffac934
-    ssa_ast: dd0124f84e54804c23cd5bf3d82f7720d8b5f53a676dfae3b22b42ff98c5be2e
+    initial_ast: 8a248ee366734e7743d92217dcfcc23fbd979ab6a2a5ddba5a22a82192c0260c
+    unrolled_ast: 8a248ee366734e7743d92217dcfcc23fbd979ab6a2a5ddba5a22a82192c0260c
+    ssa_ast: c33f8f58fa23ed04640f9c9ad5e4195e279a9090319dba77f6fbfe337ceb101f
diff --git a/tests/expectations/compiler/integers/i64/ternary.out b/tests/expectations/compiler/integers/i64/ternary.out
index 286bef8496..ee8158def2 100644
--- a/tests/expectations/compiler/integers/i64/ternary.out
+++ b/tests/expectations/compiler/integers/i64/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: cea990f9b29fdc1bf1caf09f6ee0035e40187d31f628560551559f705748690b
       - initial_input_ast: e4bd5abe3d4330c103e167d8ed7eed9aed518e5bef3fb0b7a234a81ae942e2a7
-    initial_ast: 8b7415a8a8c0bb100fe8cb2ba042b914c490e1640a3bd1d64d112ee53a9ef482
-    unrolled_ast: 8b7415a8a8c0bb100fe8cb2ba042b914c490e1640a3bd1d64d112ee53a9ef482
-    ssa_ast: aedb2171a2353a167a5c64bb90899cade615d528911feef2267b02bcdbb56609
+    initial_ast: 844de5e963e8248105210a73e35c2a0d76d28012343ae4b1b8d26a1bd99afd09
+    unrolled_ast: 844de5e963e8248105210a73e35c2a0d76d28012343ae4b1b8d26a1bd99afd09
+    ssa_ast: f50107d8096c89655f6745e3566ff45745793c9e06a42f6b7fdc4a91b9f695b5
diff --git a/tests/expectations/compiler/integers/i64/xor.out b/tests/expectations/compiler/integers/i64/xor.out
index d17185f3d0..1561e2c40d 100644
--- a/tests/expectations/compiler/integers/i64/xor.out
+++ b/tests/expectations/compiler/integers/i64/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: a4ec848f96832d119dde4f63a155deb438afc1d7642ed7e33be05acfb474b7de
-    initial_ast: 37150ef012f9c945e2d9ac64b3bae56464ad7ee958980e00b29d47c123794c19
-    unrolled_ast: 37150ef012f9c945e2d9ac64b3bae56464ad7ee958980e00b29d47c123794c19
-    ssa_ast: 2c04586644e51327a3998bab62d8d0446e0b86aacdea6081d9dd669a946cf62c
+    initial_ast: 2e24e613d82f1b4450f95646b6f69e4825c49081c7ec01e84cdcce03dd29c68b
+    unrolled_ast: 2e24e613d82f1b4450f95646b6f69e4825c49081c7ec01e84cdcce03dd29c68b
+    ssa_ast: 10fcbce2f2bd19203f86303f68741099a8d6d8e318b1a50503fc45d5914620e3
diff --git a/tests/expectations/compiler/integers/i8/add.out b/tests/expectations/compiler/integers/i8/add.out
index d09f253c8b..2b2ec884ff 100644
--- a/tests/expectations/compiler/integers/i8/add.out
+++ b/tests/expectations/compiler/integers/i8/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9d85de327955beffad413de3c18fffcb6e8995caaebc7cdef0f08c9af1eb4a43
-    initial_ast: 96a71122a8fc14cfcfc81a00ff5564944cb46a7a1a35e8a766b19ade9b79203f
-    unrolled_ast: 96a71122a8fc14cfcfc81a00ff5564944cb46a7a1a35e8a766b19ade9b79203f
-    ssa_ast: e1e77c7aa6c05c44e136b1b962dfc6856249450d25d6ff22d0abecfb801b7351
+    initial_ast: d7ddadadcf3bba192b531c31393587606df083211ad5f11786da4dc844255b53
+    unrolled_ast: d7ddadadcf3bba192b531c31393587606df083211ad5f11786da4dc844255b53
+    ssa_ast: 0822365293b94b57cbd7f9328fa8276ba48311ca957218b7b55b0fa56d28ecf8
diff --git a/tests/expectations/compiler/integers/i8/and.out b/tests/expectations/compiler/integers/i8/and.out
index dbb24db1af..c2f2510509 100644
--- a/tests/expectations/compiler/integers/i8/and.out
+++ b/tests/expectations/compiler/integers/i8/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9d85de327955beffad413de3c18fffcb6e8995caaebc7cdef0f08c9af1eb4a43
-    initial_ast: 2c03792f4f99f27d87818209bc36a7678012025da823c17094eaef2d8d9063d4
-    unrolled_ast: 2c03792f4f99f27d87818209bc36a7678012025da823c17094eaef2d8d9063d4
-    ssa_ast: 0f5c95d882020394d68943729d3f95ca806b9a972ee5c989abbd62af477169a8
+    initial_ast: 97ab8e1735f692843e0d0252f6ed6a857f030d5e3d775780153b97e349e900bf
+    unrolled_ast: 97ab8e1735f692843e0d0252f6ed6a857f030d5e3d775780153b97e349e900bf
+    ssa_ast: d435436a1938af42f8d29eb31de082950913d085d5f311cd8a4ca81096f55612
diff --git a/tests/expectations/compiler/integers/i8/console_assert.out b/tests/expectations/compiler/integers/i8/console_assert.out
index f02bffaec9..f86f2a53bf 100644
--- a/tests/expectations/compiler/integers/i8/console_assert.out
+++ b/tests/expectations/compiler/integers/i8/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c1866727cd7a45ae29dc69693a8996c0d0705eafc204957cafa8fa6bf6fb6d68
-    initial_ast: 371a6140fa82764b8ca85558277805a3825e1b112879ec7bb845ede27f784e77
-    unrolled_ast: 371a6140fa82764b8ca85558277805a3825e1b112879ec7bb845ede27f784e77
-    ssa_ast: 01028b599c22c5def4013449ea93761b1a0b2d917bd45eafb13e0d29d64b70cb
+    initial_ast: 3d2e45a4f602cc66e582c99dc58cabd264895d7da02b3159210fc645b7d2dcb9
+    unrolled_ast: 3d2e45a4f602cc66e582c99dc58cabd264895d7da02b3159210fc645b7d2dcb9
+    ssa_ast: 878fb7f382a813e6f0b1de3f3be38fd6d7d49465242f8df81cd6af691526c141
diff --git a/tests/expectations/compiler/integers/i8/div.out b/tests/expectations/compiler/integers/i8/div.out
index dadf0aba29..fff0c47cd1 100644
--- a/tests/expectations/compiler/integers/i8/div.out
+++ b/tests/expectations/compiler/integers/i8/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 831f3aeaac9f0826cc41ac261dbdd38890478d837e32a85fd61850bf0fbf2ff4
-    initial_ast: b4c0c7a06378b6054da3534192f12c034c19ed51d1ab4302fee648d9d94d2159
-    unrolled_ast: b4c0c7a06378b6054da3534192f12c034c19ed51d1ab4302fee648d9d94d2159
-    ssa_ast: 3e9346d1e090a89aaa375a5dc0d11848620d9ed90af4d1ba60f2d7bec4ba67f7
+    initial_ast: df2e2ca5bac14d4a2689fb5c0e7a027bf3cf6b150bbe8a73167535d35eaaaac5
+    unrolled_ast: df2e2ca5bac14d4a2689fb5c0e7a027bf3cf6b150bbe8a73167535d35eaaaac5
+    ssa_ast: 3f94a751fc61d5d3f41af1924fb7db48f4bbdf84b027f350c5c8977323ee7527
diff --git a/tests/expectations/compiler/integers/i8/eq.out b/tests/expectations/compiler/integers/i8/eq.out
index c0465a3878..b68f156949 100644
--- a/tests/expectations/compiler/integers/i8/eq.out
+++ b/tests/expectations/compiler/integers/i8/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 67e06a6d3fb0cc1d0a638b61bab10e477e0c99df13f224da4f958652a793d60c
-    initial_ast: 678e2310fb9e4d3fa10af6afd1d7e7cc1cb26e6492e7fac6e92648dcc449ad26
-    unrolled_ast: 678e2310fb9e4d3fa10af6afd1d7e7cc1cb26e6492e7fac6e92648dcc449ad26
-    ssa_ast: d527291e94aed4e67e02afaec170c331fa7dcb7cc549725e42127e6e92fab678
+    initial_ast: 22fb5ea5d72285971c77a3a788167f0acce750a161bff72cf3dbb1fbac4d84f9
+    unrolled_ast: 22fb5ea5d72285971c77a3a788167f0acce750a161bff72cf3dbb1fbac4d84f9
+    ssa_ast: 7cade3eca1ef482a2641bdc56e537992095609b0a45b7d578320842dc9d66d6b
diff --git a/tests/expectations/compiler/integers/i8/ge.out b/tests/expectations/compiler/integers/i8/ge.out
index 6715771789..c9c207937e 100644
--- a/tests/expectations/compiler/integers/i8/ge.out
+++ b/tests/expectations/compiler/integers/i8/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 82d053893c54bace369ef2e90a85326caab57bf9995b2cf83bc8e8bc4c2ea4cf
       - initial_input_ast: 0f93127cd3645c6ee80996cc681ba75b5ac7b21548c2c7075dcab2c1ccacd308
-    initial_ast: 9607250a6d5392a47a1d69abca4004cbe71ff90d16bc52c894df63776af27918
-    unrolled_ast: 9607250a6d5392a47a1d69abca4004cbe71ff90d16bc52c894df63776af27918
-    ssa_ast: 29f6dd9274bc1299a369f73543270c1ab48d6b389e220cb5d805518671c2932c
+    initial_ast: 03455b32420a5ea4a944b886896f5009ccf9780fcc054155af25a647ea4c194c
+    unrolled_ast: 03455b32420a5ea4a944b886896f5009ccf9780fcc054155af25a647ea4c194c
+    ssa_ast: 09109b6f800044c81606439090abccd7702332333183c7aa63b5a8aa45a43da0
diff --git a/tests/expectations/compiler/integers/i8/gt.out b/tests/expectations/compiler/integers/i8/gt.out
index 3a1f10e3a2..fafd7ec185 100644
--- a/tests/expectations/compiler/integers/i8/gt.out
+++ b/tests/expectations/compiler/integers/i8/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 11a434a8b3430503476027519203b3ef7547c5cbc207226957163b3f72bf544b
       - initial_input_ast: 572b929a946620a917d13bf4736f51b4388684c1526b806def1c4f698b8bc124
-    initial_ast: 2026f21a16472f7d87085d395753659082651c6476f7b1f149690ebc230ffa98
-    unrolled_ast: 2026f21a16472f7d87085d395753659082651c6476f7b1f149690ebc230ffa98
-    ssa_ast: 6a4421a8d106c8d027da2899bc94639d671f9ca1bd7c3df3d65717770044d8a7
+    initial_ast: a03d55687a80a6db5c1473dd14bf0f1847b7f9339ef6073327eae6c1f7899a8c
+    unrolled_ast: a03d55687a80a6db5c1473dd14bf0f1847b7f9339ef6073327eae6c1f7899a8c
+    ssa_ast: f7041f59b834e80db54f482a7a2fe5c17d768100cfdc718edad43acb029d06c1
diff --git a/tests/expectations/compiler/integers/i8/le.out b/tests/expectations/compiler/integers/i8/le.out
index dff9d8a3e5..bcc1446df3 100644
--- a/tests/expectations/compiler/integers/i8/le.out
+++ b/tests/expectations/compiler/integers/i8/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 82d053893c54bace369ef2e90a85326caab57bf9995b2cf83bc8e8bc4c2ea4cf
       - initial_input_ast: 6419cdc254f90d5859667d19e6c9d190630e2789c714ab6bb23ad28082552ec5
-    initial_ast: a1738c12ead319bdacb047661a3967dda2b8637156fcdfca23d45acbb7270860
-    unrolled_ast: a1738c12ead319bdacb047661a3967dda2b8637156fcdfca23d45acbb7270860
-    ssa_ast: 9938db0eeeb8efd6dd188f779f0787a526d9a95ee82d7b999a2e49c969aad31a
+    initial_ast: c7cbb98d8f4959d4514e6cc2cedad24b2f95b512d988a1711eb43532bc5f5cf8
+    unrolled_ast: c7cbb98d8f4959d4514e6cc2cedad24b2f95b512d988a1711eb43532bc5f5cf8
+    ssa_ast: 2827a848a6a083da55afdddc5bc1e44c72ecfcf0b61e15c36dd7707e8b53395b
diff --git a/tests/expectations/compiler/integers/i8/lt.out b/tests/expectations/compiler/integers/i8/lt.out
index 002c3578da..b900a3398b 100644
--- a/tests/expectations/compiler/integers/i8/lt.out
+++ b/tests/expectations/compiler/integers/i8/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 816243ce2c8d49409e938b1ccc3a28ad53657cc311cc77cf43efcd0daf5449bf
       - initial_input_ast: 238a7290b2ea1984e43fdb11f837fc1ad48f8f0fde3da9e6872f5bed291958b3
-    initial_ast: 7f11085713bc50694f91f367817ec2dd31e1b7fe0b80542f15ef523174552932
-    unrolled_ast: 7f11085713bc50694f91f367817ec2dd31e1b7fe0b80542f15ef523174552932
-    ssa_ast: 157e9a3775eaeadbe7f5eba2c220951215aecdaceb2ddddb53ce5e719a76c544
+    initial_ast: 3804ec8908b5079d90bc9785a6c2c21770841230166c5620b8c2ce10a8e83d83
+    unrolled_ast: 3804ec8908b5079d90bc9785a6c2c21770841230166c5620b8c2ce10a8e83d83
+    ssa_ast: 4491a1e7e7dfce927781573051b0af6aec20fa53a4081380fb192d5649f8abf7
diff --git a/tests/expectations/compiler/integers/i8/max.out b/tests/expectations/compiler/integers/i8/max.out
index bb5491ee37..1fa12ae436 100644
--- a/tests/expectations/compiler/integers/i8/max.out
+++ b/tests/expectations/compiler/integers/i8/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 240435adb5bb971214ef6d0c8137edabcf08ac333107853eaff24e9e67dd4122
-    initial_ast: 9e715f68df55deacf735145fae47446266a12c40313639e24969c6b25af8ff7d
-    unrolled_ast: 9e715f68df55deacf735145fae47446266a12c40313639e24969c6b25af8ff7d
-    ssa_ast: c4797382fed03d620ff3043c18ec64817944fba52657c6647b6700a6bbab0342
+    initial_ast: 1f25a5cb516cc4caa5270657c206ee6274b43b35a88ea583e5e08a99d494d399
+    unrolled_ast: 1f25a5cb516cc4caa5270657c206ee6274b43b35a88ea583e5e08a99d494d399
+    ssa_ast: 9654dc6f85aa5e92078295efba519160d2f947671fe9137b8de5f09e7ba49a41
diff --git a/tests/expectations/compiler/integers/i8/max_fail.out b/tests/expectations/compiler/integers/i8/max_fail.out
index 9ac75fd08d..eefbae9119 100644
--- a/tests/expectations/compiler/integers/i8/max_fail.out
+++ b/tests/expectations/compiler/integers/i8/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 128 is not a valid `i8`\n    --> compiler-test:4:19\n     |\n   4 |     const a: i8 = 128i8;\n     |                   ^^^^^\n"
diff --git a/tests/expectations/compiler/integers/i8/min.out b/tests/expectations/compiler/integers/i8/min.out
index 35e73d8cb2..a1c31af1ae 100644
--- a/tests/expectations/compiler/integers/i8/min.out
+++ b/tests/expectations/compiler/integers/i8/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 21d32583dd1af9cd3003f8cf666078c729d433275cd1e4978e228cf09899e706
-    initial_ast: 5037bd5dbae2f95674b714a7f7ca3c954d484356d93dce9d1b3348f688b0be70
-    unrolled_ast: 5037bd5dbae2f95674b714a7f7ca3c954d484356d93dce9d1b3348f688b0be70
-    ssa_ast: 48fe1ecb33f130f1e55275f6812d08d1681569aba72200ef5fb21085992cc21f
+    initial_ast: ef5fa80c00dce6a9324ad85a1ec23493e8e2b862769b6860ed1fc2592dbd5bb0
+    unrolled_ast: ef5fa80c00dce6a9324ad85a1ec23493e8e2b862769b6860ed1fc2592dbd5bb0
+    ssa_ast: 663a2c0714d16f826fc7d495ebb33d5c5ab474f1541f3a3a1c63ed53a039a1d4
diff --git a/tests/expectations/compiler/integers/i8/min_fail.out b/tests/expectations/compiler/integers/i8/min_fail.out
index 045a49e50f..5815ab8f86 100644
--- a/tests/expectations/compiler/integers/i8/min_fail.out
+++ b/tests/expectations/compiler/integers/i8/min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b31dfe6cd2720310b35822c841634998be88bc3f57fc4a22375b567a92f46133
-    initial_ast: 2f80fc00e5af9955378a930899acba1423b853a1bf74dcc38205f8183f33fe7e
-    unrolled_ast: 2f80fc00e5af9955378a930899acba1423b853a1bf74dcc38205f8183f33fe7e
-    ssa_ast: 93dbbdcb6b5876e5fac915c9a9e38fcce68f11850b7a9ded1ddcab5994a10bf6
+    initial_ast: aae38c4adf8ef6566e5eb53eeb1624061e544a1409e36599396fc42a7109d182
+    unrolled_ast: aae38c4adf8ef6566e5eb53eeb1624061e544a1409e36599396fc42a7109d182
+    ssa_ast: 6f126b644d2314e99631ab2b26b57cbf0514ecabeac377572e9262efc8f32600
diff --git a/tests/expectations/compiler/integers/i8/mul.out b/tests/expectations/compiler/integers/i8/mul.out
index a2f0c0c056..6a96114968 100644
--- a/tests/expectations/compiler/integers/i8/mul.out
+++ b/tests/expectations/compiler/integers/i8/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9cd98b6ae90f89e657b39e6e48831d59cfbb475ea7642346f32e074499eac93a
-    initial_ast: c2a9320055f21ee118d3761b56c5bc6ff7aec80e41d3963db4ba0aabcac54393
-    unrolled_ast: c2a9320055f21ee118d3761b56c5bc6ff7aec80e41d3963db4ba0aabcac54393
-    ssa_ast: ddc3fe46945e06f554573b5a297a305eafc1eb60abed2823982f59984900b104
+    initial_ast: ff724addfd5449b6a3caa2a14fca53197b3b3c655a1df1c69a5caae33b952b9f
+    unrolled_ast: ff724addfd5449b6a3caa2a14fca53197b3b3c655a1df1c69a5caae33b952b9f
+    ssa_ast: 14b430e84500dd5754cf835ba7d14f715aebd992b5c0ffea6019bb7aff397a50
diff --git a/tests/expectations/compiler/integers/i8/ne.out b/tests/expectations/compiler/integers/i8/ne.out
index b459114ad3..d8762fc54d 100644
--- a/tests/expectations/compiler/integers/i8/ne.out
+++ b/tests/expectations/compiler/integers/i8/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: c08fa79935838db79db59c24fa163d64d3c62b0ff33757981a31aa0111f20e6e
       - initial_input_ast: 2b6d865edf568084559de273c7259f8148308b59aa3d3c4c9cf62049b80dd3c3
-    initial_ast: 1750997d962ae1bcd4f709b1abe2888e03e3cf44cba9a490918813c067483cb9
-    unrolled_ast: 1750997d962ae1bcd4f709b1abe2888e03e3cf44cba9a490918813c067483cb9
-    ssa_ast: 2ce5529097123eabebb2d9d383a29ef536aa2e166aa9174f8052f35a5b6d84a5
+    initial_ast: b26c7165886eead0e15ff5ecc515e36040103a2d1da9deadc2327ed78fd354c9
+    unrolled_ast: b26c7165886eead0e15ff5ecc515e36040103a2d1da9deadc2327ed78fd354c9
+    ssa_ast: 0754c043aaa15dc02fff9f786c11d6e22d5e4f4cd68c62718ee5f96031c419cf
diff --git a/tests/expectations/compiler/integers/i8/negate.out b/tests/expectations/compiler/integers/i8/negate.out
index 23cacc2267..b4182631d0 100644
--- a/tests/expectations/compiler/integers/i8/negate.out
+++ b/tests/expectations/compiler/integers/i8/negate.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 16bd51814a5af337388caa4e36772c181be384c3bfc98b6abc1c756c190368bb
       - initial_input_ast: e0416453d180f6623cb3302e3686345483d3cb250e819c73a907919e3ba35ac5
-    initial_ast: 6c229e2bf58b97f39c2f384c4acd74b00f2d299fc7a6fa7ca44ea07a03e986d0
-    unrolled_ast: 6c229e2bf58b97f39c2f384c4acd74b00f2d299fc7a6fa7ca44ea07a03e986d0
-    ssa_ast: 85e484302031ebf6c3ccfb9f0ec643abfe415665e369841c6ff45ad2f8340d61
+    initial_ast: 16baccccaaec6f30202632d0e5b0c0697898336a0c6004a9ca44fa0f8381e25b
+    unrolled_ast: 16baccccaaec6f30202632d0e5b0c0697898336a0c6004a9ca44fa0f8381e25b
+    ssa_ast: cf4b2cc0ab8a755f1581bad03b089128ac3afaa889196ec34dacc9cc122b7131
diff --git a/tests/expectations/compiler/integers/i8/negate_min_fail.out b/tests/expectations/compiler/integers/i8/negate_min_fail.out
index 6ebc712584..462c04c04e 100644
--- a/tests/expectations/compiler/integers/i8/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i8/negate_min_fail.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c206fdfeceed348568d29f8eac48d60fb03306f23294b6b7a88d873cea5becdd
-    initial_ast: 4794c8294c5ea7f11699d088d37ca775efe0752d50d6df995ace8e0ed26dbdd3
-    unrolled_ast: 4794c8294c5ea7f11699d088d37ca775efe0752d50d6df995ace8e0ed26dbdd3
-    ssa_ast: 484e1d30cafb4f7e37c93b057e933e1603af4e9e898b35c50793d12eaf292636
+    initial_ast: 9ff524e06c836275bcb2fdfda5e0ceb12eeeeadfd598ff77771cb88e5cce3f3a
+    unrolled_ast: 9ff524e06c836275bcb2fdfda5e0ceb12eeeeadfd598ff77771cb88e5cce3f3a
+    ssa_ast: 361832085b2f96a204b3f0760e7f94e178f9e3bfc8c8c5b46867530d301804eb
diff --git a/tests/expectations/compiler/integers/i8/negate_zero.out b/tests/expectations/compiler/integers/i8/negate_zero.out
index 12e4e79ac8..20ab2e5bbf 100644
--- a/tests/expectations/compiler/integers/i8/negate_zero.out
+++ b/tests/expectations/compiler/integers/i8/negate_zero.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3ae28983e2d2b8955095c5982e00f0841d541858f9c43f24867766bb351a96f4
-    initial_ast: eea1c5079b78e37c50b540be88fb772424f68edfce9b03e777ee4603269d03c2
-    unrolled_ast: eea1c5079b78e37c50b540be88fb772424f68edfce9b03e777ee4603269d03c2
-    ssa_ast: 37b30465821df84a042e7bafa5d523fdf5b0a81ff79e88347a290b51cee11fed
+    initial_ast: fe82b9b486dbba35f41e91f37f1e980d8be47263c6eca5510651489a4e5bf84e
+    unrolled_ast: fe82b9b486dbba35f41e91f37f1e980d8be47263c6eca5510651489a4e5bf84e
+    ssa_ast: 499d8878f11c18808c30b8d852030c66474537d1200514e5582f06ecd347200b
diff --git a/tests/expectations/compiler/integers/i8/no_space_between_literal.out b/tests/expectations/compiler/integers/i8/no_space_between_literal.out
index 9ac75fd08d..a92d4ec412 100644
--- a/tests/expectations/compiler/integers/i8/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/i8/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 i8;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/i8/operator_methods.out b/tests/expectations/compiler/integers/i8/operator_methods.out
index c9ac223b7d..2c7f2bddda 100644
--- a/tests/expectations/compiler/integers/i8/operator_methods.out
+++ b/tests/expectations/compiler/integers/i8/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 7138e90a6a8e9256d2ed7d7abab5a20921790f0ca30400b24b7a08aae7fb9a15
-    initial_ast: 97edeeff681087501a1f0b767806b5c847010a6201dddedfcfe5723014e1e803
-    unrolled_ast: 97edeeff681087501a1f0b767806b5c847010a6201dddedfcfe5723014e1e803
-    ssa_ast: 08e6d600e9e85135266ee41b8d122a7b700c0ef6d116f6e5c4d55e7a2ac811dc
+    initial_ast: 82f57e05c86e069378788cc4bcf4a6ee09e82a5b1ab7021fc9d69a8478af218d
+    unrolled_ast: 82f57e05c86e069378788cc4bcf4a6ee09e82a5b1ab7021fc9d69a8478af218d
+    ssa_ast: 6dfb776bddf3d20fd2e5cc572fd6653ce78ff2628cc0d27ea3d82e8c2abcfa9c
diff --git a/tests/expectations/compiler/integers/i8/or.out b/tests/expectations/compiler/integers/i8/or.out
index 82c90f5f6f..2410e54949 100644
--- a/tests/expectations/compiler/integers/i8/or.out
+++ b/tests/expectations/compiler/integers/i8/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9d85de327955beffad413de3c18fffcb6e8995caaebc7cdef0f08c9af1eb4a43
-    initial_ast: 5c6a37c3d4e50dd890f86b44d6af346cc122a37daeb16b5c21df3c0544c18374
-    unrolled_ast: 5c6a37c3d4e50dd890f86b44d6af346cc122a37daeb16b5c21df3c0544c18374
-    ssa_ast: cffc68c6b821cca787fb2215ed3096a45d7f89b04de576f92f625fb99b83d4ca
+    initial_ast: a782f29a327b4f861a821c020e48f00fc68352d0875660cedf08c98e0c8d3985
+    unrolled_ast: a782f29a327b4f861a821c020e48f00fc68352d0875660cedf08c98e0c8d3985
+    ssa_ast: 8ce044a7b89a95f1ecbd637dab7bd1820d43b919bb42562fc1412279f11806a9
diff --git a/tests/expectations/compiler/integers/i8/pow.out b/tests/expectations/compiler/integers/i8/pow.out
index 3afbd2e7cf..b6acb9a63d 100644
--- a/tests/expectations/compiler/integers/i8/pow.out
+++ b/tests/expectations/compiler/integers/i8/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5b2b50540908e17d48fe81725ea72a21c8c6b99ceaaa69f21fe3ed5f67848ab6
-    initial_ast: bdc49ba7adfc979e98852f31b7f46fb950ebe10a1958552aa3a3a844c65bde94
-    unrolled_ast: bdc49ba7adfc979e98852f31b7f46fb950ebe10a1958552aa3a3a844c65bde94
-    ssa_ast: 02b477b6737aebd096c4a54e24ce9a47cfb4141a7b6c46dbce7933cc464b9d05
+    initial_ast: 2a6b5302fb3bb913ba6a0e96012bd64511f5b0792bbe7fa893702b57c6022da1
+    unrolled_ast: 2a6b5302fb3bb913ba6a0e96012bd64511f5b0792bbe7fa893702b57c6022da1
+    ssa_ast: 26262fe682a8c823bd3982c20ad35a59141356598ee8e6c52da5165d001f884b
diff --git a/tests/expectations/compiler/integers/i8/rem.out b/tests/expectations/compiler/integers/i8/rem.out
index e76f6f3428..3b3a96ad51 100644
--- a/tests/expectations/compiler/integers/i8/rem.out
+++ b/tests/expectations/compiler/integers/i8/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 831f3aeaac9f0826cc41ac261dbdd38890478d837e32a85fd61850bf0fbf2ff4
-    initial_ast: 35be676c3d5dfdcc96920fef709f524c5862e13160842260055ba6b995c2ee41
-    unrolled_ast: 35be676c3d5dfdcc96920fef709f524c5862e13160842260055ba6b995c2ee41
-    ssa_ast: 3e10579120bc05e9399dea2bf7a64ba564ad5f2c6cafe1bb5be92a72b0f172b3
+    initial_ast: a266494012d545688e908e575a20b3b28470da1fb27c7598b29ccd8e582879fe
+    unrolled_ast: a266494012d545688e908e575a20b3b28470da1fb27c7598b29ccd8e582879fe
+    ssa_ast: a47878564644c39fe35e12388a66b6bd0220d734a4d50f9259e12eb5bb639fe0
diff --git a/tests/expectations/compiler/integers/i8/shl.out b/tests/expectations/compiler/integers/i8/shl.out
index 34fae4dfa5..d0b3f69fd0 100644
--- a/tests/expectations/compiler/integers/i8/shl.out
+++ b/tests/expectations/compiler/integers/i8/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 555db3a1cecd97a8eafe72365b094c4465a815d16fd251e47e7d0c51c0ecc747
-    initial_ast: 7ae30a62621733885eba311adf0c6d58dfd2115ff476b9ba3a7fdc5258352193
-    unrolled_ast: 7ae30a62621733885eba311adf0c6d58dfd2115ff476b9ba3a7fdc5258352193
-    ssa_ast: c78e5f42fb4ccc372525e5ecc49fa1d868162c114e638b1a4c71c0d659a63708
+    initial_ast: 5cbb26a2e1e5312f380871b6b0dbad4b71669b6d36f7114de7cdff320918435f
+    unrolled_ast: 5cbb26a2e1e5312f380871b6b0dbad4b71669b6d36f7114de7cdff320918435f
+    ssa_ast: 8e8201877c6d93361512a7e223ed93e41fbb1692e213013f18f9fdf771cab23c
diff --git a/tests/expectations/compiler/integers/i8/shr.out b/tests/expectations/compiler/integers/i8/shr.out
index 9a8b1e81d2..0f260febd3 100644
--- a/tests/expectations/compiler/integers/i8/shr.out
+++ b/tests/expectations/compiler/integers/i8/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 555db3a1cecd97a8eafe72365b094c4465a815d16fd251e47e7d0c51c0ecc747
-    initial_ast: 4db27750a33b1a97fa6761f500a3eccf431d0ca46f381672249a16337516b931
-    unrolled_ast: 4db27750a33b1a97fa6761f500a3eccf431d0ca46f381672249a16337516b931
-    ssa_ast: e41008fb3e46921a7558f889193089d127f35b597c26c1dba41780ad9f1b85b5
+    initial_ast: c017a6dc1d61dca21af96ddb28d8946ab7d7d9b92d710c605b70b6464c1278aa
+    unrolled_ast: c017a6dc1d61dca21af96ddb28d8946ab7d7d9b92d710c605b70b6464c1278aa
+    ssa_ast: 2be8636e0cc6ee8a555ff435f7ccecf75187017885bea517c8fca94715ad478f
diff --git a/tests/expectations/compiler/integers/i8/sub.out b/tests/expectations/compiler/integers/i8/sub.out
index 28c0710398..d5d38850ac 100644
--- a/tests/expectations/compiler/integers/i8/sub.out
+++ b/tests/expectations/compiler/integers/i8/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5c37cf7e21cea3fb27e40899a8d0b622a415b93b3cf444b51a3f0c20502ef930
-    initial_ast: e080f2699daf27cff6bc8445d666391192f9d57b84b5d59729e140aafc837b5f
-    unrolled_ast: e080f2699daf27cff6bc8445d666391192f9d57b84b5d59729e140aafc837b5f
-    ssa_ast: f30f55cb7562dcdfdb7151f2077872d7b84c35f7b6b2a425b15821cf18d9251f
+    initial_ast: 66c68b7054fb9e55c27cf4465745b590d050a49db69eb0208bd19efe0b4bfb7e
+    unrolled_ast: 66c68b7054fb9e55c27cf4465745b590d050a49db69eb0208bd19efe0b4bfb7e
+    ssa_ast: 39f382ecd816eeb58f2c1737bb90d011e4bd5969a058fe220e18a7c21fe68887
diff --git a/tests/expectations/compiler/integers/i8/ternary.out b/tests/expectations/compiler/integers/i8/ternary.out
index e5d88acbdc..c2e6d06572 100644
--- a/tests/expectations/compiler/integers/i8/ternary.out
+++ b/tests/expectations/compiler/integers/i8/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 6a73f5728b4c45c5547aa30db6766382b307d271454f5db593db3456a0e42146
       - initial_input_ast: f27d04bbf16c4e8633181d2318c1297ceede65e5ed8d5607d5e09b8babca5430
-    initial_ast: 3ea71699b861b3df662eac2c1ae8c0e9e967d37684b96aa1ad49ebf64689d7fb
-    unrolled_ast: 3ea71699b861b3df662eac2c1ae8c0e9e967d37684b96aa1ad49ebf64689d7fb
-    ssa_ast: 6ad1816e2f0fd9a0729e14721bf1408b8c40ca15ea1cbbdac3b0c36474367a06
+    initial_ast: 811c796e8f73a6289d826bc8e4269729ba5d55ab42ec6e8327edd0555e067afc
+    unrolled_ast: 811c796e8f73a6289d826bc8e4269729ba5d55ab42ec6e8327edd0555e067afc
+    ssa_ast: 7152d23e17d77efe9c955c80e572e5157df166d47decb6e8b4229a348523ac11
diff --git a/tests/expectations/compiler/integers/i8/xor.out b/tests/expectations/compiler/integers/i8/xor.out
index e154f77670..0e74fb4f2d 100644
--- a/tests/expectations/compiler/integers/i8/xor.out
+++ b/tests/expectations/compiler/integers/i8/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 92a80b16b4ca2de724e7f0c645ff81b89ff8490f3d6395ac379d410ca2530904
-    initial_ast: 586c301667f50ce159f713b1f259bdee5bf796242992b508565338313bb9cb3e
-    unrolled_ast: 586c301667f50ce159f713b1f259bdee5bf796242992b508565338313bb9cb3e
-    ssa_ast: 0e997b37e1c04d72e2ce352fa5f837c7236c4d5502fa16b28093a72341734522
+    initial_ast: c3d204bd70eb069906efc3655046afc36e8271f4f093921804a2e968772ca97a
+    unrolled_ast: c3d204bd70eb069906efc3655046afc36e8271f4f093921804a2e968772ca97a
+    ssa_ast: b8e3231cb3af949fa7f5828222130b06ecc896bbcc5aa74a3826a8cc2038a2d9
diff --git a/tests/expectations/compiler/integers/u128/add.out b/tests/expectations/compiler/integers/u128/add.out
index 48e967501a..2e2555a9a9 100644
--- a/tests/expectations/compiler/integers/u128/add.out
+++ b/tests/expectations/compiler/integers/u128/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8b68efb82f47709e186ad5ea8458fe5de332a9ab1d04fb32ce4d126cb3de60a3
-    initial_ast: c31772c8255763774386189e4a73dbe07808ac7c578a308b7365a9b1903003f2
-    unrolled_ast: c31772c8255763774386189e4a73dbe07808ac7c578a308b7365a9b1903003f2
-    ssa_ast: 611cc1c62a8ecfa362c95ec5b41e79ee5b99ed9f326ad676bbde7de365d2757b
+    initial_ast: 26db5a0587790a86e418a05e963f10eabcfb11f3f5dd0f21880786b12aa5f142
+    unrolled_ast: 26db5a0587790a86e418a05e963f10eabcfb11f3f5dd0f21880786b12aa5f142
+    ssa_ast: 8d5b57e71d7295e08bc0ebbd151b2fca924bdf751147a5f8a5afcd06484153d1
diff --git a/tests/expectations/compiler/integers/u128/and.out b/tests/expectations/compiler/integers/u128/and.out
index 3b1885ba80..8caf0e7455 100644
--- a/tests/expectations/compiler/integers/u128/and.out
+++ b/tests/expectations/compiler/integers/u128/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8b68efb82f47709e186ad5ea8458fe5de332a9ab1d04fb32ce4d126cb3de60a3
-    initial_ast: 6e049279e07f9a649a057da0ba969f6c2891888544cfdb41699397097da78901
-    unrolled_ast: 6e049279e07f9a649a057da0ba969f6c2891888544cfdb41699397097da78901
-    ssa_ast: a22aea9e6934b41fe70c4f0ff6bd298dee36ff832cc78eff7396053a60848ed1
+    initial_ast: 616998741958ae425edbfd12b21840b634effc2692f3c6f32e28630b1bd549f7
+    unrolled_ast: 616998741958ae425edbfd12b21840b634effc2692f3c6f32e28630b1bd549f7
+    ssa_ast: cca52b67c1528a9207b2c13afc1579a0d370d98c0a15181cd4fa72c3ca0cae86
diff --git a/tests/expectations/compiler/integers/u128/console_assert.out b/tests/expectations/compiler/integers/u128/console_assert.out
index cbb59989d9..e2f7edf21b 100644
--- a/tests/expectations/compiler/integers/u128/console_assert.out
+++ b/tests/expectations/compiler/integers/u128/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: cdf9a7256a1e0526714d5ead47bc3cddb49dc4e1eafa28de3610b20412a33006
-    initial_ast: 1c62039b12526740227109b1e598eb5d4637f90483ece88b779f5722f97d9d5a
-    unrolled_ast: 1c62039b12526740227109b1e598eb5d4637f90483ece88b779f5722f97d9d5a
-    ssa_ast: fb27e235573bba4a61bf3aa78ee2b3408deea93937d6853b3c88dd47cd4e81a3
+    initial_ast: 0d8461be07cd78c30d90192537c5475e43764a0090df9ab6aeccec8514c54b88
+    unrolled_ast: 0d8461be07cd78c30d90192537c5475e43764a0090df9ab6aeccec8514c54b88
+    ssa_ast: f46d2a8769ae6f9eafd04338508557cc15ab06785119e45360e45c19e3231317
diff --git a/tests/expectations/compiler/integers/u128/div.out b/tests/expectations/compiler/integers/u128/div.out
index 54d8596acc..fe285e4758 100644
--- a/tests/expectations/compiler/integers/u128/div.out
+++ b/tests/expectations/compiler/integers/u128/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 65f203354453a926238320a2b63c7e807c464a851fed89fea81defeddbde0bbb
-    initial_ast: fd956f64520e864d72ed82adbcee37a40085296ea6d8a1821443520d3aa3d039
-    unrolled_ast: fd956f64520e864d72ed82adbcee37a40085296ea6d8a1821443520d3aa3d039
-    ssa_ast: cbfe62ade2f2ab76237a6c2b87d486ac40353f7e48331cddb08b1e72f232a6a9
+    initial_ast: 87764140269855063ea5b8e3cef8071e30b9ab3f076909126bdf9aeadfda2b5c
+    unrolled_ast: 87764140269855063ea5b8e3cef8071e30b9ab3f076909126bdf9aeadfda2b5c
+    ssa_ast: ea0619377c992c08cfd77f269c7bf58ff94c24bdf6c2e72758ec5354930fc9e9
diff --git a/tests/expectations/compiler/integers/u128/eq.out b/tests/expectations/compiler/integers/u128/eq.out
index eb0ff0d7e5..2b0dc988fd 100644
--- a/tests/expectations/compiler/integers/u128/eq.out
+++ b/tests/expectations/compiler/integers/u128/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 30c558a016d9a6649da4661e01121800b656b51c9373596936d7a6d4fa0fe2a9
-    initial_ast: 0b75cc47404f7e24a4a2fd348cbd492554d92213d6f15ee0f64cda297bb3d625
-    unrolled_ast: 0b75cc47404f7e24a4a2fd348cbd492554d92213d6f15ee0f64cda297bb3d625
-    ssa_ast: ed5e38f77eb07585458fb22e3efe2bad4c9dcca576e7e6276ef8444525ef9c82
+    initial_ast: 511889c377a95557de16c550d2c1c2a1d149dee292378d689331bb02373176b6
+    unrolled_ast: 511889c377a95557de16c550d2c1c2a1d149dee292378d689331bb02373176b6
+    ssa_ast: d81ed87e56828ad82ab9ca3b0aaff327b8745b42ad7d1fee7c92e12218bd2982
diff --git a/tests/expectations/compiler/integers/u128/ge.out b/tests/expectations/compiler/integers/u128/ge.out
index f1e226a90c..cadca60005 100644
--- a/tests/expectations/compiler/integers/u128/ge.out
+++ b/tests/expectations/compiler/integers/u128/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 9f6ff7676276fd71e69205fd2a37b2a517f2e6d2bbab71bea3780f9b3e4ce9d7
       - initial_input_ast: 2b77a054e534e53a6339be6690e9b8492116bda105fc6e9608d8a3974716b1c6
-    initial_ast: e921f458a267216456acd50fbb32a75a9c7393065aacc9d36cc2151b7af7c637
-    unrolled_ast: e921f458a267216456acd50fbb32a75a9c7393065aacc9d36cc2151b7af7c637
-    ssa_ast: d62e30be6673b6e8169c0805f323e5899f4b02cae9bfd63b6032213d9d173bd3
+    initial_ast: 65243fbfd52ed34328276cd0f2a3429dddf4ce52d31bc4fdd1ef4b56d4cf09c3
+    unrolled_ast: 65243fbfd52ed34328276cd0f2a3429dddf4ce52d31bc4fdd1ef4b56d4cf09c3
+    ssa_ast: ddc99e21debcf428d0ecf225f5550920ddde331972d56a7ed9386fea88b589cb
diff --git a/tests/expectations/compiler/integers/u128/gt.out b/tests/expectations/compiler/integers/u128/gt.out
index e61755dd52..c0339b8336 100644
--- a/tests/expectations/compiler/integers/u128/gt.out
+++ b/tests/expectations/compiler/integers/u128/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 68b296c4baad237c3ee5ec1ff93b1b590b33ef7bfe40c7cb755e744eaf3a25fb
       - initial_input_ast: 48c61c6af91816a96b47dd8b04f0c9c15bdae360953595c9b4ee4873e12d1858
-    initial_ast: 4141f40dee77dc1ddd0f4c881bd7ff25870c20831c1c1d6a7b7be699e02190ff
-    unrolled_ast: 4141f40dee77dc1ddd0f4c881bd7ff25870c20831c1c1d6a7b7be699e02190ff
-    ssa_ast: 4689f6d5d22c47ead303461cd138f6f2d8c1a8d8f51f200e27c82167a6675882
+    initial_ast: 8bdfe2bef21ce47412a8ebb9f2b19faca8d53f913ac71bf76d57d9144d8fecc5
+    unrolled_ast: 8bdfe2bef21ce47412a8ebb9f2b19faca8d53f913ac71bf76d57d9144d8fecc5
+    ssa_ast: 75883395d23179dc9b0f550de9bb1adedd4a1ad295c2f3c843a7259bcf985ec7
diff --git a/tests/expectations/compiler/integers/u128/le.out b/tests/expectations/compiler/integers/u128/le.out
index b695c436ef..787ba49910 100644
--- a/tests/expectations/compiler/integers/u128/le.out
+++ b/tests/expectations/compiler/integers/u128/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 9f6ff7676276fd71e69205fd2a37b2a517f2e6d2bbab71bea3780f9b3e4ce9d7
       - initial_input_ast: 11bf41d31880a7a74f59076840eee2f09884209a800a99c7c6ccc07c938caeb1
-    initial_ast: 8991d2f2adf761026070991b479c3f992bce589e7dc169529658c0c9096d4e41
-    unrolled_ast: 8991d2f2adf761026070991b479c3f992bce589e7dc169529658c0c9096d4e41
-    ssa_ast: 1a89beebb43808f6632bc92c047ea51ea02d13add81826a7a54e114cb7775cc2
+    initial_ast: b30b4c799cf4ddc93ab39ab82eb10fcbd4d3298cbd0220d5b4899294609ed1e0
+    unrolled_ast: b30b4c799cf4ddc93ab39ab82eb10fcbd4d3298cbd0220d5b4899294609ed1e0
+    ssa_ast: c17a78f0bbe496c14e997ccd0c3f63f365acbfac1229031bb043b9d842d0edac
diff --git a/tests/expectations/compiler/integers/u128/lt.out b/tests/expectations/compiler/integers/u128/lt.out
index 0d8d558b9b..84ef0496b6 100644
--- a/tests/expectations/compiler/integers/u128/lt.out
+++ b/tests/expectations/compiler/integers/u128/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: d77d5bebce02dc2a7dc4f014b85e6e4bce36aa7d2f313519e70b30b0ed059882
       - initial_input_ast: 791995324ae1ffb6ec382ef4c8061ae9b67854844da64e6113e2368a7ae3bace
-    initial_ast: 7411f501241bd8c29b8f2c1a25fc4f7b7a3f6d88acc0f0fe525c0c3a8fa4f034
-    unrolled_ast: 7411f501241bd8c29b8f2c1a25fc4f7b7a3f6d88acc0f0fe525c0c3a8fa4f034
-    ssa_ast: f00813ed0bd542aebbe66f61c414546634f00a87f7dff5f96a3083bc1a01c836
+    initial_ast: caa8523f4c26c7d7b511ca0e303b36a901ff7a7707f83c21296b35b331c5e526
+    unrolled_ast: caa8523f4c26c7d7b511ca0e303b36a901ff7a7707f83c21296b35b331c5e526
+    ssa_ast: cbea48e048593beda9fcb1c6754eca160513e666da0a2d1ac9fbe49c81157548
diff --git a/tests/expectations/compiler/integers/u128/max.out b/tests/expectations/compiler/integers/u128/max.out
index 6ef7ceff4a..cc41f54c5f 100644
--- a/tests/expectations/compiler/integers/u128/max.out
+++ b/tests/expectations/compiler/integers/u128/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: bc29c81534e8ff7275a2857bb6120478100e179a5edec8ef101fb4092a8483ee
-    initial_ast: 534661c3bf9d6c3eef85c8279fddf6812fc895b55adf562d96b164641ce24462
-    unrolled_ast: 534661c3bf9d6c3eef85c8279fddf6812fc895b55adf562d96b164641ce24462
-    ssa_ast: 1ac6026d4ed8516b1cc6b03b63e7ab4b0b332ede8607ba9585314249e288e1c2
+    initial_ast: 89af43100eee438e62ab30f175146ba4d77d7a5438b3f3db4b9d0379a609be9d
+    unrolled_ast: 89af43100eee438e62ab30f175146ba4d77d7a5438b3f3db4b9d0379a609be9d
+    ssa_ast: 0e9d146cef4530ade6c72a4112073de7001eff2adee467d2fec3ff9221801769
diff --git a/tests/expectations/compiler/integers/u128/max_fail.out b/tests/expectations/compiler/integers/u128/max_fail.out
index 9ac75fd08d..4b4e73f6a3 100644
--- a/tests/expectations/compiler/integers/u128/max_fail.out
+++ b/tests/expectations/compiler/integers/u128/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 340282366920938463463374607431768211456 is not a valid `u128`\n    --> compiler-test:4:21\n     |\n   4 |     const a: u128 = 340282366920938463463374607431768211456u128;\n     |                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u128/min.out b/tests/expectations/compiler/integers/u128/min.out
index 499261be6f..552484cc9a 100644
--- a/tests/expectations/compiler/integers/u128/min.out
+++ b/tests/expectations/compiler/integers/u128/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3a1cc3a7687324fe758ba99ebc73bf0bfb713dafd1bb0f4ffe1d182c5a27817a
-    initial_ast: 51c42ce79e9f5ac088279c82c320b427e0738f5a0a8340da799dcab29ec7f27f
-    unrolled_ast: 51c42ce79e9f5ac088279c82c320b427e0738f5a0a8340da799dcab29ec7f27f
-    ssa_ast: 719459fb3b63feb5f65d69e82a067390162fff28b9d6cda9e885f8e77a1cfdac
+    initial_ast: 1c62acd6ac1062fe05058e053ccc8e342dbf8a62e2e0c0f08b0047bc0f56e5dd
+    unrolled_ast: 1c62acd6ac1062fe05058e053ccc8e342dbf8a62e2e0c0f08b0047bc0f56e5dd
+    ssa_ast: 3c3b458b5540de1fec80869197a6dc6757a231e8d70b41999decd61205160083
diff --git a/tests/expectations/compiler/integers/u128/min_fail.out b/tests/expectations/compiler/integers/u128/min_fail.out
index 9ac75fd08d..b1d0770a45 100644
--- a/tests/expectations/compiler/integers/u128/min_fail.out
+++ b/tests/expectations/compiler/integers/u128/min_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value -1 is not a valid `u128`\n    --> compiler-test:4:21\n     |\n   4 |     const a: u128 = -1u128;\n     |                     ^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u128/mul.out b/tests/expectations/compiler/integers/u128/mul.out
index 4682e00b17..5fcc41e69d 100644
--- a/tests/expectations/compiler/integers/u128/mul.out
+++ b/tests/expectations/compiler/integers/u128/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 65c5104f29487cd8df18594b81b484c408e97346f2e80dd74fed61a876fc3429
-    initial_ast: c5a688ebe3916aef650deea2c3d9e1ba8a18bfba1921763ab177db60874d6960
-    unrolled_ast: c5a688ebe3916aef650deea2c3d9e1ba8a18bfba1921763ab177db60874d6960
-    ssa_ast: 8ff1a38a92f9d6d9b0e81cde5ecf48b1b3f8620d9535e833dd0e42b4238d5173
+    initial_ast: 4e14b5ddace304ff6cbdacc167ecd0ae802fde95004c6c3ac59c6e5785c9223d
+    unrolled_ast: 4e14b5ddace304ff6cbdacc167ecd0ae802fde95004c6c3ac59c6e5785c9223d
+    ssa_ast: 37d324e520b49beb3ebd33cf1d84cc201cdb66f299c3d73c74cfb8cb14cd2b05
diff --git a/tests/expectations/compiler/integers/u128/ne.out b/tests/expectations/compiler/integers/u128/ne.out
index dfcd60c279..116a748e38 100644
--- a/tests/expectations/compiler/integers/u128/ne.out
+++ b/tests/expectations/compiler/integers/u128/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 19819a14a7cdb32e06e422d7c669988ca8e8908efef2f701cdedc863bd2976a5
       - initial_input_ast: c15ac07970141bc18560a65d34478a953916f51489b383ae1b3d908b5139115b
-    initial_ast: 3a7e68a9747a27853f45d8f69d07e3b77639551e1d74fa97678692c17b3a49f3
-    unrolled_ast: 3a7e68a9747a27853f45d8f69d07e3b77639551e1d74fa97678692c17b3a49f3
-    ssa_ast: d9ab4c63c5127d259580591b4d42355793b46bc74008047f9e46bc8659e23c10
+    initial_ast: 8fe7ca682b2bf328ee4b9326316bbf7547f35d01e989b939286e219ac40d04f5
+    unrolled_ast: 8fe7ca682b2bf328ee4b9326316bbf7547f35d01e989b939286e219ac40d04f5
+    ssa_ast: 0a2a30c32cf58759c2a13ec0fb091e455729e65c362df92d9afe1b88fdce213f
diff --git a/tests/expectations/compiler/integers/u128/no_space_between_literal.out b/tests/expectations/compiler/integers/u128/no_space_between_literal.out
index 9ac75fd08d..549e58eaa0 100644
--- a/tests/expectations/compiler/integers/u128/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/u128/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 u128;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/u128/operator_methods.out b/tests/expectations/compiler/integers/u128/operator_methods.out
index 61086f500e..d8de007aa7 100644
--- a/tests/expectations/compiler/integers/u128/operator_methods.out
+++ b/tests/expectations/compiler/integers/u128/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 15fcfeb52a5274901910e91c8908712d76aa231b6a5f8c2406b90c2854f503a5
-    initial_ast: 535e20fc5ef82c057b3348f5e0e5fa80714188c7c8881f0168c46753ad632abc
-    unrolled_ast: 535e20fc5ef82c057b3348f5e0e5fa80714188c7c8881f0168c46753ad632abc
-    ssa_ast: bae9c555f9049f0c420477df851b8737246c9193051b57ca05ed8f15ac53ad97
+    initial_ast: 4c871f1db215428f7dd99b9edf6bf1ebb7ae2f6217ebb6a27991faba1664a840
+    unrolled_ast: 4c871f1db215428f7dd99b9edf6bf1ebb7ae2f6217ebb6a27991faba1664a840
+    ssa_ast: 040abe19255b2ab5b0728bd536e1ff9b97fdb416725aa01e876e6a73d283e94d
diff --git a/tests/expectations/compiler/integers/u128/or.out b/tests/expectations/compiler/integers/u128/or.out
index 87d76d2c4e..3a5d318203 100644
--- a/tests/expectations/compiler/integers/u128/or.out
+++ b/tests/expectations/compiler/integers/u128/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8b68efb82f47709e186ad5ea8458fe5de332a9ab1d04fb32ce4d126cb3de60a3
-    initial_ast: 4c24b23edc7a033885bee7da74a73588027c3d91867d0e9bb247eecb562721e3
-    unrolled_ast: 4c24b23edc7a033885bee7da74a73588027c3d91867d0e9bb247eecb562721e3
-    ssa_ast: c3f2ef223604f43d77bf8b30120130521dc219105f3d1f8421f33959446d8aa4
+    initial_ast: 0c23fbc3ba25f1eefccb1551bc2f088ab07f0b30db8999755ce5c097ee32ed48
+    unrolled_ast: 0c23fbc3ba25f1eefccb1551bc2f088ab07f0b30db8999755ce5c097ee32ed48
+    ssa_ast: cea33bf78e204efbc3e65fd539b449c614362497696e54613c72f5c5b04044d2
diff --git a/tests/expectations/compiler/integers/u128/pow.out b/tests/expectations/compiler/integers/u128/pow.out
index 84603f4c7e..e72bcd7391 100644
--- a/tests/expectations/compiler/integers/u128/pow.out
+++ b/tests/expectations/compiler/integers/u128/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 3ad7948f2fea7fc228db3549968b7a52d40e6545bfcf05059ddcc8a9280007b6
-    unrolled_ast: 3ad7948f2fea7fc228db3549968b7a52d40e6545bfcf05059ddcc8a9280007b6
-    ssa_ast: aa4a11b23f20c4a342eeffc4baf1223321d472e051ac499fa03ce52d87a85ccd
+    initial_ast: 5b91285721f9770b26c7ef2ef8a49a78e8f26ea841f05f4d350b3bef21c07de3
+    unrolled_ast: 5b91285721f9770b26c7ef2ef8a49a78e8f26ea841f05f4d350b3bef21c07de3
+    ssa_ast: 4cfc594033a7cbbaa812519e5cee80ee0aba7d678c2ac7be956bc01b4409eeb4
diff --git a/tests/expectations/compiler/integers/u128/rem.out b/tests/expectations/compiler/integers/u128/rem.out
index 0ca2a99d87..e4b3964650 100644
--- a/tests/expectations/compiler/integers/u128/rem.out
+++ b/tests/expectations/compiler/integers/u128/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 65f203354453a926238320a2b63c7e807c464a851fed89fea81defeddbde0bbb
-    initial_ast: b63422aa9a49140aa12b361ceb929ff09abdd3f41f0da9c1236e7a9dd4660100
-    unrolled_ast: b63422aa9a49140aa12b361ceb929ff09abdd3f41f0da9c1236e7a9dd4660100
-    ssa_ast: 614d949c0b09a79fdfd566bee051993b67a903dcd133c8604c74d8e57f805b64
+    initial_ast: e2c0319eb952590df007f83097a4efda49eab440359cfbbf25a11cd57d993005
+    unrolled_ast: e2c0319eb952590df007f83097a4efda49eab440359cfbbf25a11cd57d993005
+    ssa_ast: caaa3cf267fa2a69bfa4153aed9eb501352b9c1e05bb2bcafeb95b9afe3f69e4
diff --git a/tests/expectations/compiler/integers/u128/shl.out b/tests/expectations/compiler/integers/u128/shl.out
index 8793d40e55..1bed9e9c70 100644
--- a/tests/expectations/compiler/integers/u128/shl.out
+++ b/tests/expectations/compiler/integers/u128/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3abeb6ce0b494b4a3d8970b59223f585d5b3ee3746d01157635855bdd076303e
-    initial_ast: 0eab9c5fd7819ff98395ce0332f8a3e765466b2a76e90a794b2c5cc9dfeea946
-    unrolled_ast: 0eab9c5fd7819ff98395ce0332f8a3e765466b2a76e90a794b2c5cc9dfeea946
-    ssa_ast: c3cfb89880ef452f82fa6940f6f2cdfd7dbd58d1cd38f9be363bcbfdf7e691cc
+    initial_ast: b024e97eedff6997fbfa42e6919330c17ce9cb114d1b1e2b031c184bf64fc8e4
+    unrolled_ast: b024e97eedff6997fbfa42e6919330c17ce9cb114d1b1e2b031c184bf64fc8e4
+    ssa_ast: 0a55f7d1efde045c147dc1faaad2cfbb86ca1a6961f6961d73fd7928e7ce53f9
diff --git a/tests/expectations/compiler/integers/u128/shr.out b/tests/expectations/compiler/integers/u128/shr.out
index 3d1b034883..8063c321b2 100644
--- a/tests/expectations/compiler/integers/u128/shr.out
+++ b/tests/expectations/compiler/integers/u128/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3abeb6ce0b494b4a3d8970b59223f585d5b3ee3746d01157635855bdd076303e
-    initial_ast: a003f25bf0d70b7814407d9e5e28c249a9032ac8ccf5c8edb344e6dc9751b065
-    unrolled_ast: a003f25bf0d70b7814407d9e5e28c249a9032ac8ccf5c8edb344e6dc9751b065
-    ssa_ast: 1facbde709be224ce5301b914f0c350e36c2487690eac30ba09448d26e3a5a24
+    initial_ast: 7f1605bc7407efce86086ba0826a2d16a22dc5af10d77f6e2f0d78603cdaf5ce
+    unrolled_ast: 7f1605bc7407efce86086ba0826a2d16a22dc5af10d77f6e2f0d78603cdaf5ce
+    ssa_ast: 4d04c26ec55d49ac5ed7166e1bec2fb703bbc90f1b05fe3b72e8052db29f061a
diff --git a/tests/expectations/compiler/integers/u128/sub.out b/tests/expectations/compiler/integers/u128/sub.out
index f5999445c6..3183ed1626 100644
--- a/tests/expectations/compiler/integers/u128/sub.out
+++ b/tests/expectations/compiler/integers/u128/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: bb82184e58a17c8852e54e1b91b47f0898f62a5e4a21ca5102120b9779a4dd64
-    initial_ast: 6d58af148b38ccc18354fa716717f513b2d28aa175d349c55c48dbaf9a91061c
-    unrolled_ast: 6d58af148b38ccc18354fa716717f513b2d28aa175d349c55c48dbaf9a91061c
-    ssa_ast: 237b58eacf7d4f8ec5a98d6bdd5da19ce3a1e55b7241f090dd071f2a34b07add
+    initial_ast: d7442afac4188da36dc6115beadcdc6d71315f6f7a30b5ebe8d0bea91aa66a5b
+    unrolled_ast: d7442afac4188da36dc6115beadcdc6d71315f6f7a30b5ebe8d0bea91aa66a5b
+    ssa_ast: a502b5102c7d8f3940b625689de72a5d29ac003fd5aa6e65af2014ed24f523a2
diff --git a/tests/expectations/compiler/integers/u128/ternary.out b/tests/expectations/compiler/integers/u128/ternary.out
index e41b73cb38..dc1385757f 100644
--- a/tests/expectations/compiler/integers/u128/ternary.out
+++ b/tests/expectations/compiler/integers/u128/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 1aaa2706cef21c490be0a8348a4855f0deb1801d915f61bb75e0b588ed458efc
       - initial_input_ast: 7446eb31cafbfa66057d1011ae50643b3c7673bdb13b806325537cc32409efee
-    initial_ast: 0efeaef9cee966709614b8904154699bc5de96b5072042f8e6058b35d4c15643
-    unrolled_ast: 0efeaef9cee966709614b8904154699bc5de96b5072042f8e6058b35d4c15643
-    ssa_ast: 05af8d669e79d26f8e0520e582310ccba60d7b783764ae0999cda8770c68c1d1
+    initial_ast: 6c4ea6343cd3bc6c11b0f7a1641ded9fd2ca74799769bf088f4036fff3541b83
+    unrolled_ast: 6c4ea6343cd3bc6c11b0f7a1641ded9fd2ca74799769bf088f4036fff3541b83
+    ssa_ast: 241bdae517208be9dc56d2bd6990c623cc0edd25bf2be28c8bf44e7928fb6527
diff --git a/tests/expectations/compiler/integers/u128/xor.out b/tests/expectations/compiler/integers/u128/xor.out
index 88b3b44db1..a2c691273f 100644
--- a/tests/expectations/compiler/integers/u128/xor.out
+++ b/tests/expectations/compiler/integers/u128/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b8f2b8136d76b046c8e2ce4fadeea68c449fd8667c610522532b4c958d7cd52e
-    initial_ast: 15eb9ce372e1dba002238f0d10e66f6ed6956030c8feffd4ce13ee27c5695aae
-    unrolled_ast: 15eb9ce372e1dba002238f0d10e66f6ed6956030c8feffd4ce13ee27c5695aae
-    ssa_ast: 7c3471de18142473c5f343a9d77d850879ffb60daabb9c1c0c19b66869d307e5
+    initial_ast: 389ddb8d22037984eb9742fea84a6fd3bf70506acf92568ee10fa609c40e10e7
+    unrolled_ast: 389ddb8d22037984eb9742fea84a6fd3bf70506acf92568ee10fa609c40e10e7
+    ssa_ast: 06387d98a5a0dba9092daa58713bbaeed3e00ee1cbeabe249a5ad7e87d207244
diff --git a/tests/expectations/compiler/integers/u16/add.out b/tests/expectations/compiler/integers/u16/add.out
index eef847dd54..6ceb2e0256 100644
--- a/tests/expectations/compiler/integers/u16/add.out
+++ b/tests/expectations/compiler/integers/u16/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 993a5fc14ee2734fdf2229df93f6bae75d35324cfecb0ee5146d8afe871c148b
-    initial_ast: ebca2af37ebc7a9f5ec91ca5de6d0a82e0a097500614412be7523f3e07cd2565
-    unrolled_ast: ebca2af37ebc7a9f5ec91ca5de6d0a82e0a097500614412be7523f3e07cd2565
-    ssa_ast: 00a57e5a0f19eb53de4380c98e7d31a1b88b96ed322ca52a9db62f798c1c3aa9
+    initial_ast: c1943f4984f7d0d9929b19270281666a022cec0bf73f0a8e5a9ca0d5e63af65d
+    unrolled_ast: c1943f4984f7d0d9929b19270281666a022cec0bf73f0a8e5a9ca0d5e63af65d
+    ssa_ast: bf62dca4df35f72258e656aacb35ff46e6e29c6146b0bf866c46d15bfb92794d
diff --git a/tests/expectations/compiler/integers/u16/and.out b/tests/expectations/compiler/integers/u16/and.out
index 3421263190..0c7908e0d5 100644
--- a/tests/expectations/compiler/integers/u16/and.out
+++ b/tests/expectations/compiler/integers/u16/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 993a5fc14ee2734fdf2229df93f6bae75d35324cfecb0ee5146d8afe871c148b
-    initial_ast: 2a2ba90e33bb6a7151405692fd76e8f74e982f726b185346198e079955709155
-    unrolled_ast: 2a2ba90e33bb6a7151405692fd76e8f74e982f726b185346198e079955709155
-    ssa_ast: d4f937573ae1be51c93e4ffc61476dae6219828158e6449da17da7ed25434453
+    initial_ast: 4ef7f1877d385cba311c343668c7a0efc667c009c69566ce0bb78f0b404fb50d
+    unrolled_ast: 4ef7f1877d385cba311c343668c7a0efc667c009c69566ce0bb78f0b404fb50d
+    ssa_ast: 856b220f348fcffb035bfa00c562e2d39be10d8167557f5524ced626c49745f7
diff --git a/tests/expectations/compiler/integers/u16/console_assert.out b/tests/expectations/compiler/integers/u16/console_assert.out
index 1a32d09f58..7ffc030c7e 100644
--- a/tests/expectations/compiler/integers/u16/console_assert.out
+++ b/tests/expectations/compiler/integers/u16/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d732d00f10e47c172697f0edb8c525156925d9322ab202fe848b07ef7be1054e
-    initial_ast: 44f911f4284f27a0b1718da5dfabc4d367d81e0449a8b759cf055c97a5de4083
-    unrolled_ast: 44f911f4284f27a0b1718da5dfabc4d367d81e0449a8b759cf055c97a5de4083
-    ssa_ast: 6e34b9a2aac72ef48780cad8b1c57562c64d710603a31b1e21f0f84ede682bba
+    initial_ast: 3f2123de2d426c449d2ccc7fff5ed4c93cfc3aae5684db6d42e058e491fa6279
+    unrolled_ast: 3f2123de2d426c449d2ccc7fff5ed4c93cfc3aae5684db6d42e058e491fa6279
+    ssa_ast: a794a23bcfc4bc72ace2145460be8e6f71a501f207c817e5b803b1aacb968975
diff --git a/tests/expectations/compiler/integers/u16/div.out b/tests/expectations/compiler/integers/u16/div.out
index 6f3641bb3a..e3dd3ee2b4 100644
--- a/tests/expectations/compiler/integers/u16/div.out
+++ b/tests/expectations/compiler/integers/u16/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 16cef0c3d31d3893ebd9ce62218078de2a48a29e85237013b4faa8c0b2477c02
-    initial_ast: ce17ccbff042e3e61b6508031a6701242ab4691edd0a0fe2659e3575273f6fdd
-    unrolled_ast: ce17ccbff042e3e61b6508031a6701242ab4691edd0a0fe2659e3575273f6fdd
-    ssa_ast: 9011b0c7eb07904af2afcb5da6c114aafa4bab8b03b93aa77c4435655bc4191f
+    initial_ast: accf6f04889e124df6b2f9df4e513430111ec4ac2fa219f2694e86b1bf4b9f87
+    unrolled_ast: accf6f04889e124df6b2f9df4e513430111ec4ac2fa219f2694e86b1bf4b9f87
+    ssa_ast: ee9d00772451340213a7623425fe45c8472f16f926a19bf879b5fb1e83c1f47f
diff --git a/tests/expectations/compiler/integers/u16/eq.out b/tests/expectations/compiler/integers/u16/eq.out
index e6e32fa52e..130b20c45b 100644
--- a/tests/expectations/compiler/integers/u16/eq.out
+++ b/tests/expectations/compiler/integers/u16/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: f390ad1f3be58b85c4aafabe4f8968e8d4ead0a2c323db40dfa323f57472d8e9
-    initial_ast: 95b113a21a318b75dbe7bd557fa72ca2f9f6e48022432b1490fb42e57fe25023
-    unrolled_ast: 95b113a21a318b75dbe7bd557fa72ca2f9f6e48022432b1490fb42e57fe25023
-    ssa_ast: 99bc31772a7095d126c8be304aab0ee0ef6e265310d15554244ffe15ccf83106
+    initial_ast: 9daafe60a5f981ffc0cd0dafaaad99a0fa7f4ff5af28c594c3db4107485eb6af
+    unrolled_ast: 9daafe60a5f981ffc0cd0dafaaad99a0fa7f4ff5af28c594c3db4107485eb6af
+    ssa_ast: be334bce12ec9f135492ae88d2a36883861f395d4063e9d777e191ca69051120
diff --git a/tests/expectations/compiler/integers/u16/ge.out b/tests/expectations/compiler/integers/u16/ge.out
index ad352105ed..128d5f09c8 100644
--- a/tests/expectations/compiler/integers/u16/ge.out
+++ b/tests/expectations/compiler/integers/u16/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 5c7892d223be41430082e72a4768647efa6b992fa373e04cc3196ccc88bab8fd
       - initial_input_ast: 316cdb75fca37c149bfdb728865c9c75263f880a5dbdcf8b85c2db9014a837c4
-    initial_ast: 1e31dd2298855a0f850b7a4f2a1032891230938c4d2b98fabca946b1b29056f3
-    unrolled_ast: 1e31dd2298855a0f850b7a4f2a1032891230938c4d2b98fabca946b1b29056f3
-    ssa_ast: a347b3331c8e61870ed1d61005b353eb0a33931300a73acb55a7d37f304e7d22
+    initial_ast: a7c744d37d92260354bfec13aeb66f30183965ea8365c63519696a7895cb7c8b
+    unrolled_ast: a7c744d37d92260354bfec13aeb66f30183965ea8365c63519696a7895cb7c8b
+    ssa_ast: c18612d090941a7270b8a8f693bef5a1ad482fb3ce62d18c6e6f4fb3c0bbbb9a
diff --git a/tests/expectations/compiler/integers/u16/gt.out b/tests/expectations/compiler/integers/u16/gt.out
index d98199d428..1ddcff08ae 100644
--- a/tests/expectations/compiler/integers/u16/gt.out
+++ b/tests/expectations/compiler/integers/u16/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: b3ba9bc6f5eb91d695b9cddb79d208b960232ba498593ea91b14727febbc65ca
       - initial_input_ast: 31d09d3096d5acb457e30fa11760cc94f5dff6a4e6fcf22eab0bdbfee0bf73a1
-    initial_ast: dccb097919a627759b7744176bc0392c5903fe94fad3e1e07551f548895fbeeb
-    unrolled_ast: dccb097919a627759b7744176bc0392c5903fe94fad3e1e07551f548895fbeeb
-    ssa_ast: dd1c80851152a002d977c4a0d73a065e1a466f6621c1fcfc787cba3a8b7dcf2d
+    initial_ast: e5fa4830d4b609e986bec251535a223a9aa938088dfc186f225e6789f32f9612
+    unrolled_ast: e5fa4830d4b609e986bec251535a223a9aa938088dfc186f225e6789f32f9612
+    ssa_ast: 433002149cfb92c167d296299d2b777f06db8d9635a7b1a118f6fdbbe0bc430c
diff --git a/tests/expectations/compiler/integers/u16/le.out b/tests/expectations/compiler/integers/u16/le.out
index 045250761d..853ab5cb70 100644
--- a/tests/expectations/compiler/integers/u16/le.out
+++ b/tests/expectations/compiler/integers/u16/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 5c7892d223be41430082e72a4768647efa6b992fa373e04cc3196ccc88bab8fd
       - initial_input_ast: e2098a986970b489c90368ab0891e009b60fc6458d3218d1f738f44e3ebbe062
-    initial_ast: e0b3a39043b274a12ed74c0d3cd272271d856f6e57a04f67633ca21057d8b9c5
-    unrolled_ast: e0b3a39043b274a12ed74c0d3cd272271d856f6e57a04f67633ca21057d8b9c5
-    ssa_ast: cb3b69e2167bbd97e2b300f6672f7b37d55f7af5f0e2abd2cb0a11191933d3ef
+    initial_ast: 839dbfd92ec64d5e94d0d356c828bc97a12fe816c899cdcaa2164c0fc5d40439
+    unrolled_ast: 839dbfd92ec64d5e94d0d356c828bc97a12fe816c899cdcaa2164c0fc5d40439
+    ssa_ast: 51d5d76d141232f708ed8d46661fec224a3223c3ddf2ac3b9a666051962d4595
diff --git a/tests/expectations/compiler/integers/u16/lt.out b/tests/expectations/compiler/integers/u16/lt.out
index 2ed0d938d9..882ca32cb1 100644
--- a/tests/expectations/compiler/integers/u16/lt.out
+++ b/tests/expectations/compiler/integers/u16/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 173acccf217827ae3052a3d44be4c7535b7ef53a7a5d30c92f080f9e601399fa
       - initial_input_ast: 46ddd7878bbe5c5eb390094dff0b5de1c52fe28550011015136e7a5197ce2f88
-    initial_ast: 480ac3dd50505c3fb1b24fe236a3337a5ac266af09c1d38d27c1872d6c421e1b
-    unrolled_ast: 480ac3dd50505c3fb1b24fe236a3337a5ac266af09c1d38d27c1872d6c421e1b
-    ssa_ast: c2be629b8fd9b5d0caeed514cfd27f6cfe8955e8b18c9e3ea14706657b5c3477
+    initial_ast: 2fb99ad6c67951ca163a01f33fa63427f47f3dc01459bbd6740c57d93192a2df
+    unrolled_ast: 2fb99ad6c67951ca163a01f33fa63427f47f3dc01459bbd6740c57d93192a2df
+    ssa_ast: b1c28a2a69556c2cc387344f951e615c490dbb309b2b72886938c9e840fadd99
diff --git a/tests/expectations/compiler/integers/u16/max.out b/tests/expectations/compiler/integers/u16/max.out
index c3470154f1..36350337d8 100644
--- a/tests/expectations/compiler/integers/u16/max.out
+++ b/tests/expectations/compiler/integers/u16/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d17c8a902f7db5b98db912fb42ef2b8b2c3d8c20eb234922abb93c64424dec55
-    initial_ast: 0ffdec2140506957803fabe603523d2a85291e0d0180ed9ba27b27916aad5ba5
-    unrolled_ast: 0ffdec2140506957803fabe603523d2a85291e0d0180ed9ba27b27916aad5ba5
-    ssa_ast: fc8cf2994e44fb233cb0f5db2a658f2efcf48c5068f2575bf876ce4b199db354
+    initial_ast: 2e5ae926b20fc0d6bd7b604a7df47cfb42a3cb679ab75583b00de516385c4902
+    unrolled_ast: 2e5ae926b20fc0d6bd7b604a7df47cfb42a3cb679ab75583b00de516385c4902
+    ssa_ast: 02571f879e8226c03e951a01b5c771fd30bc496daf113f2398d36ac24b1cf00a
diff --git a/tests/expectations/compiler/integers/u16/max_fail.out b/tests/expectations/compiler/integers/u16/max_fail.out
index 9ac75fd08d..0740c32533 100644
--- a/tests/expectations/compiler/integers/u16/max_fail.out
+++ b/tests/expectations/compiler/integers/u16/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 65536 is not a valid `u16`\n    --> compiler-test:4:20\n     |\n   4 |     const a: u16 = 65536u16;\n     |                    ^^^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u16/min.out b/tests/expectations/compiler/integers/u16/min.out
index 6d00aef8df..9156a8fb23 100644
--- a/tests/expectations/compiler/integers/u16/min.out
+++ b/tests/expectations/compiler/integers/u16/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c82b4b7f26a3647900a1669a09055618ad25db71a06ad82171f22d66bad41351
-    initial_ast: 05b1c88e55b5c5f7fc21c7e09be7f8ad489c96d70380092b804566da6888ba71
-    unrolled_ast: 05b1c88e55b5c5f7fc21c7e09be7f8ad489c96d70380092b804566da6888ba71
-    ssa_ast: de2d7384442386978f790d08e35c6cee45ed83992eb8e18dd22c93b2b472f593
+    initial_ast: bb078bcd4db60433d25646b454882327ed1a5dbfb0a122cd6b3ecdffdd25aea3
+    unrolled_ast: bb078bcd4db60433d25646b454882327ed1a5dbfb0a122cd6b3ecdffdd25aea3
+    ssa_ast: f39923bdeb4b6b5470a4a2a05c339b9a4a4a534e1bc289be5250535656d72de0
diff --git a/tests/expectations/compiler/integers/u16/min_fail.out b/tests/expectations/compiler/integers/u16/min_fail.out
index 9ac75fd08d..9c9733f3b8 100644
--- a/tests/expectations/compiler/integers/u16/min_fail.out
+++ b/tests/expectations/compiler/integers/u16/min_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value -1 is not a valid `u16`\n    --> compiler-test:4:20\n     |\n   4 |     const a: u16 = -1u16;\n     |                    ^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u16/mul.out b/tests/expectations/compiler/integers/u16/mul.out
index d6d5e530f4..9b16fad761 100644
--- a/tests/expectations/compiler/integers/u16/mul.out
+++ b/tests/expectations/compiler/integers/u16/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 0305f61fc0b426a3bfe87b17ef67d050db7ff5df4dc269bdef7767108ccfbf7b
-    initial_ast: 23f9ef2d4f05c6367434ab44e3dcd5a7478d8ff72e80c0c7a48d8f6a5f83626c
-    unrolled_ast: 23f9ef2d4f05c6367434ab44e3dcd5a7478d8ff72e80c0c7a48d8f6a5f83626c
-    ssa_ast: 482754d45a29805a6051551429ae028d0f5761736f4fe9b7cfbde36b806f35ed
+    initial_ast: 60667f7f70218e47007e0add4c13ef16b39441cdbe3d0e6fece7f38bd0aadd55
+    unrolled_ast: 60667f7f70218e47007e0add4c13ef16b39441cdbe3d0e6fece7f38bd0aadd55
+    ssa_ast: 287280bf1904155f6c52d5f92f07171efb329678a7846dea51c2774a010724e1
diff --git a/tests/expectations/compiler/integers/u16/ne.out b/tests/expectations/compiler/integers/u16/ne.out
index d7b541858b..f4c9b0cf2b 100644
--- a/tests/expectations/compiler/integers/u16/ne.out
+++ b/tests/expectations/compiler/integers/u16/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 2804fe3ab5df443beee5be6a51146770dda94b5606d5c3401427e4bd41c07050
       - initial_input_ast: a68ce9ff32662164ef5cff8e3b1797dc11821054de227a1f9212941389ffe03a
-    initial_ast: 18e9b91ca6c208a1553ae30f68c1ed6877689c9a53b5fe8e0b59e3c8a533ef5a
-    unrolled_ast: 18e9b91ca6c208a1553ae30f68c1ed6877689c9a53b5fe8e0b59e3c8a533ef5a
-    ssa_ast: 20e6d7f23b7ecc892f3ddd8b3e8d06299e2c744b5e967393fc3f3f8a595ef72f
+    initial_ast: 59c900e6dd6c75b93a3bdf78fedadc4e3fb030a4cbb738872805d1b516cc854b
+    unrolled_ast: 59c900e6dd6c75b93a3bdf78fedadc4e3fb030a4cbb738872805d1b516cc854b
+    ssa_ast: f5e2ebc96b14425351687a3c967278b1c877e2697859365475e3d99f60407977
diff --git a/tests/expectations/compiler/integers/u16/no_space_between_literal.out b/tests/expectations/compiler/integers/u16/no_space_between_literal.out
index 9ac75fd08d..f98151f611 100644
--- a/tests/expectations/compiler/integers/u16/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/u16/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 u16;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/u16/operator_methods.out b/tests/expectations/compiler/integers/u16/operator_methods.out
index 6121cdf06b..ed21e3e93e 100644
--- a/tests/expectations/compiler/integers/u16/operator_methods.out
+++ b/tests/expectations/compiler/integers/u16/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9869aaa1d8d9fb4bfaa989ac65837e6d00bd8f6c61d814fb27818d6bf09116d6
-    initial_ast: 088e3fb105d1d466880c2deb40d209de7eeb3ba9217cdd98d07ac8d957d7521e
-    unrolled_ast: 088e3fb105d1d466880c2deb40d209de7eeb3ba9217cdd98d07ac8d957d7521e
-    ssa_ast: 19417e454522c0e35f57fdfaf97ea4f3028b48cc802e04300588f20e3e05d3f0
+    initial_ast: 93c6eb3dfda9d823b8ab7d6e8276408eb035e758bdd1a3d51629bcf4cc27cdf9
+    unrolled_ast: 93c6eb3dfda9d823b8ab7d6e8276408eb035e758bdd1a3d51629bcf4cc27cdf9
+    ssa_ast: 07543a232379f2004cb55c90e1d8abad45fdf690a71c8eefe6273045c514ec9c
diff --git a/tests/expectations/compiler/integers/u16/or.out b/tests/expectations/compiler/integers/u16/or.out
index 72a655ab9d..903aba6ea9 100644
--- a/tests/expectations/compiler/integers/u16/or.out
+++ b/tests/expectations/compiler/integers/u16/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 993a5fc14ee2734fdf2229df93f6bae75d35324cfecb0ee5146d8afe871c148b
-    initial_ast: 56d40cb348f8fb05173fdee4b1c594586728a55c3cc05a78963e40d4774c0a02
-    unrolled_ast: 56d40cb348f8fb05173fdee4b1c594586728a55c3cc05a78963e40d4774c0a02
-    ssa_ast: 751637b5ece70adf522bd64662fe3fa6cfbbd058b2c7054113867b0a3f018a82
+    initial_ast: 38bcc5c3a8164044d401c7e6bb59f4bf8fd71d5982e0adcf9f6412ca278728c0
+    unrolled_ast: 38bcc5c3a8164044d401c7e6bb59f4bf8fd71d5982e0adcf9f6412ca278728c0
+    ssa_ast: ac44a95182db79adc18345d5a5e9fe1ebde87c200134e77917114fe563f3be8b
diff --git a/tests/expectations/compiler/integers/u16/pow.out b/tests/expectations/compiler/integers/u16/pow.out
index 59c9de1164..e63b5689cd 100644
--- a/tests/expectations/compiler/integers/u16/pow.out
+++ b/tests/expectations/compiler/integers/u16/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 512c3e88d6e6aabdc1cedbaace53b2125b2310c6203056e8ff3fe9198ea18fed
-    initial_ast: 968d9190d0e40ae8025c327af90809c8c41477bdfc11ba7d91b1604e550c35d4
-    unrolled_ast: 968d9190d0e40ae8025c327af90809c8c41477bdfc11ba7d91b1604e550c35d4
-    ssa_ast: 37812433bd7412ed50f79ac10e7a9e1c921b3649eb0904c9b6ab1df9f88688eb
+    initial_ast: 5768281d526dbbdb968073b71ccfd9503b10d30f937f9271b7118c3d14e25790
+    unrolled_ast: 5768281d526dbbdb968073b71ccfd9503b10d30f937f9271b7118c3d14e25790
+    ssa_ast: 8a594b89cbc8ffa2ad7c9c2fb43e57fde56a11c7f405b9e56797d9c4360f752d
diff --git a/tests/expectations/compiler/integers/u16/rem.out b/tests/expectations/compiler/integers/u16/rem.out
index 0a409ee361..d4428d1d08 100644
--- a/tests/expectations/compiler/integers/u16/rem.out
+++ b/tests/expectations/compiler/integers/u16/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 16cef0c3d31d3893ebd9ce62218078de2a48a29e85237013b4faa8c0b2477c02
-    initial_ast: 11bceaa26c70e445f617b1a5a1482737995a57c8d6ddbc2991113f8f52673a3f
-    unrolled_ast: 11bceaa26c70e445f617b1a5a1482737995a57c8d6ddbc2991113f8f52673a3f
-    ssa_ast: 32f8a583dbae5da47873f1ea4b42ee1eebcffe9d7c148f593d7bef6e5466ef46
+    initial_ast: da495837cc8b8e770301cb64caf7274c8e3d1934fad1ef4c4d5dafef24afd6fd
+    unrolled_ast: da495837cc8b8e770301cb64caf7274c8e3d1934fad1ef4c4d5dafef24afd6fd
+    ssa_ast: 80e7e6f2d8ef90ab1e42002625e3f157931d458e3289f2a1735b28ce9567a8f5
diff --git a/tests/expectations/compiler/integers/u16/shl.out b/tests/expectations/compiler/integers/u16/shl.out
index d4a1057cac..f49351bfa8 100644
--- a/tests/expectations/compiler/integers/u16/shl.out
+++ b/tests/expectations/compiler/integers/u16/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9e31bca38b0d03af19a6a5af2a635bc70f0c797d7a3fdbcb8e6c5e74cfda039c
-    initial_ast: 00e488dfa677fe3b1de8657ed35248979e9cc3f47e875e7b68f26ffbec048979
-    unrolled_ast: 00e488dfa677fe3b1de8657ed35248979e9cc3f47e875e7b68f26ffbec048979
-    ssa_ast: 2499138d1571c87cbc4bbfefecbb06ae978f9d50927b839049f85fe09185d136
+    initial_ast: 3a50ac77fb25b6e1b1561409d44952fd74b90ba5fc482b1359eb6e2a10061f7f
+    unrolled_ast: 3a50ac77fb25b6e1b1561409d44952fd74b90ba5fc482b1359eb6e2a10061f7f
+    ssa_ast: 09ce451d76f525134f7913bf49b8fc5e2b2642903d978d24b23aa9d77ee25b74
diff --git a/tests/expectations/compiler/integers/u16/shr.out b/tests/expectations/compiler/integers/u16/shr.out
index 60e1224de1..20a8099f87 100644
--- a/tests/expectations/compiler/integers/u16/shr.out
+++ b/tests/expectations/compiler/integers/u16/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9e31bca38b0d03af19a6a5af2a635bc70f0c797d7a3fdbcb8e6c5e74cfda039c
-    initial_ast: e4b95b6e37ce4d59606eb4db65cc716725c2076d4aa4bc8676a3b03739d312a7
-    unrolled_ast: e4b95b6e37ce4d59606eb4db65cc716725c2076d4aa4bc8676a3b03739d312a7
-    ssa_ast: 8af93895f4d314cc0711be7f11db712eda84360ee0aebbd6a6237eed0a6d20df
+    initial_ast: c9796c6a0127120872a17d8c3054ed8af7ac6c90c685a5baa9e503cda9fde716
+    unrolled_ast: c9796c6a0127120872a17d8c3054ed8af7ac6c90c685a5baa9e503cda9fde716
+    ssa_ast: dfd0107a36f09565433cf2688ed7ffd0ac754bc93f46da5b19600e6b7f48ed6a
diff --git a/tests/expectations/compiler/integers/u16/sub.out b/tests/expectations/compiler/integers/u16/sub.out
index 22f5426f09..b33d083bf5 100644
--- a/tests/expectations/compiler/integers/u16/sub.out
+++ b/tests/expectations/compiler/integers/u16/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ef6dc49e27ac338a1a13f58ed93cfd97a1ea54c737ad99f2239657dbe162b27a
-    initial_ast: d59e13d21d79f5558a4d69ff1b5600b2cee240c28b65053c376e9e29fa536584
-    unrolled_ast: d59e13d21d79f5558a4d69ff1b5600b2cee240c28b65053c376e9e29fa536584
-    ssa_ast: 44685b464bce4e8c76c62bbb8c57333a369ceea4bd02840e2d66b5a037250d75
+    initial_ast: 5a6b8de2eac7a9168522dae604795466098766fb29f969d4a3e5bdd30e0b2e7a
+    unrolled_ast: 5a6b8de2eac7a9168522dae604795466098766fb29f969d4a3e5bdd30e0b2e7a
+    ssa_ast: 5b630fd39571f4f122d63a46f420a0127fbae0c033975a01cab72707ff92c7f0
diff --git a/tests/expectations/compiler/integers/u16/ternary.out b/tests/expectations/compiler/integers/u16/ternary.out
index ab5309d317..897c0b3dc2 100644
--- a/tests/expectations/compiler/integers/u16/ternary.out
+++ b/tests/expectations/compiler/integers/u16/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 974c56843dfb3ab88100a02caf99a6eb0cd56593cd18420dbe7f5b7a4556aa57
       - initial_input_ast: f3bfa524cc034083bae89d91575591cce93d7baa7b059c2b1af3ff2575d1b598
-    initial_ast: 6b6175521b39d68673ee646202db50bb2415681716f52ec2eb30b154bae677e4
-    unrolled_ast: 6b6175521b39d68673ee646202db50bb2415681716f52ec2eb30b154bae677e4
-    ssa_ast: 10c0d77ec41296e3c9378c1ce54c22ac93cf7bc9acea7e4d0502e21a5c743f6a
+    initial_ast: 05de3dae81bb5985dafaa77bb5617cf4d5f8a9d7799baa36b4f46f3438b56505
+    unrolled_ast: 05de3dae81bb5985dafaa77bb5617cf4d5f8a9d7799baa36b4f46f3438b56505
+    ssa_ast: 213ee817d30303668972c27c9f243b05e615bde36118fb686b80384a2c43e090
diff --git a/tests/expectations/compiler/integers/u16/xor.out b/tests/expectations/compiler/integers/u16/xor.out
index da4dcc5594..8c9aff7f75 100644
--- a/tests/expectations/compiler/integers/u16/xor.out
+++ b/tests/expectations/compiler/integers/u16/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: cf9a478ff98a432f98f853d2f508167ddc0c74815c6eb0456d3f6c8ef11f6302
-    initial_ast: 247579bedd54b6e1c5237171bf28b8b69eb0b60c1c8cefbf89cdc73332c42ca7
-    unrolled_ast: 247579bedd54b6e1c5237171bf28b8b69eb0b60c1c8cefbf89cdc73332c42ca7
-    ssa_ast: 843bff5a9476c9d0c1e28cd21fe4739c1969231f08816f6c50b9ef7b7797b93a
+    initial_ast: 7c87526b760c6c6c9c98e1ec395f8f6ebd474b5da00619d3bd544e9556a0f836
+    unrolled_ast: 7c87526b760c6c6c9c98e1ec395f8f6ebd474b5da00619d3bd544e9556a0f836
+    ssa_ast: 0ce6ace0479cc13a77c8a707438f92f84fe13309c4c1ba199ea2c164b77d4926
diff --git a/tests/expectations/compiler/integers/u32/add.out b/tests/expectations/compiler/integers/u32/add.out
index 546757a0ab..dca04fc6a2 100644
--- a/tests/expectations/compiler/integers/u32/add.out
+++ b/tests/expectations/compiler/integers/u32/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 1d6cb8fd8bb08fd5d5ba6987bdd553e22154575d209a822a4b7c2f0fe9aef12c
-    initial_ast: 222398469cd0e2d5f20de50c787a7785f21cc42c6d89468d6d3a6b79780cbef1
-    unrolled_ast: 222398469cd0e2d5f20de50c787a7785f21cc42c6d89468d6d3a6b79780cbef1
-    ssa_ast: 8bb755b237c1ed16f8c86c5015d39b844c52dca6224c777e082407dcf6f66fa9
+    initial_ast: 83abb258a572916ab87d120c3e5d35ac1bbcb25a37a885e3ea0277561c09084c
+    unrolled_ast: 83abb258a572916ab87d120c3e5d35ac1bbcb25a37a885e3ea0277561c09084c
+    ssa_ast: 65aca4daa446ce75dcb3d11a0ad8f94270856ac71442d44b82c1d53c9a900589
diff --git a/tests/expectations/compiler/integers/u32/and.out b/tests/expectations/compiler/integers/u32/and.out
index fb1284a9c9..ad31e5fae9 100644
--- a/tests/expectations/compiler/integers/u32/and.out
+++ b/tests/expectations/compiler/integers/u32/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 1d6cb8fd8bb08fd5d5ba6987bdd553e22154575d209a822a4b7c2f0fe9aef12c
-    initial_ast: 9f8d0ceb235e1f99d662ace25f10a755e700b6ffc875fe5dfd9396ac8ae8a0f2
-    unrolled_ast: 9f8d0ceb235e1f99d662ace25f10a755e700b6ffc875fe5dfd9396ac8ae8a0f2
-    ssa_ast: 18ce43cb2882d7adea8533f042bd4359cf94dc1a9d5ea91d5b54ea730daae369
+    initial_ast: d9aa2a20fd511fddaddebcad4b0f3810bd3d204345d5991b02601621521691ff
+    unrolled_ast: d9aa2a20fd511fddaddebcad4b0f3810bd3d204345d5991b02601621521691ff
+    ssa_ast: 2ba58235d66ba75fbec6a7d70831cdc9010918b3de8a2ff317ad8720d1b06538
diff --git a/tests/expectations/compiler/integers/u32/console_assert.out b/tests/expectations/compiler/integers/u32/console_assert.out
index 4a0c56e76b..955b3c9319 100644
--- a/tests/expectations/compiler/integers/u32/console_assert.out
+++ b/tests/expectations/compiler/integers/u32/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 2f1d5397a6fb480a25c8af6da60e3aae90f79f027c06991326db1dd0f3bf0c2e
-    initial_ast: fb9b55a6b5f0905f51739274f467dd6e886cdd5c60579a65380fdbc914ee4038
-    unrolled_ast: fb9b55a6b5f0905f51739274f467dd6e886cdd5c60579a65380fdbc914ee4038
-    ssa_ast: 0d552f4fa60342f9b589fca78a06e36c01ed36c7ab0fb6c8855f6a8201e5def6
+    initial_ast: 4c57520f9a6c7d0666e0d31b5670b67d7cf155b19decf2545104a833d788fe3c
+    unrolled_ast: 4c57520f9a6c7d0666e0d31b5670b67d7cf155b19decf2545104a833d788fe3c
+    ssa_ast: 6807af6c6debcb0b4221967a9e21c457a2073863ba68dc28a6113a62ed2b7d3e
diff --git a/tests/expectations/compiler/integers/u32/div.out b/tests/expectations/compiler/integers/u32/div.out
index 288f9a5a87..f64f4691ba 100644
--- a/tests/expectations/compiler/integers/u32/div.out
+++ b/tests/expectations/compiler/integers/u32/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 48f85455877550aaf0a5e842943ebf471f6aa571aaa183f6db989538a5e1bcf8
-    initial_ast: fe1e427f9ab26b3a688eaa040a6bc709e32ddc9b3b335a6188358f4ed4d69e2d
-    unrolled_ast: fe1e427f9ab26b3a688eaa040a6bc709e32ddc9b3b335a6188358f4ed4d69e2d
-    ssa_ast: fe738b18b6f418d0cbdfc3a75ebe502a8080cdc3bf4f443ab2f09733b7ec14d3
+    initial_ast: a51354109fbebb60d6f468968a2dc0dddc7537a64bbe4e93f6520a0ed1b7bda7
+    unrolled_ast: a51354109fbebb60d6f468968a2dc0dddc7537a64bbe4e93f6520a0ed1b7bda7
+    ssa_ast: 4a15f5801f5ed4100730517d72d1fa68b4b82a9e3b75044e000fda4d16586d4d
diff --git a/tests/expectations/compiler/integers/u32/eq.out b/tests/expectations/compiler/integers/u32/eq.out
index c9d2b4dc05..d6ea2bbb4b 100644
--- a/tests/expectations/compiler/integers/u32/eq.out
+++ b/tests/expectations/compiler/integers/u32/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 73f783e291d8e9575065142cfbc126f91ecd8bb09b882338bfbb63f8d3d70301
-    initial_ast: f2bb46d3362ce6e9c6f87d7738198f5537df702157b43e55946d0f2e1eb78b93
-    unrolled_ast: f2bb46d3362ce6e9c6f87d7738198f5537df702157b43e55946d0f2e1eb78b93
-    ssa_ast: 0f05a16587f974db0803ef10bf2ac29ad04b2bc2ce93a312387686336881e1e1
+    initial_ast: 870a9c6a75e642981adab3ef6af00ae65ab46e2c5048b78597e5ee29bcf87aa2
+    unrolled_ast: 870a9c6a75e642981adab3ef6af00ae65ab46e2c5048b78597e5ee29bcf87aa2
+    ssa_ast: af2d13d75a28f4354c7282cb64296033c62da87878e23f29d4090e09a75487e0
diff --git a/tests/expectations/compiler/integers/u32/ge.out b/tests/expectations/compiler/integers/u32/ge.out
index a17c69af2c..9003f6da94 100644
--- a/tests/expectations/compiler/integers/u32/ge.out
+++ b/tests/expectations/compiler/integers/u32/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: c785cf879d181995ff74f4a07a6bf889fe4d436785e86241e4df1b090834e9cd
       - initial_input_ast: 2d556dc336117a3f25c3f378bfd8e43a333263d85e53dcb95825bef6bda4bf2d
-    initial_ast: a25d925a6bd27345327ec95a7d6316135c5bcc4962b39887a74634000d81f202
-    unrolled_ast: a25d925a6bd27345327ec95a7d6316135c5bcc4962b39887a74634000d81f202
-    ssa_ast: 55d72635ab86653e63d9580bbac6e610e2368179fd8f016f986e5a5d78c889e4
+    initial_ast: eeebc339e69d857f02af3f76b716d7e92b9e195029aa7d401357086e199f76e5
+    unrolled_ast: eeebc339e69d857f02af3f76b716d7e92b9e195029aa7d401357086e199f76e5
+    ssa_ast: 6600c846ea052de6019608a92288de5e140fc8049287a6d741e17e528e30826c
diff --git a/tests/expectations/compiler/integers/u32/gt.out b/tests/expectations/compiler/integers/u32/gt.out
index da78941ba1..8351574065 100644
--- a/tests/expectations/compiler/integers/u32/gt.out
+++ b/tests/expectations/compiler/integers/u32/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: eb286de6bd0fce78c0348d4c402d7652e9586b0f546cc642e5521a214d6eb01f
       - initial_input_ast: bcfea19a22b25b9f234270d648fb274b350d1648d4a9ea1f0bc501e03ffa354a
-    initial_ast: a426655385cc219a03445cd53e6cca0adec4f86e66d3a72e0da5b9431da88c3b
-    unrolled_ast: a426655385cc219a03445cd53e6cca0adec4f86e66d3a72e0da5b9431da88c3b
-    ssa_ast: 31f48ac8541ae8236db30b08e0e8712053aa9082cd4e46a6b439aeda4a570498
+    initial_ast: ed43e306567e84370bef129b46a41f326cd8bb7353d3415ca51817631995bc55
+    unrolled_ast: ed43e306567e84370bef129b46a41f326cd8bb7353d3415ca51817631995bc55
+    ssa_ast: ace3bef13b77cdc76a4a081bd94e3526abec43b39e27ff9253611b3b4c55426d
diff --git a/tests/expectations/compiler/integers/u32/le.out b/tests/expectations/compiler/integers/u32/le.out
index 0233ee7f52..77f6f442bc 100644
--- a/tests/expectations/compiler/integers/u32/le.out
+++ b/tests/expectations/compiler/integers/u32/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: c785cf879d181995ff74f4a07a6bf889fe4d436785e86241e4df1b090834e9cd
       - initial_input_ast: 80e6f2e121ff4ba23b4fdc6002053d95d1ded29c163d022fbd4ee502da415dde
-    initial_ast: b858be106be22c5a57ddaa111465fcbec5d583c03068171b0e59a7271342df83
-    unrolled_ast: b858be106be22c5a57ddaa111465fcbec5d583c03068171b0e59a7271342df83
-    ssa_ast: fdaed5a370a3bfcdd485985a214c465085607849d8b172a1b5d566437e002dc3
+    initial_ast: 04bd15fca0abeed1fa2d0500a19eda43cd2cbed3eb80469be7ba666e87d15380
+    unrolled_ast: 04bd15fca0abeed1fa2d0500a19eda43cd2cbed3eb80469be7ba666e87d15380
+    ssa_ast: aaeafd3b3b896814fcd4eb95ffde8c77c8a764292574eae89910baf1425672d9
diff --git a/tests/expectations/compiler/integers/u32/lt.out b/tests/expectations/compiler/integers/u32/lt.out
index 695be27d5e..0a34063c2d 100644
--- a/tests/expectations/compiler/integers/u32/lt.out
+++ b/tests/expectations/compiler/integers/u32/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 7cdd50ab0ab9969faa45fddb4868d00a5e699dae062cadb4010aebea8ecbc993
       - initial_input_ast: b6b1dcbf84b431d61acb2129ad0c0f07d179f94e2b6e8dd28960b67a25482843
-    initial_ast: bc3429020a5c1d376836f7ce91d9c5e258f13f8ee9c0f09dc9881935541ea64a
-    unrolled_ast: bc3429020a5c1d376836f7ce91d9c5e258f13f8ee9c0f09dc9881935541ea64a
-    ssa_ast: 8a86c4d00dc69be2aebbe6c7f0739b513c535518e2e5d82adbf9d0d0c1979a8b
+    initial_ast: cf3c36d6c6e21f465ac5fab339f5edc9da1a8a50e68883de4155bd9425abaa16
+    unrolled_ast: cf3c36d6c6e21f465ac5fab339f5edc9da1a8a50e68883de4155bd9425abaa16
+    ssa_ast: 097a2103a5b7ded4eb4357e2c7fcf926ee782e9284c2f5461e9c5251cf6b31dc
diff --git a/tests/expectations/compiler/integers/u32/max.out b/tests/expectations/compiler/integers/u32/max.out
index 9b31d735d5..8c3bf86c67 100644
--- a/tests/expectations/compiler/integers/u32/max.out
+++ b/tests/expectations/compiler/integers/u32/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d7efb950b283e8043cb74d699f193749324f2fb6714df5fde527c348f849a179
-    initial_ast: 18fc445b1ac665672a4bb02e07e2b651a4ad33bd207e1444c24199e433ab66ac
-    unrolled_ast: 18fc445b1ac665672a4bb02e07e2b651a4ad33bd207e1444c24199e433ab66ac
-    ssa_ast: 75601847720caaa7c350d83bf7a209426d1f5486f9b6ec22e3207d023dde2394
+    initial_ast: eb140362aeaaebaae6507847c17c697537d1b823549e34ca6264b4e5b769780c
+    unrolled_ast: eb140362aeaaebaae6507847c17c697537d1b823549e34ca6264b4e5b769780c
+    ssa_ast: 447562dd224290d881603ed02461797c509cc662762790fb3ceafc7ddbf9572f
diff --git a/tests/expectations/compiler/integers/u32/max_fail.out b/tests/expectations/compiler/integers/u32/max_fail.out
index 9ac75fd08d..6f8b16cd6d 100644
--- a/tests/expectations/compiler/integers/u32/max_fail.out
+++ b/tests/expectations/compiler/integers/u32/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 4294967296 is not a valid `u32`\n    --> compiler-test:4:20\n     |\n   4 |     const a: u32 = 4294967296u32;\n     |                    ^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u32/min.out b/tests/expectations/compiler/integers/u32/min.out
index 5344f1c989..ff0ccd2710 100644
--- a/tests/expectations/compiler/integers/u32/min.out
+++ b/tests/expectations/compiler/integers/u32/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c82b4b7f26a3647900a1669a09055618ad25db71a06ad82171f22d66bad41351
-    initial_ast: e45ab94f8811a703146cd014ba6e9afc251b7bc53a7963665df80e99bcece209
-    unrolled_ast: e45ab94f8811a703146cd014ba6e9afc251b7bc53a7963665df80e99bcece209
-    ssa_ast: 2fc9fead7acbea7cb0834c79d955b2370856da8aaf51891c95afc28a0287a15a
+    initial_ast: fad51b7f8a89f8ed59791397256df0f23fca4bdb0bc84dac776a645f45add46d
+    unrolled_ast: fad51b7f8a89f8ed59791397256df0f23fca4bdb0bc84dac776a645f45add46d
+    ssa_ast: b9355b18823c46420681928ee89dda0d6560933341a677b56760628d71dc6aa2
diff --git a/tests/expectations/compiler/integers/u32/min_fail.out b/tests/expectations/compiler/integers/u32/min_fail.out
index 9ac75fd08d..7b28ed9cef 100644
--- a/tests/expectations/compiler/integers/u32/min_fail.out
+++ b/tests/expectations/compiler/integers/u32/min_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value -1 is not a valid `u32`\n    --> compiler-test:4:20\n     |\n   4 |     const a: u32 = -1u32;\n     |                    ^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u32/mul.out b/tests/expectations/compiler/integers/u32/mul.out
index a182b26c51..c03fe519ec 100644
--- a/tests/expectations/compiler/integers/u32/mul.out
+++ b/tests/expectations/compiler/integers/u32/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ff573edd9432f0ca8449181b916fb7c087a21359e7f6de1505245ace1b383e43
-    initial_ast: c9aae47538b3e33ffb38a7715594454267e3b837da90638304603361c4ce566c
-    unrolled_ast: c9aae47538b3e33ffb38a7715594454267e3b837da90638304603361c4ce566c
-    ssa_ast: 9f5d873af0ff05125a7278ba955abd091d057c6aa0529fdca43ea152cdc06a2e
+    initial_ast: 4f3db288e6df8274f0355461cf1ac6210f358a2beda66dccc605c2bc07e870c5
+    unrolled_ast: 4f3db288e6df8274f0355461cf1ac6210f358a2beda66dccc605c2bc07e870c5
+    ssa_ast: 3a2017d7e54b8f6384c91b4838a4d2e20b06ec4f34b0e34a610229eb997861c5
diff --git a/tests/expectations/compiler/integers/u32/ne.out b/tests/expectations/compiler/integers/u32/ne.out
index 0b329b213b..1973cc5a57 100644
--- a/tests/expectations/compiler/integers/u32/ne.out
+++ b/tests/expectations/compiler/integers/u32/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: f58a5fbb544ac66c637d47b70157f37c6f1cf0ec20e6803cb89578bbeaa36e92
       - initial_input_ast: 77899745913819e6bf5f84a0e6780c778f6baecc76bc8c8538fa1b7d42eb5376
-    initial_ast: 3e2658fad00bae76fd4bf86b7629294b960aa6f0618ed3dc3e1b447e73c057a0
-    unrolled_ast: 3e2658fad00bae76fd4bf86b7629294b960aa6f0618ed3dc3e1b447e73c057a0
-    ssa_ast: 3d1a0041fe9a05bc22cb2fcec128b0f696c19e5ebf5f93938f5680b8523ea621
+    initial_ast: 6a6141546cccf28462f400e5d6eb18dec28cfbe52ca698798c7e93e645f4a208
+    unrolled_ast: 6a6141546cccf28462f400e5d6eb18dec28cfbe52ca698798c7e93e645f4a208
+    ssa_ast: b51c33f8bf92dac363f4f566c99c5071bb24cb9be9efd408dfe3884eea7c857b
diff --git a/tests/expectations/compiler/integers/u32/no_space_between_literal.out b/tests/expectations/compiler/integers/u32/no_space_between_literal.out
index 9ac75fd08d..a03f8c0218 100644
--- a/tests/expectations/compiler/integers/u32/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/u32/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 u32;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/u32/operator_methods.out b/tests/expectations/compiler/integers/u32/operator_methods.out
index a8a8635939..550356335f 100644
--- a/tests/expectations/compiler/integers/u32/operator_methods.out
+++ b/tests/expectations/compiler/integers/u32/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5bd28ba9321ddf2a6b7b2f74764d316e991096225b25359c1efcbf75702a8baf
-    initial_ast: 489dc3bb8013b5aaac86bf978db3a341c57187d12bdba7823a4f62da5291ef72
-    unrolled_ast: 489dc3bb8013b5aaac86bf978db3a341c57187d12bdba7823a4f62da5291ef72
-    ssa_ast: 2b0a33664fb2cb880b12aa498772bd69f292fee60b3fb1b590eaba50874f3ad6
+    initial_ast: 665e1e73fdcb1f507b664a1a73b094dd5d251ccebcdecea60ba7739d589e10c5
+    unrolled_ast: 665e1e73fdcb1f507b664a1a73b094dd5d251ccebcdecea60ba7739d589e10c5
+    ssa_ast: b8f1fe62a68fb2a3ced92284653be71a3d3f3c38546cc9f8c028c16c78b2f744
diff --git a/tests/expectations/compiler/integers/u32/or.out b/tests/expectations/compiler/integers/u32/or.out
index 856be58c96..2caa6f646c 100644
--- a/tests/expectations/compiler/integers/u32/or.out
+++ b/tests/expectations/compiler/integers/u32/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 1d6cb8fd8bb08fd5d5ba6987bdd553e22154575d209a822a4b7c2f0fe9aef12c
-    initial_ast: ba3bc72017a88182a4fae3e7fd50c172b8b7b5f578699f618b999e69b5a00e21
-    unrolled_ast: ba3bc72017a88182a4fae3e7fd50c172b8b7b5f578699f618b999e69b5a00e21
-    ssa_ast: 469c814a6ede988cc769f17fdba5cf63d24d54c6b9ca390a3be44f15237fafec
+    initial_ast: d02868c350bdf9c074aaa833fa548891cd40f6006309cad4630924a62cf092a7
+    unrolled_ast: d02868c350bdf9c074aaa833fa548891cd40f6006309cad4630924a62cf092a7
+    ssa_ast: 3582f721251c5a2fec7ae3836e43c221b2516152149c6160370e71ca82d7f6d0
diff --git a/tests/expectations/compiler/integers/u32/pow.out b/tests/expectations/compiler/integers/u32/pow.out
index 574366af4a..2fda6e1b9d 100644
--- a/tests/expectations/compiler/integers/u32/pow.out
+++ b/tests/expectations/compiler/integers/u32/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e2143107fe54a709ec1b0439745e210bba42e78c2cd3ba099649876febbbaf77
-    initial_ast: fb5090669ebeacfc887b96470c775dbb53938c7cc1a5328d3f01d2ca72de4fcf
-    unrolled_ast: fb5090669ebeacfc887b96470c775dbb53938c7cc1a5328d3f01d2ca72de4fcf
-    ssa_ast: 518e674c58cc9066e7f9a060ba40f9e42885c0e76f31d409c5cfb7121c548edf
+    initial_ast: 6517061906c8a99678d237831e8b844dd4e34c0e305802cadc43bfb384f51ff6
+    unrolled_ast: 6517061906c8a99678d237831e8b844dd4e34c0e305802cadc43bfb384f51ff6
+    ssa_ast: 37c89489d8af954d70c54e889c597e291317402e94709d5936800a37be881ea9
diff --git a/tests/expectations/compiler/integers/u32/rem.out b/tests/expectations/compiler/integers/u32/rem.out
index 94a8f9eb0c..ac1d89ff8f 100644
--- a/tests/expectations/compiler/integers/u32/rem.out
+++ b/tests/expectations/compiler/integers/u32/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 48f85455877550aaf0a5e842943ebf471f6aa571aaa183f6db989538a5e1bcf8
-    initial_ast: 7a0ecc1ff2e99b446b9d7b179c6fe78bb0aae22acac0eb8d1df200eb7c8de58c
-    unrolled_ast: 7a0ecc1ff2e99b446b9d7b179c6fe78bb0aae22acac0eb8d1df200eb7c8de58c
-    ssa_ast: 7da8f14967b4185b075d88ff60f80d4dafed056dbb8fbe0ebe96ad937ddc1e2a
+    initial_ast: ed37235864574d35c717b6ce4cc3c77181f6b7f987a68c63d4d30eba734504e3
+    unrolled_ast: ed37235864574d35c717b6ce4cc3c77181f6b7f987a68c63d4d30eba734504e3
+    ssa_ast: 7c0cfc891a84a80a664e9ba6fa1ed118e89165485d9a2449463b42c540ddb7cc
diff --git a/tests/expectations/compiler/integers/u32/shl.out b/tests/expectations/compiler/integers/u32/shl.out
index b80f3b02fe..6785346ae1 100644
--- a/tests/expectations/compiler/integers/u32/shl.out
+++ b/tests/expectations/compiler/integers/u32/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 247f59706c38b2a6c03e64c910943e4e2e246915c0288ffc7bd15f1eaa960f15
-    initial_ast: 0817c9e550e672c1f4cc3f8bfa7cd7629dc97c811a467de4cc2cb766b93fe96e
-    unrolled_ast: 0817c9e550e672c1f4cc3f8bfa7cd7629dc97c811a467de4cc2cb766b93fe96e
-    ssa_ast: 8a69dc920c333c25c7ea189d60d744df11f412f0c7db81e3a72d6c3352048045
+    initial_ast: 92572f47482146a66b2b76de3c1a7e1fc58172e47be25428c210d5a805c01546
+    unrolled_ast: 92572f47482146a66b2b76de3c1a7e1fc58172e47be25428c210d5a805c01546
+    ssa_ast: 07c3210bec21029a42a059b9afd6b48c329fc1b652c5f1c8d0a42639d0097127
diff --git a/tests/expectations/compiler/integers/u32/shr.out b/tests/expectations/compiler/integers/u32/shr.out
index 2162b7c56b..f47390adec 100644
--- a/tests/expectations/compiler/integers/u32/shr.out
+++ b/tests/expectations/compiler/integers/u32/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 247f59706c38b2a6c03e64c910943e4e2e246915c0288ffc7bd15f1eaa960f15
-    initial_ast: b5fd497a9cd61cee18720a37483194bfcd43dab56bbe3e6111d17daf908c55a4
-    unrolled_ast: b5fd497a9cd61cee18720a37483194bfcd43dab56bbe3e6111d17daf908c55a4
-    ssa_ast: 1727065cc57225aece25ba48951318ce237c867141deb4381c9a980fe2658ca1
+    initial_ast: 0521d2f1f002cb5a30d535dfc44483e33e1fca8b2325a7fdd6d603e3a547ed1e
+    unrolled_ast: 0521d2f1f002cb5a30d535dfc44483e33e1fca8b2325a7fdd6d603e3a547ed1e
+    ssa_ast: e3dabd35d5f3d73ae55aefd2a6479a3776eae8cc4e61948deb43e74d67708efb
diff --git a/tests/expectations/compiler/integers/u32/sub.out b/tests/expectations/compiler/integers/u32/sub.out
index bc16054ab7..aac09c6df0 100644
--- a/tests/expectations/compiler/integers/u32/sub.out
+++ b/tests/expectations/compiler/integers/u32/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 882ee42da32dd726f4dfabe1330f30fe548105ba3f66896ec1f2ec37fae76a67
-    initial_ast: 7ae99850cf39ac10ef1aad0497c50e8a0453cfbe3f072501180ab096b95f0ef9
-    unrolled_ast: 7ae99850cf39ac10ef1aad0497c50e8a0453cfbe3f072501180ab096b95f0ef9
-    ssa_ast: 9b0dc1feb18b0748b0db8b6265d7d7fde202d2dbffb28a23c80aaddb242a1aa2
+    initial_ast: 67eaab21e3155c7f9b333882b0de1f007aea0258e5919b2cbd660e308ee920d8
+    unrolled_ast: 67eaab21e3155c7f9b333882b0de1f007aea0258e5919b2cbd660e308ee920d8
+    ssa_ast: cc819dea02a45e9d08f8f8cd1ad1c9c83895bcdf39e75355aabce880d8a11bf4
diff --git a/tests/expectations/compiler/integers/u32/ternary.out b/tests/expectations/compiler/integers/u32/ternary.out
index f0c342c671..e4d8b634e9 100644
--- a/tests/expectations/compiler/integers/u32/ternary.out
+++ b/tests/expectations/compiler/integers/u32/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: fa17885ede22083d38b7ba1fed3fa5610818c6d912aa2dc5f3e99ba99ec6bcde
       - initial_input_ast: e64ed5abfb4738239a100ec503f6cac47d208c9272ddcb9fad92ca86e21e0994
-    initial_ast: 4e9e9dfa297a32eab47a78df8c45f9f5294dde82431f8c1de17c3fa64f2fb98f
-    unrolled_ast: 4e9e9dfa297a32eab47a78df8c45f9f5294dde82431f8c1de17c3fa64f2fb98f
-    ssa_ast: 9342254f292a45fe89a0c19daae887262456bbc935eaff5f7d0a3234f6b8d8cf
+    initial_ast: 701404c8eaa3470463e4887ad62417e5bc77ead17bcb38209926cc2e2ed2bdec
+    unrolled_ast: 701404c8eaa3470463e4887ad62417e5bc77ead17bcb38209926cc2e2ed2bdec
+    ssa_ast: 79f58b5186e0bdea73b0577a0105f6bf0d86babef42133dd812a2555d8428500
diff --git a/tests/expectations/compiler/integers/u32/xor.out b/tests/expectations/compiler/integers/u32/xor.out
index bccfdd1d40..404410f170 100644
--- a/tests/expectations/compiler/integers/u32/xor.out
+++ b/tests/expectations/compiler/integers/u32/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 75e743ebd4c86ed8178eb359d792183ddc204539be443cf65fec2d109cf5a85f
-    initial_ast: a187f9acbe9cc2449191e744a83a91d19f1b3d78c56d6f5639e27736e444217d
-    unrolled_ast: a187f9acbe9cc2449191e744a83a91d19f1b3d78c56d6f5639e27736e444217d
-    ssa_ast: 07016d961f199d509007ff1cc627437161179bd7808f98d1098e20ed13d2eff5
+    initial_ast: 4cbc2e972cfdb02df2123aedca69c1f3e43d8db29021f49240f5caa589f7818f
+    unrolled_ast: 4cbc2e972cfdb02df2123aedca69c1f3e43d8db29021f49240f5caa589f7818f
+    ssa_ast: ff67c715fb41b7a3aab4efc1b1e7040e431cd0c2436cd6a1eee37eadab17ffe1
diff --git a/tests/expectations/compiler/integers/u64/add.out b/tests/expectations/compiler/integers/u64/add.out
index 9c0b4b6350..c9f46aa686 100644
--- a/tests/expectations/compiler/integers/u64/add.out
+++ b/tests/expectations/compiler/integers/u64/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: eb0d423d8e380cd1459e98e517d28ad95611d1c0a4603ecae405f17496f95d72
-    initial_ast: 7398cb00f1a1650f1d6593c95f7cf6a06cbecacb71adc50cb825ee03bb571bd1
-    unrolled_ast: 7398cb00f1a1650f1d6593c95f7cf6a06cbecacb71adc50cb825ee03bb571bd1
-    ssa_ast: 051047cdea1fe2a8312ab205aba09627ebf79ece447bd387a3176c6ecf5f73fa
+    initial_ast: bae6816368f514e4fc989269052f837364957c4e6f6ce289daf7b3c3ef19df12
+    unrolled_ast: bae6816368f514e4fc989269052f837364957c4e6f6ce289daf7b3c3ef19df12
+    ssa_ast: 2184e6fc5641458f4569e5384ca477856925b615afd6281b8a1a2a2f57628f17
diff --git a/tests/expectations/compiler/integers/u64/and.out b/tests/expectations/compiler/integers/u64/and.out
index 3720bc6c65..f8791056a3 100644
--- a/tests/expectations/compiler/integers/u64/and.out
+++ b/tests/expectations/compiler/integers/u64/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: eb0d423d8e380cd1459e98e517d28ad95611d1c0a4603ecae405f17496f95d72
-    initial_ast: ddd5bae0d13b889d267dc608f6b72e252a16b7e5a28f9662c6cf16168db1cfd7
-    unrolled_ast: ddd5bae0d13b889d267dc608f6b72e252a16b7e5a28f9662c6cf16168db1cfd7
-    ssa_ast: c4e24dc7d30bebfbcf997099514573b52278a750a89b9ae3c9028a48d05f3de3
+    initial_ast: a7926622a2245a77e11a825cdd493b3e6fa2e416c7c5f9a9b41966b85b2867ac
+    unrolled_ast: a7926622a2245a77e11a825cdd493b3e6fa2e416c7c5f9a9b41966b85b2867ac
+    ssa_ast: 9dedbcd872cff2d883fc438054874e51af8205a04ade222442e263ccad8336e2
diff --git a/tests/expectations/compiler/integers/u64/console_assert.out b/tests/expectations/compiler/integers/u64/console_assert.out
index ff2314f8c3..7ffdff3ed8 100644
--- a/tests/expectations/compiler/integers/u64/console_assert.out
+++ b/tests/expectations/compiler/integers/u64/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3050dd8c1831b1f44cbd57ad9e99509a619bf198ad5eee27b39f176bba5ed107
-    initial_ast: 9003e006de0708ef79460c07d0ce408bae639cb93ad2c22ac7faf5515d3bf8d1
-    unrolled_ast: 9003e006de0708ef79460c07d0ce408bae639cb93ad2c22ac7faf5515d3bf8d1
-    ssa_ast: 29bcdacf776ace9d356b2bda6482614c54f7a7199d2ac398dbd572032b8db977
+    initial_ast: 681b386bcbbf16b0ab0d6521e224d2945eead74c0a7905c0c257701f5c3ced40
+    unrolled_ast: 681b386bcbbf16b0ab0d6521e224d2945eead74c0a7905c0c257701f5c3ced40
+    ssa_ast: 36b85f0225263f7f9776097923bf98c977d5df3cbaeff1bcc8106f5a89d9d331
diff --git a/tests/expectations/compiler/integers/u64/div.out b/tests/expectations/compiler/integers/u64/div.out
index 0ab558b331..0ed80c32a0 100644
--- a/tests/expectations/compiler/integers/u64/div.out
+++ b/tests/expectations/compiler/integers/u64/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 763414cdacfe133d15422931f04d6a4ae70023787d4278d207772b309373d4ab
-    initial_ast: f84b58dfa6623ee40d38c17f6dbdf3370c4ee9409c35e2f1966997a67369ce38
-    unrolled_ast: f84b58dfa6623ee40d38c17f6dbdf3370c4ee9409c35e2f1966997a67369ce38
-    ssa_ast: e95bd437a81db9beae52f82ef38a66a49e3ca060c6189089677103e3b50ed753
+    initial_ast: a76015631a440ab0561021c5b85c6f0b6b8b844ca12c10890be34ef532f3e4e9
+    unrolled_ast: a76015631a440ab0561021c5b85c6f0b6b8b844ca12c10890be34ef532f3e4e9
+    ssa_ast: eb760591f78bd5350c166dedb0bdca5ee6cb0073ea3deba87c73366652ead87a
diff --git a/tests/expectations/compiler/integers/u64/eq.out b/tests/expectations/compiler/integers/u64/eq.out
index 860f531521..4d484fc7d8 100644
--- a/tests/expectations/compiler/integers/u64/eq.out
+++ b/tests/expectations/compiler/integers/u64/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: dfb55e5ff58ce4f85113d4ba50ee20717587fe0b45b22ab7b99e7becd08783aa
-    initial_ast: ad313168a19469528dfdc784c6eb1330ab3813d146ea7b3dd698db2527d299c6
-    unrolled_ast: ad313168a19469528dfdc784c6eb1330ab3813d146ea7b3dd698db2527d299c6
-    ssa_ast: 3d6b478d7eb7ee3f08ec15e89dcbda0fc38af7d2759ab13dfeae02e26f2becf6
+    initial_ast: ba6366b729c0789d1c22dbaf108969c361606f7c060fe0ef6f1116426debebf3
+    unrolled_ast: ba6366b729c0789d1c22dbaf108969c361606f7c060fe0ef6f1116426debebf3
+    ssa_ast: 9c57991eabdeb05a7af93ecae204b47ad9b1c53495e07dbea72bfebc96eab291
diff --git a/tests/expectations/compiler/integers/u64/ge.out b/tests/expectations/compiler/integers/u64/ge.out
index f4e74517c3..496db79f6d 100644
--- a/tests/expectations/compiler/integers/u64/ge.out
+++ b/tests/expectations/compiler/integers/u64/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: a50cf721f61d260cccc9656070eb1259b041dd28a2111ae5da74a937039b3e5c
       - initial_input_ast: a77841035082db1e722299d5b2d05a8b8747776bdde8ee7f8980627da85ba5e0
-    initial_ast: 2d1564e74e43e5a5066297246b73f95ddab0f41c7d4b615d6522451e7545d41b
-    unrolled_ast: 2d1564e74e43e5a5066297246b73f95ddab0f41c7d4b615d6522451e7545d41b
-    ssa_ast: 4b47e96bbd8cf8eaf0a483d1f12097218753d141a80fed48805d8b275e839fe0
+    initial_ast: cf4b03adc99610a01e3c4d9352140c0def125e344be09d7b20834e94378013f8
+    unrolled_ast: cf4b03adc99610a01e3c4d9352140c0def125e344be09d7b20834e94378013f8
+    ssa_ast: d31f647bdc6fc0e637a383821852b004c4262542aa0965aa9fec34a32e3c4824
diff --git a/tests/expectations/compiler/integers/u64/gt.out b/tests/expectations/compiler/integers/u64/gt.out
index c99ec5c71a..7c2b9bcaea 100644
--- a/tests/expectations/compiler/integers/u64/gt.out
+++ b/tests/expectations/compiler/integers/u64/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 981226e817742f032dc4f458c4509893799c30a756c965f18cdb1f8e5d0c24b7
       - initial_input_ast: ae4d484a70ece580907c84c26943e1a75facbda23a5df181db813fac201e6c08
-    initial_ast: 6b67346ff5f5ee3b8ea1650da53c38968649dba6ea6bc2546fed899aae310340
-    unrolled_ast: 6b67346ff5f5ee3b8ea1650da53c38968649dba6ea6bc2546fed899aae310340
-    ssa_ast: 559b8360dc585df000f0cf788b3074d91a77c2ae0f6875096450759dbb921e25
+    initial_ast: 0baab3bb769f9ed2c05212df36c537fd6d6e1374cd0a5ba75407483bc59ac76b
+    unrolled_ast: 0baab3bb769f9ed2c05212df36c537fd6d6e1374cd0a5ba75407483bc59ac76b
+    ssa_ast: 0ffac79fecd1facfb0bccf630038ff43ad0d121f579330262ab64accd9391bb3
diff --git a/tests/expectations/compiler/integers/u64/le.out b/tests/expectations/compiler/integers/u64/le.out
index 872af3d97c..2a31d1b9e2 100644
--- a/tests/expectations/compiler/integers/u64/le.out
+++ b/tests/expectations/compiler/integers/u64/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: a50cf721f61d260cccc9656070eb1259b041dd28a2111ae5da74a937039b3e5c
       - initial_input_ast: 87a24e3fe44b31b29489a5b17704a88038943cc6660277222c9aed34b87bda99
-    initial_ast: 4db6651ea1c98e47089ecd1bc8b95e7ad6873f3b87078e3f2c0d8055c1e987ad
-    unrolled_ast: 4db6651ea1c98e47089ecd1bc8b95e7ad6873f3b87078e3f2c0d8055c1e987ad
-    ssa_ast: d0c469942aff4088d907de36663fefd1e9e9671d091f1fb8b659013190e22a14
+    initial_ast: fbdecdd7617c01a77533d1c75075d30b66691e395d35eb104a1a8a9c6b4c13fa
+    unrolled_ast: fbdecdd7617c01a77533d1c75075d30b66691e395d35eb104a1a8a9c6b4c13fa
+    ssa_ast: e35bebfc8bca485ace0beba46ea36ad2b9749f2fa7bd1a16632b223d2534f106
diff --git a/tests/expectations/compiler/integers/u64/lt.out b/tests/expectations/compiler/integers/u64/lt.out
index 955335529b..346e23c207 100644
--- a/tests/expectations/compiler/integers/u64/lt.out
+++ b/tests/expectations/compiler/integers/u64/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: d574f29089a3ffa65c320198ffc9b3959106e80bf2e9bb749e892c214d4b1dd3
       - initial_input_ast: c2d4d47613332053145ecef24b67291557215ef83bac541cd3d3845b4e666fb1
-    initial_ast: 52e6e6d59b0218db933771d511a6a848e758a431200eb594d7b7276a118f470d
-    unrolled_ast: 52e6e6d59b0218db933771d511a6a848e758a431200eb594d7b7276a118f470d
-    ssa_ast: b42f2acbcaaa2d1b0e56021398690efd43db7964d925fff9b8e24ed2bd939e9d
+    initial_ast: 41cf8324a6772b7decd0d71199b639bd6f515ccc73ad6a11225ddcebd844fba5
+    unrolled_ast: 41cf8324a6772b7decd0d71199b639bd6f515ccc73ad6a11225ddcebd844fba5
+    ssa_ast: 0d641f255778b0083952538f19614bd821f6f5d1d51c3ddd83b91fcbc9681e1c
diff --git a/tests/expectations/compiler/integers/u64/max.out b/tests/expectations/compiler/integers/u64/max.out
index 0924d4d212..a3ee43afd8 100644
--- a/tests/expectations/compiler/integers/u64/max.out
+++ b/tests/expectations/compiler/integers/u64/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e1384263a1c0a020dfb2e479ac003bf88585716f7492d60429e4a030a81760e1
-    initial_ast: f0c2b72a9f9869485fc3985ec719d5d0c36b27a35b617672e45032c78a9cb5c4
-    unrolled_ast: f0c2b72a9f9869485fc3985ec719d5d0c36b27a35b617672e45032c78a9cb5c4
-    ssa_ast: e22a5f84ba7ba80c4336d1983cfcd4b4fad75ef74e79ad65af940d03955e6411
+    initial_ast: 70879442c7480d756f6ed2fbbef95713ed9d45ba5c3903482a6837e65a01b70a
+    unrolled_ast: 70879442c7480d756f6ed2fbbef95713ed9d45ba5c3903482a6837e65a01b70a
+    ssa_ast: 17cb2f749c87cfbefe8cc6c03a521205db61fa825130431b799cf7ecdc943ade
diff --git a/tests/expectations/compiler/integers/u64/max_fail.out b/tests/expectations/compiler/integers/u64/max_fail.out
index 9ac75fd08d..1b32571dab 100644
--- a/tests/expectations/compiler/integers/u64/max_fail.out
+++ b/tests/expectations/compiler/integers/u64/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 18446744073709551616 is not a valid `u64`\n    --> compiler-test:4:20\n     |\n   4 |     const a: u64 = 18446744073709551616u64;\n     |                    ^^^^^^^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u64/min.out b/tests/expectations/compiler/integers/u64/min.out
index 5ae7d3b57f..4a225d7fdb 100644
--- a/tests/expectations/compiler/integers/u64/min.out
+++ b/tests/expectations/compiler/integers/u64/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c82b4b7f26a3647900a1669a09055618ad25db71a06ad82171f22d66bad41351
-    initial_ast: bcdc0f0f4cd80fb4e5b677f551d6365c10c1c9a3e80f3da48a89338e3c091d77
-    unrolled_ast: bcdc0f0f4cd80fb4e5b677f551d6365c10c1c9a3e80f3da48a89338e3c091d77
-    ssa_ast: 94e1891a933df9fe300a6d89ec6c09245280a0dff439c5c44fdbe18ba47c7405
+    initial_ast: 0a312f8f92cc90044cd3ca1757fb2c15d27ea1328dcd535b343ec6ae3a4701dc
+    unrolled_ast: 0a312f8f92cc90044cd3ca1757fb2c15d27ea1328dcd535b343ec6ae3a4701dc
+    ssa_ast: 65213a6cfce0b695bdaa785ede2ad20c765a08c439612425a48ce712229dbcc6
diff --git a/tests/expectations/compiler/integers/u64/min_fail.out b/tests/expectations/compiler/integers/u64/min_fail.out
index 9ac75fd08d..3cb6612390 100644
--- a/tests/expectations/compiler/integers/u64/min_fail.out
+++ b/tests/expectations/compiler/integers/u64/min_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value -1 is not a valid `u64`\n    --> compiler-test:4:20\n     |\n   4 |     const a: u64 = -1u64;\n     |                    ^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u64/mul.out b/tests/expectations/compiler/integers/u64/mul.out
index 44c7d26034..bbab4cfece 100644
--- a/tests/expectations/compiler/integers/u64/mul.out
+++ b/tests/expectations/compiler/integers/u64/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: d2b1592270a3624346e6e60899c0c85335516d130486e8e0394c4d8dcf74b0de
-    initial_ast: 5af707b6b00b05bd7eb578738f472bf517933f3c8aeb3c81c8219a6c4cba3dec
-    unrolled_ast: 5af707b6b00b05bd7eb578738f472bf517933f3c8aeb3c81c8219a6c4cba3dec
-    ssa_ast: 3aff8f265d50a39add2a88b70c360de4f844891c421965cb2d084c904dc2b53c
+    initial_ast: 2a0c57e1eafc17edcdbb200ce3917bbcfc9f851418c7a4f6cde3908f3fa7ed33
+    unrolled_ast: 2a0c57e1eafc17edcdbb200ce3917bbcfc9f851418c7a4f6cde3908f3fa7ed33
+    ssa_ast: e0d8f1b1486c05a5bd51de3952a9f688b49ecf4c16c177f8a174418a24ab80f3
diff --git a/tests/expectations/compiler/integers/u64/ne.out b/tests/expectations/compiler/integers/u64/ne.out
index fee3517c27..cb59a77109 100644
--- a/tests/expectations/compiler/integers/u64/ne.out
+++ b/tests/expectations/compiler/integers/u64/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: db286612d59c502e80b92887558f3a963465ae7e103f84de0e6818d912ead4a4
       - initial_input_ast: 185a5c03e8fe87a97a3ae33fbeb3cf80d6b17cd629f0e7fe9872be33f5877b23
-    initial_ast: 878f9c2acb873e382418d0fda24fa949b260b2726d00ce25023a8a13af83e3ce
-    unrolled_ast: 878f9c2acb873e382418d0fda24fa949b260b2726d00ce25023a8a13af83e3ce
-    ssa_ast: 0846d5973fb00d43cc501a98d34ee15de4a463e6d2f8f3be9d16d5d44fe46e4a
+    initial_ast: 41be407a543a8d276dde7c3ee3f1a62ca0e693ecf8578fd497d34e63e10cb59d
+    unrolled_ast: 41be407a543a8d276dde7c3ee3f1a62ca0e693ecf8578fd497d34e63e10cb59d
+    ssa_ast: fe52b0d509ebc4bd8bf21997eaea7be41fe6a7dfbbb4947385c2afaf1a8134cd
diff --git a/tests/expectations/compiler/integers/u64/no_space_between_literal.out b/tests/expectations/compiler/integers/u64/no_space_between_literal.out
index 9ac75fd08d..39b9cd684d 100644
--- a/tests/expectations/compiler/integers/u64/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/u64/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 u64;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/u64/operator_methods.out b/tests/expectations/compiler/integers/u64/operator_methods.out
index 8010d02224..379f4e90fa 100644
--- a/tests/expectations/compiler/integers/u64/operator_methods.out
+++ b/tests/expectations/compiler/integers/u64/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5b844be6c87e0f969a2b66393bd811d93b508181e78ceb5e3d5e67ac2703d2fb
-    initial_ast: 9282c9e3c3cbd83d1c2bb24ecfdc475a045a27dcce867e5ed1fe65bc0781b4b4
-    unrolled_ast: 9282c9e3c3cbd83d1c2bb24ecfdc475a045a27dcce867e5ed1fe65bc0781b4b4
-    ssa_ast: 84388bd387c57f90e001ddf276524c9be087e36d372470f30ed8c1fa129a0a0d
+    initial_ast: e94f1b8f6c8dbb9760f4e8b01253bfa58187b487dcb26b9013f3bed33f19f3e5
+    unrolled_ast: e94f1b8f6c8dbb9760f4e8b01253bfa58187b487dcb26b9013f3bed33f19f3e5
+    ssa_ast: 6d8a977a711cb83141d1e3e9ad4676727115e04e0f9a2be2892ce9d20828dc32
diff --git a/tests/expectations/compiler/integers/u64/or.out b/tests/expectations/compiler/integers/u64/or.out
index 4164f0897b..bc70a1b8dc 100644
--- a/tests/expectations/compiler/integers/u64/or.out
+++ b/tests/expectations/compiler/integers/u64/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: eb0d423d8e380cd1459e98e517d28ad95611d1c0a4603ecae405f17496f95d72
-    initial_ast: 9f997f946ae7daaa87a30271a85993008673ee16c8c1e547c9e0ede21bed167f
-    unrolled_ast: 9f997f946ae7daaa87a30271a85993008673ee16c8c1e547c9e0ede21bed167f
-    ssa_ast: b653dcf7f7a45ac567f4dec826a80d06e19f44b59ccb04b304b7f30a21abda19
+    initial_ast: c1e132721ea49331796d17f61a20e716e36560300e34d3ca2cd050c40bacc4c2
+    unrolled_ast: c1e132721ea49331796d17f61a20e716e36560300e34d3ca2cd050c40bacc4c2
+    ssa_ast: d66a628ec31d5cd9f0c2bd74691b4facdeabf996ed9ee6b0984b3881a0b0eb14
diff --git a/tests/expectations/compiler/integers/u64/pow.out b/tests/expectations/compiler/integers/u64/pow.out
index 046287ed1e..a7439b9eb1 100644
--- a/tests/expectations/compiler/integers/u64/pow.out
+++ b/tests/expectations/compiler/integers/u64/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 9d31c8ab7b4d93888af0d50d7057366dfb6d38d0d91f882f8539b333277fcec1
-    initial_ast: 44a8cc75eda370531aaa0cdfb7ac1bb450db215ba38b3fd0e7950645a374a994
-    unrolled_ast: 44a8cc75eda370531aaa0cdfb7ac1bb450db215ba38b3fd0e7950645a374a994
-    ssa_ast: 8b09c12c1b35afa1e55dd905f3ea53ba99bcf91a3352d66df5c9442013807cef
+    initial_ast: c40edde907d94d0f1f1327d89d106f3ad6a6857336f0e17136510521ab1363d0
+    unrolled_ast: c40edde907d94d0f1f1327d89d106f3ad6a6857336f0e17136510521ab1363d0
+    ssa_ast: 5048eb5ee3cdb019c9e1548b56621ee43c2aef356e470d0dd4573c09eea6e208
diff --git a/tests/expectations/compiler/integers/u64/rem.out b/tests/expectations/compiler/integers/u64/rem.out
index 495962fc96..4efdbac501 100644
--- a/tests/expectations/compiler/integers/u64/rem.out
+++ b/tests/expectations/compiler/integers/u64/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 763414cdacfe133d15422931f04d6a4ae70023787d4278d207772b309373d4ab
-    initial_ast: c594ad83d60cf637405bcacb39893b57160c4d0105bcf24ef85dd9a72d380d2e
-    unrolled_ast: c594ad83d60cf637405bcacb39893b57160c4d0105bcf24ef85dd9a72d380d2e
-    ssa_ast: dd196471f703a7131351e904205f5f2da37d392b41465060bffd94b4b3c9a673
+    initial_ast: 30a6404d618971efa0644f5a539d1cb0a40d388e874368918fd35eccbb4c8489
+    unrolled_ast: 30a6404d618971efa0644f5a539d1cb0a40d388e874368918fd35eccbb4c8489
+    ssa_ast: 25f2dd60f14c469737d67b5bc01ba86b3a8bda96395e8404761c77380977753e
diff --git a/tests/expectations/compiler/integers/u64/shl.out b/tests/expectations/compiler/integers/u64/shl.out
index ff27e71bd4..dfa4ceab86 100644
--- a/tests/expectations/compiler/integers/u64/shl.out
+++ b/tests/expectations/compiler/integers/u64/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ee30b7433ae4ec45bd2e0b777544eebcf75ef350efc62281a389be7e9df835ff
-    initial_ast: 9d5ce0d58c00f6498a5bd573eb4853fb4a93412fb136aa6a16eed4afa03d03dc
-    unrolled_ast: 9d5ce0d58c00f6498a5bd573eb4853fb4a93412fb136aa6a16eed4afa03d03dc
-    ssa_ast: d09337fb2b5dc628b56c80647a8af4dcb24b094e040e6f373cec790c286ef960
+    initial_ast: 385112ccd249b733187a82ed1ca079414d05e4fdec179d051f87d65f71fd9541
+    unrolled_ast: 385112ccd249b733187a82ed1ca079414d05e4fdec179d051f87d65f71fd9541
+    ssa_ast: 47935092328f63b26da97e593b55fa7475c40c295095b484c426ff9dc68aef86
diff --git a/tests/expectations/compiler/integers/u64/shr.out b/tests/expectations/compiler/integers/u64/shr.out
index 30408167bc..2d8e56ce4a 100644
--- a/tests/expectations/compiler/integers/u64/shr.out
+++ b/tests/expectations/compiler/integers/u64/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ee30b7433ae4ec45bd2e0b777544eebcf75ef350efc62281a389be7e9df835ff
-    initial_ast: c1c3157420ceb73949717354f911a4487ec3564b5d0531d077e56aeec8529ec1
-    unrolled_ast: c1c3157420ceb73949717354f911a4487ec3564b5d0531d077e56aeec8529ec1
-    ssa_ast: 80e905a05af0a5c0012195e3a8259ef40d7b11cfa5eddde3e9f6e67cb8444ecd
+    initial_ast: 23f1fad69781ade38072e5a96428ed60c3827ea6208d955401ba2ba2506c3f68
+    unrolled_ast: 23f1fad69781ade38072e5a96428ed60c3827ea6208d955401ba2ba2506c3f68
+    ssa_ast: 9389ac923e10fd9832b1c72a44d0d8e82cb0a9cb8955a84714216264f145b745
diff --git a/tests/expectations/compiler/integers/u64/sub.out b/tests/expectations/compiler/integers/u64/sub.out
index 753de63e3d..b1e3b2b760 100644
--- a/tests/expectations/compiler/integers/u64/sub.out
+++ b/tests/expectations/compiler/integers/u64/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 0bd35280293db72af9dc04ac909146c552fe6360cea5d8938e5791b04ce46643
-    initial_ast: cd8718fcce97ebb53005c934dad475aa21c2dea8ee6ebb67ca36fc7184bbee05
-    unrolled_ast: cd8718fcce97ebb53005c934dad475aa21c2dea8ee6ebb67ca36fc7184bbee05
-    ssa_ast: c5d729ed076a47f923b148d47bcfa1ec1e27cf83889019ef1f16aa48b3d947b4
+    initial_ast: 426ca042772a1323073d330fd2a12d6985353e407199f28685e9e82ffc8af920
+    unrolled_ast: 426ca042772a1323073d330fd2a12d6985353e407199f28685e9e82ffc8af920
+    ssa_ast: 89f57dc06eb7276ad2073053d4051fd44547ac867c5b0d68214fc398e52bbe9b
diff --git a/tests/expectations/compiler/integers/u64/ternary.out b/tests/expectations/compiler/integers/u64/ternary.out
index 8289b309aa..0ed6cef18d 100644
--- a/tests/expectations/compiler/integers/u64/ternary.out
+++ b/tests/expectations/compiler/integers/u64/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: aefbdc1a57dffeb6ab6279dbe40bc27ba3658cb5391d65a59d9dd8a16dd6f89c
       - initial_input_ast: 3932aaf15ea9e1a1d765d755853bf144fdc2928013288d9da8ccda7900a8d852
-    initial_ast: 9f5a4ff27fa6c24d8d22c2672a4970d345ec7e49980590832ad785020c90a8e3
-    unrolled_ast: 9f5a4ff27fa6c24d8d22c2672a4970d345ec7e49980590832ad785020c90a8e3
-    ssa_ast: b95a894f7bb0101541c39226f99e58c7d7ca26c37d00fbdd98e4f3c80dee828c
+    initial_ast: 45a718c493070cd4a02eceb9eaa68dfd5d7c6b85fbd33ff42cacdfc24f100147
+    unrolled_ast: 45a718c493070cd4a02eceb9eaa68dfd5d7c6b85fbd33ff42cacdfc24f100147
+    ssa_ast: d0d71353e3c49866c61ae23584b79e02d1d269f2532799f08abe108b2109a0c7
diff --git a/tests/expectations/compiler/integers/u64/xor.out b/tests/expectations/compiler/integers/u64/xor.out
index f2bd78730b..bbfbce51e0 100644
--- a/tests/expectations/compiler/integers/u64/xor.out
+++ b/tests/expectations/compiler/integers/u64/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5025d5e83bc398fdfff5bc9e7dcdbdde88fbd08eb125bce2f42967b4bae9801d
-    initial_ast: 5c2d52a3559b009c7ecc907c80687adc73184b1eeff57efa017e836e85b19a7c
-    unrolled_ast: 5c2d52a3559b009c7ecc907c80687adc73184b1eeff57efa017e836e85b19a7c
-    ssa_ast: c2c1a899111e344d1ecaced4c3624d85d666a2470105b2e2d2aa9a5d3d7f424c
+    initial_ast: 62f7b8b7ae631ce2baed4faf1f6aff9a5c35ddc10a5abe8315e155b85434b32d
+    unrolled_ast: 62f7b8b7ae631ce2baed4faf1f6aff9a5c35ddc10a5abe8315e155b85434b32d
+    ssa_ast: 2e5173b847dde3b35a9e22133e1c775e6ffe35eabeaaeb30f8416b54b6314d39
diff --git a/tests/expectations/compiler/integers/u8/add.out b/tests/expectations/compiler/integers/u8/add.out
index b6a6696ecb..9f00a550d1 100644
--- a/tests/expectations/compiler/integers/u8/add.out
+++ b/tests/expectations/compiler/integers/u8/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: da9cbc3b198d4979155523b6003c948a8851461a84397220fba7cdb6167d3bae
-    initial_ast: 99c2f6083704e3e429da760d504957a02393cbb3892cd3e4097dbcfa3f127b4b
-    unrolled_ast: 99c2f6083704e3e429da760d504957a02393cbb3892cd3e4097dbcfa3f127b4b
-    ssa_ast: b5ab6d20139d300688be37312fa55364caee89c40a7950ea8acffb479795a80d
+    initial_ast: 4806cb68fbb2e66f7b943bd67083a4940f7c08b50c08c06f48c89ac329ef480e
+    unrolled_ast: 4806cb68fbb2e66f7b943bd67083a4940f7c08b50c08c06f48c89ac329ef480e
+    ssa_ast: 241b911f3989258aa9faff30f898604defaf27305eb959f3014f537d44704779
diff --git a/tests/expectations/compiler/integers/u8/and.out b/tests/expectations/compiler/integers/u8/and.out
index 5810cb907b..b308e82858 100644
--- a/tests/expectations/compiler/integers/u8/and.out
+++ b/tests/expectations/compiler/integers/u8/and.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: da9cbc3b198d4979155523b6003c948a8851461a84397220fba7cdb6167d3bae
-    initial_ast: a08ec4cb44c1122ba8d7883326e993a8275ce67c56da13a1fb10f460bbd500a0
-    unrolled_ast: a08ec4cb44c1122ba8d7883326e993a8275ce67c56da13a1fb10f460bbd500a0
-    ssa_ast: c983ea93b60a9c94d7f3def726a7d1a208577053d8ba66368329a9161623319f
+    initial_ast: 1b83c2993a52650cf7a70385f0a14b3872d450dcb2ac1a4ba847290dbfc2ff8e
+    unrolled_ast: 1b83c2993a52650cf7a70385f0a14b3872d450dcb2ac1a4ba847290dbfc2ff8e
+    ssa_ast: c7616104b93c0735df6be52f5750b4bd7edfa6196ddf9bee6234b366965e16bf
diff --git a/tests/expectations/compiler/integers/u8/console_assert.out b/tests/expectations/compiler/integers/u8/console_assert.out
index b63cf95577..5ee7a7d7f7 100644
--- a/tests/expectations/compiler/integers/u8/console_assert.out
+++ b/tests/expectations/compiler/integers/u8/console_assert.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 0566cab3fead101aa0182d9dc200865db44131872f9442055cfa4f1fa65d4216
-    initial_ast: f21f479b4557adaf87df14fbe2014e61100fa5060a75493da0005c111296b1b7
-    unrolled_ast: f21f479b4557adaf87df14fbe2014e61100fa5060a75493da0005c111296b1b7
-    ssa_ast: efee300d872aa027f0868cf57456c033077ef7d02018534db3934dc0a9ce5d10
+    initial_ast: 435a50b27aa411984af4a04569e8ff2714e7f8097c1854b793ce5114288a3dc3
+    unrolled_ast: 435a50b27aa411984af4a04569e8ff2714e7f8097c1854b793ce5114288a3dc3
+    ssa_ast: 0bf6aa49acc7decaf4fbaf8c9c673070aa8404d403c87adb1304331da3084294
diff --git a/tests/expectations/compiler/integers/u8/div.out b/tests/expectations/compiler/integers/u8/div.out
index c3ff7c2d9b..4bc655230b 100644
--- a/tests/expectations/compiler/integers/u8/div.out
+++ b/tests/expectations/compiler/integers/u8/div.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5bbec5d16f5d680c993359292946db566654eb0b16392dd64db71b2f9c66a34d
-    initial_ast: 114b4ebdb3ec050800ae0594ef04055d54efb589768e96dee8f0f2bc8680202c
-    unrolled_ast: 114b4ebdb3ec050800ae0594ef04055d54efb589768e96dee8f0f2bc8680202c
-    ssa_ast: 074341add52c6729d18a6967bbc1bcdd8b4171cbfca680c92828d9b57a9c9a95
+    initial_ast: 3da399ecd33417d282a071388955bfcdaaa307c5c5aaf1166e43470f31d77003
+    unrolled_ast: 3da399ecd33417d282a071388955bfcdaaa307c5c5aaf1166e43470f31d77003
+    ssa_ast: fcb87927ba8f167da76601da14b1705648c540d217727e21daccddf86262aa63
diff --git a/tests/expectations/compiler/integers/u8/eq.out b/tests/expectations/compiler/integers/u8/eq.out
index e34d23de38..4f65258f89 100644
--- a/tests/expectations/compiler/integers/u8/eq.out
+++ b/tests/expectations/compiler/integers/u8/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3392aaa03c8e5204dd6b88339c413ebe8e028bcc1065a1ccb6fa21fb5c59b0d5
-    initial_ast: cf548b9476520b460bc19aae1104fe7dd3efc66b24c4de5546b63e12f9afb9bc
-    unrolled_ast: cf548b9476520b460bc19aae1104fe7dd3efc66b24c4de5546b63e12f9afb9bc
-    ssa_ast: 1f94dcbbec48a59888edc92384cd8f94d65beace192d1a0dac46c28e67f8378f
+    initial_ast: b2763c985debed753d53377dba9507f637263e381ffe217cba3fc1f70d9ad554
+    unrolled_ast: b2763c985debed753d53377dba9507f637263e381ffe217cba3fc1f70d9ad554
+    ssa_ast: c16233a2c72464647062685cc87990709df2515bac03e9a5cfde32113ac1ea15
diff --git a/tests/expectations/compiler/integers/u8/ge.out b/tests/expectations/compiler/integers/u8/ge.out
index 8a4a2af9a4..7b244e4abe 100644
--- a/tests/expectations/compiler/integers/u8/ge.out
+++ b/tests/expectations/compiler/integers/u8/ge.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 3714b8c1301c3dd1b1ca0d487aa44c7f62c3e4c184c47f6da5ac0019a66879e8
       - initial_input_ast: 4257922b155aef73a6ba335801cdda0ded2e747c1460fa86f79b79b7b29f0aa9
-    initial_ast: 3e8c9bff6626442d71a09d64562a6b02fc446c2e9a0607a35e11f87353540c99
-    unrolled_ast: 3e8c9bff6626442d71a09d64562a6b02fc446c2e9a0607a35e11f87353540c99
-    ssa_ast: 9f129d09e54134e7b8f48a3cf72149d52ccc19185ea62f200ae7e2e9410a3bbb
+    initial_ast: 850e043e718fce0f0d3a4d9332030cb93e4ea0288dc640139723c452a65963cd
+    unrolled_ast: 850e043e718fce0f0d3a4d9332030cb93e4ea0288dc640139723c452a65963cd
+    ssa_ast: 1edb79b1aef3a3ebc7c146f62ea8654e504f33b02b757cb204db7cd678d6020c
diff --git a/tests/expectations/compiler/integers/u8/gt.out b/tests/expectations/compiler/integers/u8/gt.out
index 0becc8b899..57d621be7e 100644
--- a/tests/expectations/compiler/integers/u8/gt.out
+++ b/tests/expectations/compiler/integers/u8/gt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: f8597af926db1450f826087f3edd5d209cedaaf46623c147acd6e13415967b94
       - initial_input_ast: a43357af695abc926970c0c91f0a0d08d70b60feccc2b693947b201c8e924717
-    initial_ast: 89b54f3eb7ed89b87a38115bcfc8ff2469facf816e8e03be332811f78243e62b
-    unrolled_ast: 89b54f3eb7ed89b87a38115bcfc8ff2469facf816e8e03be332811f78243e62b
-    ssa_ast: 9e3d1e1ce5a757fc12a32baed1ef0795b776e43b0ab71857212e0ef0bda4254c
+    initial_ast: 8588da3992db7f0e6a6a94f139fa99342a7a6b8c4f7075127be3c756bf1ac30d
+    unrolled_ast: 8588da3992db7f0e6a6a94f139fa99342a7a6b8c4f7075127be3c756bf1ac30d
+    ssa_ast: eaeaff53610e0889ebeef53c1f45c9f37a8aaf767897fd5c4b1beaecad799eed
diff --git a/tests/expectations/compiler/integers/u8/le.out b/tests/expectations/compiler/integers/u8/le.out
index ca25866e6b..fce0cb9b22 100644
--- a/tests/expectations/compiler/integers/u8/le.out
+++ b/tests/expectations/compiler/integers/u8/le.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 3714b8c1301c3dd1b1ca0d487aa44c7f62c3e4c184c47f6da5ac0019a66879e8
       - initial_input_ast: cbed552889b23b16dbcc2ab12b551c747620aa9fc3326967473521c4af180a7b
-    initial_ast: 05ff0c455b8f3c319be22c32d298fb6530cf1cccaa3e7ac5e970542300604cb4
-    unrolled_ast: 05ff0c455b8f3c319be22c32d298fb6530cf1cccaa3e7ac5e970542300604cb4
-    ssa_ast: ba1cc02e6a507e5ee8ed5026766e6263d577eb6080a0b7e8be4229b7292f50df
+    initial_ast: 305a964249e2593999cad9d873e44de611d7f0a782bb9e6aab19c78270e7e6ca
+    unrolled_ast: 305a964249e2593999cad9d873e44de611d7f0a782bb9e6aab19c78270e7e6ca
+    ssa_ast: 02e2a18c9a1a0ae867223418e6efaf47923746ef3fc777c5344f94e40470bfc0
diff --git a/tests/expectations/compiler/integers/u8/lt.out b/tests/expectations/compiler/integers/u8/lt.out
index 892f284122..7271d955b9 100644
--- a/tests/expectations/compiler/integers/u8/lt.out
+++ b/tests/expectations/compiler/integers/u8/lt.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 4ced05aeaa53f2cb7600508ea19c652991edd3bce79a3ee74b318318e5e5683b
       - initial_input_ast: 4373a9128ffe9064bafdec83a6613dfe2b9dc8eb7fff93d0d93dc4b28bdcc42b
-    initial_ast: 1847c5422dcca7b0ae89334bac269e8b70b14cdd5e0bbbf1297c9b77a821bbde
-    unrolled_ast: 1847c5422dcca7b0ae89334bac269e8b70b14cdd5e0bbbf1297c9b77a821bbde
-    ssa_ast: 67c29fe85833819e9871900fd7d342e1f811f30157c0603cd5606c40284885de
+    initial_ast: 63ef5af9cf13f03471c1bbb3c1388c8c063c354eff5cfaeb6da27d0eabf3ac13
+    unrolled_ast: 63ef5af9cf13f03471c1bbb3c1388c8c063c354eff5cfaeb6da27d0eabf3ac13
+    ssa_ast: 1c023ae427a009833d1d0d0595feb48480c485660cc92bf84803f2e8fef0a8ea
diff --git a/tests/expectations/compiler/integers/u8/max.out b/tests/expectations/compiler/integers/u8/max.out
index f3666bfc34..dcda40f807 100644
--- a/tests/expectations/compiler/integers/u8/max.out
+++ b/tests/expectations/compiler/integers/u8/max.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: c82b4b7f26a3647900a1669a09055618ad25db71a06ad82171f22d66bad41351
-    initial_ast: d5e8caea53877248702990bb8cdb884d3dc6565e1a18008856b84a9014a7f7b7
-    unrolled_ast: d5e8caea53877248702990bb8cdb884d3dc6565e1a18008856b84a9014a7f7b7
-    ssa_ast: 5166fb1abe2a553db3c46045d1099f55efc2e7583992170818793338cb888681
+    initial_ast: a0ed41e95063964d9a67f4d40af244736c8e737d2b39044790a4620660d02148
+    unrolled_ast: a0ed41e95063964d9a67f4d40af244736c8e737d2b39044790a4620660d02148
+    ssa_ast: 2b21e682277922b74f1886e79c5a62e645c459d1f80fca967bb53228be742800
diff --git a/tests/expectations/compiler/integers/u8/max_fail.out b/tests/expectations/compiler/integers/u8/max_fail.out
index 9ac75fd08d..9b5a7d3ef3 100644
--- a/tests/expectations/compiler/integers/u8/max_fail.out
+++ b/tests/expectations/compiler/integers/u8/max_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value 256 is not a valid `u8`\n    --> compiler-test:4:19\n     |\n   4 |     const a: u8 = 256u8;\n     |                   ^^^^^\n"
diff --git a/tests/expectations/compiler/integers/u8/min.out b/tests/expectations/compiler/integers/u8/min.out
index d67815cd1f..3fb83fc428 100644
--- a/tests/expectations/compiler/integers/u8/min.out
+++ b/tests/expectations/compiler/integers/u8/min.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: a1a34a6c86c699c5d6619fb0a62bcba7304c61a47948782864b22feecedbd5dd
-    initial_ast: f3c0ef5eec29aeaf2d9d5a520127f93fc321af4f6b1dc1cd36d45917d87f9aa8
-    unrolled_ast: f3c0ef5eec29aeaf2d9d5a520127f93fc321af4f6b1dc1cd36d45917d87f9aa8
-    ssa_ast: 2bf066c38b68291ffa3333d896e6fd57f07215beee6f5ff1a320892b321199ef
+    initial_ast: b8dd145128c81da989a9ad2190970ea194ea524764317927fac86106cabcd3ff
+    unrolled_ast: b8dd145128c81da989a9ad2190970ea194ea524764317927fac86106cabcd3ff
+    ssa_ast: 80edf53e76d55d1e21b8a5f5d8e80c49b9b03556145a8753b7ac5b1d95a104a4
diff --git a/tests/expectations/compiler/integers/u8/min_fail.out b/tests/expectations/compiler/integers/u8/min_fail.out
index 9ac75fd08d..c4ee2b78a8 100644
--- a/tests/expectations/compiler/integers/u8/min_fail.out
+++ b/tests/expectations/compiler/integers/u8/min_fail.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [ETYC0372008]: The value -1 is not a valid `u8`\n    --> compiler-test:4:19\n     |\n   4 |     const a: u8 = -1u8;\n     |                   ^^^^\n"
diff --git a/tests/expectations/compiler/integers/u8/mul.out b/tests/expectations/compiler/integers/u8/mul.out
index 548c6fa29f..1a0f93e9b8 100644
--- a/tests/expectations/compiler/integers/u8/mul.out
+++ b/tests/expectations/compiler/integers/u8/mul.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b6b76e341c85b58e7b2aabbd1f364eb07caa75c3fa43cf87956605b3b49a20f2
-    initial_ast: 2519c8e2109b952b71f475a6e05cf13b6976fb641a499d1521570632dd50c549
-    unrolled_ast: 2519c8e2109b952b71f475a6e05cf13b6976fb641a499d1521570632dd50c549
-    ssa_ast: ccf84d4e58a656ca6e380f44a384a901ef4aa3bb2d3134fb1feb5d04c810214b
+    initial_ast: 19d15423debc9bceb71fdee66bfbb4d9a5eef4623943108552634f40aadc5430
+    unrolled_ast: 19d15423debc9bceb71fdee66bfbb4d9a5eef4623943108552634f40aadc5430
+    ssa_ast: 331d391c51ad8a647063efd8b7a3ac625c2ac050954a63bc5104a2fefc756b4d
diff --git a/tests/expectations/compiler/integers/u8/ne.out b/tests/expectations/compiler/integers/u8/ne.out
index 2237f8aa89..139c55c238 100644
--- a/tests/expectations/compiler/integers/u8/ne.out
+++ b/tests/expectations/compiler/integers/u8/ne.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: cb1414242c37bdb26deea0a57d41ad26a1755ec0681ce8b4fdcfecc8cfd80cad
       - initial_input_ast: 30a3d51db9d5e2a43a67de69e441e552838a451baf8a9e19077b06ee943e51dc
-    initial_ast: c0f5854362ccc68483b71ba542aa132d1cc1ebe2e7f11ad9b929ff28f0caaf07
-    unrolled_ast: c0f5854362ccc68483b71ba542aa132d1cc1ebe2e7f11ad9b929ff28f0caaf07
-    ssa_ast: b6eb40a8d7c46612484a091c246d697fa150e954fb0af48f7c8a0df3fb69eb3c
+    initial_ast: 0c25091469d6ba96eb3315f0b269a687a0e3da9974eaf547a58c58f8433650bd
+    unrolled_ast: 0c25091469d6ba96eb3315f0b269a687a0e3da9974eaf547a58c58f8433650bd
+    ssa_ast: 877507ecd40d2c01fe98b7cd7f2d45b46396b62a438f3ed8246d2c685bdd99c9
diff --git a/tests/expectations/compiler/integers/u8/no_space_between_literal.out b/tests/expectations/compiler/integers/u8/no_space_between_literal.out
index 9ac75fd08d..e489aaacb9 100644
--- a/tests/expectations/compiler/integers/u8/no_space_between_literal.out
+++ b/tests/expectations/compiler/integers/u8/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:13\n     |\n   4 |     const i = 1 u8;\n     |             ^"
diff --git a/tests/expectations/compiler/integers/u8/operator_methods.out b/tests/expectations/compiler/integers/u8/operator_methods.out
index a738ea6064..9506d60849 100644
--- a/tests/expectations/compiler/integers/u8/operator_methods.out
+++ b/tests/expectations/compiler/integers/u8/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: f412eac0d2e73c9c7058e571c75584880db3c411f2c59eea0a620504d6cb3825
-    initial_ast: eb7fdf789600a8222337ae8e4c4900e99c4df834e7a1b67703844091ca333a5e
-    unrolled_ast: eb7fdf789600a8222337ae8e4c4900e99c4df834e7a1b67703844091ca333a5e
-    ssa_ast: ae2c797230c0e33d6267df2a57b8c672a8b0f04765bc9d12ded982f8b5355a9a
+    initial_ast: eb8683727720d86becf6c851216998f72b37c250b0c82ffc87ada0e6bafbf1fd
+    unrolled_ast: eb8683727720d86becf6c851216998f72b37c250b0c82ffc87ada0e6bafbf1fd
+    ssa_ast: 80bc2f08de69886046530309bd07152fa7172b8781a57f8aa010e3847d57c7ce
diff --git a/tests/expectations/compiler/integers/u8/or.out b/tests/expectations/compiler/integers/u8/or.out
index 89d9084154..9f23be93ee 100644
--- a/tests/expectations/compiler/integers/u8/or.out
+++ b/tests/expectations/compiler/integers/u8/or.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: da9cbc3b198d4979155523b6003c948a8851461a84397220fba7cdb6167d3bae
-    initial_ast: 04fc5111bb87125900544acd3e08f46b406fce48f78ed8c23e90ed691f8f1275
-    unrolled_ast: 04fc5111bb87125900544acd3e08f46b406fce48f78ed8c23e90ed691f8f1275
-    ssa_ast: 8c5addc97e1122328be36a1a3525b64f73d74d752de1f1feba6e0c55661371ce
+    initial_ast: 7b780b7f6dabf6adc4c0f8482a67e1f0ee6801139e67df3d1baff1faf0814b16
+    unrolled_ast: 7b780b7f6dabf6adc4c0f8482a67e1f0ee6801139e67df3d1baff1faf0814b16
+    ssa_ast: 5d7fd9b9765378981818434d134895dec590612d3c6b6ea6191b3b6e1c5538bc
diff --git a/tests/expectations/compiler/integers/u8/pow.out b/tests/expectations/compiler/integers/u8/pow.out
index 084ddca2ea..f8cac90d96 100644
--- a/tests/expectations/compiler/integers/u8/pow.out
+++ b/tests/expectations/compiler/integers/u8/pow.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 1c274ffd5072383cfdd3241b0bf547a2a12be43d8e37d712e151b3576b9223be
-    initial_ast: 8dc8122e466865351dd495ab296cffe2d7e6df029a06ec33ef3ccf1366c033b6
-    unrolled_ast: 8dc8122e466865351dd495ab296cffe2d7e6df029a06ec33ef3ccf1366c033b6
-    ssa_ast: 2e4157eb4c641616f172ce1484fb4e3da632d40615bd2af95b6a19dab6e797bf
+    initial_ast: 1500c1c98e7f05ec43d279e70656d48e4e515b470d057cb339b816990908cb95
+    unrolled_ast: 1500c1c98e7f05ec43d279e70656d48e4e515b470d057cb339b816990908cb95
+    ssa_ast: c9295c3e35ba078c40bba05af7dae301947454c1f35d12ff91e64d53e2fb2c60
diff --git a/tests/expectations/compiler/integers/u8/rem.out b/tests/expectations/compiler/integers/u8/rem.out
index 9087ccc492..10c9b2fe92 100644
--- a/tests/expectations/compiler/integers/u8/rem.out
+++ b/tests/expectations/compiler/integers/u8/rem.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 5bbec5d16f5d680c993359292946db566654eb0b16392dd64db71b2f9c66a34d
-    initial_ast: 81c7fd3c7a5015a44853d61b6eba1f92347c2bb673d96290b3fbd6154c34b757
-    unrolled_ast: 81c7fd3c7a5015a44853d61b6eba1f92347c2bb673d96290b3fbd6154c34b757
-    ssa_ast: b84a29541bb4749cdf5e631935484a61d088123851be47f81cb5a5de19c19700
+    initial_ast: 35b020447a033f5956f9bf26c1447d15f48736045060bb5844028f57b6a5a4d4
+    unrolled_ast: 35b020447a033f5956f9bf26c1447d15f48736045060bb5844028f57b6a5a4d4
+    ssa_ast: d16da59cedb1aedd0d2aa1618ec49c0ad4b58dbbaa309633c0f762d22095dd9d
diff --git a/tests/expectations/compiler/integers/u8/shl.out b/tests/expectations/compiler/integers/u8/shl.out
index bccead747f..41e067fc3f 100644
--- a/tests/expectations/compiler/integers/u8/shl.out
+++ b/tests/expectations/compiler/integers/u8/shl.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8e86862b6bf9dfc4ab6ba11f6f5a1789b436ad993d8e4c508816ec7575487b06
-    initial_ast: e83b055c482c64e01882691080f70b1951a8ebbd789a1feb58d6051f39ce3adf
-    unrolled_ast: e83b055c482c64e01882691080f70b1951a8ebbd789a1feb58d6051f39ce3adf
-    ssa_ast: 124a517e50518143e3711d75fedaa5961118cef7c9507da7f7982f809a051363
+    initial_ast: ee11cf0a395f86ebe614362e49f0db9c5e70e507f792b1061a9e711a32799917
+    unrolled_ast: ee11cf0a395f86ebe614362e49f0db9c5e70e507f792b1061a9e711a32799917
+    ssa_ast: 6ed80ad3a81deb5caaeb7a1fc6f64cd5a7cffdfbf1e8c55e8432f2cad5bc9e69
diff --git a/tests/expectations/compiler/integers/u8/shr.out b/tests/expectations/compiler/integers/u8/shr.out
index 7ee08e3c7e..4a9964c199 100644
--- a/tests/expectations/compiler/integers/u8/shr.out
+++ b/tests/expectations/compiler/integers/u8/shr.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 8e86862b6bf9dfc4ab6ba11f6f5a1789b436ad993d8e4c508816ec7575487b06
-    initial_ast: 02f754372a7d3dae62a490e3b836c7c56b5256b19763156e482ccfac2abb8c96
-    unrolled_ast: 02f754372a7d3dae62a490e3b836c7c56b5256b19763156e482ccfac2abb8c96
-    ssa_ast: 5f3a3da30625a8031fc24c567d062ac131f22ab2f26f630fc1fab6dc814ff7ea
+    initial_ast: 44db860987a60f050428612585d6fa8a57e6485d04a8459bba63883822cc17da
+    unrolled_ast: 44db860987a60f050428612585d6fa8a57e6485d04a8459bba63883822cc17da
+    ssa_ast: 68789c4d879e9748479a49aecfca8fc6f7fd1aafc17921ac222209f769de1451
diff --git a/tests/expectations/compiler/integers/u8/sub.out b/tests/expectations/compiler/integers/u8/sub.out
index a1b9a6e063..8ab882b819 100644
--- a/tests/expectations/compiler/integers/u8/sub.out
+++ b/tests/expectations/compiler/integers/u8/sub.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 0d6280d75da81c7f57bef3e5878c016be8c603cf0ca0476c39116a8da049c462
-    initial_ast: d0174b0bde76897f78b2bb3a18cea63456a278bee358d2bc05cf3dc764a581c4
-    unrolled_ast: d0174b0bde76897f78b2bb3a18cea63456a278bee358d2bc05cf3dc764a581c4
-    ssa_ast: 9aa9695185e6ab2a44b7ca91551a373a89bac41f548d91c3a24e3a96cc2af370
+    initial_ast: 9b101dacd0dc71dd48f6732474f4526e6ae1b21241e8c662ac09ff47add58fe8
+    unrolled_ast: 9b101dacd0dc71dd48f6732474f4526e6ae1b21241e8c662ac09ff47add58fe8
+    ssa_ast: 871b517ccaec98e0847a1518c15067c2654fcc564d3014f8c51dfbd88ea261b7
diff --git a/tests/expectations/compiler/integers/u8/ternary.out b/tests/expectations/compiler/integers/u8/ternary.out
index 1717fe6429..ecca0c94cd 100644
--- a/tests/expectations/compiler/integers/u8/ternary.out
+++ b/tests/expectations/compiler/integers/u8/ternary.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: 0ce01c5744a4edd9ee2a31332e052f6d52534bcd13a57b459527d478e4124acf
       - initial_input_ast: b9e96a28e358cbe8efe681e28e47ca50fd331b27da8fe7df6df0de5d600b39b4
-    initial_ast: 9f0ab941ca3e04afbe90a369ed32ea653a298069174f5e531707cba9c3b56b27
-    unrolled_ast: 9f0ab941ca3e04afbe90a369ed32ea653a298069174f5e531707cba9c3b56b27
-    ssa_ast: 18291ca7a1915f8e9f099d1b418aebe6eb0d2252d2a858eeaaa3d0ea53a35b69
+    initial_ast: 7898ff4cd92a7dc7b37ed6e47c4f0d6e4c9a7ca8d77faef13b39c252b8b944b1
+    unrolled_ast: 7898ff4cd92a7dc7b37ed6e47c4f0d6e4c9a7ca8d77faef13b39c252b8b944b1
+    ssa_ast: 33fc99c19bbb1610bcd249339c8b2a22c52cb91c6d68544d67505aeda18e871b
diff --git a/tests/expectations/compiler/integers/u8/xor.out b/tests/expectations/compiler/integers/u8/xor.out
index 9ad0f63e56..2056e3b5e5 100644
--- a/tests/expectations/compiler/integers/u8/xor.out
+++ b/tests/expectations/compiler/integers/u8/xor.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3556e01eb78b34bc6aa109af636dfc2787371488cc9950b1e016bde826c007e3
-    initial_ast: cc9938c3e3cde7416c965abe97e5e798ea539f6fccc81ea2535951b5b78faab3
-    unrolled_ast: cc9938c3e3cde7416c965abe97e5e798ea539f6fccc81ea2535951b5b78faab3
-    ssa_ast: 4de2ec62ac095db2acce55b55822cbaa012687ed7e37dcc9f84357dfe5f07deb
+    initial_ast: ba31d263f75be86a403e18841f7fc6e9ccf8ccb5f3ae75c333a09bd18e3cc581
+    unrolled_ast: ba31d263f75be86a403e18841f7fc6e9ccf8ccb5f3ae75c333a09bd18e3cc581
+    ssa_ast: 39b950ea34ba3db520764a79dc76fb5a7c0b3622d2cdd6204f706fa1a9568d77
diff --git a/tests/expectations/compiler/records/declaration.out b/tests/expectations/compiler/records/declaration.out
index 2abc668cb4..ac67e696f6 100644
--- a/tests/expectations/compiler/records/declaration.out
+++ b/tests/expectations/compiler/records/declaration.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: e52e284b4ce8f03547699674c85c79632c6c4984f5e0054422db8e097b35adf0
-    unrolled_ast: e52e284b4ce8f03547699674c85c79632c6c4984f5e0054422db8e097b35adf0
-    ssa_ast: a2397b5788eafe72c950510de6cb273e1db536117fa73df21a7cea1653a35678
+    initial_ast: 1a50749957d7f8419dbc87989971e1258b1c9c51355eb3421074dc3bfc9ac6e5
+    unrolled_ast: 1a50749957d7f8419dbc87989971e1258b1c9c51355eb3421074dc3bfc9ac6e5
+    ssa_ast: 33228d19dc07adfdbd09a0756f74c5ce4d463cbc35525fd5c729e8cf8ea320cd
diff --git a/tests/expectations/compiler/records/init_expression.out b/tests/expectations/compiler/records/init_expression.out
index c8188b5834..53cf0e75e5 100644
--- a/tests/expectations/compiler/records/init_expression.out
+++ b/tests/expectations/compiler/records/init_expression.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 9144e9045e7c85d34d7fd83f5a63d583a3cc4123de884f90649582818b96ee06
-    unrolled_ast: 9144e9045e7c85d34d7fd83f5a63d583a3cc4123de884f90649582818b96ee06
-    ssa_ast: bcb4ffdd6b7e5e84a27db5e9e346cbbec109b0102c129cbe36da9540a5bf1cf5
+    initial_ast: 6a82f9491434e663b6b10ad89ee9f0aaffdae72c8eff141736a337afa0f73b27
+    unrolled_ast: 6a82f9491434e663b6b10ad89ee9f0aaffdae72c8eff141736a337afa0f73b27
+    ssa_ast: b0267a5572830e781f068ae0c2be375e58038493f93771492e58bed6932551d2
diff --git a/tests/expectations/compiler/records/init_expression_shorthand.out b/tests/expectations/compiler/records/init_expression_shorthand.out
index 359ba24acd..8b1e7f44ee 100644
--- a/tests/expectations/compiler/records/init_expression_shorthand.out
+++ b/tests/expectations/compiler/records/init_expression_shorthand.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 620c3fc85e51367c81560547cb01e6ec142d6b8288b59cd1c91b9a96cbec1b68
-    unrolled_ast: 620c3fc85e51367c81560547cb01e6ec142d6b8288b59cd1c91b9a96cbec1b68
-    ssa_ast: 7084a22442a495fba886e5a935dbb35d3af135d6c82a2585ce3bad07a8ad8ae1
+    initial_ast: 8c154f19b078995f9fa6828374ee1af317103cdeb37f4b7bcf32c2efb475a615
+    unrolled_ast: 8c154f19b078995f9fa6828374ee1af317103cdeb37f4b7bcf32c2efb475a615
+    ssa_ast: 5f6ff2e37bc019fa8755a3e4660a9206d3679a3a2a7966af20f3dbd983f51b91
diff --git a/tests/expectations/compiler/records/nested_record.out b/tests/expectations/compiler/records/nested_record.out
index cc97ecc22a..5950092304 100644
--- a/tests/expectations/compiler/records/nested_record.out
+++ b/tests/expectations/compiler/records/nested_record.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: b143b08f9e6a58b95ddb21724cd8b6269fb5a022e7b840093ae78006cbe93a08
-    unrolled_ast: b143b08f9e6a58b95ddb21724cd8b6269fb5a022e7b840093ae78006cbe93a08
-    ssa_ast: 4aebf8f19ec22257d598a3cd005e4c10cdfd22572b4d4a8ab2134b5a49fcafba
+    initial_ast: 555d9cf4ff2667903032ede329e1f5cb678af9eeb8ce6bf63b3b01fbc8b9f47c
+    unrolled_ast: 555d9cf4ff2667903032ede329e1f5cb678af9eeb8ce6bf63b3b01fbc8b9f47c
+    ssa_ast: b291816d30cc91139d5e5f875eb932729d5e14cfbbdbf18804e0ec5c0a2dc5cb
diff --git a/tests/expectations/compiler/scalar/add.out b/tests/expectations/compiler/scalar/add.out
index e2771713e8..84bb592df2 100644
--- a/tests/expectations/compiler/scalar/add.out
+++ b/tests/expectations/compiler/scalar/add.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: b3c3f36f43e4e6a247351cc9e1724ccb8893bf47f2f9217002cccc0d6a578495
-    initial_ast: 813d5465cb3947c2a6a9490c904c7095207adfc6c235309afb521e998f6df188
-    unrolled_ast: 813d5465cb3947c2a6a9490c904c7095207adfc6c235309afb521e998f6df188
-    ssa_ast: 30640bdfad94dad45284a1245ae94ffd58c6f82619f3d23c5fb95845a72df6ba
+    initial_ast: 9084f9e16ae61b1b3b449304f3c6221bc2c98f2373160939374c9acfc653ea5e
+    unrolled_ast: 9084f9e16ae61b1b3b449304f3c6221bc2c98f2373160939374c9acfc653ea5e
+    ssa_ast: cc878bf9bc92cc2a0400c5b970274527cfed0c0792f4af16fe464a667764d1ee
diff --git a/tests/expectations/compiler/scalar/cmp.out b/tests/expectations/compiler/scalar/cmp.out
index aed0de2ee2..27a8833ff1 100644
--- a/tests/expectations/compiler/scalar/cmp.out
+++ b/tests/expectations/compiler/scalar/cmp.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 3d3353f4a8936ad5eb3738204dc57b3e08dae541cfbe5dd012fd82413c4a800d
-    initial_ast: 9c2e9b10e37b4ecf4caf4bed11af0bf4b20ca396a0f3573a91618a054c700ece
-    unrolled_ast: 9c2e9b10e37b4ecf4caf4bed11af0bf4b20ca396a0f3573a91618a054c700ece
-    ssa_ast: 9bbd8f90174b87efba70981ae5b3d4beb11ffbbfd75e7f660c9817b144fb7ecc
+    initial_ast: e783b4875cc980b07691c2afe59ac1132accc2ad445445fa76630459021bb79d
+    unrolled_ast: e783b4875cc980b07691c2afe59ac1132accc2ad445445fa76630459021bb79d
+    ssa_ast: f00aa04e1c47f15fb3086bc2718f4b9307e5795134495a1bc486cc443ae46537
diff --git a/tests/expectations/compiler/scalar/eq.out b/tests/expectations/compiler/scalar/eq.out
index d4c5ce3dc9..7c5b60e85a 100644
--- a/tests/expectations/compiler/scalar/eq.out
+++ b/tests/expectations/compiler/scalar/eq.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ba7d5fcbce9ef9e8a4d2861afe75514f0ee87b8d5aca0407cdce1ca637c2ddf4
-    initial_ast: ab99209c30f353856f85e049fb84c0c436da67a0bd84155351eb854661fca055
-    unrolled_ast: ab99209c30f353856f85e049fb84c0c436da67a0bd84155351eb854661fca055
-    ssa_ast: 7d6bcceec718d219fed1653603df3c16851d4cbcc3c13d8375db178d03f25dce
+    initial_ast: 6a24378a4f871585601ac7e4ae25dfc14018553b84ae40e97149405788ed9d6a
+    unrolled_ast: 6a24378a4f871585601ac7e4ae25dfc14018553b84ae40e97149405788ed9d6a
+    ssa_ast: a5ab11e915cabe2cd1483e89683f5c528926f300271bd7a84f29ad31ec27b897
diff --git a/tests/expectations/compiler/scalar/no_space_between_literal.out b/tests/expectations/compiler/scalar/no_space_between_literal.out
index 9ac75fd08d..782ae3acc2 100644
--- a/tests/expectations/compiler/scalar/no_space_between_literal.out
+++ b/tests/expectations/compiler/scalar/no_space_between_literal.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:17\n     |\n   3 | function main() {\n     |                 ^"
+  - "Error [EPAR0370005]: expected : -- found '='\n    --> compiler-test:4:11\n     |\n   4 |   const f = 1 scalar;\n     |           ^"
diff --git a/tests/expectations/compiler/scalar/operator_methods.out b/tests/expectations/compiler/scalar/operator_methods.out
index f52c372c37..96ebf29428 100644
--- a/tests/expectations/compiler/scalar/operator_methods.out
+++ b/tests/expectations/compiler/scalar/operator_methods.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 241af2baf840e4d881d353b9f22a691be1e1aa9285245a0691b5f20091e9b122
-    initial_ast: 51029551f81a2273b28ebacdc33b273fd8d428dcebd4be19a92336dd25c3474b
-    unrolled_ast: 51029551f81a2273b28ebacdc33b273fd8d428dcebd4be19a92336dd25c3474b
-    ssa_ast: 0e560ca368a73872e802c32117f23d03bb598e3c026441f42d8a4b5af66798f4
+    initial_ast: 7624702eae1bd7decbcdd75b67db6ae4119b9cdf720c753be789f291cd12cd6b
+    unrolled_ast: 7624702eae1bd7decbcdd75b67db6ae4119b9cdf720c753be789f291cd12cd6b
+    ssa_ast: 638df64398712b14fdb86bdf3c725f351e24dab71761696bd20ce19f9976d0a2
diff --git a/tests/expectations/compiler/scalar/scalar.out b/tests/expectations/compiler/scalar/scalar.out
index 87e83f5a79..7611c802de 100644
--- a/tests/expectations/compiler/scalar/scalar.out
+++ b/tests/expectations/compiler/scalar/scalar.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 2a0b081038ac342aa2fbb460baec0f4ed842e646dc6f5057f691336cad1860de
-    initial_ast: 52021df069fbbf70903295174ce499947d20775fb267f77d09dff616a93cdc4a
-    unrolled_ast: 52021df069fbbf70903295174ce499947d20775fb267f77d09dff616a93cdc4a
-    ssa_ast: 8520e67c78b510b299b45244d572fbbaef63f8161d240f8218e5fb7239071a31
+    initial_ast: bac85b638e0e2f0a360207b15cdd82f6cf815af6890220d9bf74e60eeb2d59d0
+    unrolled_ast: bac85b638e0e2f0a360207b15cdd82f6cf815af6890220d9bf74e60eeb2d59d0
+    ssa_ast: 839e682148b18c2a195844e76e28c471a68c7b4bdf4fa958e18cab1dffdc177b
diff --git a/tests/expectations/compiler/scalar/ternary.out b/tests/expectations/compiler/scalar/ternary.out
index 2c40d75b34..76c57d2155 100644
--- a/tests/expectations/compiler/scalar/ternary.out
+++ b/tests/expectations/compiler/scalar/ternary.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ba7d5fcbce9ef9e8a4d2861afe75514f0ee87b8d5aca0407cdce1ca637c2ddf4
-    initial_ast: da2d449a7cceb7da6926c3ef17c173e27530dd94e5c82765e093db22e830eaca
-    unrolled_ast: da2d449a7cceb7da6926c3ef17c173e27530dd94e5c82765e093db22e830eaca
-    ssa_ast: b9aa1e1e3bad9ff8278f6750d7b1eccf8ef40f9bb3176340f05b27a5b2ea0cb4
+    initial_ast: 3b24693db697cafee24962e3368427d380f9f113b71506c7d61faabce87764b2
+    unrolled_ast: 3b24693db697cafee24962e3368427d380f9f113b71506c7d61faabce87764b2
+    ssa_ast: 5cc6bc6d5701a856342e4cb788eeabb8e011af8d2a6f780ffbe3e5102d2c6ca5
diff --git a/tests/expectations/compiler/statements/assign.out b/tests/expectations/compiler/statements/assign.out
index d8164dd8db..e9623f5aff 100644
--- a/tests/expectations/compiler/statements/assign.out
+++ b/tests/expectations/compiler/statements/assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 1a1667298d727c7ed5249b12209be44385a8751fb788e6bf54dd02ac7e69eea6
-    initial_ast: 5e4d5a1afc3bb26cc9bf832fb2e1b8b83a86b15731a85cd85dbbd878d554ff07
-    unrolled_ast: 5e4d5a1afc3bb26cc9bf832fb2e1b8b83a86b15731a85cd85dbbd878d554ff07
-    ssa_ast: 947afe7f724e9e1f3371a482b92912168968e28409f50a7a664d74355ca3fbf0
+    initial_ast: 7227ac3b555221df4cbd98bebdb5d8d291829f8c4e8b24921f89618519df4873
+    unrolled_ast: 7227ac3b555221df4cbd98bebdb5d8d291829f8c4e8b24921f89618519df4873
+    ssa_ast: 488641174ce51052cad88b5d0e0915fcca562239babb23f01145f87bff6cefba
diff --git a/tests/expectations/compiler/statements/assign_ternary.out b/tests/expectations/compiler/statements/assign_ternary.out
index efdfd7f46d..0deca0cd05 100644
--- a/tests/expectations/compiler/statements/assign_ternary.out
+++ b/tests/expectations/compiler/statements/assign_ternary.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370005]: expected -> -- found '{'\n    --> compiler-test:3:23\n     |\n   3 | function main(x: u32) {\n     |                       ^"
+  - "Error [ETYC0372003]: Expected type `boolean` but type `u32` was found\n    --> compiler-test:3:15\n     |\n   3 | function main(x: u32) {\n     |               ^\nError [EAST0372011]: variable `x` shadowed by\n    --> compiler-test:4:5\n     |\n   4 |     let x: bool = true ? x: true;\n     |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n"
diff --git a/tests/expectations/compiler/statements/block.out b/tests/expectations/compiler/statements/block.out
index 909012f50e..3786308c30 100644
--- a/tests/expectations/compiler/statements/block.out
+++ b/tests/expectations/compiler/statements/block.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: e0ecb9ab54864c97215d3a8dc14f7f1913c944c753c9991688c2a2db4f4026ec
-    initial_ast: 7e6da8280e152b932a787291fca2ab04308bb8b967c81208ee71fcbb934cbba7
-    unrolled_ast: 7e6da8280e152b932a787291fca2ab04308bb8b967c81208ee71fcbb934cbba7
-    ssa_ast: f0220ec044583473bd0fe814a016186dc1fcdcf3746b8a536e7e1c15d2739b3e
+    initial_ast: 6802db40eeae876c744eafbae2e56bf8348f3ef2d639d74bec2059a0b3aed5ec
+    unrolled_ast: 6802db40eeae876c744eafbae2e56bf8348f3ef2d639d74bec2059a0b3aed5ec
+    ssa_ast: 0a19ba77c7d86b870e9a9bc6203ebdbef58a25b40fe347a2072200c661998415
diff --git a/tests/expectations/compiler/statements/chain.out b/tests/expectations/compiler/statements/chain.out
index 83536edc07..492e0c1b60 100644
--- a/tests/expectations/compiler/statements/chain.out
+++ b/tests/expectations/compiler/statements/chain.out
@@ -6,6 +6,6 @@ outputs:
       - initial_input_ast: b5ef7b7986b5248a94615154bef9032fc0314acabf12c5eb22454b75d232bd11
       - initial_input_ast: d7b189d5e91a3eb928802dc9833af0dd2047975ae6390f27ed2580309b644b4e
       - initial_input_ast: 4c73cc4d60dd535ca2d782e45811516699eeb0be3a28826d6c2f6799181a41f7
-    initial_ast: 4c39b83797a4db018a73dfce7b44bd3ec5bb1390b14041904d072a3cf30f6ebb
-    unrolled_ast: 4c39b83797a4db018a73dfce7b44bd3ec5bb1390b14041904d072a3cf30f6ebb
-    ssa_ast: 2de843c410c9d003945e1f17c724eb83a7eca1fd149dd09c9f48eccffe8d1b14
+    initial_ast: b81908cea5b03c0c01bf8e99b1b29eaf06ab9ef3a7874ae876d80e64bba8063a
+    unrolled_ast: b81908cea5b03c0c01bf8e99b1b29eaf06ab9ef3a7874ae876d80e64bba8063a
+    ssa_ast: 538393572fdb5875182bff7ea63951026d18cc38fc3e0a1bab06125d6b09b608
diff --git a/tests/expectations/compiler/statements/iteration_basic.out b/tests/expectations/compiler/statements/iteration_basic.out
index 46c6840a0e..1b6fa263e2 100644
--- a/tests/expectations/compiler/statements/iteration_basic.out
+++ b/tests/expectations/compiler/statements/iteration_basic.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: f08c71e3e0b85f673152dddb038d33d9714f6c286ec5cb9b0cc476deabf731d9
-    initial_ast: 051d4bd514f7c0c1100e614f3cd2e70550a1c2cfa1fd10c4487401348d81244e
-    unrolled_ast: b4c6cf07c615cc779c1a33e49895d0b69a4425683d6ad177c170d2795dd392a6
-    ssa_ast: f6ab8c56dd1d083847703ae016aa0d37c6b5613d10020ab05d2b007e51caa230
+    initial_ast: 3cbd2e471a0b0bdbbc8735a62e0f173c6fbf3183c710601e645e245cec05bd9e
+    unrolled_ast: 5223fe7cafd21eff3bdc52a2902d277545ee04a72c08f3ac3361a692c0a888fd
+    ssa_ast: 99da089db78b87143bebc6868c5bff9546729faec09556c06a68704f422def41
diff --git a/tests/expectations/compiler/statements/iteration_nested.out b/tests/expectations/compiler/statements/iteration_nested.out
index 0fb2faff4f..c62a939072 100644
--- a/tests/expectations/compiler/statements/iteration_nested.out
+++ b/tests/expectations/compiler/statements/iteration_nested.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: ad0d3998aeb1df690fbe23f1fd3df7b91d1b003ddb5858961c830edf8c683fe1
-    initial_ast: f3b40d97c0fff3def517650d3e5e3f4909e16bb2fe22d2907b33b9221fe64ed9
-    unrolled_ast: 37f3a454bdcd88620b3cb135ec3174212f1ee84cf2ea50cef4b0d09aa1582811
-    ssa_ast: 378945f23fdc81703945cec4fa6e5e4d647de219decb5823d26bda093e62c727
+    initial_ast: 5fe6a65bce5125cdc0f20b9830456a5ef4ba55dde1611cbf1bb430a80a473467
+    unrolled_ast: ed02be653ccaa57ce9028d8a1c6938185b999ac4bf3f2fa568e175be339b9c85
+    ssa_ast: 9011ad7ce301f260ea8df4fa29ec9f46c3b648baa056f9dde2b6decb3f6bdc69
diff --git a/tests/expectations/compiler/statements/multiple_returns.out b/tests/expectations/compiler/statements/multiple_returns.out
index 64738987e1..7087a7522f 100644
--- a/tests/expectations/compiler/statements/multiple_returns.out
+++ b/tests/expectations/compiler/statements/multiple_returns.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: e0ecb9ab54864c97215d3a8dc14f7f1913c944c753c9991688c2a2db4f4026ec
       - initial_input_ast: 23334c9c6f3741f0659966764b58cd0313d2dd73d04be862b0c3d156a6f14c72
-    initial_ast: 2022a66e90bda86d138bd994703ad134fd5498978e61a43de5820c366c9156a9
-    unrolled_ast: 2022a66e90bda86d138bd994703ad134fd5498978e61a43de5820c366c9156a9
-    ssa_ast: 79e4eb4b0cb7e59aaa58b660070e987dbdb3b8c328c0fa84b933b0215af56dcd
+    initial_ast: 83ee65d25ad6447cc8b1fe86fa9bc83fc0d074e2e9a788f95cfc57cb5dd3efe1
+    unrolled_ast: 83ee65d25ad6447cc8b1fe86fa9bc83fc0d074e2e9a788f95cfc57cb5dd3efe1
+    ssa_ast: fec60fe0979939b73488ebc7323c8b3d6ce1b8ea1e7a5af36c1399c7ae40482d
diff --git a/tests/expectations/compiler/statements/mutate.out b/tests/expectations/compiler/statements/mutate.out
index f4f925c759..81a5bd5dec 100644
--- a/tests/expectations/compiler/statements/mutate.out
+++ b/tests/expectations/compiler/statements/mutate.out
@@ -5,6 +5,6 @@ outputs:
   - output:
       - initial_input_ast: eb6471b59179f70f0b3fff95f61f9e9fdad4fa56db0a36e38df2cd609bb128f4
       - initial_input_ast: 6ad39429c1fdf45e582200bc1b2d3eef49dac71f921332d3b074ebd38e2cbd76
-    initial_ast: a6fe0258229f3a8e8b5d2cf49f18aeb1a2962df8aa2b0b10f471547feabda517
-    unrolled_ast: a6fe0258229f3a8e8b5d2cf49f18aeb1a2962df8aa2b0b10f471547feabda517
-    ssa_ast: 0acaeaaab9405fe9b5b2c045b25b9dfb028a9971c48749b3051942004a6cedb1
+    initial_ast: 17eba906c217af4481abff062ba937c95f4d523a19d65c7fc98e6bdaa101b0b0
+    unrolled_ast: 17eba906c217af4481abff062ba937c95f4d523a19d65c7fc98e6bdaa101b0b0
+    ssa_ast: 983dc8e2512d89a1e7bdb605238c522fb01316dea99af17cbb612ac56cb10c20
diff --git a/tests/expectations/compiler/statements/operations/add_assign.out b/tests/expectations/compiler/statements/operations/add_assign.out
index 5ac45e851e..a2e4bb9e08 100644
--- a/tests/expectations/compiler/statements/operations/add_assign.out
+++ b/tests/expectations/compiler/statements/operations/add_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 7fb1b08cb4e5a9c2bdaf94b233293159fc79017be3eaf3e6ff8b09ab0bb1b9db
-    unrolled_ast: 7fb1b08cb4e5a9c2bdaf94b233293159fc79017be3eaf3e6ff8b09ab0bb1b9db
-    ssa_ast: 8ba537a95bc0a96c86a2b0e1570b81876f1932b29bc9763cc5216796cd5c14a7
+    initial_ast: 8b196c36d7e823bcc9320da834aa97b340043fa6ccbbc5b3066bf7920c553e68
+    unrolled_ast: 8b196c36d7e823bcc9320da834aa97b340043fa6ccbbc5b3066bf7920c553e68
+    ssa_ast: f7dd5e18be98ada7ee599826d66eefdf72718332375d89deb5d859b3329e49c9
diff --git a/tests/expectations/compiler/statements/operations/and_assign.out b/tests/expectations/compiler/statements/operations/and_assign.out
index a1a3500f8d..f49582297b 100644
--- a/tests/expectations/compiler/statements/operations/and_assign.out
+++ b/tests/expectations/compiler/statements/operations/and_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 8d2739be878610e0874552b5f3474ebfde22696b861251e9797ea7b21b4eef38
-    unrolled_ast: 8d2739be878610e0874552b5f3474ebfde22696b861251e9797ea7b21b4eef38
-    ssa_ast: e4986115d6ddbc6212d0830d1ce6930d7397b6ce0d1f25108c31411c90c7cb38
+    initial_ast: 7ae73abc05ab53b4007475f0fe957e0e34f151d0fdf8638c6875c1f531127c9f
+    unrolled_ast: 7ae73abc05ab53b4007475f0fe957e0e34f151d0fdf8638c6875c1f531127c9f
+    ssa_ast: eafade33c36751b2b1ba2f483af1b61be49fdde9b33df26b334a4cf9f312c1c8
diff --git a/tests/expectations/compiler/statements/operations/bitand_assign.out b/tests/expectations/compiler/statements/operations/bitand_assign.out
index 3b7d50fa55..883a7054a2 100644
--- a/tests/expectations/compiler/statements/operations/bitand_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitand_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 2dff3822f53059f7c17a37004871605620558b7968ed8e128679979327e153e1
-    unrolled_ast: 2dff3822f53059f7c17a37004871605620558b7968ed8e128679979327e153e1
-    ssa_ast: 27feee0668e08fe380939109a568b221d5a8bb6d1132001ac9d0a3c6ca71e8e9
+    initial_ast: d7d588e3e4113f3af230d3a50c5b454af94e2f059b7852072dfb4f18b9322d65
+    unrolled_ast: d7d588e3e4113f3af230d3a50c5b454af94e2f059b7852072dfb4f18b9322d65
+    ssa_ast: 795dea80f419dbabaebed106e698e94f5974b490f53f6d082dca8ccf2d3c9add
diff --git a/tests/expectations/compiler/statements/operations/bitor_assign.out b/tests/expectations/compiler/statements/operations/bitor_assign.out
index c383a16bd9..07e739c65e 100644
--- a/tests/expectations/compiler/statements/operations/bitor_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitor_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: b339afcd218744e3d89a07ac7b798c51d8959cedcf5c08e990515dff92412bf8
-    unrolled_ast: b339afcd218744e3d89a07ac7b798c51d8959cedcf5c08e990515dff92412bf8
-    ssa_ast: ea6a03f0ef3594b8ac32e0ea7913721f06b4af92477da9fa2d83d4e95444b91c
+    initial_ast: 0ab5818e348a1338a7160f50b8cda90d5d0638cd547c8dc3999d16fde04ba141
+    unrolled_ast: 0ab5818e348a1338a7160f50b8cda90d5d0638cd547c8dc3999d16fde04ba141
+    ssa_ast: bc8f315cee52e48ee9288f1a9e81bbc55565d2c6cbee7ac7c79f069b455f6e35
diff --git a/tests/expectations/compiler/statements/operations/bitxor_assign.out b/tests/expectations/compiler/statements/operations/bitxor_assign.out
index 8f531021e1..df44fa268a 100644
--- a/tests/expectations/compiler/statements/operations/bitxor_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitxor_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: ec0a46a08ccaf5d73a2f81e20706f95596248f9cbe845a8aa3fb7f408e1ac7e6
-    unrolled_ast: ec0a46a08ccaf5d73a2f81e20706f95596248f9cbe845a8aa3fb7f408e1ac7e6
-    ssa_ast: 26e11969176c03462e8b376f194be8ac6c567bf5a92719a72e98ec26baa389d3
+    initial_ast: 8f07cf8c9e67b238763d50e5a9c26b3c0d600c1aadac90d198c1e5e962c2bb94
+    unrolled_ast: 8f07cf8c9e67b238763d50e5a9c26b3c0d600c1aadac90d198c1e5e962c2bb94
+    ssa_ast: cfaa99bda6bdac98e82cd3519eb452199ea1b6a6f67edf6b70f0ffb2ebe6100c
diff --git a/tests/expectations/compiler/statements/operations/div_assign.out b/tests/expectations/compiler/statements/operations/div_assign.out
index 04bdf61739..85b7ac0fe2 100644
--- a/tests/expectations/compiler/statements/operations/div_assign.out
+++ b/tests/expectations/compiler/statements/operations/div_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 9b3819117da2440170a3982d0a017896b819e471dcac91b88e19cd743a6bf628
-    unrolled_ast: 9b3819117da2440170a3982d0a017896b819e471dcac91b88e19cd743a6bf628
-    ssa_ast: 4f22150a72b7cf1abc06f4cbc3e61461b2a5a3a10a56a25d50b85b2a118af8a0
+    initial_ast: 6b56284dbe55842d967352a3a9e596265a34585c9facd6e2387ad578fe6e2eae
+    unrolled_ast: 6b56284dbe55842d967352a3a9e596265a34585c9facd6e2387ad578fe6e2eae
+    ssa_ast: 9baaa86be77c6c76192403d01f1dbf8b507425454ed3c1bc2c60e105c8e289a1
diff --git a/tests/expectations/compiler/statements/operations/mul_assign.out b/tests/expectations/compiler/statements/operations/mul_assign.out
index aa81511c4e..19274af608 100644
--- a/tests/expectations/compiler/statements/operations/mul_assign.out
+++ b/tests/expectations/compiler/statements/operations/mul_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 0b92bbdc36db941ec85426cbf468709f20e6d74ed9a4837863cee1c9f4324779
-    unrolled_ast: 0b92bbdc36db941ec85426cbf468709f20e6d74ed9a4837863cee1c9f4324779
-    ssa_ast: 5ce11dbbb4141617896fb0c383504eea2c7b21b2b32ecbea9889479bb071bb84
+    initial_ast: 7212df712e602cfb76c81811ed683cc6126fff6264a96adc2bbc324427f814e7
+    unrolled_ast: 7212df712e602cfb76c81811ed683cc6126fff6264a96adc2bbc324427f814e7
+    ssa_ast: b3b664987054dc4882483087bf65c1407ea4d5dd69b0b39d7b9b9e7425b66f62
diff --git a/tests/expectations/compiler/statements/operations/or_assign.out b/tests/expectations/compiler/statements/operations/or_assign.out
index aead902175..6caf0b1007 100644
--- a/tests/expectations/compiler/statements/operations/or_assign.out
+++ b/tests/expectations/compiler/statements/operations/or_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 525aa0f44f4fbc2aaad5ea45e8f5bdc1767be1156daea5a878de99320c8bdfdd
-    unrolled_ast: 525aa0f44f4fbc2aaad5ea45e8f5bdc1767be1156daea5a878de99320c8bdfdd
-    ssa_ast: 278927dc6dc2971884a667c1cc9feab8e419207596123ea6119a24cfd1c5a5ff
+    initial_ast: 4e1afca483d3c9b0ef6e85e7a609d930bf1ca6de05a0daba670609bb2f58abdf
+    unrolled_ast: 4e1afca483d3c9b0ef6e85e7a609d930bf1ca6de05a0daba670609bb2f58abdf
+    ssa_ast: e286d1134cf673fe7bc3e8896b0f73ca55addafed1ce7bfae3b10fce18faedd4
diff --git a/tests/expectations/compiler/statements/operations/pow_assign.out b/tests/expectations/compiler/statements/operations/pow_assign.out
index 3bc0bb46d3..abb1ba7a3f 100644
--- a/tests/expectations/compiler/statements/operations/pow_assign.out
+++ b/tests/expectations/compiler/statements/operations/pow_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: a28a977d72a58c9c3b64180ceb896646958a35ef49c506e518caf9538d906196
-    unrolled_ast: a28a977d72a58c9c3b64180ceb896646958a35ef49c506e518caf9538d906196
-    ssa_ast: 076a894b0171bea997c577e0abab9cd4f2fd7a59793ee36aa06c2a3126cc2383
+    initial_ast: 2bad7a231d0987590f82757560928a1fc3e48c87df8375c1dfcb74fdbf13c1ea
+    unrolled_ast: 2bad7a231d0987590f82757560928a1fc3e48c87df8375c1dfcb74fdbf13c1ea
+    ssa_ast: cf36ed617dedde2be2cbaf121033f766a517dbb5f0da36701d994364fc0a4b2f
diff --git a/tests/expectations/compiler/statements/operations/rem_assign.out b/tests/expectations/compiler/statements/operations/rem_assign.out
index 33f2ff23c2..0e204195b3 100644
--- a/tests/expectations/compiler/statements/operations/rem_assign.out
+++ b/tests/expectations/compiler/statements/operations/rem_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 7fd71e87478042770edfcd125aa71c0ad0c35d401ebde9a277381cdca8feaf25
-    unrolled_ast: 7fd71e87478042770edfcd125aa71c0ad0c35d401ebde9a277381cdca8feaf25
-    ssa_ast: 80e1052747dccdc933fbb8f06169f7914c3201fbd0425d775534c99e4fe4aac6
+    initial_ast: f134888dec426c46d3900467aed4a379ac251b5e44eb107e35ab84951247f083
+    unrolled_ast: f134888dec426c46d3900467aed4a379ac251b5e44eb107e35ab84951247f083
+    ssa_ast: 85fcf689a5054e036695656fc4f3cf78e7b3d674015a55c158c1adc9a47f2371
diff --git a/tests/expectations/compiler/statements/operations/shl_assign.out b/tests/expectations/compiler/statements/operations/shl_assign.out
index 245c09908a..8e5d23d1ba 100644
--- a/tests/expectations/compiler/statements/operations/shl_assign.out
+++ b/tests/expectations/compiler/statements/operations/shl_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 6c7b09f9e40cad1a5f3b149be9f50dfcb544ee87647ceb5ca690fdb8d958fbf9
-    unrolled_ast: 6c7b09f9e40cad1a5f3b149be9f50dfcb544ee87647ceb5ca690fdb8d958fbf9
-    ssa_ast: b6a767cf57d33a7512ded67d89dd71e1c248463e9707ed73d8fe04edbe8a8983
+    initial_ast: 6223feac8ca724706dbdcce594d269b22de0e552929f47a4bb837f7585c8add1
+    unrolled_ast: 6223feac8ca724706dbdcce594d269b22de0e552929f47a4bb837f7585c8add1
+    ssa_ast: b77554ab4da6372ebc44b0d50c00d44061c34311d95774e2054d7f4b5dc48435
diff --git a/tests/expectations/compiler/statements/operations/shr_assign.out b/tests/expectations/compiler/statements/operations/shr_assign.out
index 10eeea862b..3cc52fd727 100644
--- a/tests/expectations/compiler/statements/operations/shr_assign.out
+++ b/tests/expectations/compiler/statements/operations/shr_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: b4152fa8dfccd01816ece7cb13dfdf4ee5c79ef936f096ff259123d4d71f0304
-    unrolled_ast: b4152fa8dfccd01816ece7cb13dfdf4ee5c79ef936f096ff259123d4d71f0304
-    ssa_ast: f11d784676549268f75335bec2925b669904362a368668025f9837ca22983ce7
+    initial_ast: 3008dc2947cb9ffcb3ca3a9ac8c2e9026b38baa4c68669aaf61be83b1bd793f9
+    unrolled_ast: 3008dc2947cb9ffcb3ca3a9ac8c2e9026b38baa4c68669aaf61be83b1bd793f9
+    ssa_ast: 849739288470fe01c300d16aaddb598d08ad8ded716b0d9660c8de7e4876d5e1
diff --git a/tests/expectations/compiler/statements/operations/sub_assign.out b/tests/expectations/compiler/statements/operations/sub_assign.out
index f9eae59e07..b906c4eb3b 100644
--- a/tests/expectations/compiler/statements/operations/sub_assign.out
+++ b/tests/expectations/compiler/statements/operations/sub_assign.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: a8914e5b913ce5f4c67fd40647d65e4af59c8d68c14cd0edc74c4dce84f1e19c
-    unrolled_ast: a8914e5b913ce5f4c67fd40647d65e4af59c8d68c14cd0edc74c4dce84f1e19c
-    ssa_ast: 842f07df362ce6252a007aec6d5468836f135c46518910a884a38f887e240ae4
+    initial_ast: 874844f775da2d71391b53e00203c9b90744b091420a27a3aa3792cbb7bfc7a9
+    unrolled_ast: 874844f775da2d71391b53e00203c9b90744b091420a27a3aa3792cbb7bfc7a9
+    ssa_ast: 0ba2d2f04e4c941fa604df4f3ed7d716dd0b5628c485b53363975a4c5e5587de
diff --git a/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out b/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
index fc06e7bbed..9bbed7b7fc 100644
--- a/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
+++ b/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: fa02d6008d76acfee2bad7c041abd05c85a2f2a50568d23dd79e3d6e82216572
-    initial_ast: afe727f453a6455267fab84c2ebe89b9350a1fc526a597d6b6c860d63824b8a6
-    unrolled_ast: afe727f453a6455267fab84c2ebe89b9350a1fc526a597d6b6c860d63824b8a6
-    ssa_ast: b3a4d12346654d05f55c44ad5ba04dd309fc65ec3f96eb6748731f8044507bb8
+    initial_ast: 3cb641285b7b979fbe80458371f060e866eac0703a2e999ba0843cfc1d3ed4ee
+    unrolled_ast: 3cb641285b7b979fbe80458371f060e866eac0703a2e999ba0843cfc1d3ed4ee
+    ssa_ast: e407ac14240bb8a43c64a0106ce3f2b52205bde543078f59a36b72f1fa16b88a
diff --git a/tests/expectations/compiler/tuple/function_early_return.out b/tests/expectations/compiler/tuple/function_early_return.out
index 3be68375d3..12b6dfef35 100644
--- a/tests/expectations/compiler/tuple/function_early_return.out
+++ b/tests/expectations/compiler/tuple/function_early_return.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 2a38fc7740cc89715b62627a8f8600456df8de97c4cfd9ddeb98c60e04d71622
-    initial_ast: c664eaf1397ff583b566d946fee487663b5d7b7e53b0edfdb8988ac6494d4b7b
-    unrolled_ast: c664eaf1397ff583b566d946fee487663b5d7b7e53b0edfdb8988ac6494d4b7b
-    ssa_ast: 0189d2e724ab40277b0115dfa29e345bc72a32d2a1517d4ad3f12bd64d6d0b44
+    initial_ast: b2fd7939629b41eee63f16f3197b1605c5520888e28959a28a8a4ef819353c7d
+    unrolled_ast: b2fd7939629b41eee63f16f3197b1605c5520888e28959a28a8a4ef819353c7d
+    ssa_ast: a640db046a0709169d739dbcc6b30a2d6db54547615c9e313291a7dd6daaa997
diff --git a/tests/expectations/compiler/tuple/function_return.out b/tests/expectations/compiler/tuple/function_return.out
index b100bc70f7..3b8741d92b 100644
--- a/tests/expectations/compiler/tuple/function_return.out
+++ b/tests/expectations/compiler/tuple/function_return.out
@@ -4,6 +4,6 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: 252190961c79cf78b20ef54c7c525e52c3c85cd5f65adb022c4eaac1393f6c02
-    initial_ast: e185fb605639725b3a2ee59da1e8991a01112ea3422240f60ad70f9f39764b15
-    unrolled_ast: e185fb605639725b3a2ee59da1e8991a01112ea3422240f60ad70f9f39764b15
-    ssa_ast: 09e17f6ff0e3326abdf71dbb64c8ae69319d40c6c1b9f3e5123100b82425894f
+    initial_ast: b823da8b262b33a2b09db9c5ae45c40af0ab60ff0fb6c8f35cbffc6530a2a915
+    unrolled_ast: b823da8b262b33a2b09db9c5ae45c40af0ab60ff0fb6c8f35cbffc6530a2a915
+    ssa_ast: c75b80ea224bafca2ed0b3ad4a0ea11e98ae566634b17dca114eb9bfe8fbe96c
diff --git a/tests/expectations/compiler/tuple/tuple_not_allowed.out b/tests/expectations/compiler/tuple/tuple_not_allowed.out
index 01a1909214..70d8f34144 100644
--- a/tests/expectations/compiler/tuple/tuple_not_allowed.out
+++ b/tests/expectations/compiler/tuple/tuple_not_allowed.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [ETYC0372025]: Tuples are only allowed as function return types.\n    --> compiler-test:7:14\n     |\n   7 | function foo(a: (u8, u16)) -> (u8, u16) {\n     |              ^\nError [ETYC0372025]: Tuples are only allowed as function return types.\n    --> compiler-test:11:1\n     |\n  11 | function bar() -> (u8, (u16, u32)) {\n  12 |     return (1u8, (2u16, 3u32));\n  13 | }\n     | ^\nError [ETYC0372007]: Expected one type from `i8, i16, i32, i64, i128, u8, u16, u32, u64, u128`, but got `(u8,u16)`\n    --> compiler-test:16:9\n     |\n  16 |     for i: (u8, u16) in 0u8..2u8 {}\n     |         ^\nError [ETYC0372003]: Expected type `(u8,u16)` but type `u8` was found\n    --> compiler-test:16:25\n     |\n  16 |     for i: (u8, u16) in 0u8..2u8 {}\n     |                         ^^^\nError [ETYC0372003]: Expected type `(u8,u16)` but type `u8` was found\n    --> compiler-test:16:30\n     |\n  16 |     for i: (u8, u16) in 0u8..2u8 {}\n     |                              ^^^\nError [ETYC0372025]: Tuples are only allowed as function return types.\n    --> compiler-test:21:5\n     |\n  21 |     mem: (u8, u16)\n     |     ^^^\n"
+  - "Error [ETYC0372025]: Tuples are only allowed as function return types.\n    --> compiler-test:21:5\n     |\n  21 |     mem: (u8, u16)\n     |     ^^^\nError [ETYC0372025]: Tuples are only allowed as function return types.\n    --> compiler-test:7:14\n     |\n   7 | function foo(a: (u8, u16)) -> (u8, u16) {\n     |              ^\nError [ETYC0372025]: Tuples are only allowed as function return types.\n    --> compiler-test:11:1\n     |\n  11 | function bar() -> (u8, (u16, u32)) {\n  12 |     return (1u8, (2u16, 3u32));\n  13 | }\n     | ^\nError [ETYC0372007]: Expected one type from `i8, i16, i32, i64, i128, u8, u16, u32, u64, u128`, but got `(u8,u16)`\n    --> compiler-test:16:9\n     |\n  16 |     for i: (u8, u16) in 0u8..2u8 {}\n     |         ^\nError [ETYC0372003]: Expected type `(u8,u16)` but type `u8` was found\n    --> compiler-test:16:25\n     |\n  16 |     for i: (u8, u16) in 0u8..2u8 {}\n     |                         ^^^\nError [ETYC0372003]: Expected type `(u8,u16)` but type `u8` was found\n    --> compiler-test:16:30\n     |\n  16 |     for i: (u8, u16) in 0u8..2u8 {}\n     |                              ^^^\n"