diff --git a/compiler/ast/src/common/identifier.rs b/compiler/ast/src/common/identifier.rs
index 46e3f1ab1e..59ec2482e4 100644
--- a/compiler/ast/src/common/identifier.rs
+++ b/compiler/ast/src/common/identifier.rs
@@ -52,9 +52,9 @@ pub struct Identifier {
 simple_node_impl!(Identifier);
 
 impl Identifier {
-    /// Constructs a new identifier with `name` and a default span.
-    pub fn new(name: Symbol) -> Self {
-        Self { name, span: Span::default(), id: NodeID::default() }
+    /// Constructs a new identifier with `name` and `id` and a default span.
+    pub fn new(name: Symbol, id: NodeID) -> Self {
+        Self { name, span: Span::default(), id }
     }
 
     /// Check if the Identifier name matches the other name.
@@ -100,6 +100,7 @@ impl Serialize for Identifier {
         let mut key: BTreeMap<String, String> = BTreeMap::new();
         key.insert("name".to_string(), self.name.to_string());
         key.insert("span".to_string(), to_json_string(&self.span)?);
+        key.insert("id".to_string(), to_json_string(&self.id)?);
 
         // Convert the serialized object into a string for use as a key.
         serializer.serialize_str(&to_json_string(&key)?)
diff --git a/compiler/ast/src/common/mod.rs b/compiler/ast/src/common/mod.rs
index 0154871dc0..d9ac1352f7 100644
--- a/compiler/ast/src/common/mod.rs
+++ b/compiler/ast/src/common/mod.rs
@@ -24,6 +24,10 @@ pub mod positive_number;
 pub use positive_number::*;
 
 pub mod node;
+
+pub mod node_builder;
+pub use node_builder::*;
+
 pub mod static_string;
 
 pub use static_string::*;
diff --git a/compiler/ast/src/common/node.rs b/compiler/ast/src/common/node.rs
index e68d0abab4..a0a5080cc9 100644
--- a/compiler/ast/src/common/node.rs
+++ b/compiler/ast/src/common/node.rs
@@ -19,7 +19,6 @@ use leo_span::Span;
 /// A node ID.
 // Development Note:
 // A `NodeID` must implement: `Copy`, `Default`, among others.
-// TODO (@d0cd): Replace use of `NodeID::default()` with unique IDs in the rest of the codebase.
 pub type NodeID = usize;
 
 /// A node in the AST.
diff --git a/compiler/ast/src/common/node_builder.rs b/compiler/ast/src/common/node_builder.rs
new file mode 100644
index 0000000000..b1eab436eb
--- /dev/null
+++ b/compiler/ast/src/common/node_builder.rs
@@ -0,0 +1,67 @@
+// Copyright (C) 2019-2023 Aleo Systems Inc.
+// This file is part of the Leo library.
+
+// The Leo library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// The Leo library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
+
+use crate::NodeID;
+
+use std::cell::RefCell;
+
+/// A counter that produces sequentially increasing `NodeID`s.
+#[derive(Debug, Clone)]
+pub struct NodeBuilder {
+    /// The inner counter.
+    /// `RefCell` is used here to avoid `&mut` all over the compiler.
+    inner: RefCell<NodeBuilderInner>,
+}
+
+impl NodeBuilder {
+    /// Returns a new `NodeCounter` with the given `NodeID` as the starting value.
+    pub fn new(next: NodeID) -> Self {
+        Self { inner: RefCell::new(NodeBuilderInner::new(next)) }
+    }
+
+    /// Returns the next `NodeID` and increments the internal state.
+    pub fn next_id(&self) -> NodeID {
+        self.inner.borrow_mut().next_id()
+    }
+}
+
+impl Default for NodeBuilder {
+    fn default() -> Self {
+        Self::new(0)
+    }
+}
+
+/// Contains the actual data for `Handler`.
+/// Modeled this way to afford an API using interior mutability.
+#[derive(Debug, Clone)]
+pub struct NodeBuilderInner {
+    /// The next `NodeID`.
+    next: NodeID,
+}
+
+impl NodeBuilderInner {
+    /// Returns a new `NodeCounter` with the given `NodeID` as the starting value.
+    pub fn new(next: NodeID) -> Self {
+        Self { next }
+    }
+
+    /// Returns the next `NodeID` and increments the internal state.
+    pub fn next_id(&mut self) -> NodeID {
+        let next = self.next;
+        self.next += 1;
+        next
+    }
+}
diff --git a/compiler/ast/src/functions/finalize.rs b/compiler/ast/src/functions/finalize.rs
index 58fc5ae822..b64a953cff 100644
--- a/compiler/ast/src/functions/finalize.rs
+++ b/compiler/ast/src/functions/finalize.rs
@@ -42,14 +42,21 @@ pub struct Finalize {
 
 impl Finalize {
     /// Create a new finalize block.
-    pub fn new(identifier: Identifier, input: Vec<Input>, output: Vec<Output>, block: Block, span: Span) -> Self {
+    pub fn new(
+        identifier: Identifier,
+        input: Vec<Input>,
+        output: Vec<Output>,
+        block: Block,
+        span: Span,
+        id: NodeID,
+    ) -> Self {
         let output_type = match output.len() {
             0 => Type::Unit,
             1 => output[0].type_(),
             _ => Type::Tuple(Tuple(output.iter().map(|output| output.type_()).collect())),
         };
 
-        Self { identifier, input, output, output_type, block, span, id: NodeID::default() }
+        Self { identifier, input, output, output_type, block, span, id }
     }
 }
 
diff --git a/compiler/ast/src/functions/mod.rs b/compiler/ast/src/functions/mod.rs
index 25eaa062b6..33438d856d 100644
--- a/compiler/ast/src/functions/mod.rs
+++ b/compiler/ast/src/functions/mod.rs
@@ -89,6 +89,7 @@ impl Function {
         block: Block,
         finalize: Option<Finalize>,
         span: Span,
+        id: NodeID,
     ) -> Self {
         // Determine the output type of the function
         let get_output_type = |output: &Output| match &output {
@@ -102,18 +103,7 @@ impl Function {
             _ => Type::Tuple(Tuple(output.iter().map(|output| get_output_type(output)).collect())),
         };
 
-        Function {
-            annotations,
-            variant,
-            identifier,
-            input,
-            output,
-            output_type,
-            block,
-            finalize,
-            span,
-            id: NodeID::default(),
-        }
+        Function { annotations, variant, identifier, input, output, output_type, block, finalize, span, id }
     }
 
     /// Returns function name.
diff --git a/compiler/ast/src/statement/mod.rs b/compiler/ast/src/statement/mod.rs
index a982a11d41..7dae07ef71 100644
--- a/compiler/ast/src/statement/mod.rs
+++ b/compiler/ast/src/statement/mod.rs
@@ -73,8 +73,8 @@ pub enum Statement {
 
 impl Statement {
     /// Returns a dummy statement made from an empty block `{}`.
-    pub fn dummy(span: Span) -> Self {
-        Self::Block(Block { statements: Vec::new(), span, id: NodeID::default() })
+    pub fn dummy(span: Span, id: NodeID) -> Self {
+        Self::Block(Block { statements: Vec::new(), span, id })
     }
 }
 
diff --git a/compiler/ast/src/value/mod.rs b/compiler/ast/src/value/mod.rs
index 60bc565e26..7f9db8ddb5 100644
--- a/compiler/ast/src/value/mod.rs
+++ b/compiler/ast/src/value/mod.rs
@@ -893,28 +893,29 @@ impl TryFrom<&Literal> for Value {
     }
 }
 
-impl From<Value> for Literal {
-    fn from(v: Value) -> Self {
+impl Literal {
+    #[allow(unused)]
+    fn from_value(v: Value, id: NodeID) -> Self {
         use Value::*;
         match v {
             Input(_, _) => todo!("We need to test if this is hittable"),
-            Address(v, span) => Literal::Address(v, span, NodeID::default()),
-            Boolean(v, span) => Literal::Boolean(v, span, NodeID::default()),
+            Address(v, span) => Literal::Address(v, span, id),
+            Boolean(v, span) => Literal::Boolean(v, span, id),
             Struct(_ident, _values) => todo!("We need to test if this is hittable"),
-            Field(v, span) => Literal::Field(v, span, NodeID::default()),
+            Field(v, span) => Literal::Field(v, span, id),
             Group(v) => Literal::Group(v),
-            I8(v, span) => Literal::Integer(IntegerType::I8, v.to_string(), span, NodeID::default()),
-            I16(v, span) => Literal::Integer(IntegerType::I16, v.to_string(), span, NodeID::default()),
-            I32(v, span) => Literal::Integer(IntegerType::I32, v.to_string(), span, NodeID::default()),
-            I64(v, span) => Literal::Integer(IntegerType::I64, v.to_string(), span, NodeID::default()),
-            I128(v, span) => Literal::Integer(IntegerType::I128, v.to_string(), span, NodeID::default()),
-            U8(v, span) => Literal::Integer(IntegerType::U8, v.to_string(), span, NodeID::default()),
-            U16(v, span) => Literal::Integer(IntegerType::U16, v.to_string(), span, NodeID::default()),
-            U32(v, span) => Literal::Integer(IntegerType::U32, v.to_string(), span, NodeID::default()),
-            U64(v, span) => Literal::Integer(IntegerType::U64, v.to_string(), span, NodeID::default()),
-            U128(v, span) => Literal::Integer(IntegerType::U128, v.to_string(), span, NodeID::default()),
-            Scalar(v, span) => Literal::Scalar(v, span, NodeID::default()),
-            String(v, span) => Literal::String(v, span, NodeID::default()),
+            I8(v, span) => Literal::Integer(IntegerType::I8, v.to_string(), span, id),
+            I16(v, span) => Literal::Integer(IntegerType::I16, v.to_string(), span, id),
+            I32(v, span) => Literal::Integer(IntegerType::I32, v.to_string(), span, id),
+            I64(v, span) => Literal::Integer(IntegerType::I64, v.to_string(), span, id),
+            I128(v, span) => Literal::Integer(IntegerType::I128, v.to_string(), span, id),
+            U8(v, span) => Literal::Integer(IntegerType::U8, v.to_string(), span, id),
+            U16(v, span) => Literal::Integer(IntegerType::U16, v.to_string(), span, id),
+            U32(v, span) => Literal::Integer(IntegerType::U32, v.to_string(), span, id),
+            U64(v, span) => Literal::Integer(IntegerType::U64, v.to_string(), span, id),
+            U128(v, span) => Literal::Integer(IntegerType::U128, v.to_string(), span, id),
+            Scalar(v, span) => Literal::Scalar(v, span, id),
+            String(v, span) => Literal::String(v, span, id),
         }
     }
 }
diff --git a/compiler/compiler/src/compiler.rs b/compiler/compiler/src/compiler.rs
index 41587d1244..5ff76091a2 100644
--- a/compiler/compiler/src/compiler.rs
+++ b/compiler/compiler/src/compiler.rs
@@ -17,8 +17,8 @@
 //! The compiler for Leo programs.
 //!
 //! The [`Compiler`] type compiles Leo programs into R1CS circuits.
-use leo_ast::Program;
 pub use leo_ast::{Ast, InputAst};
+use leo_ast::{NodeBuilder, Program};
 use leo_errors::{emitter::Handler, CompilerError, Result};
 pub use leo_passes::SymbolTable;
 use leo_passes::*;
@@ -48,6 +48,10 @@ pub struct Compiler<'a> {
     pub input_ast: Option<InputAst>,
     /// Options configuring compilation.
     compiler_options: CompilerOptions,
+    /// The `NodeCounter` used to generate sequentially increasing `NodeID`s.
+    node_builder: NodeBuilder,
+    /// The `Assigner` is used to construct (unique) assignment statements.
+    assigner: Assigner,
 }
 
 impl<'a> Compiler<'a> {
@@ -60,6 +64,8 @@ impl<'a> Compiler<'a> {
         output_directory: PathBuf,
         compiler_options: Option<CompilerOptions>,
     ) -> Self {
+        let node_builder = NodeBuilder::default();
+        let assigner = Assigner::default();
         Self {
             handler,
             main_file_path,
@@ -69,6 +75,8 @@ impl<'a> Compiler<'a> {
             ast: Ast::new(Program::default()),
             input_ast: None,
             compiler_options: compiler_options.unwrap_or_default(),
+            node_builder,
+            assigner,
         }
     }
 
@@ -92,7 +100,7 @@ impl<'a> Compiler<'a> {
         let prg_sf = with_session_globals(|s| s.source_map.new_source(program_string, name));
 
         // Use the parser to construct the abstract syntax tree (ast).
-        self.ast = leo_parser::parse_ast(self.handler, &prg_sf.src, prg_sf.start_pos)?;
+        self.ast = leo_parser::parse_ast(self.handler, &self.node_builder, &prg_sf.src, prg_sf.start_pos)?;
 
         // If the program is imported, then check that the name of its program scope matches the file name.
         // Note that parsing enforces that there is exactly one program scope in a file.
@@ -132,7 +140,8 @@ impl<'a> Compiler<'a> {
                 .map_err(|e| CompilerError::file_read_error(&input_file_path, e))?;
 
             // Parse and serialize it.
-            let input_ast = leo_parser::parse_input(self.handler, &input_sf.src, input_sf.start_pos)?;
+            let input_ast =
+                leo_parser::parse_input(self.handler, &self.node_builder, &input_sf.src, input_sf.start_pos)?;
             if self.compiler_options.output.initial_ast {
                 // Write the input AST snapshot post parsing.
                 if self.compiler_options.output.spans_enabled {
@@ -166,7 +175,8 @@ impl<'a> Compiler<'a> {
 
     /// Runs the loop unrolling pass.
     pub fn loop_unrolling_pass(&mut self, symbol_table: SymbolTable) -> Result<SymbolTable> {
-        let (ast, symbol_table) = Unroller::do_pass((std::mem::take(&mut self.ast), self.handler, symbol_table))?;
+        let (ast, symbol_table) =
+            Unroller::do_pass((std::mem::take(&mut self.ast), self.handler, &self.node_builder, symbol_table))?;
         self.ast = ast;
 
         if self.compiler_options.output.unrolled_ast {
@@ -177,45 +187,50 @@ impl<'a> Compiler<'a> {
     }
 
     /// Runs the static single assignment pass.
-    pub fn static_single_assignment_pass(&mut self, symbol_table: &SymbolTable) -> Result<Assigner> {
-        let (ast, assigner) = StaticSingleAssigner::do_pass((std::mem::take(&mut self.ast), symbol_table))?;
-        self.ast = ast;
+    pub fn static_single_assignment_pass(&mut self, symbol_table: &SymbolTable) -> Result<()> {
+        self.ast = StaticSingleAssigner::do_pass((
+            std::mem::take(&mut self.ast),
+            &self.node_builder,
+            &self.assigner,
+            symbol_table,
+        ))?;
 
         if self.compiler_options.output.ssa_ast {
             self.write_ast_to_json("ssa_ast.json")?;
         }
 
-        Ok(assigner)
+        Ok(())
     }
 
     /// Runs the flattening pass.
-    pub fn flattening_pass(&mut self, symbol_table: &SymbolTable, assigner: Assigner) -> Result<Assigner> {
-        let (ast, assigner) = Flattener::do_pass((std::mem::take(&mut self.ast), symbol_table, assigner))?;
-        self.ast = ast;
+    pub fn flattening_pass(&mut self, symbol_table: &SymbolTable) -> Result<()> {
+        self.ast =
+            Flattener::do_pass((std::mem::take(&mut self.ast), symbol_table, &self.node_builder, &self.assigner))?;
 
         if self.compiler_options.output.flattened_ast {
             self.write_ast_to_json("flattened_ast.json")?;
         }
 
-        Ok(assigner)
+        Ok(())
     }
 
     /// Runs the function inlining pass.
-    pub fn function_inlining_pass(&mut self, call_graph: &CallGraph, assigner: Assigner) -> Result<Assigner> {
-        let (ast, assigner) = FunctionInliner::do_pass((std::mem::take(&mut self.ast), call_graph, assigner))?;
+    pub fn function_inlining_pass(&mut self, call_graph: &CallGraph) -> Result<()> {
+        let ast =
+            FunctionInliner::do_pass((std::mem::take(&mut self.ast), &self.node_builder, call_graph, &self.assigner))?;
         self.ast = ast;
 
         if self.compiler_options.output.inlined_ast {
             self.write_ast_to_json("inlined_ast.json")?;
         }
 
-        Ok(assigner)
+        Ok(())
     }
 
     /// Runs the dead code elimination pass.
     pub fn dead_code_elimination_pass(&mut self) -> Result<()> {
         if self.compiler_options.build.dce_enabled {
-            self.ast = DeadCodeEliminator::do_pass(std::mem::take(&mut self.ast))?;
+            self.ast = DeadCodeEliminator::do_pass((std::mem::take(&mut self.ast), &self.node_builder))?;
         }
 
         if self.compiler_options.output.dce_ast {
@@ -243,12 +258,11 @@ impl<'a> Compiler<'a> {
         // TODO: Make this pass optional.
         let st = self.loop_unrolling_pass(st)?;
 
-        // TODO: Make this pass optional.
-        let assigner = self.static_single_assignment_pass(&st)?;
+        self.static_single_assignment_pass(&st)?;
 
-        let assigner = self.flattening_pass(&st, assigner)?;
+        self.flattening_pass(&st)?;
 
-        let _ = self.function_inlining_pass(&call_graph, assigner)?;
+        self.function_inlining_pass(&call_graph)?;
 
         self.dead_code_elimination_pass()?;
 
diff --git a/compiler/compiler/tests/utilities/check_unique_node_ids.rs b/compiler/compiler/tests/utilities/check_unique_node_ids.rs
new file mode 100644
index 0000000000..0debeb7554
--- /dev/null
+++ b/compiler/compiler/tests/utilities/check_unique_node_ids.rs
@@ -0,0 +1,352 @@
+// Copyright (C) 2019-2023 Aleo Systems Inc.
+// This file is part of the Leo library.
+
+// The Leo library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// The Leo library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
+
+use leo_ast::*;
+
+use std::{collections::HashSet, marker::PhantomData};
+
+/// A utility that checks that each node in the AST has a unique `NodeID`.
+pub struct CheckUniqueNodeIds<'a> {
+    /// The set of `NodeID`s that have been seen.
+    seen: HashSet<NodeID>,
+    _phantom: PhantomData<&'a ()>,
+}
+
+impl<'a> CheckUniqueNodeIds<'a> {
+    /// Creates a new `CheckUniqueNodeId`.
+    pub fn new() -> Self {
+        Self { seen: HashSet::new(), _phantom: PhantomData }
+    }
+
+    /// Checks that the given `NodeID` has not been seen before.
+    pub fn check(&mut self, id: NodeID) {
+        if !self.seen.insert(id) {
+            panic!("Duplicate NodeID found in the AST: {}", id);
+        }
+    }
+
+    /// Checks that the given `Type` has a unique `NodeID`.
+    pub fn check_ty(&mut self, ty: &'a Type) {
+        match ty {
+            Type::Identifier(identifier) => self.visit_identifier(identifier, &Default::default()),
+            Type::Mapping(mapping) => {
+                self.check_ty(&mapping.key);
+                self.check_ty(&mapping.value);
+            }
+            Type::Tuple(tuple) => {
+                for ty in &tuple.0 {
+                    self.check_ty(ty);
+                }
+            }
+            _ => {}
+        }
+    }
+}
+
+impl<'a> ExpressionVisitor<'a> for CheckUniqueNodeIds<'a> {
+    type AdditionalInput = ();
+    type Output = ();
+
+    fn visit_access(&mut self, input: &'a AccessExpression, _: &Self::AdditionalInput) -> Self::Output {
+        match input {
+            AccessExpression::AssociatedConstant(AssociatedConstant { ty, name, id, .. }) => {
+                self.check_ty(ty);
+                self.visit_identifier(name, &Default::default());
+                self.check(*id);
+            }
+            AccessExpression::AssociatedFunction(AssociatedFunction { ty, name, arguments, id, .. }) => {
+                self.check_ty(ty);
+                self.visit_identifier(name, &Default::default());
+                for argument in arguments {
+                    self.visit_expression(argument, &Default::default());
+                }
+                self.check(*id);
+            }
+            AccessExpression::Member(MemberAccess { inner, name, id, .. }) => {
+                self.visit_expression(inner, &Default::default());
+                self.visit_identifier(name, &Default::default());
+                self.check(*id);
+            }
+            AccessExpression::Tuple(TupleAccess { tuple, id, .. }) => {
+                self.visit_expression(tuple, &Default::default());
+                self.check(*id);
+            }
+        }
+    }
+
+    fn visit_binary(&mut self, input: &'a BinaryExpression, _: &Self::AdditionalInput) -> Self::Output {
+        let BinaryExpression { left, right, id, .. } = input;
+        self.visit_expression(left, &Default::default());
+        self.visit_expression(right, &Default::default());
+        self.check(*id);
+    }
+
+    fn visit_call(&mut self, input: &'a CallExpression, _: &Self::AdditionalInput) -> Self::Output {
+        let CallExpression { function, arguments, external, id, .. } = input;
+        self.visit_expression(function, &Default::default());
+        for argument in arguments {
+            self.visit_expression(argument, &Default::default());
+        }
+        if let Some(external) = external {
+            self.visit_expression(external, &Default::default());
+        }
+        self.check(*id);
+    }
+
+    fn visit_cast(&mut self, input: &'a CastExpression, _: &Self::AdditionalInput) -> Self::Output {
+        let CastExpression { expression, type_, id, .. } = input;
+        self.visit_expression(expression, &Default::default());
+        self.check_ty(type_);
+        self.check(*id);
+    }
+
+    fn visit_struct_init(&mut self, input: &'a StructExpression, _: &Self::AdditionalInput) -> Self::Output {
+        let StructExpression { name, members, id, .. } = input;
+        self.visit_identifier(name, &Default::default());
+        for StructVariableInitializer { identifier, expression, id, .. } in members {
+            self.visit_identifier(identifier, &Default::default());
+            if let Some(expression) = expression {
+                self.visit_expression(expression, &Default::default());
+            }
+            self.check(*id);
+        }
+        self.check(*id);
+    }
+
+    fn visit_err(&mut self, input: &'a ErrExpression, _: &Self::AdditionalInput) -> Self::Output {
+        self.check(input.id);
+    }
+
+    fn visit_identifier(&mut self, input: &'a Identifier, _: &Self::AdditionalInput) -> Self::Output {
+        self.check(input.id)
+    }
+
+    fn visit_literal(&mut self, input: &'a Literal, _: &Self::AdditionalInput) -> Self::Output {
+        self.check(input.id())
+    }
+
+    fn visit_ternary(&mut self, input: &'a TernaryExpression, _: &Self::AdditionalInput) -> Self::Output {
+        let TernaryExpression { condition, if_true, if_false, id, .. } = input;
+        self.visit_expression(condition, &Default::default());
+        self.visit_expression(if_true, &Default::default());
+        self.visit_expression(if_false, &Default::default());
+        self.check(*id);
+    }
+
+    fn visit_tuple(&mut self, input: &'a TupleExpression, _: &Self::AdditionalInput) -> Self::Output {
+        let TupleExpression { elements, id, .. } = input;
+        for element in elements {
+            self.visit_expression(element, &Default::default());
+        }
+        self.check(*id);
+    }
+
+    fn visit_unary(&mut self, input: &'a UnaryExpression, _: &Self::AdditionalInput) -> Self::Output {
+        let UnaryExpression { receiver, id, .. } = input;
+        self.visit_expression(receiver, &Default::default());
+        self.check(*id);
+    }
+
+    fn visit_unit(&mut self, input: &'a UnitExpression, _: &Self::AdditionalInput) -> Self::Output {
+        self.check(input.id)
+    }
+}
+
+impl<'a> StatementVisitor<'a> for CheckUniqueNodeIds<'a> {
+    fn visit_assert(&mut self, input: &'a AssertStatement) {
+        match &input.variant {
+            AssertVariant::Assert(expr) => self.visit_expression(expr, &Default::default()),
+            AssertVariant::AssertEq(left, right) | AssertVariant::AssertNeq(left, right) => {
+                self.visit_expression(left, &Default::default());
+                self.visit_expression(right, &Default::default())
+            }
+        };
+        self.check(input.id)
+    }
+
+    fn visit_assign(&mut self, input: &'a AssignStatement) {
+        self.visit_expression(&input.place, &Default::default());
+        self.visit_expression(&input.value, &Default::default());
+        self.check(input.id)
+    }
+
+    fn visit_block(&mut self, input: &'a Block) {
+        input.statements.iter().for_each(|stmt| self.visit_statement(stmt));
+        self.check(input.id)
+    }
+
+    fn visit_conditional(&mut self, input: &'a ConditionalStatement) {
+        self.visit_expression(&input.condition, &Default::default());
+        self.visit_block(&input.then);
+        if let Some(stmt) = input.otherwise.as_ref() {
+            self.visit_statement(stmt);
+        }
+        self.check(input.id)
+    }
+
+    fn visit_console(&mut self, input: &'a ConsoleStatement) {
+        match &input.function {
+            ConsoleFunction::Assert(expr) => {
+                self.visit_expression(expr, &Default::default());
+            }
+            ConsoleFunction::AssertEq(left, right) => {
+                self.visit_expression(left, &Default::default());
+                self.visit_expression(right, &Default::default());
+            }
+            ConsoleFunction::AssertNeq(left, right) => {
+                self.visit_expression(left, &Default::default());
+                self.visit_expression(right, &Default::default());
+            }
+        };
+        self.check(input.id)
+    }
+
+    fn visit_definition(&mut self, input: &'a DefinitionStatement) {
+        self.visit_expression(&input.place, &Default::default());
+        self.check_ty(&input.type_);
+        self.visit_expression(&input.value, &Default::default());
+        self.check(input.id)
+    }
+
+    fn visit_expression_statement(&mut self, input: &'a ExpressionStatement) {
+        self.visit_expression(&input.expression, &Default::default());
+        self.check(input.id)
+    }
+
+    fn visit_iteration(&mut self, input: &'a IterationStatement) {
+        self.visit_identifier(&input.variable, &Default::default());
+        self.check_ty(&input.type_);
+        self.visit_expression(&input.start, &Default::default());
+        self.visit_expression(&input.stop, &Default::default());
+        self.visit_block(&input.block);
+        self.check(input.id)
+    }
+
+    fn visit_return(&mut self, input: &'a ReturnStatement) {
+        self.visit_expression(&input.expression, &Default::default());
+        if let Some(arguments) = &input.finalize_arguments {
+            arguments.iter().for_each(|argument| {
+                self.visit_expression(argument, &Default::default());
+            })
+        }
+        self.check(input.id)
+    }
+}
+
+impl<'a> ProgramVisitor<'a> for CheckUniqueNodeIds<'a> {
+    fn visit_struct(&mut self, input: &'a Struct) {
+        let Struct { identifier, members, id, .. } = input;
+        self.visit_identifier(identifier, &Default::default());
+        for Member { identifier, type_, id, .. } in members {
+            self.visit_identifier(identifier, &Default::default());
+            self.check_ty(type_);
+            self.check(*id);
+        }
+        self.check(*id);
+    }
+
+    fn visit_mapping(&mut self, input: &'a Mapping) {
+        let Mapping { identifier, key_type, value_type, id, .. } = input;
+        self.visit_identifier(identifier, &Default::default());
+        self.check_ty(key_type);
+        self.check_ty(value_type);
+        self.check(*id);
+    }
+
+    fn visit_function(&mut self, input: &'a Function) {
+        let Function { annotations, identifier, input, output, block, finalize, id, .. } = input;
+        // Check the annotations.
+        for Annotation { identifier, id, .. } in annotations {
+            self.visit_identifier(identifier, &Default::default());
+            self.check(*id);
+        }
+        // Check the function name.
+        self.visit_identifier(identifier, &Default::default());
+        // Check the inputs.
+        for in_ in input {
+            match in_ {
+                Input::Internal(FunctionInput { identifier, type_, id, .. }) => {
+                    self.visit_identifier(identifier, &Default::default());
+                    self.check_ty(type_);
+                    self.check(*id);
+                }
+                Input::External(External { identifier, program_name, record, id, .. }) => {
+                    self.visit_identifier(identifier, &Default::default());
+                    self.visit_identifier(program_name, &Default::default());
+                    self.visit_identifier(record, &Default::default());
+                    self.check(*id);
+                }
+            }
+        }
+        // Check the outputs.
+        for out in output {
+            match out {
+                Output::Internal(FunctionOutput { type_, id, .. }) => {
+                    self.check_ty(type_);
+                    self.check(*id);
+                }
+                Output::External(External { identifier, program_name, record, id, .. }) => {
+                    self.visit_identifier(identifier, &Default::default());
+                    self.visit_identifier(program_name, &Default::default());
+                    self.visit_identifier(record, &Default::default());
+                    self.check(*id);
+                }
+            }
+        }
+        // Check the function body.
+        self.visit_block(block);
+        // Check the finalize block.
+        if let Some(Finalize { identifier, input, output, block, id, .. }) = finalize {
+            // Check the finalize name.
+            self.visit_identifier(identifier, &Default::default());
+            // Check the inputs.
+            for in_ in input {
+                match in_ {
+                    Input::Internal(FunctionInput { identifier, type_, id, .. }) => {
+                        self.visit_identifier(identifier, &Default::default());
+                        self.check_ty(type_);
+                        self.check(*id);
+                    }
+                    Input::External(External { identifier, program_name, record, id, .. }) => {
+                        self.visit_identifier(identifier, &Default::default());
+                        self.visit_identifier(program_name, &Default::default());
+                        self.visit_identifier(record, &Default::default());
+                        self.check(*id);
+                    }
+                }
+            }
+            // Check the outputs.
+            for out in output {
+                match out {
+                    Output::Internal(FunctionOutput { type_, id, .. }) => {
+                        self.check_ty(type_);
+                        self.check(*id);
+                    }
+                    Output::External(External { identifier, program_name, record, id, .. }) => {
+                        self.visit_identifier(identifier, &Default::default());
+                        self.visit_identifier(program_name, &Default::default());
+                        self.visit_identifier(record, &Default::default());
+                        self.check(*id);
+                    }
+                }
+            }
+            // Check the function body.
+            self.visit_block(block);
+            self.check(*id);
+        }
+        self.check(*id);
+    }
+}
diff --git a/compiler/compiler/tests/utilities/mod.rs b/compiler/compiler/tests/utilities/mod.rs
index 990033a20d..1a6fba1d77 100644
--- a/compiler/compiler/tests/utilities/mod.rs
+++ b/compiler/compiler/tests/utilities/mod.rs
@@ -14,6 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
+mod check_unique_node_ids;
+use check_unique_node_ids::*;
+
 use leo_compiler::{BuildOptions, Compiler, CompilerOptions};
 use leo_errors::{
     emitter::{Buffer, Emitter, Handler},
@@ -27,6 +30,7 @@ use leo_test_framework::{test::TestConfig, Test};
 
 use snarkvm::prelude::*;
 
+use leo_ast::ProgramVisitor;
 use snarkvm::{file::Manifest, package::Package};
 use std::{
     cell::RefCell,
@@ -144,6 +148,8 @@ pub fn parse_program<'a>(
     let name = cwd.map_or_else(|| FileName::Custom("compiler-test".into()), FileName::Real);
     compiler.parse_program_from_string(program_string, name)?;
 
+    CheckUniqueNodeIds::new().visit_program(&compiler.ast.ast);
+
     Ok(compiler)
 }
 
@@ -211,15 +217,19 @@ pub fn temp_dir() -> PathBuf {
 pub fn compile_and_process<'a>(parsed: &'a mut Compiler<'a>) -> Result<String, LeoError> {
     let st = parsed.symbol_table_pass()?;
 
+    CheckUniqueNodeIds::new().visit_program(&parsed.ast.ast);
+
     let (st, struct_graph, call_graph) = parsed.type_checker_pass(st)?;
 
+    CheckUniqueNodeIds::new().visit_program(&parsed.ast.ast);
+
     let st = parsed.loop_unrolling_pass(st)?;
 
-    let assigner = parsed.static_single_assignment_pass(&st)?;
+    parsed.static_single_assignment_pass(&st)?;
 
-    let assigner = parsed.flattening_pass(&st, assigner)?;
+    parsed.flattening_pass(&st)?;
 
-    let _ = parsed.function_inlining_pass(&call_graph, assigner)?;
+    parsed.function_inlining_pass(&call_graph)?;
 
     parsed.dead_code_elimination_pass()?;
 
diff --git a/compiler/parser/examples/input_parser.rs b/compiler/parser/examples/input_parser.rs
index 9570e991ad..70c76403d9 100644
--- a/compiler/parser/examples/input_parser.rs
+++ b/compiler/parser/examples/input_parser.rs
@@ -16,6 +16,7 @@
 
 #![forbid(unsafe_code)]
 
+use leo_ast::NodeBuilder;
 use leo_errors::{emitter::Handler, Result};
 use leo_span::symbol::create_session_if_not_set_then;
 
@@ -45,7 +46,9 @@ fn main() -> Result<(), String> {
         let input_string = s.source_map.load_file(&opt.input_path).expect("failed to open an input file");
 
         Handler::with(|handler| {
-            let input = leo_parser::parse_program_inputs(handler, &input_string.src, input_string.start_pos)?;
+            let node_builder = NodeBuilder::default();
+            let input =
+                leo_parser::parse_program_inputs(handler, &node_builder, &input_string.src, input_string.start_pos)?;
             input.to_json_string()
         })
         .map_err(|e| e.to_string())
diff --git a/compiler/parser/examples/parser.rs b/compiler/parser/examples/parser.rs
index 8b608b7a5e..d309a5216e 100644
--- a/compiler/parser/examples/parser.rs
+++ b/compiler/parser/examples/parser.rs
@@ -16,7 +16,7 @@
 
 #![forbid(unsafe_code)]
 
-use leo_ast::Ast;
+use leo_ast::{Ast, NodeBuilder};
 use leo_errors::emitter::Handler;
 use leo_span::symbol::create_session_if_not_set_then;
 
@@ -47,7 +47,8 @@ fn main() -> Result<(), String> {
         let code = s.source_map.load_file(&opt.input_path).expect("failed to open file");
 
         Handler::with(|h| {
-            let ast = leo_parser::parse_ast(h, &code.src, code.start_pos)?;
+            let node_builder = NodeBuilder::default();
+            let ast = leo_parser::parse_ast(h, &node_builder, &code.src, code.start_pos)?;
             let json = Ast::to_json_string(&ast)?;
             println!("{json}");
             Ok(json)
diff --git a/compiler/parser/src/lib.rs b/compiler/parser/src/lib.rs
index fb14cbc0ba..f04fe69ddf 100644
--- a/compiler/parser/src/lib.rs
+++ b/compiler/parser/src/lib.rs
@@ -31,20 +31,26 @@ pub(crate) use tokenizer::*;
 pub mod parser;
 pub use parser::*;
 
-use leo_ast::{input::InputData, Ast, ProgramInput};
+use leo_ast::{input::InputData, Ast, NodeBuilder, ProgramInput};
 use leo_errors::{emitter::Handler, Result};
 
 #[cfg(test)]
 mod test;
 
 /// Creates a new AST from a given file path and source code text.
-pub fn parse_ast(handler: &Handler, source: &str, start_pos: BytePos) -> Result<Ast> {
-    Ok(Ast::new(parser::parse(handler, source, start_pos)?))
+pub fn parse_ast(handler: &Handler, node_builder: &NodeBuilder, source: &str, start_pos: BytePos) -> Result<Ast> {
+    Ok(Ast::new(parser::parse(handler, node_builder, source, start_pos)?))
 }
 
 /// Parses program inputs from the input file path
-pub fn parse_program_inputs(handler: &Handler, input_string: &str, start_pos: BytePos) -> Result<InputData> {
-    let program_input: ProgramInput = parser::parse_input(handler, input_string, start_pos)?.try_into()?;
+pub fn parse_program_inputs(
+    handler: &Handler,
+    node_builder: &NodeBuilder,
+    input_string: &str,
+    start_pos: BytePos,
+) -> Result<InputData> {
+    let program_input: ProgramInput =
+        parser::parse_input(handler, node_builder, input_string, start_pos)?.try_into()?;
 
     Ok(InputData { program_input })
 }
diff --git a/compiler/parser/src/parser/context.rs b/compiler/parser/src/parser/context.rs
index 1a071c4714..e24ddabe6f 100644
--- a/compiler/parser/src/parser/context.rs
+++ b/compiler/parser/src/parser/context.rs
@@ -27,6 +27,8 @@ use std::{fmt::Display, mem};
 pub(crate) struct ParserContext<'a> {
     /// Handler used to side-channel emit errors from the parser.
     pub(crate) handler: &'a Handler,
+    /// Counter used to generate unique node ids.
+    pub(crate) node_builder: &'a NodeBuilder,
     /// All un-bumped tokens.
     tokens: Vec<SpannedToken>,
     /// The current token, i.e., if `p.tokens = ['3', *, '4']`,
@@ -46,7 +48,7 @@ const DUMMY_EOF: SpannedToken = SpannedToken { token: Token::Eof, span: Span::du
 
 impl<'a> ParserContext<'a> {
     /// Returns a new [`ParserContext`] type given a vector of tokens.
-    pub fn new(handler: &'a Handler, mut tokens: Vec<SpannedToken>) -> Self {
+    pub fn new(handler: &'a Handler, node_builder: &'a NodeBuilder, mut tokens: Vec<SpannedToken>) -> Self {
         // Strip out comments.
         tokens.retain(|x| !matches!(x.token, Token::CommentLine(_) | Token::CommentBlock(_)));
         // For performance we reverse so that we get cheap `.pop()`s.
@@ -55,6 +57,7 @@ impl<'a> ParserContext<'a> {
         let token = SpannedToken::dummy();
         let mut p = Self {
             handler,
+            node_builder,
             disallow_struct_construction: false,
             allow_identifier_underscores: false,
             prev_token: token.clone(),
@@ -131,7 +134,7 @@ impl<'a> ParserContext<'a> {
     /// At the previous token, return and make an identifier with `name`.
     fn mk_ident_prev(&self, name: Symbol) -> Identifier {
         let span = self.prev_token.span;
-        Identifier { name, span, id: NodeID::default() }
+        Identifier { name, span, id: self.node_builder.next_id() }
     }
 
     /// Eats the next token if its an identifier and returns it.
diff --git a/compiler/parser/src/parser/expression.rs b/compiler/parser/src/parser/expression.rs
index e2654e842f..0e1142273d 100644
--- a/compiler/parser/src/parser/expression.rs
+++ b/compiler/parser/src/parser/expression.rs
@@ -15,11 +15,9 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use super::*;
-
 use leo_errors::{ParserError, Result};
 
 use leo_span::{sym, Symbol};
-
 use snarkvm_console::{account::Address, network::Testnet3};
 
 const INT_TYPES: &[Token] = &[
@@ -75,20 +73,20 @@ impl ParserContext<'_> {
                 condition: Box::new(expr),
                 if_true: Box::new(if_true),
                 if_false: Box::new(if_false),
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             });
         }
         Ok(expr)
     }
 
     /// Constructs a binary expression `left op right`.
-    fn bin_expr(left: Expression, right: Expression, op: BinaryOperation) -> Expression {
+    fn bin_expr(node_builder: &NodeBuilder, left: Expression, right: Expression, op: BinaryOperation) -> Expression {
         Expression::Binary(BinaryExpression {
             span: left.span() + right.span(),
             op,
             left: Box::new(left),
             right: Box::new(right),
-            id: NodeID::default(),
+            id: node_builder.next_id(),
         })
     }
 
@@ -101,7 +99,7 @@ impl ParserContext<'_> {
     ) -> Result<Expression> {
         let mut expr = f(self)?;
         while let Some(op) = self.eat_bin_op(tokens) {
-            expr = Self::bin_expr(expr, f(self)?, op);
+            expr = Self::bin_expr(self.node_builder, expr, f(self)?, op);
         }
         Ok(expr)
     }
@@ -156,7 +154,7 @@ impl ParserContext<'_> {
         let mut expr = self.parse_bitwise_exclusive_or_expression()?;
         if let Some(op) = self.eat_bin_op(&[Token::Lt, Token::LtEq, Token::Gt, Token::GtEq]) {
             let right = self.parse_bitwise_exclusive_or_expression()?;
-            expr = Self::bin_expr(expr, right, op);
+            expr = Self::bin_expr(self.node_builder, expr, right, op);
         }
         Ok(expr)
     }
@@ -169,7 +167,7 @@ impl ParserContext<'_> {
         let mut expr = self.parse_ordering_expression()?;
         if let Some(op) = self.eat_bin_op(&[Token::Eq, Token::NotEq]) {
             let right = self.parse_ordering_expression()?;
-            expr = Self::bin_expr(expr, right, op);
+            expr = Self::bin_expr(self.node_builder, expr, right, op);
         }
         Ok(expr)
     }
@@ -239,7 +237,12 @@ impl ParserContext<'_> {
         if self.eat(&Token::As) {
             let (type_, end_span) = self.parse_primitive_type()?;
             let span = expr.span() + end_span;
-            expr = Expression::Cast(CastExpression { expression: Box::new(expr), type_, span, id: NodeID::default() });
+            expr = Expression::Cast(CastExpression {
+                expression: Box::new(expr),
+                type_,
+                span,
+                id: self.node_builder.next_id(),
+            });
         }
 
         Ok(expr)
@@ -308,7 +311,7 @@ impl ParserContext<'_> {
                 span: op_span + inner.span(),
                 op,
                 receiver: Box::new(inner),
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             });
         }
 
@@ -325,7 +328,12 @@ impl ParserContext<'_> {
 
         if let (true, Some(op)) = (args.is_empty(), UnaryOperation::from_symbol(method.name)) {
             // Found an unary operator and the argument list is empty.
-            Ok(Expression::Unary(UnaryExpression { span, op, receiver: Box::new(receiver), id: NodeID::default() }))
+            Ok(Expression::Unary(UnaryExpression {
+                span,
+                op,
+                receiver: Box::new(receiver),
+                id: self.node_builder.next_id(),
+            }))
         } else if let (1, Some(op)) = (args.len(), BinaryOperation::from_symbol(method.name)) {
             // Found a binary operator and the argument list contains a single argument.
             Ok(Expression::Binary(BinaryExpression {
@@ -333,7 +341,7 @@ impl ParserContext<'_> {
                 op,
                 left: Box::new(receiver),
                 right: Box::new(args.swap_remove(0)),
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             }))
         } else {
             // Attempt to parse the method call as a mapping operation.
@@ -345,7 +353,7 @@ impl ParserContext<'_> {
                 | (1, Some(CoreFunction::MappingContains)) => {
                     // Found an instance of `<mapping>.get`, `<mapping>.get_or_use`, `<mapping>.set`, `<mapping>.remove`, or `<mapping>.contains`.
                     Ok(Expression::Access(AccessExpression::AssociatedFunction(AssociatedFunction {
-                        ty: Type::Identifier(Identifier::new(sym::Mapping)),
+                        ty: Type::Identifier(Identifier::new(sym::Mapping, self.node_builder.next_id())),
                         name: method,
                         arguments: {
                             let mut arguments = vec![receiver];
@@ -353,13 +361,13 @@ impl ParserContext<'_> {
                             arguments
                         },
                         span,
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     })))
                 }
                 _ => {
                     // Either an invalid unary/binary operator, or more arguments given.
                     self.emit_err(ParserError::invalid_method_call(receiver, method, args.len(), span));
-                    Ok(Expression::Err(ErrExpression { span, id: NodeID::default() }))
+                    Ok(Expression::Err(ErrExpression { span, id: self.node_builder.next_id() }))
                 }
             }
         }
@@ -389,7 +397,7 @@ impl ParserContext<'_> {
                 ty: type_,
                 name: member_name,
                 arguments: args,
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             })
         } else {
             // Return the struct constant.
@@ -397,7 +405,7 @@ impl ParserContext<'_> {
                 span: module_name.span() + member_name.span(),
                 ty: type_,
                 name: member_name,
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             })
         }))
     }
@@ -425,7 +433,7 @@ impl ParserContext<'_> {
                         tuple: Box::new(expr),
                         index,
                         span,
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     }))
                 } else if self.eat(&Token::Leo) {
                     // Eat an external function call.
@@ -441,7 +449,7 @@ impl ParserContext<'_> {
                         function: Box::new(Expression::Identifier(name)),
                         external: Some(Box::new(expr)),
                         arguments,
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     });
                 } else {
                     // Parse identifier name.
@@ -456,7 +464,7 @@ impl ParserContext<'_> {
                             span: expr.span() + name.span(),
                             inner: Box::new(expr),
                             name,
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         }))
                     }
                 }
@@ -475,7 +483,7 @@ impl ParserContext<'_> {
                     function: Box::new(expr),
                     external: None,
                     arguments,
-                    id: NodeID::default(),
+                    id: self.node_builder.next_id(),
                 });
             }
             // Check if next token is a dot to see if we are calling recursive method.
@@ -497,7 +505,7 @@ impl ParserContext<'_> {
 
         match elements.len() {
             // If the tuple expression is empty, return a `UnitExpression`.
-            0 => Ok(Expression::Unit(UnitExpression { span, id: NodeID::default() })),
+            0 => Ok(Expression::Unit(UnitExpression { span, id: self.node_builder.next_id() })),
             1 => match trailing {
                 // If there is one element in the tuple but no trailing comma, e.g `(foo)`, return the element.
                 false => Ok(elements.swap_remove(0)),
@@ -506,7 +514,7 @@ impl ParserContext<'_> {
             },
             // Otherwise, return a tuple expression.
             // Note: This is the only place where `TupleExpression` is constructed in the parser.
-            _ => Ok(Expression::Tuple(TupleExpression { elements, span, id: NodeID::default() })),
+            _ => Ok(Expression::Tuple(TupleExpression { elements, span, id: self.node_builder.next_id() })),
         }
     }
 
@@ -554,7 +562,8 @@ impl ParserContext<'_> {
         let end_span = check_ahead(dist, &Token::Group)?;
         dist += 1; // Standing at `)` so advance one for 'group'.
 
-        let gt = GroupTuple { span: start_span + &end_span, x: first_gc, y: second_gc, id: NodeID::default() };
+        let gt =
+            GroupTuple { span: start_span + &end_span, x: first_gc, y: second_gc, id: self.node_builder.next_id() };
 
         // Eat everything so that this isn't just peeking.
         for _ in 0..dist {
@@ -572,7 +581,10 @@ impl ParserContext<'_> {
         let identifier = if self.allow_identifier_underscores && self.eat(&Token::Underscore) {
             // Allow `_nonce` for struct records.
             let identifier_without_underscore = self.expect_identifier()?;
-            Identifier::new(Symbol::intern(&format!("_{}", identifier_without_underscore.name)))
+            Identifier::new(
+                Symbol::intern(&format!("_{}", identifier_without_underscore.name)),
+                self.node_builder.next_id(),
+            )
         } else {
             self.expect_identifier()?
         };
@@ -586,7 +598,7 @@ impl ParserContext<'_> {
             (None, identifier.span)
         };
 
-        Ok(StructVariableInitializer { identifier, expression, id: NodeID::default(), span })
+        Ok(StructVariableInitializer { identifier, expression, id: self.node_builder.next_id(), span })
     }
 
     /// Returns an [`Expression`] AST node if the next tokens represent a
@@ -600,7 +612,7 @@ impl ParserContext<'_> {
             span: identifier.span + end,
             name: identifier,
             members,
-            id: NodeID::default(),
+            id: self.node_builder.next_id(),
         }))
     }
 
@@ -628,7 +640,7 @@ impl ParserContext<'_> {
                     // Literal followed by `field`, e.g., `42field`.
                     Some(Token::Field) => {
                         assert_no_whitespace("field")?;
-                        Expression::Literal(Literal::Field(value, full_span, NodeID::default()))
+                        Expression::Literal(Literal::Field(value, full_span, self.node_builder.next_id()))
                     }
                     // Literal followed by `group`, e.g., `42group`.
                     Some(Token::Group) => {
@@ -636,34 +648,36 @@ impl ParserContext<'_> {
                         Expression::Literal(Literal::Group(Box::new(GroupLiteral::Single(
                             value,
                             full_span,
-                            NodeID::default(),
+                            self.node_builder.next_id(),
                         ))))
                     }
                     // Literal followed by `scalar` e.g., `42scalar`.
                     Some(Token::Scalar) => {
                         assert_no_whitespace("scalar")?;
-                        Expression::Literal(Literal::Scalar(value, full_span, NodeID::default()))
+                        Expression::Literal(Literal::Scalar(value, full_span, self.node_builder.next_id()))
                     }
                     // Literal followed by other type suffix, e.g., `42u8`.
                     Some(suffix) => {
                         assert_no_whitespace(&suffix.to_string())?;
                         let int_ty = Self::token_to_int_type(suffix).expect("unknown int type token");
-                        Expression::Literal(Literal::Integer(int_ty, value, full_span, NodeID::default()))
+                        Expression::Literal(Literal::Integer(int_ty, value, full_span, self.node_builder.next_id()))
                     }
                     None => return Err(ParserError::implicit_values_not_allowed(value, span).into()),
                 }
             }
-            Token::True => Expression::Literal(Literal::Boolean(true, span, NodeID::default())),
-            Token::False => Expression::Literal(Literal::Boolean(false, span, NodeID::default())),
+            Token::True => Expression::Literal(Literal::Boolean(true, span, self.node_builder.next_id())),
+            Token::False => Expression::Literal(Literal::Boolean(false, span, self.node_builder.next_id())),
             Token::AddressLit(address_string) => {
                 if address_string.parse::<Address<Testnet3>>().is_err() {
                     self.emit_err(ParserError::invalid_address_lit(&address_string, span));
                 }
-                Expression::Literal(Literal::Address(address_string, span, NodeID::default()))
+                Expression::Literal(Literal::Address(address_string, span, self.node_builder.next_id()))
+            }
+            Token::StaticString(value) => {
+                Expression::Literal(Literal::String(value, span, self.node_builder.next_id()))
             }
-            Token::StaticString(value) => Expression::Literal(Literal::String(value, span, NodeID::default())),
             Token::Identifier(name) => {
-                let ident = Identifier { name, span, id: NodeID::default() };
+                let ident = Identifier { name, span, id: self.node_builder.next_id() };
                 if !self.disallow_struct_construction && self.check(&Token::LeftCurly) {
                     // Parse struct and records inits as struct expressions.
                     // Enforce struct or record type later at type checking.
@@ -673,12 +687,16 @@ impl ParserContext<'_> {
                 }
             }
             Token::SelfLower => {
-                Expression::Identifier(Identifier { name: sym::SelfLower, span, id: NodeID::default() })
+                Expression::Identifier(Identifier { name: sym::SelfLower, span, id: self.node_builder.next_id() })
             }
-            Token::Block => Expression::Identifier(Identifier { name: sym::block, span, id: NodeID::default() }),
-            t if crate::type_::TYPE_TOKENS.contains(&t) => {
-                Expression::Identifier(Identifier { name: t.keyword_to_symbol().unwrap(), span, id: NodeID::default() })
+            Token::Block => {
+                Expression::Identifier(Identifier { name: sym::block, span, id: self.node_builder.next_id() })
             }
+            t if crate::type_::TYPE_TOKENS.contains(&t) => Expression::Identifier(Identifier {
+                name: t.keyword_to_symbol().unwrap(),
+                span,
+                id: self.node_builder.next_id(),
+            }),
             token => {
                 return Err(ParserError::unexpected_str(token, "expression", span).into());
             }
diff --git a/compiler/parser/src/parser/file.rs b/compiler/parser/src/parser/file.rs
index f60d6e1fc6..bfa829f8b8 100644
--- a/compiler/parser/src/parser/file.rs
+++ b/compiler/parser/src/parser/file.rs
@@ -109,7 +109,7 @@ impl ParserContext<'_> {
         let prg_sf = with_session_globals(|s| s.source_map.new_source(&program_string, name));
 
         // Use the parser to construct the imported abstract syntax tree (ast).
-        let program_ast = parse_ast(self.handler, &prg_sf.src, prg_sf.start_pos)?;
+        let program_ast = parse_ast(self.handler, self.node_builder, &prg_sf.src, prg_sf.start_pos)?;
 
         Ok((import_name.name, (program_ast.into_repr(), start + end)))
     }
@@ -223,7 +223,7 @@ impl ParserContext<'_> {
 
         let (identifier, type_, span) = self.parse_typed_ident()?;
 
-        Ok(Member { mode, identifier, type_, span, id: NodeID::default() })
+        Ok(Member { mode, identifier, type_, span, id: self.node_builder.next_id() })
     }
 
     /// Parses a struct or record definition, e.g., `struct Foo { ... }` or `record Foo { ... }`.
@@ -240,7 +240,7 @@ impl ParserContext<'_> {
             members,
             is_record,
             span: start + end,
-            id: NodeID::default(),
+            id: self.node_builder.next_id(),
         }))
     }
 
@@ -253,7 +253,13 @@ impl ParserContext<'_> {
         self.expect(&Token::BigArrow)?;
         let (value_type, _) = self.parse_type()?;
         let end = self.expect(&Token::Semicolon)?;
-        Ok((identifier.name, Mapping { identifier, key_type, value_type, span: start + end, id: NodeID::default() }))
+        Ok((identifier.name, Mapping {
+            identifier,
+            key_type,
+            value_type,
+            span: start + end,
+            id: self.node_builder.next_id(),
+        }))
     }
 
     // TODO: Return a span associated with the mode.
@@ -309,7 +315,7 @@ impl ParserContext<'_> {
                 program_name: external,
                 record,
                 span,
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             }))
         } else {
             let type_ = self.parse_type()?.0;
@@ -319,7 +325,7 @@ impl ParserContext<'_> {
                 mode,
                 type_,
                 span: name.span,
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             }))
         }
     }
@@ -329,7 +335,7 @@ impl ParserContext<'_> {
         // TODO: Could this span be made more accurate?
         let mode = self.parse_mode()?;
         let (type_, span) = self.parse_type()?;
-        Ok(FunctionOutput { mode, type_, span, id: NodeID::default() })
+        Ok(FunctionOutput { mode, type_, span, id: self.node_builder.next_id() })
     }
 
     /// Returns a [`Output`] AST node if the next tokens represent a function output.
@@ -352,11 +358,11 @@ impl ParserContext<'_> {
             span = span + self.prev_token.span;
 
             Ok(Output::External(External {
-                identifier: Identifier::new(Symbol::intern("dummy")),
+                identifier: Identifier::new(Symbol::intern("dummy"), self.node_builder.next_id()),
                 program_name: external,
                 record,
                 span,
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             }))
         } else {
             Ok(Output::Internal(self.parse_function_output()?))
@@ -373,7 +379,7 @@ impl ParserContext<'_> {
         let start = self.expect(&Token::At)?;
         let identifier = match self.token.token {
             Token::Program => {
-                Identifier { name: sym::program, span: self.expect(&Token::Program)?, id: NodeID::default() }
+                Identifier { name: sym::program, span: self.expect(&Token::Program)?, id: self.node_builder.next_id() }
             }
             _ => self.expect_identifier()?,
         };
@@ -383,7 +389,7 @@ impl ParserContext<'_> {
         // Check that there is no whitespace in between the `@` symbol and identifier.
         match identifier.span.hi.0 - start.lo.0 > 1 + identifier.name.to_string().len() as u32 {
             true => Err(ParserError::space_in_annotation(span).into()),
-            false => Ok(Annotation { identifier, span, id: NodeID::default() }),
+            false => Ok(Annotation { identifier, span, id: self.node_builder.next_id() }),
         }
     }
 
@@ -456,12 +462,25 @@ impl ParserContext<'_> {
                 let block = self.parse_block()?;
                 let span = start + block.span;
 
-                Some(Finalize::new(identifier, input, output, block, span))
+                Some(Finalize::new(identifier, input, output, block, span, self.node_builder.next_id()))
             }
         };
 
         let span = start + block.span;
-        Ok((name.name, Function::new(annotations, variant, name, inputs, output, block, finalize, span)))
+        Ok((
+            name.name,
+            Function::new(
+                annotations,
+                variant,
+                name,
+                inputs,
+                output,
+                block,
+                finalize,
+                span,
+                self.node_builder.next_id(),
+            ),
+        ))
     }
 }
 
diff --git a/compiler/parser/src/parser/mod.rs b/compiler/parser/src/parser/mod.rs
index 023952a75b..038cf80c5d 100644
--- a/compiler/parser/src/parser/mod.rs
+++ b/compiler/parser/src/parser/mod.rs
@@ -39,15 +39,20 @@ mod statement;
 pub(super) mod type_;
 
 /// Creates a new program from a given file path and source code text.
-pub fn parse(handler: &Handler, source: &str, start_pos: BytePos) -> Result<Program> {
-    let mut tokens = ParserContext::new(handler, crate::tokenize(source, start_pos)?);
+pub fn parse(handler: &Handler, node_builder: &NodeBuilder, source: &str, start_pos: BytePos) -> Result<Program> {
+    let mut tokens = ParserContext::new(handler, node_builder, crate::tokenize(source, start_pos)?);
 
     tokens.parse_program()
 }
 
 /// Parses an input file at the given file `path` and `source` code text.
-pub fn parse_input(handler: &Handler, source: &str, start_pos: BytePos) -> Result<InputAst> {
-    let mut tokens = ParserContext::new(handler, crate::tokenize(source, start_pos)?);
+pub fn parse_input(
+    handler: &Handler,
+    node_builder: &NodeBuilder,
+    source: &str,
+    start_pos: BytePos,
+) -> Result<InputAst> {
+    let mut tokens = ParserContext::new(handler, node_builder, crate::tokenize(source, start_pos)?);
 
     tokens.parse_input_file()
 }
diff --git a/compiler/parser/src/parser/statement.rs b/compiler/parser/src/parser/statement.rs
index eb02119ff3..9e260bd337 100644
--- a/compiler/parser/src/parser/statement.rs
+++ b/compiler/parser/src/parser/statement.rs
@@ -82,7 +82,7 @@ impl ParserContext<'_> {
         self.expect(&Token::Semicolon)?;
 
         // Return the assertion statement.
-        Ok(Statement::Assert(AssertStatement { variant, span, id: NodeID::default() }))
+        Ok(Statement::Assert(AssertStatement { variant, span, id: self.node_builder.next_id() }))
     }
 
     /// Returns a [`AssignStatement`] AST node if the next tokens represent a assign, otherwise expects an expression statement.
@@ -115,20 +115,24 @@ impl ParserContext<'_> {
             // Construct the span for the statement.
             let span = place.span() + value.span();
 
+            // Construct a copy of the lhs with a unique id.
+            let mut left = place.clone();
+            left.set_id(self.node_builder.next_id());
+
             // Simplify complex assignments into simple assignments.
             // For example, `x += 1` becomes `x = x + 1`, while simple assignments like `x = y` remain unchanged.
             let value = match operation {
                 None => value,
                 Some(op) => Expression::Binary(BinaryExpression {
-                    left: Box::new(place.clone()),
+                    left: Box::new(left),
                     right: Box::new(value),
                     op,
                     span,
-                    id: NodeID::default(),
+                    id: self.node_builder.next_id(),
                 }),
             };
 
-            Ok(Statement::Assign(Box::new(AssignStatement { span, place, value, id: NodeID::default() })))
+            Ok(Statement::Assign(Box::new(AssignStatement { span, place, value, id: self.node_builder.next_id() })))
         } else {
             // Check for `increment` and `decrement` statements. If found, emit a deprecation warning.
             if let Expression::Call(call_expression) = &place {
@@ -156,7 +160,7 @@ impl ParserContext<'_> {
             Ok(Statement::Expression(ExpressionStatement {
                 span: place.span() + end,
                 expression: place,
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             }))
         }
     }
@@ -166,7 +170,7 @@ impl ParserContext<'_> {
         self.parse_list(Delimiter::Brace, None, |p| p.parse_statement().map(Some)).map(|(statements, _, span)| Block {
             statements,
             span,
-            id: NodeID::default(),
+            id: self.node_builder.next_id(),
         })
     }
 
@@ -177,7 +181,7 @@ impl ParserContext<'_> {
         let expression = match self.token.token {
             // If the next token is a semicolon, implicitly return a unit expression, `()`.
             Token::Semicolon | Token::Then => {
-                Expression::Unit(UnitExpression { span: self.token.span, id: NodeID::default() })
+                Expression::Unit(UnitExpression { span: self.token.span, id: self.node_builder.next_id() })
             }
             // Otherwise, attempt to parse an expression.
             _ => self.parse_expression()?,
@@ -200,7 +204,7 @@ impl ParserContext<'_> {
         };
         let end = self.expect(&Token::Semicolon)?;
         let span = start + end;
-        Ok(ReturnStatement { span, expression, finalize_arguments: finalize_args, id: NodeID::default() })
+        Ok(ReturnStatement { span, expression, finalize_arguments: finalize_args, id: self.node_builder.next_id() })
     }
 
     /// Returns a [`ConditionalStatement`] AST node if the next tokens represent a conditional statement.
@@ -225,7 +229,7 @@ impl ParserContext<'_> {
             condition: expr,
             then: body,
             otherwise: next,
-            id: NodeID::default(),
+            id: self.node_builder.next_id(),
         })
     }
 
@@ -256,7 +260,7 @@ impl ParserContext<'_> {
             stop_value: Default::default(),
             inclusive: false,
             block,
-            id: NodeID::default(),
+            id: self.node_builder.next_id(),
         })
     }
 
@@ -300,14 +304,14 @@ impl ParserContext<'_> {
                     Default::default(),
                     ConsoleFunction::Assert(Expression::Err(ErrExpression {
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     })),
                 )
             }
         };
         self.expect(&Token::Semicolon)?;
 
-        Ok(ConsoleStatement { span: keyword + span, function, id: NodeID::default() })
+        Ok(ConsoleStatement { span: keyword + span, function, id: self.node_builder.next_id() })
     }
 
     /// Returns a [`DefinitionStatement`] AST node if the next tokens represent a definition statement.
@@ -335,7 +339,7 @@ impl ParserContext<'_> {
             place,
             type_,
             value,
-            id: NodeID::default(),
+            id: self.node_builder.next_id(),
         })
     }
 }
diff --git a/compiler/parser/src/test.rs b/compiler/parser/src/test.rs
index 89976ca804..5c02a5b3c4 100644
--- a/compiler/parser/src/test.rs
+++ b/compiler/parser/src/test.rs
@@ -16,7 +16,7 @@
 
 use crate::{tokenizer, ParserContext, SpannedToken};
 
-use leo_ast::Statement;
+use leo_ast::{NodeBuilder, NodeID, Statement};
 use leo_errors::{emitter::Handler, LeoError};
 use leo_span::{
     source_map::FileName,
@@ -67,7 +67,8 @@ fn with_handler<T>(
     logic: impl FnOnce(&mut ParserContext<'_>) -> Result<T, LeoError>,
 ) -> Result<T, String> {
     let (handler, buf) = Handler::new_with_buf();
-    let mut tokens = ParserContext::new(&handler, tokens);
+    let node_builder = NodeBuilder::default();
+    let mut tokens = ParserContext::new(&handler, &node_builder, tokens);
     let parsed = handler
         .extend_if_error(logic(&mut tokens))
         .map_err(|_| buf.extract_errs().to_string() + &buf.extract_warnings().to_string())?;
@@ -117,7 +118,7 @@ impl Namespace for ParseStatementNamespace {
         create_session_if_not_set_then(|s| {
             let tokenizer = tokenize(test, s)?;
             if all_are_comments(&tokenizer) {
-                return Ok(yaml_or_fail(Statement::dummy(Span::default())));
+                return Ok(yaml_or_fail(Statement::dummy(Span::default(), NodeID::default())));
             }
             with_handler(tokenizer, |p| p.parse_statement()).map(yaml_or_fail)
         })
diff --git a/compiler/passes/src/common/assigner/mod.rs b/compiler/passes/src/common/assigner/mod.rs
index 829670e247..9615004930 100644
--- a/compiler/passes/src/common/assigner/mod.rs
+++ b/compiler/passes/src/common/assigner/mod.rs
@@ -16,41 +16,53 @@
 
 use leo_ast::{AssignStatement, Expression, Identifier, NodeID, Statement};
 use leo_span::Symbol;
-use std::fmt::Display;
+
+use std::{cell::RefCell, fmt::Display};
 
 /// A struct used to create assignment statements.
-#[derive(Default)]
+#[derive(Debug, Default, Clone)]
 pub struct Assigner {
-    /// A strictly increasing counter, used to ensure that new variable names are unique.
-    pub(crate) counter: usize,
+    /// The inner counter.
+    /// `RefCell` is used here to avoid `&mut` all over the compiler.
+    inner: RefCell<AssignerInner>,
 }
 
 impl Assigner {
     /// Return a new unique `Symbol` from a `&str`.
-    pub(crate) fn unique_symbol(&mut self, arg: impl Display, separator: impl Display) -> Symbol {
+    pub fn unique_symbol(&self, arg: impl Display, separator: impl Display) -> Symbol {
+        self.inner.borrow_mut().unique_symbol(arg, separator)
+    }
+
+    /// Constructs the assignment statement `place = expr;`.
+    /// This function should be the only place where `AssignStatement`s are constructed.
+    pub fn simple_assign_statement(&self, identifier: Identifier, value: Expression, id: NodeID) -> Statement {
+        self.inner.borrow_mut().simple_assign_statement(identifier, value, id)
+    }
+}
+
+/// Contains the actual data for `Assigner`.
+/// Modeled this way to afford an API using interior mutability.
+#[derive(Debug, Default, Clone)]
+pub struct AssignerInner {
+    /// A strictly increasing counter, used to ensure that new variable names are unique.
+    pub(crate) counter: usize,
+}
+
+impl AssignerInner {
+    /// Return a new unique `Symbol` from a `&str`.
+    fn unique_symbol(&mut self, arg: impl Display, separator: impl Display) -> Symbol {
         self.counter += 1;
         Symbol::intern(&format!("{}{}{}", arg, separator, self.counter - 1))
     }
 
     /// 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 {
+    fn simple_assign_statement(&mut self, identifier: Identifier, value: Expression, id: NodeID) -> Statement {
         Statement::Assign(Box::new(AssignStatement {
             place: Expression::Identifier(identifier),
             value,
             span: Default::default(),
-            id: NodeID::default(),
+            id,
         }))
     }
-
-    /// Constructs a simple assign statement for `expr` with a unique name.
-    /// For example, `expr` is transformed into `$var$0 = expr;`.
-    pub(crate) fn unique_simple_assign_statement(&mut self, expr: Expression) -> (Identifier, Statement) {
-        // Create a new variable for the expression.
-        let name = self.unique_symbol("$var", "$");
-
-        let place = Identifier { name, span: Default::default(), id: NodeID::default() };
-
-        (place, self.simple_assign_statement(place, expr))
-    }
 }
diff --git a/compiler/passes/src/dead_code_elimination/dead_code_eliminator.rs b/compiler/passes/src/dead_code_elimination/dead_code_eliminator.rs
index 83919755bf..e033a57138 100644
--- a/compiler/passes/src/dead_code_elimination/dead_code_eliminator.rs
+++ b/compiler/passes/src/dead_code_elimination/dead_code_eliminator.rs
@@ -14,21 +14,23 @@
 // You should have received a copy of the GNU General Public License
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
+use leo_ast::NodeBuilder;
 use leo_span::Symbol;
 
 use indexmap::IndexSet;
 
-#[derive(Default)]
-pub struct DeadCodeEliminator {
+pub struct DeadCodeEliminator<'a> {
+    /// A counter to generate unique node IDs.
+    pub(crate) node_builder: &'a NodeBuilder,
     /// The set of used variables in the current function body.
     pub(crate) used_variables: IndexSet<Symbol>,
     /// Whether or not the variables are necessary.
     pub(crate) is_necessary: bool,
 }
 
-impl DeadCodeEliminator {
+impl<'a> DeadCodeEliminator<'a> {
     /// Initializes a new `DeadCodeEliminator`.
-    pub fn new() -> Self {
-        Self { used_variables: Default::default(), is_necessary: false }
+    pub fn new(node_builder: &'a NodeBuilder) -> Self {
+        Self { node_builder, used_variables: Default::default(), is_necessary: false }
     }
 }
diff --git a/compiler/passes/src/dead_code_elimination/eliminate_expression.rs b/compiler/passes/src/dead_code_elimination/eliminate_expression.rs
index 574fb0252d..b52d33145f 100644
--- a/compiler/passes/src/dead_code_elimination/eliminate_expression.rs
+++ b/compiler/passes/src/dead_code_elimination/eliminate_expression.rs
@@ -23,7 +23,6 @@ use leo_ast::{
     ExpressionReconstructor,
     Identifier,
     MemberAccess,
-    NodeID,
     StructExpression,
     StructVariableInitializer,
     TupleAccess,
@@ -31,7 +30,7 @@ use leo_ast::{
 };
 use leo_span::sym;
 
-impl ExpressionReconstructor for DeadCodeEliminator {
+impl ExpressionReconstructor for DeadCodeEliminator<'_> {
     type AdditionalOutput = ();
 
     /// Reconstructs the components of an access expression.
@@ -58,7 +57,7 @@ impl ExpressionReconstructor for DeadCodeEliminator {
                             .map(|arg| self.reconstruct_expression(arg).0)
                             .collect(),
                         span: function.span,
-                        id: NodeID::default(),
+                        id: function.id,
                     });
                     // Unset `self.is_necessary`.
                     self.is_necessary = false;
@@ -68,13 +67,13 @@ impl ExpressionReconstructor for DeadCodeEliminator {
                     inner: Box::new(self.reconstruct_expression(*member.inner).0),
                     name: member.name,
                     span: member.span,
-                    id: NodeID::default(),
+                    id: member.id,
                 }),
                 AccessExpression::Tuple(tuple) => AccessExpression::Tuple(TupleAccess {
                     tuple: Box::new(self.reconstruct_expression(*tuple.tuple).0),
                     index: tuple.index,
                     span: tuple.span,
-                    id: NodeID::default(),
+                    id: tuple.id,
                 }),
                 AccessExpression::AssociatedConstant(constant) => AccessExpression::AssociatedConstant(constant),
             }),
@@ -99,11 +98,11 @@ impl ExpressionReconstructor for DeadCodeEliminator {
                             None => unreachable!("Static single assignment ensures that the expression always exists."),
                         },
                         span: member.span,
-                        id: NodeID::default(),
+                        id: member.id,
                     })
                     .collect(),
                 span: input.span,
-                id: NodeID::default(),
+                id: input.id,
             }),
             Default::default(),
         )
diff --git a/compiler/passes/src/dead_code_elimination/eliminate_program.rs b/compiler/passes/src/dead_code_elimination/eliminate_program.rs
index a11321f5a9..3cbbf05357 100644
--- a/compiler/passes/src/dead_code_elimination/eliminate_program.rs
+++ b/compiler/passes/src/dead_code_elimination/eliminate_program.rs
@@ -16,9 +16,9 @@
 
 use crate::DeadCodeEliminator;
 
-use leo_ast::{Finalize, Function, NodeID, ProgramReconstructor, StatementReconstructor};
+use leo_ast::{Finalize, Function, ProgramReconstructor, StatementReconstructor};
 
-impl ProgramReconstructor for DeadCodeEliminator {
+impl ProgramReconstructor for DeadCodeEliminator<'_> {
     fn reconstruct_function(&mut self, input: Function) -> Function {
         // Reset the state of the dead code eliminator.
         self.used_variables.clear();
@@ -43,7 +43,7 @@ impl ProgramReconstructor for DeadCodeEliminator {
                 output_type: finalize.output_type,
                 block,
                 span: finalize.span,
-                id: NodeID::default(),
+                id: finalize.id,
             }
         });
 
@@ -57,7 +57,7 @@ impl ProgramReconstructor for DeadCodeEliminator {
             block,
             finalize,
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }
     }
 }
diff --git a/compiler/passes/src/dead_code_elimination/eliminate_statement.rs b/compiler/passes/src/dead_code_elimination/eliminate_statement.rs
index 493dfe8580..4eeaf0d244 100644
--- a/compiler/passes/src/dead_code_elimination/eliminate_statement.rs
+++ b/compiler/passes/src/dead_code_elimination/eliminate_statement.rs
@@ -29,13 +29,12 @@ use leo_ast::{
     ExpressionReconstructor,
     ExpressionStatement,
     IterationStatement,
-    NodeID,
     ReturnStatement,
     Statement,
     StatementReconstructor,
 };
 
-impl StatementReconstructor for DeadCodeEliminator {
+impl StatementReconstructor for DeadCodeEliminator<'_> {
     fn reconstruct_assert(&mut self, input: AssertStatement) -> (Statement, Self::AdditionalOutput) {
         // Set the `is_necessary` flag.
         self.is_necessary = true;
@@ -52,7 +51,7 @@ impl StatementReconstructor for DeadCodeEliminator {
                 }
             },
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         });
 
         // Unset the `is_necessary` flag.
@@ -92,7 +91,7 @@ impl StatementReconstructor for DeadCodeEliminator {
                     place: input.place,
                     value: self.reconstruct_expression(input.value).0,
                     span: input.span,
-                    id: NodeID::default(),
+                    id: input.id,
                 }));
 
                 // Unset the `is_necessary` flag.
@@ -101,7 +100,7 @@ impl StatementReconstructor for DeadCodeEliminator {
                 (statement, Default::default())
             }
             // Otherwise, we can eliminate it.
-            false => (Statement::dummy(Default::default()), Default::default()),
+            false => (Statement::dummy(Default::default(), self.node_builder.next_id()), Default::default()),
         }
     }
 
@@ -114,7 +113,7 @@ impl StatementReconstructor for DeadCodeEliminator {
         // Reverse the direction of `statements`.
         statements.reverse();
 
-        (Block { statements, span: block.span, id: NodeID::default() }, Default::default())
+        (Block { statements, span: block.span, id: block.id }, Default::default())
     }
 
     /// Flattening removes conditional statements from the program.
@@ -145,7 +144,7 @@ impl StatementReconstructor for DeadCodeEliminator {
                 let statement = Statement::Expression(ExpressionStatement {
                     expression: self.reconstruct_call(expression).0,
                     span: input.span,
-                    id: NodeID::default(),
+                    id: input.id,
                 });
 
                 // Unset the `is_necessary` flag.
@@ -161,14 +160,14 @@ impl StatementReconstructor for DeadCodeEliminator {
                             .reconstruct_access(AccessExpression::AssociatedFunction(associated_function))
                             .0,
                         span: input.span,
-                        id: NodeID::default(),
+                        id: input.id,
                     }),
                     Default::default(),
                 )
             }
             // Any other expression is dead code, since they do not have side effects.
             // Note: array access expressions will have side effects and need to be handled here.
-            _ => (Statement::dummy(Default::default()), Default::default()),
+            _ => (Statement::dummy(Default::default(), self.node_builder.next_id()), Default::default()),
         }
     }
 
@@ -188,7 +187,7 @@ impl StatementReconstructor for DeadCodeEliminator {
                 arguments.into_iter().map(|argument| self.reconstruct_expression(argument).0).collect()
             }),
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         });
 
         // Unset the `is_necessary` flag.
diff --git a/compiler/passes/src/dead_code_elimination/mod.rs b/compiler/passes/src/dead_code_elimination/mod.rs
index 55210ad71a..0a95ba0748 100644
--- a/compiler/passes/src/dead_code_elimination/mod.rs
+++ b/compiler/passes/src/dead_code_elimination/mod.rs
@@ -60,15 +60,15 @@ pub use dead_code_eliminator::*;
 
 use crate::Pass;
 
-use leo_ast::{Ast, ProgramReconstructor};
+use leo_ast::{Ast, NodeBuilder, ProgramReconstructor};
 use leo_errors::Result;
 
-impl Pass for DeadCodeEliminator {
-    type Input = Ast;
+impl<'a> Pass for DeadCodeEliminator<'a> {
+    type Input = (Ast, &'a NodeBuilder);
     type Output = Result<Ast>;
 
-    fn do_pass(ast: Self::Input) -> Self::Output {
-        let mut reconstructor = DeadCodeEliminator::new();
+    fn do_pass((ast, node_builder): Self::Input) -> Self::Output {
+        let mut reconstructor = DeadCodeEliminator::new(node_builder);
         let program = reconstructor.reconstruct_program(ast.into_repr());
 
         Ok(Ast::new(program))
diff --git a/compiler/passes/src/flattening/flatten_expression.rs b/compiler/passes/src/flattening/flatten_expression.rs
index ccda026a76..97e13627a4 100644
--- a/compiler/passes/src/flattening/flatten_expression.rs
+++ b/compiler/passes/src/flattening/flatten_expression.rs
@@ -24,7 +24,6 @@ use leo_ast::{
     ExpressionReconstructor,
     Member,
     MemberAccess,
-    NodeID,
     Statement,
     StructExpression,
     StructVariableInitializer,
@@ -52,14 +51,14 @@ impl ExpressionReconstructor for Flattener<'_> {
                             .map(|arg| self.reconstruct_expression(arg).0)
                             .collect(),
                         span: function.span,
-                        id: NodeID::default(),
+                        id: function.id,
                     }))
                 }
                 AccessExpression::Member(member) => Expression::Access(AccessExpression::Member(MemberAccess {
                     inner: Box::new(self.reconstruct_expression(*member.inner).0),
                     name: member.name,
                     span: member.span,
-                    id: NodeID::default(),
+                    id: member.id,
                 })),
                 AccessExpression::Tuple(tuple) => {
                     // Reconstruct the tuple expression.
@@ -99,14 +98,11 @@ impl ExpressionReconstructor for Flattener<'_> {
                 identifier: member.identifier,
                 expression: Some(expr),
                 span: member.span,
-                id: NodeID::default(),
+                id: member.id,
             });
         }
 
-        (
-            Expression::Struct(StructExpression { name: input.name, members, span: input.span, id: NodeID::default() }),
-            statements,
-        )
+        (Expression::Struct(StructExpression { name: input.name, members, span: input.span, id: input.id }), statements)
     }
 
     /// Reconstructs ternary expressions over tuples and structs, accumulating any statements that are generated.
@@ -150,7 +146,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                                 if_true: Box::new(if_true),
                                 if_false: Box::new(if_false),
                                 span: input.span,
-                                id: NodeID::default(),
+                                id: input.id,
                             });
 
                             // Accumulate any statements generated.
@@ -165,7 +161,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                         })
                         .collect(),
                     span: Default::default(),
-                    id: NodeID::default(),
+                    id: self.node_builder.next_id(),
                 });
                 (tuple, statements)
             }
@@ -200,16 +196,16 @@ impl ExpressionReconstructor for Flattener<'_> {
                                         inner: Box::new(Expression::Access(AccessExpression::Member(first.clone()))),
                                         name: *identifier,
                                         span: Default::default(),
-                                        id: NodeID::default(),
+                                        id: self.node_builder.next_id(),
                                     }))),
                                     if_false: Box::new(Expression::Access(AccessExpression::Member(MemberAccess {
                                         inner: Box::new(Expression::Access(AccessExpression::Member(second.clone()))),
                                         name: *identifier,
                                         span: Default::default(),
-                                        id: NodeID::default(),
+                                        id: self.node_builder.next_id(),
                                     }))),
                                     span: Default::default(),
-                                    id: NodeID::default(),
+                                    id: self.node_builder.next_id(),
                                 });
 
                                 // Accumulate any statements generated.
@@ -223,7 +219,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                                     identifier: *identifier,
                                     expression: Some(Expression::Identifier(result)),
                                     span: Default::default(),
-                                    id: NodeID::default(),
+                                    id: self.node_builder.next_id(),
                                 }
                             })
                             .collect();
@@ -232,7 +228,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                             name: first_member_struct.identifier,
                             members,
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         });
 
                         // Accumulate any statements generated.
@@ -265,7 +261,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                                 if_true: Box::new(if_true),
                                 if_false: Box::new(if_false),
                                 span: input.span,
-                                id: NodeID::default(),
+                                id: input.id,
                             }));
 
                         // Accumulate the new assignment statement.
@@ -296,16 +292,16 @@ impl ExpressionReconstructor for Flattener<'_> {
                                 inner: Box::new(Expression::Identifier(first)),
                                 name: *identifier,
                                 span: Default::default(),
-                                id: NodeID::default(),
+                                id: self.node_builder.next_id(),
                             }))),
                             if_false: Box::new(Expression::Access(AccessExpression::Member(MemberAccess {
                                 inner: Box::new(Expression::Identifier(second)),
                                 name: *identifier,
                                 span: Default::default(),
-                                id: NodeID::default(),
+                                id: self.node_builder.next_id(),
                             }))),
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         });
 
                         // Accumulate any statements generated.
@@ -319,7 +315,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                             identifier: *identifier,
                             expression: Some(Expression::Identifier(result)),
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         }
                     })
                     .collect();
@@ -328,7 +324,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                     name: first_struct.identifier,
                     members,
                     span: Default::default(),
-                    id: NodeID::default(),
+                    id: self.node_builder.next_id(),
                 });
 
                 // Accumulate any statements generated.
@@ -358,7 +354,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                     if_true: Box::new(Expression::Tuple(first_tuple.clone())),
                     if_false: Box::new(Expression::Tuple(second_tuple.clone())),
                     span: input.span,
-                    id: NodeID::default(),
+                    id: input.id,
                 })
             }
             // Otherwise, create a new intermediate assignment for the ternary expression are return the assigned variable.
@@ -378,7 +374,7 @@ impl ExpressionReconstructor for Flattener<'_> {
                         if_true: Box::new(if_true),
                         if_false: Box::new(if_false),
                         span: input.span,
-                        id: NodeID::default(),
+                        id: input.id,
                     }));
 
                 // Accumulate the new assignment statement.
diff --git a/compiler/passes/src/flattening/flatten_program.rs b/compiler/passes/src/flattening/flatten_program.rs
index 44a0d5085f..3434c490ff 100644
--- a/compiler/passes/src/flattening/flatten_program.rs
+++ b/compiler/passes/src/flattening/flatten_program.rs
@@ -16,7 +16,7 @@
 
 use crate::Flattener;
 
-use leo_ast::{Finalize, Function, NodeID, ProgramReconstructor, StatementReconstructor, Type};
+use leo_ast::{Finalize, Function, ProgramReconstructor, StatementReconstructor, Type};
 
 impl ProgramReconstructor for Flattener<'_> {
     /// Flattens a function's body and finalize block, if it exists.
@@ -47,7 +47,7 @@ impl ProgramReconstructor for Flattener<'_> {
                 output_type: finalize.output_type,
                 block,
                 span: finalize.span,
-                id: NodeID::default(),
+                id: finalize.id,
             }
         });
 
@@ -78,7 +78,7 @@ impl ProgramReconstructor for Flattener<'_> {
             block,
             finalize,
             span: function.span,
-            id: NodeID::default(),
+            id: function.id,
         }
     }
 }
diff --git a/compiler/passes/src/flattening/flatten_statement.rs b/compiler/passes/src/flattening/flatten_statement.rs
index f76f928950..cb856869ac 100644
--- a/compiler/passes/src/flattening/flatten_statement.rs
+++ b/compiler/passes/src/flattening/flatten_statement.rs
@@ -35,7 +35,6 @@ use leo_ast::{
     Identifier,
     IterationStatement,
     Node,
-    NodeID,
     ReturnStatement,
     Statement,
     StatementReconstructor,
@@ -70,7 +69,7 @@ impl StatementReconstructor for Flattener<'_> {
         // Flatten the arguments of the assert statement.
         let assert = AssertStatement {
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
             variant: match input.variant {
                 AssertVariant::Assert(expression) => {
                     let (expression, additional_statements) = self.reconstruct_expression(expression);
@@ -104,17 +103,17 @@ impl StatementReconstructor for Flattener<'_> {
             Some(guard) => (
                 Statement::Assert(AssertStatement {
                     span: input.span,
-                    id: NodeID::default(),
+                    id: input.id,
                     variant: AssertVariant::Assert(Expression::Binary(BinaryExpression {
                         op: BinaryOperation::Or,
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                         // Take the logical negation of the guard.
                         left: Box::new(Expression::Unary(UnaryExpression {
                             op: UnaryOperation::Not,
                             receiver: Box::new(guard),
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         })),
                         right: Box::new(match assert.variant {
                             // If the assert statement is an `assert`, use the expression as is.
@@ -125,7 +124,7 @@ impl StatementReconstructor for Flattener<'_> {
                                 op: BinaryOperation::Eq,
                                 right: Box::new(right),
                                 span: Default::default(),
-                                id: NodeID::default(),
+                                id: self.node_builder.next_id(),
                             }),
                             // If the assert statement is an `assert_ne`, construct a new inequality expression.
                             AssertVariant::AssertNeq(left, right) => Expression::Binary(BinaryExpression {
@@ -133,7 +132,7 @@ impl StatementReconstructor for Flattener<'_> {
                                 op: BinaryOperation::Neq,
                                 right: Box::new(right),
                                 span: Default::default(),
-                                id: NodeID::default(),
+                                id: self.node_builder.next_id(),
                             }),
                         }),
                     })),
@@ -155,7 +154,7 @@ impl StatementReconstructor for Flattener<'_> {
             (Expression::Identifier(identifier), Expression::Tuple(tuple)) => {
                 self.tuples.insert(identifier.name, tuple);
                 // Note that tuple assignments are removed from the AST.
-                (Statement::dummy(Default::default()), statements)
+                (Statement::dummy(Default::default(), self.node_builder.next_id()), statements)
             }
             // If the lhs is an identifier and the rhs is an identifier that is a tuple, then add it to `self.tuples`.
             (Expression::Identifier(lhs_identifier), Expression::Identifier(rhs_identifier))
@@ -165,7 +164,7 @@ impl StatementReconstructor for Flattener<'_> {
                 // Note that the `unwrap` is safe since the match arm checks that the entry exists.
                 self.tuples.insert(lhs_identifier.name, self.tuples.get(&rhs_identifier.name).unwrap().clone());
                 // Note that tuple assignments are removed from the AST.
-                (Statement::dummy(Default::default()), statements)
+                (Statement::dummy(Default::default(), self.node_builder.next_id()), statements)
             }
             // If the lhs is an identifier and the rhs is a function call that produces a tuple, then add it to `self.tuples`.
             (Expression::Identifier(lhs_identifier), Expression::Call(call)) => {
@@ -187,6 +186,7 @@ impl StatementReconstructor for Flattener<'_> {
                                 .map(|(i, type_)| {
                                     let identifier = Identifier::new(
                                         self.assigner.unique_symbol(lhs_identifier.name, format!("$index${i}$")),
+                                        self.node_builder.next_id(),
                                     );
 
                                     // If the output type is a struct, add it to `self.structs`.
@@ -198,7 +198,7 @@ impl StatementReconstructor for Flattener<'_> {
                                 })
                                 .collect(),
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         };
                         // Add the `tuple_expression` to `self.tuples`.
                         self.tuples.insert(lhs_identifier.name, tuple_expression.clone());
@@ -208,7 +208,7 @@ impl StatementReconstructor for Flattener<'_> {
                                 place: Expression::Tuple(tuple_expression),
                                 value: Expression::Call(call),
                                 span: Default::default(),
-                                id: NodeID::default(),
+                                id: self.node_builder.next_id(),
                             })),
                             statements,
                         )
@@ -224,7 +224,7 @@ impl StatementReconstructor for Flattener<'_> {
                                 place: Expression::Identifier(lhs_identifier),
                                 value: Expression::Call(call),
                                 span: Default::default(),
-                                id: NodeID::default(),
+                                id: self.node_builder.next_id(),
                             })),
                             statements,
                         )
@@ -274,14 +274,14 @@ impl StatementReconstructor for Flattener<'_> {
                         place: Expression::Identifier(lhs_identifier),
                         value,
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     })),
                     statements,
                 )
             }
             (Expression::Identifier(identifier), expression) => {
                 self.update_structs(&identifier, &expression);
-                (self.assigner.simple_assign_statement(identifier, expression), statements)
+                (self.assigner.simple_assign_statement(identifier, expression, self.node_builder.next_id()), statements)
             }
             // If the lhs is a tuple and the rhs is a function call, then return the reconstructed statement.
             (Expression::Tuple(tuple), Expression::Call(call)) => {
@@ -315,7 +315,7 @@ impl StatementReconstructor for Flattener<'_> {
                         place: Expression::Tuple(tuple),
                         value: Expression::Call(call),
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     })),
                     statements,
                 )
@@ -333,11 +333,11 @@ impl StatementReconstructor for Flattener<'_> {
                             place: lhs,
                             value: rhs,
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         }))
                     },
                 ));
-                (Statement::dummy(Default::default()), statements)
+                (Statement::dummy(Default::default(), self.node_builder.next_id()), statements)
             }
             // If the lhs is a tuple and the rhs is an identifier that is a tuple, create a new assign statement for each tuple element.
             (Expression::Tuple(lhs_tuple), Expression::Identifier(identifier))
@@ -358,10 +358,10 @@ impl StatementReconstructor for Flattener<'_> {
                         place: lhs,
                         value: rhs,
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     })));
                 }
-                (Statement::dummy(Default::default()), statements)
+                (Statement::dummy(Default::default(), self.node_builder.next_id()), statements)
             }
             // If the lhs of an assignment is a tuple, then the rhs can be one of the following:
             //  - A function call that produces a tuple. (handled above)
@@ -388,7 +388,7 @@ impl StatementReconstructor for Flattener<'_> {
             statements.push(reconstructed_statement);
         }
 
-        (Block { span: block.span, statements, id: NodeID::default() }, Default::default())
+        (Block { span: block.span, statements, id: self.node_builder.next_id() }, Default::default())
     }
 
     /// Flatten a conditional statement into a list of statements.
@@ -411,7 +411,7 @@ impl StatementReconstructor for Flattener<'_> {
                 op: UnaryOperation::Not,
                 receiver: Box::new(conditional.condition.clone()),
                 span: conditional.condition.span(),
-                id: NodeID::default(),
+                id: conditional.condition.id(),
             }));
 
             // Reconstruct the otherwise-block and accumulate it constituent statements.
@@ -424,7 +424,7 @@ impl StatementReconstructor for Flattener<'_> {
             self.condition_stack.pop();
         };
 
-        (Statement::dummy(Default::default()), statements)
+        (Statement::dummy(Default::default(), self.node_builder.next_id()), statements)
     }
 
     fn reconstruct_console(&mut self, _: ConsoleStatement) -> (Statement, Self::AdditionalOutput) {
@@ -458,13 +458,13 @@ impl StatementReconstructor for Flattener<'_> {
                     span: input.span,
                     expression: Expression::Tuple(tuple),
                     finalize_arguments: input.finalize_arguments,
-                    id: NodeID::default(),
+                    id: input.id,
                 }));
             }
             // Otherwise, add the expression directly.
             _ => self.returns.push((guard, input)),
         };
 
-        (Statement::dummy(Default::default()), Default::default())
+        (Statement::dummy(Default::default(), self.node_builder.next_id()), Default::default())
     }
 }
diff --git a/compiler/passes/src/flattening/flattener.rs b/compiler/passes/src/flattening/flattener.rs
index 8292077887..d18ee4ccf4 100644
--- a/compiler/passes/src/flattening/flattener.rs
+++ b/compiler/passes/src/flattening/flattener.rs
@@ -25,7 +25,7 @@ use leo_ast::{
     ExpressionReconstructor,
     Identifier,
     Member,
-    NodeID,
+    NodeBuilder,
     ReturnStatement,
     Statement,
     TernaryExpression,
@@ -39,8 +39,10 @@ use indexmap::IndexMap;
 pub struct Flattener<'a> {
     /// The symbol table associated with the program.
     pub(crate) symbol_table: &'a SymbolTable,
+    /// A counter used to generate unique node IDs.
+    pub(crate) node_builder: &'a NodeBuilder,
     /// A struct used to construct (unique) assignment statements.
-    pub(crate) assigner: Assigner,
+    pub(crate) assigner: &'a Assigner,
     /// The set of variables that are structs.
     pub(crate) structs: IndexMap<Symbol, Symbol>,
     /// A stack of condition `Expression`s visited up to the current point in the AST.
@@ -55,9 +57,10 @@ pub struct Flattener<'a> {
 }
 
 impl<'a> Flattener<'a> {
-    pub(crate) fn new(symbol_table: &'a SymbolTable, assigner: Assigner) -> Self {
+    pub(crate) fn new(symbol_table: &'a SymbolTable, node_builder: &'a NodeBuilder, assigner: &'a Assigner) -> Self {
         Self {
             symbol_table,
+            node_builder,
             assigner,
             structs: IndexMap::new(),
             condition_stack: Vec::new(),
@@ -83,7 +86,7 @@ impl<'a> Flattener<'a> {
                         left: Box::new(acc),
                         right: Box::new(condition),
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     })
                 }))
             }
@@ -114,14 +117,14 @@ impl<'a> Flattener<'a> {
                         let place = Identifier {
                             name: self.assigner.unique_symbol(prefix, "$"),
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         };
                         let (value, stmts) = self.reconstruct_ternary(TernaryExpression {
                             condition: Box::new(guard),
                             if_true: Box::new(if_true),
                             if_false: Box::new(if_false),
                             span: Default::default(),
-                            id: NodeID::default(),
+                            id: self.node_builder.next_id(),
                         });
                         statements.extend(stmts);
 
@@ -186,7 +189,13 @@ impl<'a> Flattener<'a> {
 
     /// A wrapper around `assigner.unique_simple_assign_statement` that updates `self.structs`.
     pub(crate) fn unique_simple_assign_statement(&mut self, expr: Expression) -> (Identifier, Statement) {
-        let (place, statement) = self.assigner.unique_simple_assign_statement(expr);
+        // Create a new variable for the expression.
+        let name = self.assigner.unique_symbol("$var", "$");
+        // Construct the lhs of the assignment.
+        let place = Identifier { name, span: Default::default(), id: self.node_builder.next_id() };
+        // Construct the assignment statement.
+        let statement = self.assigner.simple_assign_statement(place, expr, self.node_builder.next_id());
+
         match &statement {
             Statement::Assign(assign) => {
                 self.update_structs(&place, &assign.value);
@@ -199,7 +208,7 @@ impl<'a> Flattener<'a> {
     /// A wrapper around `assigner.simple_assign_statement` that updates `self.structs`.
     pub(crate) fn simple_assign_statement(&mut self, lhs: Identifier, rhs: Expression) -> Statement {
         self.update_structs(&lhs, &rhs);
-        self.assigner.simple_assign_statement(lhs, rhs)
+        self.assigner.simple_assign_statement(lhs, rhs, self.node_builder.next_id())
     }
 
     /// Folds a list of return statements into a single return statement and adds the produced statements to the block.
@@ -254,7 +263,7 @@ impl<'a> Flattener<'a> {
                 expression,
                 finalize_arguments,
                 span: Default::default(),
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             }));
         }
     }
diff --git a/compiler/passes/src/flattening/mod.rs b/compiler/passes/src/flattening/mod.rs
index 9cd00c6ee8..3af1449355 100644
--- a/compiler/passes/src/flattening/mod.rs
+++ b/compiler/passes/src/flattening/mod.rs
@@ -61,17 +61,17 @@ pub use flattener::*;
 
 use crate::{Assigner, Pass, SymbolTable};
 
-use leo_ast::{Ast, ProgramReconstructor};
+use leo_ast::{Ast, NodeBuilder, ProgramReconstructor};
 use leo_errors::Result;
 
 impl<'a> Pass for Flattener<'a> {
-    type Input = (Ast, &'a SymbolTable, Assigner);
-    type Output = Result<(Ast, Assigner)>;
+    type Input = (Ast, &'a SymbolTable, &'a NodeBuilder, &'a Assigner);
+    type Output = Result<Ast>;
 
-    fn do_pass((ast, st, assigner): Self::Input) -> Self::Output {
-        let mut reconstructor = Flattener::new(st, assigner);
+    fn do_pass((ast, st, node_builder, assigner): Self::Input) -> Self::Output {
+        let mut reconstructor = Flattener::new(st, node_builder, assigner);
         let program = reconstructor.reconstruct_program(ast.into_repr());
 
-        Ok((Ast::new(program), reconstructor.assigner))
+        Ok(Ast::new(program))
     }
 }
diff --git a/compiler/passes/src/function_inlining/assignment_renamer.rs b/compiler/passes/src/function_inlining/assignment_renamer.rs
index e150663cd1..8cce2deda8 100644
--- a/compiler/passes/src/function_inlining/assignment_renamer.rs
+++ b/compiler/passes/src/function_inlining/assignment_renamer.rs
@@ -24,7 +24,6 @@ use leo_ast::{
     ExpressionReconstructor,
     Identifier,
     IterationStatement,
-    NodeID,
     ProgramReconstructor,
     Statement,
     StatementReconstructor,
@@ -36,15 +35,15 @@ use leo_span::Symbol;
 // TODO: Generalize the functionality of this reconstructor to be used in other passes.
 /// An `AssignmentRenamer` renames the left-hand side of all assignment statements in an AST node.
 /// The new names are propagated to all following identifiers.
-pub struct AssignmentRenamer {
-    pub assigner: Assigner,
+pub struct AssignmentRenamer<'a> {
+    pub assigner: &'a Assigner,
     pub rename_table: RenameTable,
     pub is_lhs: bool,
 }
 
-impl AssignmentRenamer {
+impl<'a> AssignmentRenamer<'a> {
     /// Initialize a new `AssignmentRenamer`.
-    pub fn new(assigner: Assigner) -> Self {
+    pub fn new(assigner: &'a Assigner) -> Self {
         Self { assigner, rename_table: RenameTable::new(None), is_lhs: false }
     }
 
@@ -61,7 +60,7 @@ impl AssignmentRenamer {
     }
 }
 
-impl ExpressionReconstructor for AssignmentRenamer {
+impl ExpressionReconstructor for AssignmentRenamer<'_> {
     type AdditionalOutput = ();
 
     /// Rename the identifier if it is the left-hand side of an assignment, otherwise look up for a new name in the internal rename table.
@@ -80,7 +79,7 @@ impl ExpressionReconstructor for AssignmentRenamer {
             false => *self.rename_table.lookup(input.name).unwrap_or(&input.name),
         };
 
-        (Expression::Identifier(Identifier { name, span: input.span, id: NodeID::default() }), Default::default())
+        (Expression::Identifier(Identifier { name, span: input.span, id: input.id }), Default::default())
     }
 
     /// Rename the variable initializers in the struct expression.
@@ -100,18 +99,18 @@ impl ExpressionReconstructor for AssignmentRenamer {
                             ),
                         },
                         span: member.span,
-                        id: NodeID::default(),
+                        id: member.id,
                     })
                     .collect(),
                 span: input.span,
-                id: NodeID::default(),
+                id: input.id,
             }),
             Default::default(),
         )
     }
 }
 
-impl StatementReconstructor for AssignmentRenamer {
+impl StatementReconstructor for AssignmentRenamer<'_> {
     /// Rename the left-hand side of the assignment statement.
     fn reconstruct_assign(&mut self, input: AssignStatement) -> (Statement, Self::AdditionalOutput) {
         // First rename the right-hand-side of the assignment.
@@ -124,7 +123,7 @@ impl StatementReconstructor for AssignmentRenamer {
         self.is_lhs = false;
 
         (
-            Statement::Assign(Box::new(AssignStatement { place, value, span: input.span, id: NodeID::default() })),
+            Statement::Assign(Box::new(AssignStatement { place, value, span: input.span, id: input.id })),
             Default::default(),
         )
     }
@@ -150,4 +149,4 @@ impl StatementReconstructor for AssignmentRenamer {
     }
 }
 
-impl ProgramReconstructor for AssignmentRenamer {}
+impl ProgramReconstructor for AssignmentRenamer<'_> {}
diff --git a/compiler/passes/src/function_inlining/function_inliner.rs b/compiler/passes/src/function_inlining/function_inliner.rs
index c027f3b7a9..d308970a12 100644
--- a/compiler/passes/src/function_inlining/function_inliner.rs
+++ b/compiler/passes/src/function_inlining/function_inliner.rs
@@ -16,24 +16,27 @@
 
 use crate::{Assigner, AssignmentRenamer, CallGraph};
 
-use leo_ast::Function;
+use leo_ast::{Function, NodeBuilder};
 use leo_span::Symbol;
 
 use indexmap::IndexMap;
 
 pub struct FunctionInliner<'a> {
+    /// A counter used to create unique NodeIDs.
+    pub(crate) node_builder: &'a NodeBuilder,
     /// The call graph for the program.
     pub(crate) call_graph: &'a CallGraph,
     /// A wrapper around an Assigner used to create unique variable assignments.
-    pub(crate) assignment_renamer: AssignmentRenamer,
+    pub(crate) assignment_renamer: AssignmentRenamer<'a>,
     /// A map of reconstructed functions in the current program scope.
     pub(crate) reconstructed_functions: IndexMap<Symbol, Function>,
 }
 
 impl<'a> FunctionInliner<'a> {
     /// Initializes a new `FunctionInliner`.
-    pub fn new(call_graph: &'a CallGraph, assigner: Assigner) -> Self {
+    pub fn new(node_builder: &'a NodeBuilder, call_graph: &'a CallGraph, assigner: &'a Assigner) -> Self {
         Self {
+            node_builder,
             call_graph,
             assignment_renamer: AssignmentRenamer::new(assigner),
             reconstructed_functions: Default::default(),
diff --git a/compiler/passes/src/function_inlining/inline_expression.rs b/compiler/passes/src/function_inlining/inline_expression.rs
index 5e218e0008..6c9b89712f 100644
--- a/compiler/passes/src/function_inlining/inline_expression.rs
+++ b/compiler/passes/src/function_inlining/inline_expression.rs
@@ -21,7 +21,6 @@ use leo_ast::{
     Expression,
     ExpressionReconstructor,
     Identifier,
-    NodeID,
     ReturnStatement,
     Statement,
     StatementReconstructor,
@@ -90,7 +89,7 @@ impl ExpressionReconstructor for FunctionInliner<'_> {
                             _ => unreachable!("This branch checks that the last statement is a return statement."),
                         }
                     }
-                    _ => Expression::Unit(UnitExpression { span: Default::default(), id: NodeID::default() }),
+                    _ => Expression::Unit(UnitExpression { span: Default::default(), id: self.node_builder.next_id() }),
                 };
 
                 (result, inlined_statements)
diff --git a/compiler/passes/src/function_inlining/inline_statement.rs b/compiler/passes/src/function_inlining/inline_statement.rs
index 8f73446fe0..fa59281d53 100644
--- a/compiler/passes/src/function_inlining/inline_statement.rs
+++ b/compiler/passes/src/function_inlining/inline_statement.rs
@@ -26,7 +26,6 @@ use leo_ast::{
     ExpressionReconstructor,
     ExpressionStatement,
     IterationStatement,
-    NodeID,
     Statement,
     StatementReconstructor,
 };
@@ -44,14 +43,14 @@ impl StatementReconstructor for FunctionInliner<'_> {
                         place: lhs,
                         value: rhs,
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     }))
                 }));
-                (Statement::dummy(Default::default()), statements)
+                (Statement::dummy(Default::default(), self.node_builder.next_id()), statements)
             }
 
             (place, value) => (
-                Statement::Assign(Box::new(AssignStatement { place, value, span: input.span, id: NodeID::default() })),
+                Statement::Assign(Box::new(AssignStatement { place, value, span: input.span, id: input.id })),
                 statements,
             ),
         }
@@ -67,7 +66,7 @@ impl StatementReconstructor for FunctionInliner<'_> {
             statements.push(reconstructed_statement);
         }
 
-        (Block { span: block.span, statements, id: NodeID::default() }, Default::default())
+        (Block { span: block.span, statements, id: block.id }, Default::default())
     }
 
     /// Flattening removes conditional statements from the program.
@@ -93,8 +92,8 @@ impl StatementReconstructor for FunctionInliner<'_> {
 
         // If the resulting expression is a unit expression, return a dummy statement.
         let statement = match expression {
-            Expression::Unit(_) => Statement::dummy(Default::default()),
-            _ => Statement::Expression(ExpressionStatement { expression, span: input.span, id: NodeID::default() }),
+            Expression::Unit(_) => Statement::dummy(Default::default(), self.node_builder.next_id()),
+            _ => Statement::Expression(ExpressionStatement { expression, span: input.span, id: input.id }),
         };
 
         (statement, additional_statements)
diff --git a/compiler/passes/src/function_inlining/mod.rs b/compiler/passes/src/function_inlining/mod.rs
index 30ec9f8168..4cdae3c977 100644
--- a/compiler/passes/src/function_inlining/mod.rs
+++ b/compiler/passes/src/function_inlining/mod.rs
@@ -66,17 +66,17 @@ pub use function_inliner::*;
 
 use crate::{Assigner, CallGraph, Pass};
 
-use leo_ast::{Ast, ProgramReconstructor};
+use leo_ast::{Ast, NodeBuilder, ProgramReconstructor};
 use leo_errors::Result;
 
 impl<'a> Pass for FunctionInliner<'a> {
-    type Input = (Ast, &'a CallGraph, Assigner);
-    type Output = Result<(Ast, Assigner)>;
+    type Input = (Ast, &'a NodeBuilder, &'a CallGraph, &'a Assigner);
+    type Output = Result<Ast>;
 
-    fn do_pass((ast, call_graph, assigner): Self::Input) -> Self::Output {
-        let mut reconstructor = FunctionInliner::new(call_graph, assigner);
+    fn do_pass((ast, node_builder, call_graph, assigner): Self::Input) -> Self::Output {
+        let mut reconstructor = FunctionInliner::new(node_builder, call_graph, assigner);
         let program = reconstructor.reconstruct_program(ast.into_repr());
 
-        Ok((Ast::new(program), reconstructor.assignment_renamer.assigner))
+        Ok(Ast::new(program))
     }
 }
diff --git a/compiler/passes/src/loop_unrolling/mod.rs b/compiler/passes/src/loop_unrolling/mod.rs
index 87c2fbd663..a2c3def780 100644
--- a/compiler/passes/src/loop_unrolling/mod.rs
+++ b/compiler/passes/src/loop_unrolling/mod.rs
@@ -31,15 +31,15 @@ pub use unroll_statement::*;
 
 use crate::{Pass, SymbolTable};
 
-use leo_ast::{Ast, ProgramReconstructor};
+use leo_ast::{Ast, NodeBuilder, ProgramReconstructor};
 use leo_errors::{emitter::Handler, Result};
 
 impl<'a> Pass for Unroller<'a> {
-    type Input = (Ast, &'a Handler, SymbolTable);
+    type Input = (Ast, &'a Handler, &'a NodeBuilder, SymbolTable);
     type Output = Result<(Ast, SymbolTable)>;
 
-    fn do_pass((ast, handler, st): Self::Input) -> Self::Output {
-        let mut reconstructor = Self::new(st, handler);
+    fn do_pass((ast, handler, node_builder, st): Self::Input) -> Self::Output {
+        let mut reconstructor = Self::new(st, handler, node_builder);
         let program = reconstructor.reconstruct_program(ast.into_repr());
         handler.last_err().map_err(|e| *e)?;
 
diff --git a/compiler/passes/src/loop_unrolling/unroll_program.rs b/compiler/passes/src/loop_unrolling/unroll_program.rs
index de4645e7a2..34074e78a3 100644
--- a/compiler/passes/src/loop_unrolling/unroll_program.rs
+++ b/compiler/passes/src/loop_unrolling/unroll_program.rs
@@ -47,7 +47,7 @@ impl ProgramReconstructor for Unroller<'_> {
                 output_type: finalize.output_type,
                 block,
                 span: finalize.span,
-                id: NodeID::default(),
+                id: finalize.id,
             }
         });
 
@@ -62,7 +62,7 @@ impl ProgramReconstructor for Unroller<'_> {
             block,
             finalize,
             span: function.span,
-            id: NodeID::default(),
+            id: function.id,
         };
 
         // Exit the function's scope.
diff --git a/compiler/passes/src/loop_unrolling/unroll_statement.rs b/compiler/passes/src/loop_unrolling/unroll_statement.rs
index ce947ee5d1..6160eea091 100644
--- a/compiler/passes/src/loop_unrolling/unroll_statement.rs
+++ b/compiler/passes/src/loop_unrolling/unroll_statement.rs
@@ -30,7 +30,7 @@ impl StatementReconstructor for Unroller<'_> {
         let block = Block {
             statements: input.statements.into_iter().map(|s| self.reconstruct_statement(s).0).collect(),
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         };
 
         // Exit the block scope.
diff --git a/compiler/passes/src/loop_unrolling/unroller.rs b/compiler/passes/src/loop_unrolling/unroller.rs
index 35ec32a976..9483f50933 100644
--- a/compiler/passes/src/loop_unrolling/unroller.rs
+++ b/compiler/passes/src/loop_unrolling/unroller.rs
@@ -22,7 +22,7 @@ use leo_ast::{
     IntegerType,
     IterationStatement,
     Literal,
-    NodeID,
+    NodeBuilder,
     Statement,
     StatementReconstructor,
     Type,
@@ -41,13 +41,15 @@ pub struct Unroller<'a> {
     pub(crate) scope_index: usize,
     /// An error handler used for any errors found during unrolling.
     pub(crate) handler: &'a Handler,
+    /// A counter used to generate unique node IDs.
+    pub(crate) node_builder: &'a NodeBuilder,
     /// Are we in the midst of unrolling a loop?
     pub(crate) is_unrolling: bool,
 }
 
 impl<'a> Unroller<'a> {
-    pub(crate) fn new(symbol_table: SymbolTable, handler: &'a Handler) -> Self {
-        Self { symbol_table: RefCell::new(symbol_table), scope_index: 0, handler, is_unrolling: false }
+    pub(crate) fn new(symbol_table: SymbolTable, handler: &'a Handler, node_builder: &'a NodeBuilder) -> Self {
+        Self { symbol_table: RefCell::new(symbol_table), scope_index: 0, handler, node_builder, is_unrolling: false }
     }
 
     /// Returns the index of the current scope.
@@ -86,7 +88,7 @@ impl<'a> Unroller<'a> {
                 Ok(val_as_u128) => Ok(val_as_u128),
                 Err(err) => {
                     self.handler.emit_err(err);
-                    Err(Statement::dummy(input.span))
+                    Err(Statement::dummy(input.span, self.node_builder.next_id()))
                 }
             }
         };
@@ -128,7 +130,7 @@ impl<'a> Unroller<'a> {
                     iter.map(|iteration_count| self.unroll_single_iteration(&input, iteration_count)).collect()
                 }
             },
-            id: NodeID::default(),
+            id: input.id,
         });
 
         // Exit the scope of the loop body.
@@ -148,36 +150,66 @@ impl<'a> Unroller<'a> {
 
         // Reconstruct `iteration_count` as a `Literal`.
         let value = match input.type_ {
-            Type::Integer(IntegerType::I8) => {
-                Literal::Integer(IntegerType::I8, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::I16) => {
-                Literal::Integer(IntegerType::I16, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::I32) => {
-                Literal::Integer(IntegerType::I32, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::I64) => {
-                Literal::Integer(IntegerType::I64, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::I128) => {
-                Literal::Integer(IntegerType::I128, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::U8) => {
-                Literal::Integer(IntegerType::U8, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::U16) => {
-                Literal::Integer(IntegerType::U16, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::U32) => {
-                Literal::Integer(IntegerType::U32, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::U64) => {
-                Literal::Integer(IntegerType::U64, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
-            Type::Integer(IntegerType::U128) => {
-                Literal::Integer(IntegerType::U128, iteration_count.to_string(), Default::default(), NodeID::default())
-            }
+            Type::Integer(IntegerType::I8) => Literal::Integer(
+                IntegerType::I8,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::I16) => Literal::Integer(
+                IntegerType::I16,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::I32) => Literal::Integer(
+                IntegerType::I32,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::I64) => Literal::Integer(
+                IntegerType::I64,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::I128) => Literal::Integer(
+                IntegerType::I128,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::U8) => Literal::Integer(
+                IntegerType::U8,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::U16) => Literal::Integer(
+                IntegerType::U16,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::U32) => Literal::Integer(
+                IntegerType::U32,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::U64) => Literal::Integer(
+                IntegerType::U64,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
+            Type::Integer(IntegerType::U128) => Literal::Integer(
+                IntegerType::U128,
+                iteration_count.to_string(),
+                Default::default(),
+                self.node_builder.next_id(),
+            ),
             _ => unreachable!(
                 "The iteration variable must be an integer type. This should be enforced by type checking."
             ),
@@ -191,7 +223,7 @@ impl<'a> Unroller<'a> {
                 value: Expression::Literal(value),
                 span: Default::default(),
                 place: Expression::Identifier(input.variable),
-                id: NodeID::default(),
+                id: self.node_builder.next_id(),
             })
             .0,
         ];
@@ -201,7 +233,7 @@ impl<'a> Unroller<'a> {
             statements.push(self.reconstruct_statement(s).0);
         });
 
-        let block = Statement::Block(Block { statements, span: input.block.span, id: NodeID::default() });
+        let block = Statement::Block(Block { statements, span: input.block.span, id: input.block.id });
 
         self.is_unrolling = prior_is_unrolling;
 
diff --git a/compiler/passes/src/static_single_assignment/mod.rs b/compiler/passes/src/static_single_assignment/mod.rs
index 32c718bc1a..753fa35f72 100644
--- a/compiler/passes/src/static_single_assignment/mod.rs
+++ b/compiler/passes/src/static_single_assignment/mod.rs
@@ -61,17 +61,17 @@ pub use static_single_assigner::*;
 
 use crate::{Assigner, Pass, SymbolTable};
 
-use leo_ast::{Ast, ProgramConsumer};
+use leo_ast::{Ast, NodeBuilder, ProgramConsumer};
 use leo_errors::Result;
 
 impl<'a> Pass for StaticSingleAssigner<'a> {
-    type Input = (Ast, &'a SymbolTable);
-    type Output = Result<(Ast, Assigner)>;
+    type Input = (Ast, &'a NodeBuilder, &'a Assigner, &'a SymbolTable);
+    type Output = Result<Ast>;
 
-    fn do_pass((ast, symbol_table): Self::Input) -> Self::Output {
-        let mut consumer = StaticSingleAssigner::new(symbol_table);
+    fn do_pass((ast, node_builder, assigner, symbol_table): Self::Input) -> Self::Output {
+        let mut consumer = StaticSingleAssigner::new(node_builder, symbol_table, assigner);
         let program = consumer.consume_program(ast.into_repr());
 
-        Ok((Ast::new(program), consumer.assigner))
+        Ok(Ast::new(program))
     }
 }
diff --git a/compiler/passes/src/static_single_assignment/rename_expression.rs b/compiler/passes/src/static_single_assignment/rename_expression.rs
index 670855cf16..1a10e603a8 100644
--- a/compiler/passes/src/static_single_assignment/rename_expression.rs
+++ b/compiler/passes/src/static_single_assignment/rename_expression.rs
@@ -27,7 +27,6 @@ use leo_ast::{
     Identifier,
     Literal,
     MemberAccess,
-    NodeID,
     Statement,
     Struct,
     StructExpression,
@@ -65,7 +64,7 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
                             })
                             .collect(),
                         span: function.span,
-                        id: NodeID::default(),
+                        id: function.id,
                     }),
                     statements,
                 )
@@ -85,7 +84,7 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
                         inner: Box::new(expr),
                         name: member.name,
                         span: member.span,
-                        id: NodeID::default(),
+                        id: member.id,
                     }),
                     statements,
                 )
@@ -97,14 +96,14 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
                         tuple: Box::new(expr),
                         index: tuple.index,
                         span: tuple.span,
-                        id: NodeID::default(),
+                        id: tuple.id,
                     }),
                     statements,
                 )
             }
             expr => (expr, Vec::new()),
         };
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Access(expr));
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Access(expr));
         statements.push(statement);
 
         (Expression::Identifier(place), statements)
@@ -120,12 +119,12 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
         statements.append(&mut right_statements);
 
         // Construct and accumulate a unique assignment statement storing the result of the binary expression.
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Binary(BinaryExpression {
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Binary(BinaryExpression {
             left: Box::new(left_expression),
             right: Box::new(right_expression),
             op: input.op,
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }));
         statements.push(statement);
 
@@ -148,14 +147,14 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
             .collect();
 
         // Construct and accumulate a new assignment statement for the call expression.
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Call(CallExpression {
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Call(CallExpression {
             // Note that we do not rename the function name.
             function: input.function,
             // Consume the arguments.
             arguments,
             external: input.external,
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }));
         statements.push(statement);
 
@@ -168,11 +167,11 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
         let (expression, mut statements) = self.consume_expression(*input.expression);
 
         // Construct and accumulate a unique assignment statement storing the result of the cast expression.
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Cast(CastExpression {
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Cast(CastExpression {
             expression: Box::new(expression),
             type_: input.type_,
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }));
         statements.push(statement);
 
@@ -204,7 +203,7 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
                     identifier: arg.identifier,
                     expression: Some(expression),
                     span: arg.span,
-                    id: NodeID::default(),
+                    id: arg.id,
                 }
             })
             .collect();
@@ -241,11 +240,11 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
         }
 
         // Construct and accumulate a new assignment statement for the struct expression.
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Struct(StructExpression {
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Struct(StructExpression {
             name: input.name,
             span: input.span,
             members: reordered_members,
-            id: NodeID::default(),
+            id: input.id,
         }));
         statements.push(statement);
 
@@ -268,7 +267,7 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
             false => *self.rename_table.lookup(identifier.name).unwrap_or(&identifier.name),
         };
 
-        (Expression::Identifier(Identifier { name, span: identifier.span, id: NodeID::default() }), Default::default())
+        (Expression::Identifier(Identifier { name, span: identifier.span, id: identifier.id }), Default::default())
     }
 
     /// Consumes and returns the literal without making any modifications.
@@ -290,12 +289,12 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
         statements.append(&mut if_false_statements);
 
         // Construct and accumulate a unique assignment statement storing the result of the ternary expression.
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Ternary(TernaryExpression {
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Ternary(TernaryExpression {
             condition: Box::new(cond_expr),
             if_true: Box::new(if_true_expr),
             if_false: Box::new(if_false_expr),
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }));
         statements.push(statement);
 
@@ -318,10 +317,10 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
             .collect();
 
         // Construct and accumulate a new assignment statement for the tuple expression.
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Tuple(TupleExpression {
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Tuple(TupleExpression {
             elements,
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }));
         statements.push(statement);
 
@@ -334,11 +333,11 @@ impl ExpressionConsumer for StaticSingleAssigner<'_> {
         let (receiver, mut statements) = self.consume_expression(*input.receiver);
 
         // Construct and accumulate a new assignment statement for the unary expression.
-        let (place, statement) = self.assigner.unique_simple_assign_statement(Expression::Unary(UnaryExpression {
+        let (place, statement) = self.unique_simple_assign_statement(Expression::Unary(UnaryExpression {
             op: input.op,
             receiver: Box::new(receiver),
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }));
         statements.push(statement);
 
diff --git a/compiler/passes/src/static_single_assignment/rename_program.rs b/compiler/passes/src/static_single_assignment/rename_program.rs
index 2b1eb0d465..d61fe3f98e 100644
--- a/compiler/passes/src/static_single_assignment/rename_program.rs
+++ b/compiler/passes/src/static_single_assignment/rename_program.rs
@@ -22,7 +22,6 @@ use leo_ast::{
     Function,
     FunctionConsumer,
     Member,
-    NodeID,
     Program,
     ProgramConsumer,
     ProgramScope,
@@ -75,7 +74,7 @@ impl FunctionConsumer for StaticSingleAssigner<'_> {
         }
 
         let block =
-            Block { span: function.block.span, statements: self.consume_block(function.block), id: NodeID::default() };
+            Block { span: function.block.span, id: function.block.id, statements: self.consume_block(function.block) };
 
         // Remove the `RenameTable` for the function.
         self.pop();
@@ -92,8 +91,8 @@ impl FunctionConsumer for StaticSingleAssigner<'_> {
 
             let block = Block {
                 span: finalize.block.span,
+                id: finalize.block.id,
                 statements: self.consume_block(finalize.block),
-                id: NodeID::default(),
             };
 
             // Remove the `RenameTable` for the finalize block.
@@ -106,7 +105,7 @@ impl FunctionConsumer for StaticSingleAssigner<'_> {
                 output_type: finalize.output_type,
                 block,
                 span: finalize.span,
-                id: NodeID::default(),
+                id: finalize.id,
             }
         });
 
@@ -120,7 +119,7 @@ impl FunctionConsumer for StaticSingleAssigner<'_> {
             block,
             finalize,
             span: function.span,
-            id: NodeID::default(),
+            id: function.id,
         }
     }
 }
diff --git a/compiler/passes/src/static_single_assignment/rename_statement.rs b/compiler/passes/src/static_single_assignment/rename_statement.rs
index 65732d1b81..fea08fac1e 100644
--- a/compiler/passes/src/static_single_assignment/rename_statement.rs
+++ b/compiler/passes/src/static_single_assignment/rename_statement.rs
@@ -32,7 +32,6 @@ use leo_ast::{
     ExpressionStatement,
     Identifier,
     IterationStatement,
-    NodeID,
     ReturnStatement,
     Statement,
     StatementConsumer,
@@ -76,7 +75,7 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
         };
 
         // Add the assert statement to the list of produced statements.
-        statements.push(Statement::Assert(AssertStatement { variant, span: input.span, id: NodeID::default() }));
+        statements.push(Statement::Assert(AssertStatement { variant, span: input.span, id: input.id }));
 
         statements
     }
@@ -95,7 +94,7 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
         };
         self.is_lhs = false;
 
-        statements.push(self.assigner.simple_assign_statement(place, value));
+        statements.push(self.assigner.simple_assign_statement(place, value, self.node_builder.next_id()));
 
         statements
     }
@@ -122,8 +121,8 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
         // Consume the then-block.
         let then = Block {
             span: conditional.then.span,
+            id: conditional.then.id,
             statements: self.consume_block(conditional.then),
-            id: NodeID::default(),
         };
 
         // Remove the `RenameTable` for the then-block.
@@ -136,13 +135,13 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
         let otherwise = conditional.otherwise.map(|otherwise| Box::new(Statement::Block(match *otherwise {
             Statement::Block(block) => Block {
                 span: block.span,
+                id: block.id,
                 statements: self.consume_block(block),
-                id: NodeID::default(),
             },
             Statement::Conditional(conditional) => Block {
                 span: conditional.span,
+                id: conditional.id,
                 statements: self.consume_conditional(conditional),
-                id: NodeID::default()
             },
             _ => unreachable!("Type checking guarantees that the otherwise-block of a conditional statement is a block or another conditional statement."),
         })));
@@ -153,10 +152,10 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
         // Add reconstructed conditional statement to the list of produced statements.
         statements.push(Statement::Conditional(ConditionalStatement {
             span: conditional.span,
+            id: conditional.id,
             condition: condition.clone(),
             then,
             otherwise,
-            id: NodeID::default(),
         }));
 
         // Compute the write set for the variables written in the then-block or otherwise-block.
@@ -175,7 +174,7 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
                     Box::new(Expression::Identifier(Identifier {
                         name,
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     }))
                 };
 
@@ -187,15 +186,16 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
                     if_true: create_phi_argument(&if_table, **symbol),
                     if_false: create_phi_argument(&else_table, **symbol),
                     span: Default::default(),
-                    id: NodeID::default(),
+                    id: self.node_builder.next_id(),
                 });
 
                 statements.extend(stmts);
 
                 // Create a new `AssignStatement` for the phi function.
                 let assignment = self.assigner.simple_assign_statement(
-                    Identifier { name: new_name, span: Default::default(), id: NodeID::default() },
+                    Identifier { name: new_name, span: Default::default(), id: self.node_builder.next_id() },
                     value,
+                    self.node_builder.next_id(),
                 );
 
                 // Update the `RenameTable` with the new name of the variable.
@@ -228,7 +228,7 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
                     Expression::Identifier(identifier) => identifier,
                     _ => unreachable!("`self.consume_identifier` will always return an `Identifier`."),
                 };
-                statements.push(self.assigner.simple_assign_statement(identifier, value));
+                statements.push(self.assigner.simple_assign_statement(identifier, value, self.node_builder.next_id()));
             }
             Expression::Tuple(tuple) => {
                 let elements = tuple.elements.into_iter().map(|element| {
@@ -247,11 +247,11 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
                     place: Expression::Tuple(TupleExpression {
                         elements,
                         span: Default::default(),
-                        id: NodeID::default(),
+                        id: self.node_builder.next_id(),
                     }),
                     value,
                     span: Default::default(),
-                    id: NodeID::default(),
+                    id: self.node_builder.next_id(),
                 })));
             }
             _ => unreachable!(
@@ -291,10 +291,10 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
                         arguments,
                         external: call.external,
                         span: call.span,
-                        id: NodeID::default(),
+                        id: call.id,
                     }),
                     span: input.span,
-                    id: NodeID::default(),
+                    id: input.id,
                 }));
             }
             Expression::Access(AccessExpression::AssociatedFunction(associated_function)) => {
@@ -308,10 +308,10 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
                         name: associated_function.name,
                         arguments,
                         span: associated_function.span,
-                        id: NodeID::default(),
+                        id: associated_function.id,
                     })),
                     span: input.span,
-                    id: NodeID::default(),
+                    id: input.id,
                 }))
             }
 
@@ -350,7 +350,7 @@ impl StatementConsumer for StaticSingleAssigner<'_> {
             expression,
             finalize_arguments: finalize_args,
             span: input.span,
-            id: NodeID::default(),
+            id: input.id,
         }));
 
         statements
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 40cdea3ea0..13071742d7 100644
--- a/compiler/passes/src/static_single_assignment/static_single_assigner.rs
+++ b/compiler/passes/src/static_single_assignment/static_single_assigner.rs
@@ -16,7 +16,11 @@
 
 use crate::{Assigner, RenameTable, SymbolTable};
 
+use leo_ast::{Expression, Identifier, NodeBuilder, Statement};
+
 pub struct StaticSingleAssigner<'a> {
+    /// A counter used to generate unique node IDs.
+    pub(crate) node_builder: &'a NodeBuilder,
     /// The `SymbolTable` of the program.
     pub(crate) symbol_table: &'a SymbolTable,
     /// The `RenameTable` for the current basic block in the AST
@@ -24,13 +28,13 @@ 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,
     /// A struct used to construct (unique) assignment statements.
-    pub(crate) assigner: Assigner,
+    pub(crate) assigner: &'a Assigner,
 }
 
 impl<'a> StaticSingleAssigner<'a> {
     /// Initializes a new `StaticSingleAssigner` with an empty `RenameTable`.
-    pub(crate) fn new(symbol_table: &'a SymbolTable) -> Self {
-        Self { symbol_table, rename_table: RenameTable::new(None), is_lhs: false, assigner: Assigner::default() }
+    pub(crate) fn new(node_builder: &'a NodeBuilder, symbol_table: &'a SymbolTable, assigner: &'a Assigner) -> Self {
+        Self { node_builder, symbol_table, rename_table: RenameTable::new(None), is_lhs: false, assigner }
     }
 
     /// Pushes a new scope, setting the current scope as the new scope's parent.
@@ -44,4 +48,23 @@ impl<'a> StaticSingleAssigner<'a> {
         let parent = self.rename_table.parent.clone().unwrap_or_default();
         core::mem::replace(&mut self.rename_table, *parent)
     }
+
+    /// Constructs a simple assign statement for `expr` with a unique name.
+    /// For example, `expr` is transformed into `$var$0 = expr;`.
+    /// The lhs is guaranteed to be unique with respect to the `Assigner`.
+    pub(crate) fn unique_simple_assign_statement(&mut self, expr: Expression) -> (Identifier, Statement) {
+        // Create a new variable for the expression.
+        let name = self.assigner.unique_symbol("$var", "$");
+
+        // Create a new identifier for the variable.
+        let place = Identifier { name, span: Default::default(), id: self.node_builder.next_id() };
+
+        // Construct the statement.
+        let statement = self.assigner.simple_assign_statement(place, expr, self.node_builder.next_id());
+
+        // Construct the identifier to be returned. Note that it must have a unique node ID.
+        let identifier = Identifier { name, span: Default::default(), id: self.node_builder.next_id() };
+
+        (identifier, statement)
+    }
 }
diff --git a/leo/cli/commands/build.rs b/leo/cli/commands/build.rs
index 9eb7c18c6f..bde6fd605e 100644
--- a/leo/cli/commands/build.rs
+++ b/leo/cli/commands/build.rs
@@ -16,7 +16,7 @@
 
 use super::*;
 
-use leo_ast::Struct;
+use leo_ast::{NodeBuilder, Struct};
 use leo_compiler::{Compiler, CompilerOptions, InputAst, OutputOptions};
 use leo_package::{
     build::BuildDirectory,
@@ -103,6 +103,9 @@ impl Command for Build {
         // Initialize error handler
         let handler = Handler::default();
 
+        // Initialize a node counter.
+        let node_builder = NodeBuilder::default();
+
         // Fetch paths to all .leo files in the source directory.
         let source_files = SourceDirectory::files(&package_path)?;
 
@@ -158,7 +161,7 @@ impl Command for Build {
                 .map_err(|e| CompilerError::file_read_error(&input_file_path, e))?;
 
             // TODO: This is a hack to notify the user that something is wrong with the input file. Redesign.
-            leo_parser::parse_input(&handler, &input_sf.src, input_sf.start_pos)
+            leo_parser::parse_input(&handler, &node_builder, &input_sf.src, input_sf.start_pos)
                 .map_err(|_e| println!("Warning: Failed to parse input file"))
                 .ok()
         } else {
diff --git a/tests/expectations/compiler/address/binary.out b/tests/expectations/compiler/address/binary.out
index a0cc9ba911..97e609a25a 100644
--- a/tests/expectations/compiler/address/binary.out
+++ b/tests/expectations/compiler/address/binary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: aedbecdddf47324809cfe36a7329e30e0b02cb1a8e079ea3c6a1fed485eb6a23
-      unrolled_ast: aedbecdddf47324809cfe36a7329e30e0b02cb1a8e079ea3c6a1fed485eb6a23
-      ssa_ast: 6495fd7481d1b9490b37eb367af3f47f367d5571bed98476ba465441ffb6af52
-      flattened_ast: d768a50e70e99bbbebbf391db1363d50ea42a2a64997319fe442c862eb477a12
-      inlined_ast: d768a50e70e99bbbebbf391db1363d50ea42a2a64997319fe442c862eb477a12
-      dce_ast: 195cdd11eab6742a8726b398d7fe1ad5b2ed170a9ef63b8da24e5c9bfed7e066
+  - - initial_ast: ca70df10bc83440d704ee7f48d1fcd9add55c26ffc98a0f84f631ad65a83ec93
+      unrolled_ast: ca70df10bc83440d704ee7f48d1fcd9add55c26ffc98a0f84f631ad65a83ec93
+      ssa_ast: 66c5290f551b96ac177708948dd1080ddd4d00b1e3a73e33c28197e0ebdf7792
+      flattened_ast: 2f37e06e70a4256eaff95d292b04aa0c72e34c84dfd7075e7997cf05ae4826a1
+      inlined_ast: 2f37e06e70a4256eaff95d292b04aa0c72e34c84dfd7075e7997cf05ae4826a1
+      dce_ast: 4eda0426e943afc272c16e4fb45f9cdd8d5ea97d39cb495361a71549dfbec66e
       bytecode: e434c09cee27a5dfb5a4e9e9fd26aa2ba6e7f0653fad3a4f2a7d85983ba559c9
       warnings: ""
diff --git a/tests/expectations/compiler/address/branch.out b/tests/expectations/compiler/address/branch.out
index bc7b0fa571..c6ecf31dbf 100644
--- a/tests/expectations/compiler/address/branch.out
+++ b/tests/expectations/compiler/address/branch.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e64985069c66d2678488b57ceab0026149c4ebaf1fc42ac15798fdc306f74d20
-      unrolled_ast: e64985069c66d2678488b57ceab0026149c4ebaf1fc42ac15798fdc306f74d20
-      ssa_ast: 073128b766cc8ea00519d7cdee4714796e631f2847db5f55b75d829101bd9552
-      flattened_ast: 9b5233811932dc7004d77590063c9b7d2ff00be8bd7c7c8c81192ce5df740175
-      inlined_ast: 9b5233811932dc7004d77590063c9b7d2ff00be8bd7c7c8c81192ce5df740175
-      dce_ast: 9b5233811932dc7004d77590063c9b7d2ff00be8bd7c7c8c81192ce5df740175
+  - - initial_ast: 6b548ac1d786b728c21d152061d7ae31e25fe8c3a93c38577a82f1c0c2ffd0b2
+      unrolled_ast: 6b548ac1d786b728c21d152061d7ae31e25fe8c3a93c38577a82f1c0c2ffd0b2
+      ssa_ast: f3daee14d82b5ff4064f11080deef28899853dbef55479ad86e1c6fe34cec041
+      flattened_ast: 26dce66c06759444280565f35558f94c4c1550cbb589562ca7121f6651924bcc
+      inlined_ast: 26dce66c06759444280565f35558f94c4c1550cbb589562ca7121f6651924bcc
+      dce_ast: 26dce66c06759444280565f35558f94c4c1550cbb589562ca7121f6651924bcc
       bytecode: da1b0a83a17b801368b0a583b158d88d9d807a33000c8e89e82da123c8041aea
       warnings: ""
diff --git a/tests/expectations/compiler/address/equal.out b/tests/expectations/compiler/address/equal.out
index 9bb42b86cc..c149e41017 100644
--- a/tests/expectations/compiler/address/equal.out
+++ b/tests/expectations/compiler/address/equal.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7a1afdab98a730090c3370305d8fa23a7a69f779b492288ab8bae2169b880118
-      unrolled_ast: 7a1afdab98a730090c3370305d8fa23a7a69f779b492288ab8bae2169b880118
-      ssa_ast: faaa8bd1f0f1f9d0c2d20cf6e8265e8db0593930bf38451509a218fdca25905a
-      flattened_ast: 94377cdcfd12afd021b97302dc880bca782aeb9ea8b908dd3f8ef19e4d231e69
-      inlined_ast: 94377cdcfd12afd021b97302dc880bca782aeb9ea8b908dd3f8ef19e4d231e69
-      dce_ast: 94377cdcfd12afd021b97302dc880bca782aeb9ea8b908dd3f8ef19e4d231e69
+  - - initial_ast: 778ee6a278f90c3c9a337517771c2c3fd31cf166c0fe38ba7e1da097ec0f81f1
+      unrolled_ast: 778ee6a278f90c3c9a337517771c2c3fd31cf166c0fe38ba7e1da097ec0f81f1
+      ssa_ast: 577c1fdc33f8a0182faa399d4f2a5d49f95efba574f0cf451511c3b8a447914f
+      flattened_ast: 90c9589974b2fe7c5e320e4ac76a1655f4b84e60ed8ec9b8c52c9f1f29e4a682
+      inlined_ast: 90c9589974b2fe7c5e320e4ac76a1655f4b84e60ed8ec9b8c52c9f1f29e4a682
+      dce_ast: 90c9589974b2fe7c5e320e4ac76a1655f4b84e60ed8ec9b8c52c9f1f29e4a682
       bytecode: bde2653fac0393940c5400272e53492228206e50abb36ce080b95043003ee976
       warnings: ""
diff --git a/tests/expectations/compiler/address/ternary.out b/tests/expectations/compiler/address/ternary.out
index 2203c2c4a3..8b4b78e788 100644
--- a/tests/expectations/compiler/address/ternary.out
+++ b/tests/expectations/compiler/address/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3e3635b9f0e8098731455f2d2b49026c90cea00d07461e7cbcaa5759bf823be4
-      unrolled_ast: 3e3635b9f0e8098731455f2d2b49026c90cea00d07461e7cbcaa5759bf823be4
-      ssa_ast: 21ca11c494c4f9c4e204f368e967727bda93ce65962c86935ce2fe6895197ebb
-      flattened_ast: c5ebee78d83725ede5e4dce6ca0f77339b3d5dd0eb727fbf32bd6c476f569173
-      inlined_ast: c5ebee78d83725ede5e4dce6ca0f77339b3d5dd0eb727fbf32bd6c476f569173
-      dce_ast: c5ebee78d83725ede5e4dce6ca0f77339b3d5dd0eb727fbf32bd6c476f569173
+  - - initial_ast: 853fd69f7e97be37c0f6a19994e4e9bf9ae354ff2a41c3de90d23d8f0d777884
+      unrolled_ast: 853fd69f7e97be37c0f6a19994e4e9bf9ae354ff2a41c3de90d23d8f0d777884
+      ssa_ast: c08b13b85d836c9a2e4d0f6fb1b20ccc60a9d1aa8cc7ca81b1448ddd2feef8e0
+      flattened_ast: ebfda40c22a70c7490170c019fc22eef2552122300b28947b7c1826bc889cd1e
+      inlined_ast: ebfda40c22a70c7490170c019fc22eef2552122300b28947b7c1826bc889cd1e
+      dce_ast: ebfda40c22a70c7490170c019fc22eef2552122300b28947b7c1826bc889cd1e
       bytecode: c0b90b7f7e80041dc1a314c1a87290534936018fb001c6e1291266a02393c6f2
       warnings: ""
diff --git a/tests/expectations/compiler/boolean/and.out b/tests/expectations/compiler/boolean/and.out
index 36a6f80ecd..7b2436c6ca 100644
--- a/tests/expectations/compiler/boolean/and.out
+++ b/tests/expectations/compiler/boolean/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 83a584fa8274354e7caf1b9f530ee91008fb867a341045e84f1849cd8dc88e88
-      unrolled_ast: 83a584fa8274354e7caf1b9f530ee91008fb867a341045e84f1849cd8dc88e88
-      ssa_ast: 999147035ff811021e9a050ec2fabecb6ff70eacbac0ca4b6c143b9105dfd28e
-      flattened_ast: 0839b38833dc1b6dfcf512a031d4c6fa17de417ee965fd33963c9ed5eb0b7b01
-      inlined_ast: 0839b38833dc1b6dfcf512a031d4c6fa17de417ee965fd33963c9ed5eb0b7b01
-      dce_ast: 0839b38833dc1b6dfcf512a031d4c6fa17de417ee965fd33963c9ed5eb0b7b01
+  - - initial_ast: ab78d2239021d6f96bbea881d9937d95e08dea46f20c122899e0b36d0446c4c1
+      unrolled_ast: ab78d2239021d6f96bbea881d9937d95e08dea46f20c122899e0b36d0446c4c1
+      ssa_ast: d90f0982b624f26c17177ead06ed3d48a96627dd187a8c38b134714e33f48260
+      flattened_ast: 4bc298cb5533064ca61830980466ed1ed7c21a15d38bee043e3e0ed0348de182
+      inlined_ast: 4bc298cb5533064ca61830980466ed1ed7c21a15d38bee043e3e0ed0348de182
+      dce_ast: 4bc298cb5533064ca61830980466ed1ed7c21a15d38bee043e3e0ed0348de182
       bytecode: 134904b86b96581876c2ca0c6ead651dda0dc9f2fb6dc583400133410b7deede
       warnings: ""
diff --git a/tests/expectations/compiler/boolean/conditional.out b/tests/expectations/compiler/boolean/conditional.out
index 2638f69407..a1331f354b 100644
--- a/tests/expectations/compiler/boolean/conditional.out
+++ b/tests/expectations/compiler/boolean/conditional.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 28c909dfc3df83359c4f2f4b989329201c16e944b5c1206c0b770753cf07b60a
-      unrolled_ast: 28c909dfc3df83359c4f2f4b989329201c16e944b5c1206c0b770753cf07b60a
-      ssa_ast: 9a9c933d5a770b15fda13380e32bdcb72353582dc4e60db47c46ed5a95bead6f
-      flattened_ast: f7a6fe164fe7eea96468302395fa5f7a78ebed2b7bab56bbee925f773c5d290d
-      inlined_ast: f7a6fe164fe7eea96468302395fa5f7a78ebed2b7bab56bbee925f773c5d290d
-      dce_ast: f7a6fe164fe7eea96468302395fa5f7a78ebed2b7bab56bbee925f773c5d290d
+  - - initial_ast: f39f9a60bf3468977bc507347f90029d098e16e97cb8f976add9a40cd986e285
+      unrolled_ast: f39f9a60bf3468977bc507347f90029d098e16e97cb8f976add9a40cd986e285
+      ssa_ast: fc284c302558f32f72f8ed8186ac5114ea54a94d888de15907ad83207a02324b
+      flattened_ast: 30952aa8bf4898cf653ebb094c31cee491a570a5084776082e7174bd66893293
+      inlined_ast: 30952aa8bf4898cf653ebb094c31cee491a570a5084776082e7174bd66893293
+      dce_ast: 30952aa8bf4898cf653ebb094c31cee491a570a5084776082e7174bd66893293
       bytecode: 56a9fa48a00d1b38b6f60a93ef2168b2c0ce9c23ba3cb7bffa40debfc1b16180
       warnings: ""
diff --git a/tests/expectations/compiler/boolean/equal.out b/tests/expectations/compiler/boolean/equal.out
index 60941a74f4..c0d071149a 100644
--- a/tests/expectations/compiler/boolean/equal.out
+++ b/tests/expectations/compiler/boolean/equal.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c78718de7e86670216551ca3e1a7ff79eac984bbd7d3916efc0471fc47dac07e
-      unrolled_ast: c78718de7e86670216551ca3e1a7ff79eac984bbd7d3916efc0471fc47dac07e
-      ssa_ast: e5a52db1daeec16966a78bb2f7ef2449af7a7e1ff6eab67a63f24030b0d8077b
-      flattened_ast: f7632dc71f1fcdb0c810dc41804d7a774f6470d667667ea4ebafaef764c37c62
-      inlined_ast: f7632dc71f1fcdb0c810dc41804d7a774f6470d667667ea4ebafaef764c37c62
-      dce_ast: f7632dc71f1fcdb0c810dc41804d7a774f6470d667667ea4ebafaef764c37c62
+  - - initial_ast: 30edf3aaef89e9461c7fdf5a4e789edd00d7cc1b44be3387d4e0e59a70dc2e43
+      unrolled_ast: 30edf3aaef89e9461c7fdf5a4e789edd00d7cc1b44be3387d4e0e59a70dc2e43
+      ssa_ast: 72b1100d61b4477e324e30ad1eced22689eb3d63a2fd672c55498ff9465429b9
+      flattened_ast: 2569b27d888761edf53ca6312a8844318e61f8a3ebeeefbd6571098cf8bee52c
+      inlined_ast: 2569b27d888761edf53ca6312a8844318e61f8a3ebeeefbd6571098cf8bee52c
+      dce_ast: 2569b27d888761edf53ca6312a8844318e61f8a3ebeeefbd6571098cf8bee52c
       bytecode: 2332d5b7ed9910dc65c885e1aeedbbde00e02d95a55caa300a9cb72456707034
       warnings: ""
diff --git a/tests/expectations/compiler/boolean/not_equal.out b/tests/expectations/compiler/boolean/not_equal.out
index 9715b4fe50..434e464faa 100644
--- a/tests/expectations/compiler/boolean/not_equal.out
+++ b/tests/expectations/compiler/boolean/not_equal.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9e871518f362d925d3a49dc805f25270f20d8b471e75dca55bd08ddd95dba0a7
-      unrolled_ast: 9e871518f362d925d3a49dc805f25270f20d8b471e75dca55bd08ddd95dba0a7
-      ssa_ast: 4df5ebccb2b9337d9570b8b674bf110b21f03e19eed2bd62720503675dd0ed76
-      flattened_ast: 1d523dd55672a7be0a853091da70a15e24c028f0585808b60bb4d435d2e28866
-      inlined_ast: 1d523dd55672a7be0a853091da70a15e24c028f0585808b60bb4d435d2e28866
-      dce_ast: 1d523dd55672a7be0a853091da70a15e24c028f0585808b60bb4d435d2e28866
+  - - initial_ast: 7c30d305deb563c4446176cc16a27c5407c78eea7275c6e528bf425d1b034647
+      unrolled_ast: 7c30d305deb563c4446176cc16a27c5407c78eea7275c6e528bf425d1b034647
+      ssa_ast: 378c785982c1014acc1383b29b8a09dbdfd7f393b8912626e154cedeb8a0a335
+      flattened_ast: 152776e1ce69acad498c75211d502d36dd000025cd024771ba7b78dfa30bc824
+      inlined_ast: 152776e1ce69acad498c75211d502d36dd000025cd024771ba7b78dfa30bc824
+      dce_ast: 152776e1ce69acad498c75211d502d36dd000025cd024771ba7b78dfa30bc824
       bytecode: 990eee0b87d70df046bad969201ad8afabff10162eb70c00f837fde81fed4104
       warnings: ""
diff --git a/tests/expectations/compiler/boolean/operator_methods.out b/tests/expectations/compiler/boolean/operator_methods.out
index 8237e6cd46..943b2605bd 100644
--- a/tests/expectations/compiler/boolean/operator_methods.out
+++ b/tests/expectations/compiler/boolean/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 51323fd6e2305e68d3a49b1e3beff44a25962a9d2f981952270725a10fb907eb
-      unrolled_ast: 51323fd6e2305e68d3a49b1e3beff44a25962a9d2f981952270725a10fb907eb
-      ssa_ast: 7480cf469ca3ed640d36d8c171a975885590bbc3cfaec0805d9d8aef6cd19518
-      flattened_ast: 2610072b45f28619332adf130aa46d92bb6d3e008c88e0d59c35407d7fe84a09
-      inlined_ast: 2610072b45f28619332adf130aa46d92bb6d3e008c88e0d59c35407d7fe84a09
-      dce_ast: a5cc2bdb045e2f9e981c12c2411f397b4af69a2aa6cb3a83b14403ce3155e8d6
+  - - initial_ast: 75366768a7b2cb5b76e0aabd11f29dcec41d1a9d20c98ba227d9c784c8e0bd64
+      unrolled_ast: 75366768a7b2cb5b76e0aabd11f29dcec41d1a9d20c98ba227d9c784c8e0bd64
+      ssa_ast: 35c7bcdf89e7d7bd2e1d1d2ada0ab6de758f91c7160a681af8174bdd19e3c4d8
+      flattened_ast: 5cd80f02b55d9aea6d5a752b6a9b0b90a84deefffd9797a2da0ffe2c5405a558
+      inlined_ast: 5cd80f02b55d9aea6d5a752b6a9b0b90a84deefffd9797a2da0ffe2c5405a558
+      dce_ast: a1c587fc02d556c185a43ee3ceed0be4027bbaba0c4fdd7b8939d0bb2b7907a7
       bytecode: bb260232bbd0ccede368961a31abeef5edc7e00cab3348b4b8518d4e5798a6b5
       warnings: ""
diff --git a/tests/expectations/compiler/boolean/or.out b/tests/expectations/compiler/boolean/or.out
index 18535d6f90..723dd81845 100644
--- a/tests/expectations/compiler/boolean/or.out
+++ b/tests/expectations/compiler/boolean/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7cce4e768432d303e86d5d8f38ca10df9fcb641ab1bd791cfed3180594f6cea7
-      unrolled_ast: 7cce4e768432d303e86d5d8f38ca10df9fcb641ab1bd791cfed3180594f6cea7
-      ssa_ast: a8dcccc18c4984c95a15bc850343a4c0a6bd4de3745cee2d9dc5f204bf8d5290
-      flattened_ast: dac527fa65b44faef014c5046d668bf8f4fb6731beedf04369367b546521d54f
-      inlined_ast: dac527fa65b44faef014c5046d668bf8f4fb6731beedf04369367b546521d54f
-      dce_ast: dac527fa65b44faef014c5046d668bf8f4fb6731beedf04369367b546521d54f
+  - - initial_ast: 771493cfb3297abd1fbfda7b2cff7254f9106addefe0a8b5f489ecec1d83baa3
+      unrolled_ast: 771493cfb3297abd1fbfda7b2cff7254f9106addefe0a8b5f489ecec1d83baa3
+      ssa_ast: be444afe192366899792ef107676880d8f5a6f7bd7da49586d8762b2fc3fcd37
+      flattened_ast: 1197ae78c9aabdcf47b4b8c21d800c7541703fef96789584fa817ebe0b8018b3
+      inlined_ast: 1197ae78c9aabdcf47b4b8c21d800c7541703fef96789584fa817ebe0b8018b3
+      dce_ast: 1197ae78c9aabdcf47b4b8c21d800c7541703fef96789584fa817ebe0b8018b3
       bytecode: c3a0c03f4324a6dd6baea42e664ffad91868714739e03525dcbc968582007ceb
       warnings: ""
diff --git a/tests/expectations/compiler/console/assert.out b/tests/expectations/compiler/console/assert.out
index 1f8a003941..f5e6758339 100644
--- a/tests/expectations/compiler/console/assert.out
+++ b/tests/expectations/compiler/console/assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c45d509ec04f7f518387ad6a3e24a97631a50ab4d0cf122af78e03df5cb41328
-      unrolled_ast: c45d509ec04f7f518387ad6a3e24a97631a50ab4d0cf122af78e03df5cb41328
-      ssa_ast: 6aa7493d54a6eb2a5136980f379966cb25198c905c358b807c10bdb4e163de5d
-      flattened_ast: 047a89ee6cdf364b877eca15cdc92954c7ba669fddd3c99fece729abcfd211e3
-      inlined_ast: 047a89ee6cdf364b877eca15cdc92954c7ba669fddd3c99fece729abcfd211e3
-      dce_ast: 047a89ee6cdf364b877eca15cdc92954c7ba669fddd3c99fece729abcfd211e3
+  - - initial_ast: 7b2d55feccfedf17c5acaf63cbe41f3313518cdabf096c968e1104f3f5b4b869
+      unrolled_ast: 7b2d55feccfedf17c5acaf63cbe41f3313518cdabf096c968e1104f3f5b4b869
+      ssa_ast: af9661e5a0685e552b388ee6e48b8556d367d00721159fedf35288c442f21699
+      flattened_ast: da3100e3f67e9ddaf90f4d534ac6ed5dc9897edd6fb1c95c8d27cdaecf85a7ac
+      inlined_ast: da3100e3f67e9ddaf90f4d534ac6ed5dc9897edd6fb1c95c8d27cdaecf85a7ac
+      dce_ast: da3100e3f67e9ddaf90f4d534ac6ed5dc9897edd6fb1c95c8d27cdaecf85a7ac
       bytecode: 3c391009be59588562aa4a34d1b00508cd253c94d35a66741962352c76a92633
       warnings: ""
diff --git a/tests/expectations/compiler/console/conditional_assert.out b/tests/expectations/compiler/console/conditional_assert.out
index c7833e291a..d92c4cb9b9 100644
--- a/tests/expectations/compiler/console/conditional_assert.out
+++ b/tests/expectations/compiler/console/conditional_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d208faafad448ad0877c98ca0e950a6de31dd1ed12332c5475f670fda163280f
-      unrolled_ast: d208faafad448ad0877c98ca0e950a6de31dd1ed12332c5475f670fda163280f
-      ssa_ast: a69d601b77e30b0a5564c8c97308b6a4d377a8484dfcfc476f8ceeaa48334d98
-      flattened_ast: dc6accfaa25f07245d9f7c6b281e9924fc02b3c2175eb8930f9a925e0372a694
-      inlined_ast: dc6accfaa25f07245d9f7c6b281e9924fc02b3c2175eb8930f9a925e0372a694
-      dce_ast: dc6accfaa25f07245d9f7c6b281e9924fc02b3c2175eb8930f9a925e0372a694
+  - - initial_ast: 541f771580c270fa3c366fdea0c4aab112241afbf502c43ec0689762363c827b
+      unrolled_ast: 541f771580c270fa3c366fdea0c4aab112241afbf502c43ec0689762363c827b
+      ssa_ast: aaf2c7c0e099db4a5342d19b7b6e69ab4866c985b5553c53b08ff7eed8642f64
+      flattened_ast: 027e8353d91ef1c45a9d3d1db3e0ee1f2224d7be3a41c18c9f86a688e85e5106
+      inlined_ast: 027e8353d91ef1c45a9d3d1db3e0ee1f2224d7be3a41c18c9f86a688e85e5106
+      dce_ast: 027e8353d91ef1c45a9d3d1db3e0ee1f2224d7be3a41c18c9f86a688e85e5106
       bytecode: 3ff716b96c532801f4fa5310f4eedf8f96fe15bd7db3bf087e7b64a161153945
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_address.out b/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_address.out
index 6bd63d87f0..30ddb8bcdb 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6fd597b235a9ab6fa532413d5656c125639ebe5036284da78f9e5b6c69007b7d
-      unrolled_ast: 6fd597b235a9ab6fa532413d5656c125639ebe5036284da78f9e5b6c69007b7d
-      ssa_ast: 08bffe308901f0274b378f5b9011df8c245fc51d69856317430b78b5916f3943
-      flattened_ast: e77fd9b2be65e8a05590387d093a18607cdc7130fcb42c9f48820b28285219c4
-      inlined_ast: e77fd9b2be65e8a05590387d093a18607cdc7130fcb42c9f48820b28285219c4
-      dce_ast: 4cdfeac49296a80c83c11ed59e1eadf21051ef9d851f58a02d42d1b61b319ed1
+  - - initial_ast: 3498c564c77031239e93e2a745431ae348e48e542705524de326ac67afaad63f
+      unrolled_ast: 3498c564c77031239e93e2a745431ae348e48e542705524de326ac67afaad63f
+      ssa_ast: 30266684ef3db98bc60a6f6dde8cb285c9e27fe79f9581aabbd4e732c368997d
+      flattened_ast: 19277e39b931d9c8c0a49e3e88a64b9f4bfca44b4a72e41bca5debc07a488b14
+      inlined_ast: 19277e39b931d9c8c0a49e3e88a64b9f4bfca44b4a72e41bca5debc07a488b14
+      dce_ast: 4ac699200ffa50c5304aa6f3aa5511b11e99e9fd99aa115772c4d2035cca841d
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_field.out b/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_field.out
index 3022ca23a5..e3a64fa98a 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bd3ad043ad61fc8636d1bd58ce0b7a47267a4984546b02a42a0fced89751be66
-      unrolled_ast: bd3ad043ad61fc8636d1bd58ce0b7a47267a4984546b02a42a0fced89751be66
-      ssa_ast: b64e7c6c0130cf4855985b81424843521d8694b6756c137d392e0d560045851e
-      flattened_ast: ab295e2feb5d6e653270f88fe341d8a2aacd26e09a1949ae87c17440a2175b97
-      inlined_ast: ab295e2feb5d6e653270f88fe341d8a2aacd26e09a1949ae87c17440a2175b97
-      dce_ast: 91da30c194862277ddc99fef9ee7ec374649461eea7f89c29fcb48e7fa583c59
+  - - initial_ast: e7a6e1d52af61fe36010137f56a679b20d90c0a0ba7194c343784c97f987d3ca
+      unrolled_ast: e7a6e1d52af61fe36010137f56a679b20d90c0a0ba7194c343784c97f987d3ca
+      ssa_ast: b7a79d5fc1992450ae222f2cb1511ae3845ec80cdb5612680610a33c18088d75
+      flattened_ast: b3b30f99b0f01027ba1b16806068b888cd48b5e2f04b6760c4c2530846122dde
+      inlined_ast: b3b30f99b0f01027ba1b16806068b888cd48b5e2f04b6760c4c2530846122dde
+      dce_ast: d4db96add4e60f670f573c31468de00be3d5b086830efd8a5a1a5dfdfc7a011e
       bytecode: 680bee256d40c3ca4226844e73ae277e6db6af6398cab44674e421359f50cb83
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_group.out b/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_group.out
index 87165437e1..9d45254b0b 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_commit_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c9b0ddeb037da9e40d05ede3b7a8fb64087f2ac47fb4c1f0c0523a2e3b50cb85
-      unrolled_ast: c9b0ddeb037da9e40d05ede3b7a8fb64087f2ac47fb4c1f0c0523a2e3b50cb85
-      ssa_ast: be3af5d7c55442200353dee77047d0a30d8873eb25d0b7da0786fb15b074fd1e
-      flattened_ast: 5a90052cf2d88212d54c987ba60339d4b5d9579d2316965a799662ecba6b4b8c
-      inlined_ast: 5a90052cf2d88212d54c987ba60339d4b5d9579d2316965a799662ecba6b4b8c
-      dce_ast: d8ed4af576dfa745f37cd9ca9256ab9067bf9f6e56a0dbf76523ba7b859c7ff9
+  - - initial_ast: 200d406bb84a2b12a023d9aa6c9fb95035aed4fb171f4ae2bb7c0aa4fcf31bca
+      unrolled_ast: 200d406bb84a2b12a023d9aa6c9fb95035aed4fb171f4ae2bb7c0aa4fcf31bca
+      ssa_ast: 004d243356aafdf6cad6c8506b4fbac23a46376c1b6867f7be675aaebb3eb208
+      flattened_ast: e893304f6a5a44eb53da6d25d023f705bd417429c9ff793d1a5d478284ba8f18
+      inlined_ast: e893304f6a5a44eb53da6d25d023f705bd417429c9ff793d1a5d478284ba8f18
+      dce_ast: badc11deb2180b86cd9908520df6099fde87669ae29c74afd724063919950622
       bytecode: 83cd9a0a063adab9de89253b1a5be0b4bbdc04a2a73a62a03fc1dd1639a4fbbf
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_address.out b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_address.out
index 6937a08652..ebf29f2a18 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0abc353cf7d65b1c1b0272dea8760b66a479cd83656397498c6e804fcc57eca9
-      unrolled_ast: 0abc353cf7d65b1c1b0272dea8760b66a479cd83656397498c6e804fcc57eca9
-      ssa_ast: ce832fb383ceccaaa63b629cea7da2a3bb918e891499dd0027e9eeb86aeb9a8d
-      flattened_ast: 1522af9dca9861839b442c6e5e8a935d60c4fde932fba9ae125eee7f917405ab
-      inlined_ast: 1522af9dca9861839b442c6e5e8a935d60c4fde932fba9ae125eee7f917405ab
-      dce_ast: a221711722c11cb03087868a6670573bf17f47cf1303c75515950c3e28e86626
+  - - initial_ast: 9ef072ecf82cb5748ef56540885990a387d22ab8a80fc2e2b9a76d6993f6b7b4
+      unrolled_ast: 9ef072ecf82cb5748ef56540885990a387d22ab8a80fc2e2b9a76d6993f6b7b4
+      ssa_ast: ba4c512a80279acd717aa42c2cba0277cf2af2e823eba66dd07f05867cad81ba
+      flattened_ast: a89f2983a293f8ac22620cad50926738f987cda60e931e11de28268049470d2a
+      inlined_ast: a89f2983a293f8ac22620cad50926738f987cda60e931e11de28268049470d2a
+      dce_ast: 2a43b277d040dde328b04f3740ea0866eec08c66db8d28df79648e110b835602
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_field.out b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_field.out
index cfe4db8d45..79f00a7d15 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8737bb14b9811f8393e7b1214f875f6298a4cced885ff1d0b103b87c4dae42e7
-      unrolled_ast: 8737bb14b9811f8393e7b1214f875f6298a4cced885ff1d0b103b87c4dae42e7
-      ssa_ast: ffdef22bb99c2f24950b74419fe2a51b15dfd3efb7f1faed43f8d452fb21ad33
-      flattened_ast: 207311ab56f2ec438a841db6db558c009b5a74a21a335f83b957f6dd246ca922
-      inlined_ast: 207311ab56f2ec438a841db6db558c009b5a74a21a335f83b957f6dd246ca922
-      dce_ast: a6fde2b969db27f40d74709909bb4eb29e5108074b39429000025549838a5273
+  - - initial_ast: 3ba9621aa1e98533320d0ad870f3db063be8c640893d894d04df8951dd2e7a59
+      unrolled_ast: 3ba9621aa1e98533320d0ad870f3db063be8c640893d894d04df8951dd2e7a59
+      ssa_ast: d02b80b89778db49120f51e4c4458a316995070f93e4c3ba602ecd376e4fb947
+      flattened_ast: 6d7698f119f99d3e022015f3b9872842dc6575bae0c421c307f3210044df51e2
+      inlined_ast: 6d7698f119f99d3e022015f3b9872842dc6575bae0c421c307f3210044df51e2
+      dce_ast: 870f8e40d53922c4cebc657fac8bb2b3a86429eef48114c55dbc2b8f77fa6f0e
       bytecode: 941f89f9872fc4a4cd8657d4ddc9bfe76d332e25cebfb374d29f8f9359ffb4ce
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_group.out b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_group.out
index 5a600e1331..357aa30ddc 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6b3fa8d416042367bac792f30d3b9f8b6dc91fc985f208956152b97532e26642
-      unrolled_ast: 6b3fa8d416042367bac792f30d3b9f8b6dc91fc985f208956152b97532e26642
-      ssa_ast: 72eebeba1f6a40149ec31a8a52d85ee72afe9997b1c25c3bfb62b1d8e01a1c5a
-      flattened_ast: a994eee165bc14fc461972a8b0b45a75a1069498fc8cf5f05c72b30eb70805f3
-      inlined_ast: a994eee165bc14fc461972a8b0b45a75a1069498fc8cf5f05c72b30eb70805f3
-      dce_ast: 9a55f11504482e734847221e0a80a38541c9625932aa093a488d64514b660175
+  - - initial_ast: 3a414491dcc55c0c7f6bc1cba6293090d19391ba67132b05cc4661fc00dac263
+      unrolled_ast: 3a414491dcc55c0c7f6bc1cba6293090d19391ba67132b05cc4661fc00dac263
+      ssa_ast: 76238bbd3667861ac9354f0c5a3cd1848bf871726c40622f067d7d96fea1f46f
+      flattened_ast: dd2041696e3f097fe38d496f74a093f1c98323691d5410c3e083f903b3b3f056
+      inlined_ast: dd2041696e3f097fe38d496f74a093f1c98323691d5410c3e083f903b3b3f056
+      dce_ast: b208128a7b45a47478ab06a2d9cda30520c1477c640df9fe8238e6ecd56d4489
       bytecode: b325c77f01ed291126c9b43ecbf54280a09ad0be299ca2aa8698c77af8e4d9bb
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_scalar.out
index 5ddc854550..42ab2d0f4c 100644
--- a/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/bhp1024_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c4760546fc56254c08ab900e3e94f670cfd178e1e1b078f6a5ffc83cadbc1c5f
-      unrolled_ast: c4760546fc56254c08ab900e3e94f670cfd178e1e1b078f6a5ffc83cadbc1c5f
-      ssa_ast: 3b7100d9818103d05d90878c57bf1ec2cbeb2b60b760a35f52e0dcf74673d16a
-      flattened_ast: 5b9b91bad19337793ac938989de8eb9dd0fb57d5803bd0489779d890a95546e7
-      inlined_ast: 5b9b91bad19337793ac938989de8eb9dd0fb57d5803bd0489779d890a95546e7
-      dce_ast: 103fcf3bfad3b6451e678b1cb6ccfe20aee7bda22d590358b07d88a3aba2a985
+  - - initial_ast: 43de96dcfc2fcd80e20165a546c8f87129f5591cf1f3efc0fdace9bb5ab0c8fe
+      unrolled_ast: 43de96dcfc2fcd80e20165a546c8f87129f5591cf1f3efc0fdace9bb5ab0c8fe
+      ssa_ast: de4d3d7bef838786ae20d83a316bf42af23c565493261c314cc4c79c1f2c2748
+      flattened_ast: 02f90df4fa62af993c497699eb0c3a336b01fa21fec3770aeae66f068c2f9172
+      inlined_ast: 02f90df4fa62af993c497699eb0c3a336b01fa21fec3770aeae66f068c2f9172
+      dce_ast: 2616e762228cec544ac98ce250c62297917d01bce094f8f1fc33d2e1b4518208
       bytecode: 1838804cfa5f0c1f7a9bb7ba88dc0207faa0e584b0b35bb34cce7091a9178fe9
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_commit_to_address.out b/tests/expectations/compiler/core/algorithms/bhp256_commit_to_address.out
index e496ba1ef4..18846cbd4c 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_commit_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_commit_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 48d5be1d1b3c4fb8504ce57800d53999f4a92b4899d809e727a0aec33fca028f
-      unrolled_ast: 48d5be1d1b3c4fb8504ce57800d53999f4a92b4899d809e727a0aec33fca028f
-      ssa_ast: 1f4e9c7d3669da233a2b67191c3d9c7fd8d5ba41f65f9256eda21c45623af813
-      flattened_ast: dcef02c444b2a8482e8212aabc7af7184311ab3126ad2ca963c43488545db5d1
-      inlined_ast: dcef02c444b2a8482e8212aabc7af7184311ab3126ad2ca963c43488545db5d1
-      dce_ast: 9c7963fba2b84ad1c501e3626370b2e8bdab7b4e977cfecc9fe025c0f7affefc
+  - - initial_ast: 6256b3aa50ff83f8f05ad31bf0505e1802368bddb66b4eed8c97b3e446d7038d
+      unrolled_ast: 6256b3aa50ff83f8f05ad31bf0505e1802368bddb66b4eed8c97b3e446d7038d
+      ssa_ast: efa1cfe0ddd338265bfd1dd2167f5c288dc92280eb527b1dc94faf2e163df6ea
+      flattened_ast: 29d8d32740c0fecfa9a2879eb93b527f8cc9d5841a825b53e91c2401e6bd51c1
+      inlined_ast: 29d8d32740c0fecfa9a2879eb93b527f8cc9d5841a825b53e91c2401e6bd51c1
+      dce_ast: ae22e8b0e32bd60cdfaa5e6246deea26c520a11a0248d516cd47038193a84dcc
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_commit_to_field.out b/tests/expectations/compiler/core/algorithms/bhp256_commit_to_field.out
index df358ef8b9..4eea5b9a02 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_commit_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_commit_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a5ed14e8476fdff1f5fcb5f92e0b5fb2669a33eefdf537489fb73182ee608af4
-      unrolled_ast: a5ed14e8476fdff1f5fcb5f92e0b5fb2669a33eefdf537489fb73182ee608af4
-      ssa_ast: 079195bb127ebf4db1621c06fa8f856a4a751e7a914bddc26961541efaf8ea4c
-      flattened_ast: d7a1868221f871563ef4151a5ec947f2bfc2fb9ae74eb60058134a1c3a503e0f
-      inlined_ast: d7a1868221f871563ef4151a5ec947f2bfc2fb9ae74eb60058134a1c3a503e0f
-      dce_ast: 55410ad47534700121ddd46363864fabe433a9442f81115b4670d7ed85ef4c2d
+  - - initial_ast: d123591ffea71b5b2a30c85d4be12428fc927acca9aa52187e858990002c0a7d
+      unrolled_ast: d123591ffea71b5b2a30c85d4be12428fc927acca9aa52187e858990002c0a7d
+      ssa_ast: e79aa027e1c2ada8b44689fa102cf02e8370a6bbf5450b8a4d8a9b21d704d719
+      flattened_ast: 481fade59dd13622963e93a4afe532c8e3975e9821fab2b1bd5386856acda3d3
+      inlined_ast: 481fade59dd13622963e93a4afe532c8e3975e9821fab2b1bd5386856acda3d3
+      dce_ast: 57e14ce61d022acc59902f8aa38347ae969e832fdf82e9eb0dc4f523825a4935
       bytecode: ff9bf81abae8332e89f00ebd53dda80528d7a582ade15b2fec53a88a7c5f0532
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_commit_to_group.out b/tests/expectations/compiler/core/algorithms/bhp256_commit_to_group.out
index d363dcae85..9127fcbd3e 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_commit_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_commit_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 675fb4ead401c419a7a680811649b363a58356b524f5b08ec7f5569728c99f15
-      unrolled_ast: 675fb4ead401c419a7a680811649b363a58356b524f5b08ec7f5569728c99f15
-      ssa_ast: af736487218bf2fe2b1ca02a0b153b942394888de0c7aff41120f73a9153691f
-      flattened_ast: af8bf4d8a2829319891ddef9c9f1f56a3e051c256a7478c6aadb478e7452f85f
-      inlined_ast: af8bf4d8a2829319891ddef9c9f1f56a3e051c256a7478c6aadb478e7452f85f
-      dce_ast: 83119fda7f384e060c443262a323a15c176b5dc27e74b3bcf30a1e48aa547d28
+  - - initial_ast: 63bcc0bdfa7d14f170b363969c8371129b634ceefce3638c300a5aebdb4e6059
+      unrolled_ast: 63bcc0bdfa7d14f170b363969c8371129b634ceefce3638c300a5aebdb4e6059
+      ssa_ast: 1d201bd5994f3a34787be84a453f237a04f3d7d6ba63dcaa83fea62774d1195f
+      flattened_ast: 08aabffc8a0888a1a46f6ff4a0959aaa46be5101658ca489d2ee418b0532779c
+      inlined_ast: 08aabffc8a0888a1a46f6ff4a0959aaa46be5101658ca489d2ee418b0532779c
+      dce_ast: 6d33bb2e76d5f2d2420844fc75556598395b6608335f15599d24f72b0551d039
       bytecode: 7cbb302c804e8dcb41c04687fe6f45aa748c5b7c0821f3825d21b424a4f89828
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_address.out b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_address.out
index ed1f8bd02b..ce60ee5fae 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7dbd33614fc5d7ae3aecb3273e2f9cba1f36b100452b6fbe5e5d46a2e55180f9
-      unrolled_ast: 7dbd33614fc5d7ae3aecb3273e2f9cba1f36b100452b6fbe5e5d46a2e55180f9
-      ssa_ast: d0aa19d9713d3ca3fdec697f4cba37bc7146815af885aeec02294537ad37f006
-      flattened_ast: c5337f7ef66cab33c31de5a2b79301c919995fcb0849b2e917223e466d7a9eef
-      inlined_ast: c5337f7ef66cab33c31de5a2b79301c919995fcb0849b2e917223e466d7a9eef
-      dce_ast: 54bf7ae36ca87deca1c38d5a40b54fce8e7c1f64f638ee0d33ca74d19cee17fb
+  - - initial_ast: 1345d2b99e36401addfe556c910e2598fc9725b623eeb3a8976b87d9688cecee
+      unrolled_ast: 1345d2b99e36401addfe556c910e2598fc9725b623eeb3a8976b87d9688cecee
+      ssa_ast: 583bda9b3649325ae7e3e537583690f13f91d528c4b4cb52bfe6fd7f74a7de3f
+      flattened_ast: 4889a973b75b4f4b584f1f298f7ebb5a34ecf3e7a312d5155db108957128bf11
+      inlined_ast: 4889a973b75b4f4b584f1f298f7ebb5a34ecf3e7a312d5155db108957128bf11
+      dce_ast: 674eb9bb060298f3c280e86526cc8c481cf969bc4336a7891d9c6c52f85283e7
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_field.out b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_field.out
index 3e3c1351a0..e23db39f09 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9e1265b1211819172c08be5779b2b0b7e1839a7aa9a88ab6c77243a9a1711345
-      unrolled_ast: 9e1265b1211819172c08be5779b2b0b7e1839a7aa9a88ab6c77243a9a1711345
-      ssa_ast: 8ad36d53ee8e5064346547ccd87488011c18fc6f902ebcb8a13a1b3cba30ba29
-      flattened_ast: bdc6854d758b32202f4928c85f3861398fd11d0f6ec2bd0fac0972fd8e2e6648
-      inlined_ast: bdc6854d758b32202f4928c85f3861398fd11d0f6ec2bd0fac0972fd8e2e6648
-      dce_ast: 800890b1573816d74bc99385d77f42087f7ab4cc0d3c9ee99f26b0259a23b22c
+  - - initial_ast: f99f7e4852b28e80f5f897fe39256e99b0fbfd98e2f3918134dd6a2b7334bf26
+      unrolled_ast: f99f7e4852b28e80f5f897fe39256e99b0fbfd98e2f3918134dd6a2b7334bf26
+      ssa_ast: 0b08c41beb2ce37e2b050595a1c8e6b08cb6c96df11d66d0ff914bbf079e6e05
+      flattened_ast: 6aced85a3c7b2a9a2af15eb886110f1a06d7645a37ad7335f9c7b9a8e7d5e59c
+      inlined_ast: 6aced85a3c7b2a9a2af15eb886110f1a06d7645a37ad7335f9c7b9a8e7d5e59c
+      dce_ast: 9b879f75e7b4bdc4f38848eb131e9fa23b2c5d2cb424348f865941fe6f1f8164
       bytecode: d5ece61c3e7fb656863858b29941f7947b344a5ff1b4985ae467689f58938553
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_group.out b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_group.out
index 54fce21dff..711fdbaf99 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c7d38c1c176bd8b4ee26013299187d1008aaa16acfba69945ddcdf17427fc072
-      unrolled_ast: c7d38c1c176bd8b4ee26013299187d1008aaa16acfba69945ddcdf17427fc072
-      ssa_ast: aae6639ac1536f7fd3273f6816dde1d280cd72042aa0942d20f3d7a2e2d770ac
-      flattened_ast: d3eab777e3125479f833194c950ac92ba07e420d36d664ba3636f977e08e2ef5
-      inlined_ast: d3eab777e3125479f833194c950ac92ba07e420d36d664ba3636f977e08e2ef5
-      dce_ast: 0d892639f1f36263305a24bffb22c87bce630bbf0e9bc80b298946e4fa9eb046
+  - - initial_ast: 02256e685ce23c6aa8b840396c992ae54d9ae9c27367a697aa790f070c39b3c0
+      unrolled_ast: 02256e685ce23c6aa8b840396c992ae54d9ae9c27367a697aa790f070c39b3c0
+      ssa_ast: d9b7b4ee5fcb97251e7ee9499ba7f2dca5edec7eb4e8ebdf83d4a1ea647eac64
+      flattened_ast: c26d9480e3f93a232c11e55394bd44189c1911b1b3c965a76160b40415849237
+      inlined_ast: c26d9480e3f93a232c11e55394bd44189c1911b1b3c965a76160b40415849237
+      dce_ast: 8f4789bf300fb91a27af9ecae91d8e8e08bee6b2dab692e96b2636e006523aab
       bytecode: a80b560327138b8bb041f5a6cea148be39bc74dad6a47f45621d207b625a1424
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_scalar.out
index 48bfbb23ee..b27a99e222 100644
--- a/tests/expectations/compiler/core/algorithms/bhp256_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/bhp256_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a9be315a3445f9f02b64382f5506e9d367f3aeb8f4785df88ff8ac0fadedfc1e
-      unrolled_ast: a9be315a3445f9f02b64382f5506e9d367f3aeb8f4785df88ff8ac0fadedfc1e
-      ssa_ast: 67e4e9c88fa3c8c72856a9a59bb0e3ef9211981ee9a9eef752b1f832cac121f8
-      flattened_ast: 73844e9aa33ebc6a1a878f5d83f652eb89b467c82e8f47b2190820e2b5f52ac4
-      inlined_ast: 73844e9aa33ebc6a1a878f5d83f652eb89b467c82e8f47b2190820e2b5f52ac4
-      dce_ast: 099e7069ae0639e7bafde9cf92773621394f5f1eabf432b12adae16c80e06605
+  - - initial_ast: d39d5442a88a4991fe55cf474c159b4b017d0f11daa589649ce6e86523c8b348
+      unrolled_ast: d39d5442a88a4991fe55cf474c159b4b017d0f11daa589649ce6e86523c8b348
+      ssa_ast: 223b7cbbf1fc71b67697451c1aef7cd754256d78fc8cd1f79582e83b4a33f0e5
+      flattened_ast: 9627cd027b2cc268dfe6bb256128812e76a36b30eddd739fce0ad0cd97b99a3b
+      inlined_ast: 9627cd027b2cc268dfe6bb256128812e76a36b30eddd739fce0ad0cd97b99a3b
+      dce_ast: c4423bd97d8106ae47a222f3bfeef898de82602f1d32c71cba269dd1f024c4c8
       bytecode: 319405c8fe80b59376c041f234ae2ef213e2d67b50701412411ac97294f91e69
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_commit_to_address.out b/tests/expectations/compiler/core/algorithms/bhp512_commit_to_address.out
index a6ff951513..310c7bb551 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_commit_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_commit_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 864840baae360688c5aeb76a2a4af4f8928ded1b8b793a3f1e6bc2d39d3bc4c0
-      unrolled_ast: 864840baae360688c5aeb76a2a4af4f8928ded1b8b793a3f1e6bc2d39d3bc4c0
-      ssa_ast: 7870934dbdcf3c11a8e974011343342bb8671474ef2b48c58ae84836b3c66f79
-      flattened_ast: 3c37a03f673a024359a7d233df9aa5ee0c16bcf4bf295953981005c51e4f9059
-      inlined_ast: 3c37a03f673a024359a7d233df9aa5ee0c16bcf4bf295953981005c51e4f9059
-      dce_ast: 9c7963fba2b84ad1c501e3626370b2e8bdab7b4e977cfecc9fe025c0f7affefc
+  - - initial_ast: 287629280bb3ad4fecbaaa27c933520bc6dda9ffe8dde7bc33c3f18f38710201
+      unrolled_ast: 287629280bb3ad4fecbaaa27c933520bc6dda9ffe8dde7bc33c3f18f38710201
+      ssa_ast: 3136ccb3d0d91f0646259b8eeb7745afe69fdda24d3074e7b6a538d7987dc4bc
+      flattened_ast: 5ed98885264a17775d880d90197480ba1643b7717349239008be263602c771f5
+      inlined_ast: 5ed98885264a17775d880d90197480ba1643b7717349239008be263602c771f5
+      dce_ast: ae22e8b0e32bd60cdfaa5e6246deea26c520a11a0248d516cd47038193a84dcc
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_commit_to_field.out b/tests/expectations/compiler/core/algorithms/bhp512_commit_to_field.out
index 1e5a27257c..810f6d6e63 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_commit_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_commit_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 04653e3a6b37c90bb7c9dda51beb7cca18d2752671972ed2c22781453eee1576
-      unrolled_ast: 04653e3a6b37c90bb7c9dda51beb7cca18d2752671972ed2c22781453eee1576
-      ssa_ast: 6232d641a2106324612f574da221c5054bdb86f435d3c56d2b765cda6ffda6fd
-      flattened_ast: 7e1f1830c9a660702409eee8b509584dc724644d8f11888b5d9767fed3e10fb8
-      inlined_ast: 7e1f1830c9a660702409eee8b509584dc724644d8f11888b5d9767fed3e10fb8
-      dce_ast: fe5dc920e6aa68917caf37138b4d00a11a1f9d97ffb4314591855fdf76369950
+  - - initial_ast: 52e5677596cfeef742a9117e7aa7a64bcde3ae7e41380dd187b2dab1dcc98641
+      unrolled_ast: 52e5677596cfeef742a9117e7aa7a64bcde3ae7e41380dd187b2dab1dcc98641
+      ssa_ast: 8b693f92aab3cfff4a83af4fe5b26fd8be6ed0a0eb47056571e993c06af69d95
+      flattened_ast: f5f224c3f859eacc1cab290c76c5a252fcc9471c6519b06ea839df915c372bed
+      inlined_ast: f5f224c3f859eacc1cab290c76c5a252fcc9471c6519b06ea839df915c372bed
+      dce_ast: 9d9f1fd4e6c00f33262e85963f3130276d1d0558c6525232864362ae39c2c710
       bytecode: 543bce9b35ef6f58454b6f690b9fae8dcf84f639acc37546ef137d8f8e60605c
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_commit_to_group.out b/tests/expectations/compiler/core/algorithms/bhp512_commit_to_group.out
index fce1021538..9dcd14e508 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_commit_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_commit_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1ed3c248a1f803e2f43ab6dd1a22847cacee6d2dfa90849281bfde139abb7815
-      unrolled_ast: 1ed3c248a1f803e2f43ab6dd1a22847cacee6d2dfa90849281bfde139abb7815
-      ssa_ast: ef985f04dede16998deb8e67568702ea747c92e5f815d815a87622f7b501d809
-      flattened_ast: 18a771b32fe0ce395b4d0e041d9338bbfb5d822a4df3a80ae17d1ad89c545bb0
-      inlined_ast: 18a771b32fe0ce395b4d0e041d9338bbfb5d822a4df3a80ae17d1ad89c545bb0
-      dce_ast: e928d015f1a718a52c57eb61db26aa288c88fbd3711e7c2a310d6b1520f0d8f0
+  - - initial_ast: 67b57ec0541b7afc4a18246df9a0ca364daf41f99150b4f7f4eafe0fcebb8fb0
+      unrolled_ast: 67b57ec0541b7afc4a18246df9a0ca364daf41f99150b4f7f4eafe0fcebb8fb0
+      ssa_ast: f0aeb009b835cd6aae86321682425cb18acf298cdd8fbf7016dfe153bc2ff793
+      flattened_ast: c77ab4600a65575b90bf8678c98df0163d12e71811f2de2ab1d58af744d77080
+      inlined_ast: c77ab4600a65575b90bf8678c98df0163d12e71811f2de2ab1d58af744d77080
+      dce_ast: aae1ec2716070fc44bd4c9fdf8eecec7697dacca733e9d856976591d5b2c7e85
       bytecode: 5bf36355b36caa6fcd510f195c79195a7991b45e037c7d6ffe9479f3c2bb89f6
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_address.out b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_address.out
index 5ce6f5049d..2dd88be745 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 985487e286f41d77b95e043abaa99a700294acbdea52b026eabc1b403132d46e
-      unrolled_ast: 985487e286f41d77b95e043abaa99a700294acbdea52b026eabc1b403132d46e
-      ssa_ast: d5b506bf41288f39643f9c5caee3b2412ea7ea5eeec3521699cd0444c382e3b1
-      flattened_ast: cccc6852933e40eaf259a903fdd11c2e74c28f8732be6d97c3e3890445c4b393
-      inlined_ast: cccc6852933e40eaf259a903fdd11c2e74c28f8732be6d97c3e3890445c4b393
-      dce_ast: 54bf7ae36ca87deca1c38d5a40b54fce8e7c1f64f638ee0d33ca74d19cee17fb
+  - - initial_ast: eee18453add65b46525525d8015118390f91663d8587d29ac84e3fa9363901d5
+      unrolled_ast: eee18453add65b46525525d8015118390f91663d8587d29ac84e3fa9363901d5
+      ssa_ast: 7d374cb4d3b4fa72bbbd7e20affecc695135175216616d09342f2ded4f67d509
+      flattened_ast: a92fdd0dc104b691342d7e500db97f4fbbdde10bc484f1dacfe89154aaba7532
+      inlined_ast: a92fdd0dc104b691342d7e500db97f4fbbdde10bc484f1dacfe89154aaba7532
+      dce_ast: 674eb9bb060298f3c280e86526cc8c481cf969bc4336a7891d9c6c52f85283e7
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_field.out b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_field.out
index 29e7efb6f3..e076f5b5f5 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c184c3b9dea65d1c9972c6359cb266109146d9d5aeabcb5147d6a551d02edb01
-      unrolled_ast: c184c3b9dea65d1c9972c6359cb266109146d9d5aeabcb5147d6a551d02edb01
-      ssa_ast: 43e04c499f6a7be8b2f5cb861a86d610a124c22627b88c7c314cf581ce3b8247
-      flattened_ast: bbb986a4b40aa8f7240096e02a5e0402d6c7f5bc1dc0722e85a2e118dbd0106f
-      inlined_ast: bbb986a4b40aa8f7240096e02a5e0402d6c7f5bc1dc0722e85a2e118dbd0106f
-      dce_ast: ba1f517261bb11624505c6c2fd49e3f04d942ef2b30d86e3c45334dbd1bbb577
+  - - initial_ast: 1d6929dba9b3e998b112af31bf99aaa8b4b28fcc507837545d61a6dd20f3a699
+      unrolled_ast: 1d6929dba9b3e998b112af31bf99aaa8b4b28fcc507837545d61a6dd20f3a699
+      ssa_ast: 2744497abf673f6212c9186b0f12309f628297d7207673db3866c1c343102c13
+      flattened_ast: bfefceec84c521d3cb070af34af675d029be7924d4634ae27e24819c8cd84d9e
+      inlined_ast: bfefceec84c521d3cb070af34af675d029be7924d4634ae27e24819c8cd84d9e
+      dce_ast: 5deb4f73c7178da95cb181694632fcf4e9eaf3d659e121c106812f830839fbf2
       bytecode: df6d5bbf5b971b9fbf39786a5bb74b9a26b0ddd9e9bfa501cfc4da9f260de048
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_group.out b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_group.out
index bda4b3cbb2..a382266eb2 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 328daa90b038066e97d5ba5393d4a943414bc500b5237357b9c9e58fc178e51a
-      unrolled_ast: 328daa90b038066e97d5ba5393d4a943414bc500b5237357b9c9e58fc178e51a
-      ssa_ast: 06dbcc5d9abeab1a4e1b417b3b632e14cdd85af3d6c82aebb16d74b2244780cb
-      flattened_ast: cd05234ce579ddc5b36834020949acd415ce59f56a035f0109c8dd886938df20
-      inlined_ast: cd05234ce579ddc5b36834020949acd415ce59f56a035f0109c8dd886938df20
-      dce_ast: 495e6f6dde9ca039e6e55afeb94752bc044b74bf432b9193a7d01926d82e7bbb
+  - - initial_ast: 7109d0444a1664ead2cb0e7f1bfe818ec8aba07e5c6711193026d06ee74d7258
+      unrolled_ast: 7109d0444a1664ead2cb0e7f1bfe818ec8aba07e5c6711193026d06ee74d7258
+      ssa_ast: 1e4ccf228090231a7d91df4145171f7a5c30bcd1d586d0837ec85d8e1f48b947
+      flattened_ast: d6a3d02952c7d7d893242d9a65452ddc476c4b2394128b276107e3f1db3a1401
+      inlined_ast: d6a3d02952c7d7d893242d9a65452ddc476c4b2394128b276107e3f1db3a1401
+      dce_ast: 097e9ccccb137cc4dabf7663760b6307e77e0f46fa425fc6d5ef0ba401ce2886
       bytecode: 8e8ad00d8937c7ea19e29fd6e1162957946d6b2c1e90e0ab9b1a4f49a6685a02
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_scalar.out
index 67bf2f73ff..086dac10f1 100644
--- a/tests/expectations/compiler/core/algorithms/bhp512_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/bhp512_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 52f0ede29adf2ca4701003a3cd70dc4bbe21848bc68e57ce3ac6d5978731ac96
-      unrolled_ast: 52f0ede29adf2ca4701003a3cd70dc4bbe21848bc68e57ce3ac6d5978731ac96
-      ssa_ast: e9397d32377b970aa46bca1fd809ba0f0845486c39ce945b151932f716b88d9c
-      flattened_ast: 7eb3b7c843218b6b65feac487e6dd1e6319f0076985179c28f871b875b761169
-      inlined_ast: 7eb3b7c843218b6b65feac487e6dd1e6319f0076985179c28f871b875b761169
-      dce_ast: 7fbd1ac636ee91825d1346ff6003c33d2f1eb570952cecca69c68fd12540bc4e
+  - - initial_ast: 91dc57e0bc7b29c3ec5eb072a66530fecdbbd065f34a435bf7c21248262c8258
+      unrolled_ast: 91dc57e0bc7b29c3ec5eb072a66530fecdbbd065f34a435bf7c21248262c8258
+      ssa_ast: af68e87160db0c11482eb4234ec60ebeb1e8cca4750bf0f735a24a4c9e01239a
+      flattened_ast: 1cfc41ec5fd8a4734ec207c947954e42acc8336488514a28f7a21767ae8d9f11
+      inlined_ast: 1cfc41ec5fd8a4734ec207c947954e42acc8336488514a28f7a21767ae8d9f11
+      dce_ast: 19bfe4836913c51d8d4d72b08365f4f380d5509ab0a1335f857d0f879604371c
       bytecode: 4dceb1d3b4f77019d81c7e4d97a5866c6a50147cd8cbc417bb4b6629dc2cbf70
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_commit_to_address.out b/tests/expectations/compiler/core/algorithms/bhp768_commit_to_address.out
index 2ee791a62f..20b14760ad 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_commit_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_commit_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2619c8fef0b3503b1ae005f38fed58440f146962b20be560332bf395123eee74
-      unrolled_ast: 2619c8fef0b3503b1ae005f38fed58440f146962b20be560332bf395123eee74
-      ssa_ast: 6f7d5a0482b834872e14fb2a3ae867a6f377cfa21f3e71a17ff99ac698ad107d
-      flattened_ast: 13919263c46a63382f0fb34d8c1dbbf67d1a8485b80d2ace5bd8ae50f7a85252
-      inlined_ast: 13919263c46a63382f0fb34d8c1dbbf67d1a8485b80d2ace5bd8ae50f7a85252
-      dce_ast: 9c7963fba2b84ad1c501e3626370b2e8bdab7b4e977cfecc9fe025c0f7affefc
+  - - initial_ast: 2d03bdd0a7af6b16b102171d026c64b4b79dfad1c918f6372cadfac7a0efdf48
+      unrolled_ast: 2d03bdd0a7af6b16b102171d026c64b4b79dfad1c918f6372cadfac7a0efdf48
+      ssa_ast: cdbf3f51343cafafa3f5016071f94613a97ad3994b4c8dc425d11385fc61e0c9
+      flattened_ast: f9a75ef76e52b50165df620dd76ab1b575737aaa9de3ec55900855f0b88d35c8
+      inlined_ast: f9a75ef76e52b50165df620dd76ab1b575737aaa9de3ec55900855f0b88d35c8
+      dce_ast: ae22e8b0e32bd60cdfaa5e6246deea26c520a11a0248d516cd47038193a84dcc
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_commit_to_field.out b/tests/expectations/compiler/core/algorithms/bhp768_commit_to_field.out
index 21bc33ef1b..fb33bdb16f 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_commit_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_commit_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fc696ada4c5b732d15b8f9b0ad5e7549f00cfc1da5ba57b885b66e0e6818a22a
-      unrolled_ast: fc696ada4c5b732d15b8f9b0ad5e7549f00cfc1da5ba57b885b66e0e6818a22a
-      ssa_ast: 18af862c907ef728a5d39f8965676dd43211350fe3a771a5f0faad51df67c3d3
-      flattened_ast: fe08b7afbe25f75b31aae4a27ede152f12a7e50a6c327bdf362b13a1870984dc
-      inlined_ast: fe08b7afbe25f75b31aae4a27ede152f12a7e50a6c327bdf362b13a1870984dc
-      dce_ast: 1d3b448b8e1259dbeaae915175bc810a165219797bc67c7a12765996a523430a
+  - - initial_ast: 2616d69193cd18db8e0af91be4314f4f4a4ac411ad6c0bb861881e8f56c5b1b1
+      unrolled_ast: 2616d69193cd18db8e0af91be4314f4f4a4ac411ad6c0bb861881e8f56c5b1b1
+      ssa_ast: 496dd06de809c3626d968ea3fdd7c3aa83369d7a9258c565b5582f1ac90aef56
+      flattened_ast: 388802f2d2c5cd0d3debfe5e17f697e2b3b5bedcea14f2d6430fd2e8b7b380ed
+      inlined_ast: 388802f2d2c5cd0d3debfe5e17f697e2b3b5bedcea14f2d6430fd2e8b7b380ed
+      dce_ast: bb2b46bd36a6e76d34c3b00b4311c9e4afd2443a00c4140ad27554e9819cb16d
       bytecode: e1317e9396275ce8f73b494a3595e27bdbc563874acea6fed57c0b52da1354b3
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_commit_to_group.out b/tests/expectations/compiler/core/algorithms/bhp768_commit_to_group.out
index 1701994a15..72e8b0d35d 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_commit_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_commit_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 35fcb3d27fefc2e41379cef05ef329b81eac0166ddd11d78f527bc4109af41e1
-      unrolled_ast: 35fcb3d27fefc2e41379cef05ef329b81eac0166ddd11d78f527bc4109af41e1
-      ssa_ast: e86fd5bca66aa0f8199faee9ac4dd1fbaf127b900c76aedc258a79af47415bad
-      flattened_ast: 9f6a9ead21fe574985f41178303b2e49bf1697826134881eb37614e5eca94320
-      inlined_ast: 9f6a9ead21fe574985f41178303b2e49bf1697826134881eb37614e5eca94320
-      dce_ast: 9aa80eb712cd45a13d144358cfac8f5e8fb6f641732436b58b4c348d77ca25d5
+  - - initial_ast: ea07694a29ef275c288260ee45faf738963fbf22dbaf2afea90ac3112c25e816
+      unrolled_ast: ea07694a29ef275c288260ee45faf738963fbf22dbaf2afea90ac3112c25e816
+      ssa_ast: ae34127a7baf411ff8717275384763a3b3d70e29cede5c4e60a37d29ee4c0cf4
+      flattened_ast: 021b8e9d37ad1d3e2d60a5a8cc8acb88b3ad6fa9a32c30883ac5b8d4bd6e2f51
+      inlined_ast: 021b8e9d37ad1d3e2d60a5a8cc8acb88b3ad6fa9a32c30883ac5b8d4bd6e2f51
+      dce_ast: 621c04e49940033e81bd595d8f92d1009b797ac68c9f425a3c78f835c19af863
       bytecode: aee0a49b3add5225dd3e0e2343805040b94c16916e51b3405924378f62eb9f36
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_address.out b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_address.out
index 56e6872e52..5180edac60 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c7b13b58b7ba847bc7592e6afa8f7b3a140c32cf3ec1f651165eaf1b99ec95a3
-      unrolled_ast: c7b13b58b7ba847bc7592e6afa8f7b3a140c32cf3ec1f651165eaf1b99ec95a3
-      ssa_ast: 3b4bcb28b9eac4e0e3e200013c61ce5fb7b5a8baca18d6c5c53535b6c586f81b
-      flattened_ast: c239452165d456f374a3dc2789b07413191b90cd6b3c1f6d0a6f370440a2cdc9
-      inlined_ast: c239452165d456f374a3dc2789b07413191b90cd6b3c1f6d0a6f370440a2cdc9
-      dce_ast: 54bf7ae36ca87deca1c38d5a40b54fce8e7c1f64f638ee0d33ca74d19cee17fb
+  - - initial_ast: 765ba1aea9966566c3a979614731b96000194f38bfb4f65ab64bff44645b1ed7
+      unrolled_ast: 765ba1aea9966566c3a979614731b96000194f38bfb4f65ab64bff44645b1ed7
+      ssa_ast: 6ee96a9485b5116b6866b9ba1355b68e8ba557beba3404ac41d2f058cc1d2692
+      flattened_ast: 7b174ac8f24146ae7516e443447988a62ad034ed29d3baa2dc0122d237f3ae75
+      inlined_ast: 7b174ac8f24146ae7516e443447988a62ad034ed29d3baa2dc0122d237f3ae75
+      dce_ast: 674eb9bb060298f3c280e86526cc8c481cf969bc4336a7891d9c6c52f85283e7
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_field.out b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_field.out
index 27bae39b92..0553ac9624 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ede8e82829d45a29612d4478e4b573000d051b7c9a570a84088d83634b95e09b
-      unrolled_ast: ede8e82829d45a29612d4478e4b573000d051b7c9a570a84088d83634b95e09b
-      ssa_ast: 591cfefc44642c6b7d90cb032e8c50f106032d114d33c938de045389d81bca7e
-      flattened_ast: a2192bfaf96f1e137c135cc0cfa6ffdf05d61869e9932aa8704804479d091b4c
-      inlined_ast: a2192bfaf96f1e137c135cc0cfa6ffdf05d61869e9932aa8704804479d091b4c
-      dce_ast: e1947d20d04cf487a713d633edd1cdf7ce783b15d09a3f8127f77592c300d61c
+  - - initial_ast: 34321cdfdf6022714f37f053521ec53f6fcb6ebb60b137dceb4987454ed10cce
+      unrolled_ast: 34321cdfdf6022714f37f053521ec53f6fcb6ebb60b137dceb4987454ed10cce
+      ssa_ast: 13417366f95a28a70d03f4c29e1fbabfbf4d76f78774f9208082d5787b0b144e
+      flattened_ast: 256c210818a74af6b696120cd16cb82aa29cec01f200006d88924825c194710b
+      inlined_ast: 256c210818a74af6b696120cd16cb82aa29cec01f200006d88924825c194710b
+      dce_ast: 4cf3fc9aee1f9777f05c580011cd0990c1b1280c014f0c8721e92d336db2f0d7
       bytecode: 38325ddbe5ab9363326dda92ef395e1c99e78e243d95ea4364499ccabadfd299
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_group.out b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_group.out
index 68ae3a80c1..9ca14180cc 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d05138b425c3a1200484d4491ef3bf4d9b62e32f9c318ad0d2f55b331b955d67
-      unrolled_ast: d05138b425c3a1200484d4491ef3bf4d9b62e32f9c318ad0d2f55b331b955d67
-      ssa_ast: 0b0839366e8e3bce98d91cd768911a1c9198fe8c762b9e218e4efd3abe21afa0
-      flattened_ast: 02e32355b211e0c39bf8e9e1578de3ad37a48422518d7e20f70ecd67921df9be
-      inlined_ast: 02e32355b211e0c39bf8e9e1578de3ad37a48422518d7e20f70ecd67921df9be
-      dce_ast: d45be3fc835dad37fa8ec0b63d1931048d22f4587bcc0e6e6a18b0154cd93270
+  - - initial_ast: b9b0e4422dd9613f2a2c75b7ed45f3f06d33129293cc888d9498f78d3926fb7c
+      unrolled_ast: b9b0e4422dd9613f2a2c75b7ed45f3f06d33129293cc888d9498f78d3926fb7c
+      ssa_ast: df5b237191728107e4ea6ef81307887a69827f268433edb6b850501528cf1279
+      flattened_ast: 8ee14095f85ece807e1611d837b7beac682621eeafe72a961048ec23659ff709
+      inlined_ast: 8ee14095f85ece807e1611d837b7beac682621eeafe72a961048ec23659ff709
+      dce_ast: 872f2d0e342a1017ad2656eeb637661c880b17cad5013b4f21f08790f14a7f16
       bytecode: 95e421126839d599569f1a130c5852f7da8d6e40de90885f401530d8bcc18c14
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_scalar.out
index 48bfbb23ee..b27a99e222 100644
--- a/tests/expectations/compiler/core/algorithms/bhp768_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/bhp768_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a9be315a3445f9f02b64382f5506e9d367f3aeb8f4785df88ff8ac0fadedfc1e
-      unrolled_ast: a9be315a3445f9f02b64382f5506e9d367f3aeb8f4785df88ff8ac0fadedfc1e
-      ssa_ast: 67e4e9c88fa3c8c72856a9a59bb0e3ef9211981ee9a9eef752b1f832cac121f8
-      flattened_ast: 73844e9aa33ebc6a1a878f5d83f652eb89b467c82e8f47b2190820e2b5f52ac4
-      inlined_ast: 73844e9aa33ebc6a1a878f5d83f652eb89b467c82e8f47b2190820e2b5f52ac4
-      dce_ast: 099e7069ae0639e7bafde9cf92773621394f5f1eabf432b12adae16c80e06605
+  - - initial_ast: d39d5442a88a4991fe55cf474c159b4b017d0f11daa589649ce6e86523c8b348
+      unrolled_ast: d39d5442a88a4991fe55cf474c159b4b017d0f11daa589649ce6e86523c8b348
+      ssa_ast: 223b7cbbf1fc71b67697451c1aef7cd754256d78fc8cd1f79582e83b4a33f0e5
+      flattened_ast: 9627cd027b2cc268dfe6bb256128812e76a36b30eddd739fce0ad0cd97b99a3b
+      inlined_ast: 9627cd027b2cc268dfe6bb256128812e76a36b30eddd739fce0ad0cd97b99a3b
+      dce_ast: c4423bd97d8106ae47a222f3bfeef898de82602f1d32c71cba269dd1f024c4c8
       bytecode: 319405c8fe80b59376c041f234ae2ef213e2d67b50701412411ac97294f91e69
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i128.out
index 86f9813758..84658d5e45 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c91bd148e83d97ea9c5cad3a5663fdd82a83c3381151475090802525a7080746
-      unrolled_ast: c91bd148e83d97ea9c5cad3a5663fdd82a83c3381151475090802525a7080746
-      ssa_ast: 0a38c051202114aca4e5ae9a517beee7ac736361fa5b537eeb477d085b833964
-      flattened_ast: 7b95230042361cc751275babf46870a3e929f88bc327a9df3a2bf46f25522b4c
-      inlined_ast: 7b95230042361cc751275babf46870a3e929f88bc327a9df3a2bf46f25522b4c
-      dce_ast: 25a44252c57774a9a8bac44f672307eab4918c371a39566813dce234e38ccb8c
+  - - initial_ast: 5efcfb40cfb5a64bad1c44a310bb3f51ab61b709e38ac91606d17d883e72b4b6
+      unrolled_ast: 5efcfb40cfb5a64bad1c44a310bb3f51ab61b709e38ac91606d17d883e72b4b6
+      ssa_ast: 9c26e8a37c872a03ba1cba5b9731bb41a336f478db8bc034b0f5a43e6a95ba63
+      flattened_ast: 49a348be0ec3ca2fd146a38dd1230ea1d7df75326192135b591aaf5cada8b93d
+      inlined_ast: 49a348be0ec3ca2fd146a38dd1230ea1d7df75326192135b591aaf5cada8b93d
+      dce_ast: 420f9dcd4362e135f7b86bc51faa0a13c9ac2d3bf02804c1c42df7fcca84d1ec
       bytecode: bd218715549602fce75a8d64df3317bee7386870f24b3d844b01c02d1960240b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i16.out
index 3a28f10ef1..1805b9445c 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cd8360af7bce053a74c7add09ade31db66ed8b5900fcc33e4e0d4591c470e989
-      unrolled_ast: cd8360af7bce053a74c7add09ade31db66ed8b5900fcc33e4e0d4591c470e989
-      ssa_ast: d5b17cc240ab6f888faa6d6706de4c7d2c4402a7b6a5115b707258527205e3a6
-      flattened_ast: 875b99ba07c5662ee3a25d0bb18507ca8c7d5211ee40dad9368098eba5178ebf
-      inlined_ast: 875b99ba07c5662ee3a25d0bb18507ca8c7d5211ee40dad9368098eba5178ebf
-      dce_ast: 8895f89492c0ca019e4372fb4f7cab7a0dc254c058dcb7b527483b597687fab7
+  - - initial_ast: ae83c4c1c05e2741d112d9b37e3336450fcb65f65f550a561b96fcdb09d98a20
+      unrolled_ast: ae83c4c1c05e2741d112d9b37e3336450fcb65f65f550a561b96fcdb09d98a20
+      ssa_ast: 80097e52476437805c6ce471a481f15cc829a569cf52859e25abd2f2e5b6f78d
+      flattened_ast: e0e5fef742a4c0df6a24323863bb46ad8f4d513da37bea680253713ac87f059b
+      inlined_ast: e0e5fef742a4c0df6a24323863bb46ad8f4d513da37bea680253713ac87f059b
+      dce_ast: 169c97e859427f154a255263c8f36c0d48b381be2b4c4017a7e82f0019f43ce1
       bytecode: 4b3d6980860116dfb43804924f4d2cedfb7db2d9fb783fd06b3127327e31a298
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i32.out
index cf66e91c0a..203909ce7c 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0a2966eef4db383661c3b4c70257eaae893bb046930cccd59f2c771d8501cb5c
-      unrolled_ast: 0a2966eef4db383661c3b4c70257eaae893bb046930cccd59f2c771d8501cb5c
-      ssa_ast: 3a514a3264fbd19707996f304bc43aee4d7ad24ca260c91d9751d2f14508f3c8
-      flattened_ast: 66970fd4850f730a952e41ac8849536ccfc3dde5e2b3fcb571f074adb5fcf04b
-      inlined_ast: 66970fd4850f730a952e41ac8849536ccfc3dde5e2b3fcb571f074adb5fcf04b
-      dce_ast: 2f6696c21e443368f325ba36838dc7c03ab021e0da05abbe20d4cf639d93b126
+  - - initial_ast: 54ac2e3f840659fd7b5eeb98ec7827dcfb0ee4203e8658e38664f3b659962d28
+      unrolled_ast: 54ac2e3f840659fd7b5eeb98ec7827dcfb0ee4203e8658e38664f3b659962d28
+      ssa_ast: be36a341befadaa69f857dab65976c6593638bc1f724785d6947adbd5c22ab35
+      flattened_ast: 803a4d476a2312c115b4700073f78da88986fccfcdb4f15e5bfc9ff75e8d50b7
+      inlined_ast: 803a4d476a2312c115b4700073f78da88986fccfcdb4f15e5bfc9ff75e8d50b7
+      dce_ast: b9df995586996ad6e156600744e95e2e6c2fe138d14e4e6d6fdf9454083e8815
       bytecode: cf7a9eea97a35c026eeac1f4659903bec549092b56e6194f666fed520fc02b7a
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i64.out
index 1c1413f703..efbe2d9a38 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7ed91381838f579d46d070d84489f6c909c8ffdd2b184dab9e78f78795bd97b3
-      unrolled_ast: 7ed91381838f579d46d070d84489f6c909c8ffdd2b184dab9e78f78795bd97b3
-      ssa_ast: 29ddcef122568413c740e761dcbdfa184feb521eb7fd7ee44c166fd55309d562
-      flattened_ast: b6cfdf163495696b9579f35fe07925b4d3330c311aef4cb857618bbe8dce9791
-      inlined_ast: b6cfdf163495696b9579f35fe07925b4d3330c311aef4cb857618bbe8dce9791
-      dce_ast: 510d6f51ce40b821e99729f0def26529a4c6f16f01e929ca747f23d48fd6e254
+  - - initial_ast: c3cde43bd5ce6bd109a485a1bf172d483f9dcac4595057fa360e07543ee690b6
+      unrolled_ast: c3cde43bd5ce6bd109a485a1bf172d483f9dcac4595057fa360e07543ee690b6
+      ssa_ast: 7f864ba4330a2545c21bbdbe0268fbb73371e47d1fbdaf7fff1d05e87a8236cc
+      flattened_ast: d9914036faa2860c628ed5f50494f06b06d7a80f283f11a1e7c1545969c24741
+      inlined_ast: d9914036faa2860c628ed5f50494f06b06d7a80f283f11a1e7c1545969c24741
+      dce_ast: 2a9f1176a540d39660da33d14faa266e3795274285ccb68540b59ebfcf448320
       bytecode: d3d4c9152f574443e543ea5f0f1f0148116006c76aaaa2e014f268d7ab9d05df
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i8.out
index 9865ee2553..005b154ccc 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e4528d944261a3586e66e83a22a5e4372c7a45c0a3ea689927007aa37681d6d9
-      unrolled_ast: e4528d944261a3586e66e83a22a5e4372c7a45c0a3ea689927007aa37681d6d9
-      ssa_ast: 8a901b31ecf54ceef87eda818276ca5fc2de348c1e84e4cf386c4e3f7b989059
-      flattened_ast: d11751292a1314a84cf32c7333bc8bc412c5cc35e480d68a4a1a421110afdc0b
-      inlined_ast: d11751292a1314a84cf32c7333bc8bc412c5cc35e480d68a4a1a421110afdc0b
-      dce_ast: 592fabdaf4bc757afe4855bc4156f5191e76bdaa156057990234564304cbad70
+  - - initial_ast: 5dd5cefd1086637c19b2aabcd0dbb3bb45b6c15e8ab8f81d462145f39228b3de
+      unrolled_ast: 5dd5cefd1086637c19b2aabcd0dbb3bb45b6c15e8ab8f81d462145f39228b3de
+      ssa_ast: 3e104420807e18487278b84b750ca52a086cb2f74a54df1c74d7302b76a57549
+      flattened_ast: a4b78b37258e0ead4c42527345c5854b39491406a6e33eddf76c789993272f6d
+      inlined_ast: a4b78b37258e0ead4c42527345c5854b39491406a6e33eddf76c789993272f6d
+      dce_ast: f1e385ab26cde7676981f5b8b9996e5cd6264dbed5053d4d79dd6930febae2fa
       bytecode: 23b5c88c1d028f0b038f1005427c79779230306d235088802d5668e93117c120
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u128.out
index 903c88ab40..2b970ba2e8 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3c01ed969e2830bbef88c1f734850dfaf83bb7429d807b446eb9b2b9c6857e64
-      unrolled_ast: 3c01ed969e2830bbef88c1f734850dfaf83bb7429d807b446eb9b2b9c6857e64
-      ssa_ast: 90a0ab34741185c64f0b2f051649100c1170b1f44728dc1ba27050ebf9efdd9c
-      flattened_ast: 02b4f16917bd5e473d38677f9d0bc9e2c280b5951c362bc32213088d26f248d2
-      inlined_ast: 02b4f16917bd5e473d38677f9d0bc9e2c280b5951c362bc32213088d26f248d2
-      dce_ast: eb0931dbc9d952b1d43e219c3e912e2ebcce4248ee2278d4ef06b1583058cf3d
+  - - initial_ast: 7b625bf89cb9265228bc7b13ed0f3b732e246d4f054461eda8fae457a272a5b8
+      unrolled_ast: 7b625bf89cb9265228bc7b13ed0f3b732e246d4f054461eda8fae457a272a5b8
+      ssa_ast: 553e9d2bb4a265c89d6fc102270d7db5b128ce9e000f50dc5f77f165cb7e5743
+      flattened_ast: ad88dd2788bf38f99242519aad875ca84cdecafff7f4e6847cb8523ee7dd2e41
+      inlined_ast: ad88dd2788bf38f99242519aad875ca84cdecafff7f4e6847cb8523ee7dd2e41
+      dce_ast: 22badc4cb8f786aedb95733789faa02b6062a61d96db4fc206e32c6e07f182a1
       bytecode: b195e16806d0a26e2088f84136f95ca7e9401dd6846a61cda34d39445ef87684
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u16.out
index 61390ed87d..2aecb5f207 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cd05dd82f3b6b66b0ca9be70aee91fcfd1539a3894c99c60e983880a6a3c5176
-      unrolled_ast: cd05dd82f3b6b66b0ca9be70aee91fcfd1539a3894c99c60e983880a6a3c5176
-      ssa_ast: 707c7c8cf25cb1783c8042d08ba53c35f3c5e25b80c17f973fc3b748b91ee439
-      flattened_ast: 2e4d9fe6330c108c69ae7ae2b426e6d76d036f754ce5c04033454bce78cbd2d1
-      inlined_ast: 2e4d9fe6330c108c69ae7ae2b426e6d76d036f754ce5c04033454bce78cbd2d1
-      dce_ast: 5694b6e0912a2d230769d8c3ea982b0744ad18d538e18e548c415fb0da9b431a
+  - - initial_ast: fe4013daac58433b0e7ee77729e6dfd254b0cc25cf645e8bda38df6bff2ea6f5
+      unrolled_ast: fe4013daac58433b0e7ee77729e6dfd254b0cc25cf645e8bda38df6bff2ea6f5
+      ssa_ast: bdcfed2adad22237f441e2953520f53708ad3bc79c06f90f7320656b60fa50d0
+      flattened_ast: 051b5cc446838992509fe969562d26e8a2e40f8d3c65e70c19221216192421e1
+      inlined_ast: 051b5cc446838992509fe969562d26e8a2e40f8d3c65e70c19221216192421e1
+      dce_ast: b0fe7a0eca195cf829402febb958d7c5d2e3813bdf9a8e2f9a9deb677143a6ad
       bytecode: 3bd31100c828423ff38d092cfbe9c0df772aba3b6fc24931ae33b1f50efcecb0
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u32.out
index afceee50c8..664eca32ce 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 78a2df5f4cb551a93fb04cbe84fae22f1a404b38f4fa606639904f1ba45446ef
-      unrolled_ast: 78a2df5f4cb551a93fb04cbe84fae22f1a404b38f4fa606639904f1ba45446ef
-      ssa_ast: a9d66d2d618c2f102a0b50a736503498418c0b88afcf7c7b05936ddfacdf8872
-      flattened_ast: 3d1bc760b33cf23fb977288c77ca6b06409eeabfb1ad09578d78df3969bd15a3
-      inlined_ast: 3d1bc760b33cf23fb977288c77ca6b06409eeabfb1ad09578d78df3969bd15a3
-      dce_ast: 4addccb9802526a9fa5948b5d6dc7801ffd52b5d34f3657d5497f2a1d8d65924
+  - - initial_ast: a802229d4b6de00a7204febafff07ba1a48deacb1b247696049ea13c6b5dae46
+      unrolled_ast: a802229d4b6de00a7204febafff07ba1a48deacb1b247696049ea13c6b5dae46
+      ssa_ast: c84708fc6fdd2f2ac7d3d89e049b21f8798182ba7efeee69359b96c8a5715c5b
+      flattened_ast: f1ac12568348ec1ae78bd965301eeacff1dbdee97b371129cebd681376d29e10
+      inlined_ast: f1ac12568348ec1ae78bd965301eeacff1dbdee97b371129cebd681376d29e10
+      dce_ast: feaa1c6e309a6639bebc60824b78a212d4d9f260414655260a0e7b01671236ec
       bytecode: 6a94d8f23c147c3cddc2c5a44a6f07734cbe79bc899b2b830aac61b6e6975057
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u64.out
index 336b64ef20..b970c4b124 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: db23254b38f2edafa88e8444beedf9c0e6d5b58e200b0c49e783b0c2e80895b8
-      unrolled_ast: db23254b38f2edafa88e8444beedf9c0e6d5b58e200b0c49e783b0c2e80895b8
-      ssa_ast: bd7a7134d27cae528ab6e66f0a33a746a0b52942ee9a24087f7cbf4713de63f9
-      flattened_ast: 91b3cbbf48c15063c87758308f018144309bead61edc18cfb3846642fb40d4c6
-      inlined_ast: 91b3cbbf48c15063c87758308f018144309bead61edc18cfb3846642fb40d4c6
-      dce_ast: 8e4787b63356db1b948a37757c456d7f0008dfdb0299c1561f678a9fb833ff0b
+  - - initial_ast: 9be98b23ebf981caddf95cfbef47cd250afd873c1cd1bc72e1b18fbdf42fa174
+      unrolled_ast: 9be98b23ebf981caddf95cfbef47cd250afd873c1cd1bc72e1b18fbdf42fa174
+      ssa_ast: 2d8c9387be8a685dca90ea4f161866c6298683bba5ef667e195bb51c69b07271
+      flattened_ast: 5bc73f0e0d07e95442ff9de4c1b6324d3c0febd12e5803d7d48e3f56105f39b2
+      inlined_ast: 5bc73f0e0d07e95442ff9de4c1b6324d3c0febd12e5803d7d48e3f56105f39b2
+      dce_ast: c14a09c6258133c39cc0fd21c13bb64d18df171c562e2d447f5e28db349d333d
       bytecode: 5ff56b03daf136dc97334d9f0c73f26eb6e342e30b116000e7eb7cac8e2ebff5
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u8.out
index 7482d9cb2b..d381b41254 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp1024/bhp1024_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4909c65c7d9ba9483ae5a54d47cb5b45c1bffb0624ef5cb87c4520d4afa2ca52
-      unrolled_ast: 4909c65c7d9ba9483ae5a54d47cb5b45c1bffb0624ef5cb87c4520d4afa2ca52
-      ssa_ast: 2c123587922e8a5b37abc83c6c795ab6de46b25467810f89cad4db702602e093
-      flattened_ast: c01013df58690fd45025a38f2002b519cc06e4dafd15f6b960077acc67d38e82
-      inlined_ast: c01013df58690fd45025a38f2002b519cc06e4dafd15f6b960077acc67d38e82
-      dce_ast: 9fa94fa1597f0efd27d1fcac96efff1a8da824b937166bbc41c5536d8d7807dc
+  - - initial_ast: 58b7e3117c943bd4fa0d78359d1319e5f089b525eac3749dc958515ffb368dfd
+      unrolled_ast: 58b7e3117c943bd4fa0d78359d1319e5f089b525eac3749dc958515ffb368dfd
+      ssa_ast: 5af8b7ed094924143b1ba05f246a417177c6bb9c61d34bc8feda5c418d365fe1
+      flattened_ast: c3d87c76cc3699f14e0c1bc165367eaed92f5044ea942be4193dfbce12b0f0c5
+      inlined_ast: c3d87c76cc3699f14e0c1bc165367eaed92f5044ea942be4193dfbce12b0f0c5
+      dce_ast: 404e6ae5f1a61cb001a11aea3ead5082d5acd582139f56e41424a4457b14a759
       bytecode: 5552b43274ec113ad0520de7a6a457cd4ac6db08d490446eca21f148a5bbca16
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i128.out
index 441194c016..1dabb45a6d 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8cc08a55a4766806701ada82b6e6fe267fcc55dd7ffa7bdcd0df847f45a55a88
-      unrolled_ast: 8cc08a55a4766806701ada82b6e6fe267fcc55dd7ffa7bdcd0df847f45a55a88
-      ssa_ast: a6430134eda01acb48063ce754e8f1f8eceb0831ccfc7be9c2cb57a3a6b590d1
-      flattened_ast: 5007eb8364cf861e5ef11d3a782f1b97c46a35b0fe00145aac2f25de9e68505a
-      inlined_ast: 5007eb8364cf861e5ef11d3a782f1b97c46a35b0fe00145aac2f25de9e68505a
-      dce_ast: fbf9b644d9db05227b49190948363354a346d96c20ab9e1d5596a6490659368e
+  - - initial_ast: 6bc571e09c54ab29d06a5e96ba368d7c82db558e523108a87536e672b9c184ce
+      unrolled_ast: 6bc571e09c54ab29d06a5e96ba368d7c82db558e523108a87536e672b9c184ce
+      ssa_ast: 7f13a8ac4e9279024b1e3da939017bef71d196ca6243b8184e4e0ff5b6ccbb00
+      flattened_ast: 98b8cf065b004843080e319557ed2ff594e0783624fd5373a1c3046cb25f95da
+      inlined_ast: 98b8cf065b004843080e319557ed2ff594e0783624fd5373a1c3046cb25f95da
+      dce_ast: df16f37c011385cde2aeddc10ed74b041936d28475f0cb5d696550a3a970aa54
       bytecode: 325b391ad96a02efc136a7653c4a5229454ecfc76c857c6fe7d0606fd78b5336
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i16.out
index 071750179a..eddc102a18 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7a36e76f0e626ba363421a3b51b23292bfc37b0a4419289b97f845442b6f5b0c
-      unrolled_ast: 7a36e76f0e626ba363421a3b51b23292bfc37b0a4419289b97f845442b6f5b0c
-      ssa_ast: c4d434b533862126fcd137af19f5ab1380b1237f2469ef812883007e66206106
-      flattened_ast: 97de4b492d6b4d06f0866eb46d8f011f45a4b1caf9d606f41540dcea1ed30309
-      inlined_ast: 97de4b492d6b4d06f0866eb46d8f011f45a4b1caf9d606f41540dcea1ed30309
-      dce_ast: 7385743f2ca202d19e724a448188a04e8e1e4713ef5825fd6210f6a61c00df8b
+  - - initial_ast: a705aac527cf63578b2f69a56779492e8a3d998dd40667e600f773a045760653
+      unrolled_ast: a705aac527cf63578b2f69a56779492e8a3d998dd40667e600f773a045760653
+      ssa_ast: 83d5a116b9d11cebe4417cc9c31a2a91243a3f6456675b605222613f66f80440
+      flattened_ast: d4d7dd5d0adfa216b3d9e62b94737be5373dbbb4dc21f2bfe50eee8b5b861da0
+      inlined_ast: d4d7dd5d0adfa216b3d9e62b94737be5373dbbb4dc21f2bfe50eee8b5b861da0
+      dce_ast: 8e1e99ae2c5eabb1105ef04e5659e92d5d6516f47bf7330118a5580387cbf845
       bytecode: db7cf565e83b99b3a24b93bfbb5bdcda4f947f4eb64f454046ea83edca3ccbf3
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i32.out
index cf9f4ea043..3a8cbc3d5b 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 92ee68761f294ea4a49a025e9132c083f57fc01587e4c52db3bafc62f35b66c7
-      unrolled_ast: 92ee68761f294ea4a49a025e9132c083f57fc01587e4c52db3bafc62f35b66c7
-      ssa_ast: da7d82578cb1ac8f9314811d61a9bdeeabca02f301022c9753744c04626fdc18
-      flattened_ast: 3b1e9009d7f3769c4badff49c74f7af158a0ea49820d215fdebd32b2b0e062b9
-      inlined_ast: 3b1e9009d7f3769c4badff49c74f7af158a0ea49820d215fdebd32b2b0e062b9
-      dce_ast: d224b6ef7df21ccfefe7a0b949543696745820385a4fc547b5ed5b5e74ed13c7
+  - - initial_ast: 9b04c1a3199640b1bb75bf1796c51f8247101ac841efa4e78837737f1840e941
+      unrolled_ast: 9b04c1a3199640b1bb75bf1796c51f8247101ac841efa4e78837737f1840e941
+      ssa_ast: e087d9dbc1082aef11c7cdc29acbd8e40140c3f19ceb2188b936e820d58a5bc6
+      flattened_ast: 883e141c98634bcd7056dca257c5d3fe9606ca101e95c626f17b789874f8ed1c
+      inlined_ast: 883e141c98634bcd7056dca257c5d3fe9606ca101e95c626f17b789874f8ed1c
+      dce_ast: 4dd926d952ebce2dd59c1f8a967afdadc0e948af85e3f31deab550d8e4ea0107
       bytecode: d594e784e95e52089afcadbc703f266ea2fd2b211728fdbea8eea5abc5e1942b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i64.out
index d7e4bc405d..3b539a82bc 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 44afe466172f202382b83ea6416ccc3447ff684aaa9ee18c38dd665a639e8760
-      unrolled_ast: 44afe466172f202382b83ea6416ccc3447ff684aaa9ee18c38dd665a639e8760
-      ssa_ast: 9da72c4252de24be048f58668cb3c5b492f105b23c7440a959d0474574315306
-      flattened_ast: 1502430fd27a08f4eef2ca43873c588899a2c18acb15576da4b35538cb29c66e
-      inlined_ast: 1502430fd27a08f4eef2ca43873c588899a2c18acb15576da4b35538cb29c66e
-      dce_ast: 2e508af7d9b2d85877183259c9e576d25c062f03c38d23acdc2d65d66e1ad4fd
+  - - initial_ast: 7d5ed9c373b2460d26ae2e9e92c2e1e63e59af4f9daf813971486d764b7df3fa
+      unrolled_ast: 7d5ed9c373b2460d26ae2e9e92c2e1e63e59af4f9daf813971486d764b7df3fa
+      ssa_ast: 8d6571c282f21bdbc7c88ee0bd602ea2e29f7ce0408cb77b4dc9fd80ec7546e5
+      flattened_ast: b6ae966db6102e16ca5e2c3141dd59a957e8dc52e77d906220eddf7d5d81f301
+      inlined_ast: b6ae966db6102e16ca5e2c3141dd59a957e8dc52e77d906220eddf7d5d81f301
+      dce_ast: 1614b47014a0db1e2fef072ecbbae97e2d24c603b8dedcbf614ce39e340aadd2
       bytecode: e9166c477441b45359a7ab4d7ee7afd309de45ee5cad9143f0261b1c3ccf8b57
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i8.out
index 1ea24095bf..483b82eca8 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2864fdb040c4bee195ea2303902074d3210a1a4b2a224042ffa8ece7c6696dfe
-      unrolled_ast: 2864fdb040c4bee195ea2303902074d3210a1a4b2a224042ffa8ece7c6696dfe
-      ssa_ast: a5fbca02a93deaa4f8a65fd8e4efe0bc50bd49e72c98443626a8ecba88fd9d50
-      flattened_ast: 08e17eafd7e2e38737e4c84cbc4c3e98cd914c11ca35d206150dd03d7d61a19d
-      inlined_ast: 08e17eafd7e2e38737e4c84cbc4c3e98cd914c11ca35d206150dd03d7d61a19d
-      dce_ast: c647848fb6c8ba09dc687d27e4b2bdac5ec6294390b24bf01739b0989001aa76
+  - - initial_ast: 57df40883efebc40860205325620b9f6812d810284be6b352016c2b0e54ea6b7
+      unrolled_ast: 57df40883efebc40860205325620b9f6812d810284be6b352016c2b0e54ea6b7
+      ssa_ast: 998cc563874a9db6b48df8b2ae1015844e64ced62ce5ad0d8a9d6b9ab14fde5d
+      flattened_ast: e263613fcf9507550a8393fcdb21686084b0e425b7a479fcc801c7e0b9641034
+      inlined_ast: e263613fcf9507550a8393fcdb21686084b0e425b7a479fcc801c7e0b9641034
+      dce_ast: 1bfdfeed4e6f239e2a790bec65458a898045774da1b0c50fd117e01d1cc4e7a8
       bytecode: e6b4b469e458cb0a6261b92d6c8761ab35b114b09ac01811ecdde6ef97b982b3
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u128.out
index d3a996d9e3..7e5dd0ad3d 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c15baf734d3af9fa4d81db1bc4d5b502254081984fc8cb619a96e1f9ecd1d65f
-      unrolled_ast: c15baf734d3af9fa4d81db1bc4d5b502254081984fc8cb619a96e1f9ecd1d65f
-      ssa_ast: 1be19bc07d466b9608be65289057fde1dee354938a7224e821af8de14d833c8c
-      flattened_ast: f2bd000d18bcab7abcf3643bef8ef017c760e9dd1822369c4b044fa72e899280
-      inlined_ast: f2bd000d18bcab7abcf3643bef8ef017c760e9dd1822369c4b044fa72e899280
-      dce_ast: 3dd0154608334a02a73358d67c85f9e875a95efc424b9cbdfef0b61ef252b936
+  - - initial_ast: ad9a996efbe428d6a5f5017b0583ccb32f81bfb5a2fabb529d6f292e1f094d45
+      unrolled_ast: ad9a996efbe428d6a5f5017b0583ccb32f81bfb5a2fabb529d6f292e1f094d45
+      ssa_ast: f6f5a538ca8182ba058ee1a3711ec08e45190e4fd82f17a90fea89e07b269c1d
+      flattened_ast: fe2fbf2602222e96f9434c517f832ac802cd1886ea2e78a1181706ecf42c8b8d
+      inlined_ast: fe2fbf2602222e96f9434c517f832ac802cd1886ea2e78a1181706ecf42c8b8d
+      dce_ast: 9264cd8cabafa94cc4e2d6a9ac6d1d24760c5b96bf99737626b978ac7cbc8fdd
       bytecode: 37a979515b1052ed7250447aa0f7f28e1daeab1becfe22f5e5d7982a070da4e4
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u16.out
index c33a0e944b..247b597cf2 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 317a27f239ba422492fa72f5a7fbc430f26d5c780191bc2f5f818d2670c6358b
-      unrolled_ast: 317a27f239ba422492fa72f5a7fbc430f26d5c780191bc2f5f818d2670c6358b
-      ssa_ast: 0f8b6be32623c25ec76787db29d90df10fb9048b994e851ac07a58681a9b8b08
-      flattened_ast: baf314a8a6a3afdb0c70edc9ec8cd19f7b18ecb88a141cf61be599bf804b4bc6
-      inlined_ast: baf314a8a6a3afdb0c70edc9ec8cd19f7b18ecb88a141cf61be599bf804b4bc6
-      dce_ast: 506d492037ace741ad590fda1b447f380696b1036802e484ec88b82db7662b16
+  - - initial_ast: 5cca8b2bdb59d7ec530fab7f0e468b446f251e456a9d5146064b6b6280280eee
+      unrolled_ast: 5cca8b2bdb59d7ec530fab7f0e468b446f251e456a9d5146064b6b6280280eee
+      ssa_ast: bba5b7b4b83eb0f2b79cd0d0f33a88cc5ea5bc1aa3ee40778a08d19ac2e2cab0
+      flattened_ast: 459ab355e8ba69a84e31acbfdf67c440a0ef01d2e887d2fdb6250920c0928bb6
+      inlined_ast: 459ab355e8ba69a84e31acbfdf67c440a0ef01d2e887d2fdb6250920c0928bb6
+      dce_ast: 4300105414ca69b29b08d90318a500fdd1514a1bb58bedbc796a751fdf597079
       bytecode: c5e0ce1caafa4445b3ebdc57bc9a5ae3c821df23f7b4fa1d3b92a0e4911bc08f
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u32.out
index b80aaac9e2..48d69493b0 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3a40cdada551e1094961b596d82076171f689a49cba053bd83f50920ba516c9f
-      unrolled_ast: 3a40cdada551e1094961b596d82076171f689a49cba053bd83f50920ba516c9f
-      ssa_ast: 55a6a6504273a7eeade534d50080c078f7d38635e4f93488280e5b847c0196bf
-      flattened_ast: 13633670c75b48ceac8a93c2da4f421e3cab40da20a5f8695f5e3b398deded2d
-      inlined_ast: 13633670c75b48ceac8a93c2da4f421e3cab40da20a5f8695f5e3b398deded2d
-      dce_ast: fd190b7d1a535a1d7eff2049232ae5faf44b10b1dd021b5ad38419593474e6fa
+  - - initial_ast: 9e73316e0ce5f0cca6db4f766f93ce6e0ee3c99740f1f287d9cd009472adf6ad
+      unrolled_ast: 9e73316e0ce5f0cca6db4f766f93ce6e0ee3c99740f1f287d9cd009472adf6ad
+      ssa_ast: 7ef8f5b2dc467be8e9902b91a3bfdf64031312ba385fb0621d207c8c6b9e058b
+      flattened_ast: d708180553dd80126d6e1108bf9dfa15ee78d142f1d41ad8e8f560233ff9e824
+      inlined_ast: d708180553dd80126d6e1108bf9dfa15ee78d142f1d41ad8e8f560233ff9e824
+      dce_ast: 2ad891796614d132a9b413a0ffa4300983efa7f5a322fbd3386ee44e201161f2
       bytecode: e13dc9845dd08c9ac24e97102ca39e47dc86a6d6540081abe19364518003633a
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u64.out
index d250f8a890..1e875b4ab3 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d6336d68f430b113d7c4e6938d577c94d93288575c61dff453abd669be7ea06a
-      unrolled_ast: d6336d68f430b113d7c4e6938d577c94d93288575c61dff453abd669be7ea06a
-      ssa_ast: ff2167b49363ff0e394eabf53f2e539252eab4b8edb5bb9707dfb7e36a4af0b0
-      flattened_ast: 60074b357245e1052509f9ccf03576a37169e006d8e8f9138735866072323f1e
-      inlined_ast: 60074b357245e1052509f9ccf03576a37169e006d8e8f9138735866072323f1e
-      dce_ast: b9cd665522f49eb49ba9d491ff2ede8a31ab34b87c927d58d8e59ab8195a056f
+  - - initial_ast: 7c38a7735cdbd693b4033bed54345f7bf238fd9a125418940689aacc0074b5ff
+      unrolled_ast: 7c38a7735cdbd693b4033bed54345f7bf238fd9a125418940689aacc0074b5ff
+      ssa_ast: 30780b2e123a2934e056a51439f5737f00be7d22a0927040251f96b1e0fcfa45
+      flattened_ast: a2c456ce6fe4d598ba8bd8c4ad5f54e4d941b1834153e15255c3fe1d3308fa2c
+      inlined_ast: a2c456ce6fe4d598ba8bd8c4ad5f54e4d941b1834153e15255c3fe1d3308fa2c
+      dce_ast: a436e1747a11684ba2619d17199e8a385267bcc1db04eea907412a66a8a3db64
       bytecode: 9c52388f672a987f68d35317155d105b7e01e181e5640f4fba50fd2ff389cba5
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u8.out
index b67d0a4cb6..395852ff27 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp256/bhp256_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d3c672e60f36f12fca05869fa9a9c8c615829e681c39ffd88d5d0f59e0147c59
-      unrolled_ast: d3c672e60f36f12fca05869fa9a9c8c615829e681c39ffd88d5d0f59e0147c59
-      ssa_ast: b81db4d5db1bac17bf51a889ca5c91aa41e49b0656cdabfff9c7c7602b7bc0db
-      flattened_ast: 4b64107178ee389d1511bd0a40897db4a383576fb5ea634aaf7c9e374b62076f
-      inlined_ast: 4b64107178ee389d1511bd0a40897db4a383576fb5ea634aaf7c9e374b62076f
-      dce_ast: 1f250c503ba511f09ff1c3966db370973093d104c3d8ad65b6f0b733e6d2a022
+  - - initial_ast: 7932e1d378dd7bcafaaedc6a5fab7037c24c22b3bc262c4caba488ac450f4623
+      unrolled_ast: 7932e1d378dd7bcafaaedc6a5fab7037c24c22b3bc262c4caba488ac450f4623
+      ssa_ast: 81cfd1c47345837ce9758b9d48ee121d33f9d2d6b213decc4cdcc67f7ddc5e29
+      flattened_ast: 7522ba0472b5c29ced446a0ed8f44d4d9e9a2463987d2053d3aab37968004d4f
+      inlined_ast: 7522ba0472b5c29ced446a0ed8f44d4d9e9a2463987d2053d3aab37968004d4f
+      dce_ast: fd1d2cbeded36eeda8092690de397761653ac4522fe440c441da549cd4c7c5c0
       bytecode: e825e5f1ec6f8a394897f61ef950eb8bf8af29b1d34975851501c35a14efe620
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i128.out
index 7dbe0fdb1e..6025bb8f1f 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d08028b7b55e72415edbebf84dbaff6d1212be4cd4eacc2843605e01802e6a36
-      unrolled_ast: d08028b7b55e72415edbebf84dbaff6d1212be4cd4eacc2843605e01802e6a36
-      ssa_ast: 60739cdb3d73225253ff8e5723dc39d2899a6c2a0d7792a5a8ddb162a7ff6b96
-      flattened_ast: 4af29b67c7d40d2ff362c15d4f55562062ee11bc1018b71ecd3d2faebc8874a3
-      inlined_ast: 4af29b67c7d40d2ff362c15d4f55562062ee11bc1018b71ecd3d2faebc8874a3
-      dce_ast: 8497e8c829717e04804dd73adfcb5ae6c4cc110d5246192c0c730c45d4019c4e
+  - - initial_ast: 4933ba08ca3a5adb1fbef08825b1065eb3a6a8882faa33b70bcb87a4904cfad7
+      unrolled_ast: 4933ba08ca3a5adb1fbef08825b1065eb3a6a8882faa33b70bcb87a4904cfad7
+      ssa_ast: 66dde14205fb4d1e75f4c0e1634b663f25f2ed061d8bb0090d8d8113a948cec9
+      flattened_ast: 13b41a7f345be872ed8402fb0632e113cd4775ebd5ff9a9d301cd845e12d90bb
+      inlined_ast: 13b41a7f345be872ed8402fb0632e113cd4775ebd5ff9a9d301cd845e12d90bb
+      dce_ast: f63b9b08a4520ddb92717664b0fa23d0e877d2e74b5c00bbe366f89f04d96df6
       bytecode: 11ae61d5f4360419e46a728f08f8a61eac658bd9fc955eef66d5893e4510bccb
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i16.out
index 0b403132f1..3400688f5b 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ca96b022e04e6254abe0fe18694ae8481867842aae65a4a683226d9a44b13619
-      unrolled_ast: ca96b022e04e6254abe0fe18694ae8481867842aae65a4a683226d9a44b13619
-      ssa_ast: 53f8f234b7a88350b8fbf075934d25cc6d23369f945813832dfdfc12193083a7
-      flattened_ast: 7a3c0c146110979dd59473236c904c82129ffe9ffa55fbb91bcd6e95d8ed964b
-      inlined_ast: 7a3c0c146110979dd59473236c904c82129ffe9ffa55fbb91bcd6e95d8ed964b
-      dce_ast: 4c6f47186072b163ad350c411b3f06b3c815660fda7d59faccd28d66fe89fdb0
+  - - initial_ast: 8dda8e8bc886c8860fcf382a7f1dafb63683edd35e9438855e4f6ed7861fcb09
+      unrolled_ast: 8dda8e8bc886c8860fcf382a7f1dafb63683edd35e9438855e4f6ed7861fcb09
+      ssa_ast: 08693f97246c66123ee479ec8d862cd4ca8ff889fdaf24daf3210f737c59bdec
+      flattened_ast: b71123de1eaa19280ed3b0b5847b5f9cdfb3a3d704fe774edddf9b2f366ea82c
+      inlined_ast: b71123de1eaa19280ed3b0b5847b5f9cdfb3a3d704fe774edddf9b2f366ea82c
+      dce_ast: c3fd62119357fa4e5ac33e431c828ac958d46303dc354d197823188ee198218f
       bytecode: fb3436bf454ebec95e4ef923af1a39482d83be7d3d5c844d29ca75fc789df02d
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i32.out
index 163d866b23..51a5f40716 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6266ced104ac306325df718ae3632c5e1890ed880c97fdb5af9d1d2d388a09a0
-      unrolled_ast: 6266ced104ac306325df718ae3632c5e1890ed880c97fdb5af9d1d2d388a09a0
-      ssa_ast: aa37447f13a4947633caf3bd00880cc2ddc899268c53cbbda42d0c75127f7431
-      flattened_ast: 79a949c00bf0620b9fa497e46d8ec9864296bb0c0f854fc828bf65b37c229a55
-      inlined_ast: 79a949c00bf0620b9fa497e46d8ec9864296bb0c0f854fc828bf65b37c229a55
-      dce_ast: 4482473c2eb2cc3a8ad17058c05214556d9b3fbfbfe8fea00d50a078351f8a32
+  - - initial_ast: 278dfd02af19587d8ff9a9bfa7f149fdb96ca69ca5ad1cee5f536d89a767a2ed
+      unrolled_ast: 278dfd02af19587d8ff9a9bfa7f149fdb96ca69ca5ad1cee5f536d89a767a2ed
+      ssa_ast: 9ec745b9f57bb7465f2658a0e1c5bd977ccd4a987cf5faf25eb1520b0dc12559
+      flattened_ast: fcc4287936833a1f641a2698d9b33a6451cd92541e8d44c611d45f1de1a70475
+      inlined_ast: fcc4287936833a1f641a2698d9b33a6451cd92541e8d44c611d45f1de1a70475
+      dce_ast: 4a13cb6080f2daefb2066c9da267b6b35ca9725532baf767b3c86a4ba455550f
       bytecode: 7c019cbb4d7c889f44fb07bf6b5a3a009d72c70cf8d11dabdfd17b599f66b6b2
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i64.out
index 3786e7805f..1cc28bc3c2 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4d2d0541b25ce5c139b28ba2930ec857083da33ddfdaf00e9c47594e77356030
-      unrolled_ast: 4d2d0541b25ce5c139b28ba2930ec857083da33ddfdaf00e9c47594e77356030
-      ssa_ast: c60902a2f60f43992a65833c0bcf9597747fa31f6928eeb0d6f0e305c8dfc8a2
-      flattened_ast: 0aa4cb47cd07bbb44f6d7c58930f210f000dbae2b42409991cf842fa7a2ce488
-      inlined_ast: 0aa4cb47cd07bbb44f6d7c58930f210f000dbae2b42409991cf842fa7a2ce488
-      dce_ast: e1dfd145c5794d0cf64c36805eea834b9e6b96d8931106b2f1aa0f6958ca74e4
+  - - initial_ast: 7171df9198f5e13f2e19f767752776d3065cc38aa59c87a5df03d0a7b0444920
+      unrolled_ast: 7171df9198f5e13f2e19f767752776d3065cc38aa59c87a5df03d0a7b0444920
+      ssa_ast: 6fab23d4881c46732c16a3777bbf658b828c562a7dd638c681d26e7ce35fa2bf
+      flattened_ast: 311a15fab458e0193d022793b1cc62ca10a9f78b7d188823e7081b8d51df0aec
+      inlined_ast: 311a15fab458e0193d022793b1cc62ca10a9f78b7d188823e7081b8d51df0aec
+      dce_ast: e07836eec425529cd61cabb47ffda3f16f17dee6f895055b4909e244468c6519
       bytecode: 0ac6eb1b02f1e0a7d99a396f79615a0e0ab6f359773bbf3cf8051d7d67600d13
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i8.out
index 3cec24c730..b891189ac5 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5532731a8cd5f115b04efafb98e2e4aaad1505cf9f7ca9aa816c925bbf49e813
-      unrolled_ast: 5532731a8cd5f115b04efafb98e2e4aaad1505cf9f7ca9aa816c925bbf49e813
-      ssa_ast: 09f4040495a6fc43d501ef330425cfc1de2c5936c7d7732f207bc87428a478e6
-      flattened_ast: 349bd98049f114933def62c407fa97d6cb6baa6c83840da936ed8af885d54ce2
-      inlined_ast: 349bd98049f114933def62c407fa97d6cb6baa6c83840da936ed8af885d54ce2
-      dce_ast: ef147fcddc0a26124ddd2d79b6143c360b42904e14b6c9bb4db72426863ae44d
+  - - initial_ast: a00d44b4161dbbcc7798b178a7e783758b182a6fb30165f4928bc660e05b3a55
+      unrolled_ast: a00d44b4161dbbcc7798b178a7e783758b182a6fb30165f4928bc660e05b3a55
+      ssa_ast: 087a25a1ea7c1f7d5247efc7aa0e4ee5c02a7cce01e7a3154e5193316bd008af
+      flattened_ast: 90d0b5c73bd72779915625bb3d4fb73856bfb63137121a9e127fbf0e5ddaa91e
+      inlined_ast: 90d0b5c73bd72779915625bb3d4fb73856bfb63137121a9e127fbf0e5ddaa91e
+      dce_ast: 4d9fcd9d8bab7ece17523cb7110557fc5e812faab0f91b0bb24c5cee46caba8e
       bytecode: 9429c70f10830030ebe2d02d9d82604ab11222235abf4abbfe2be8b0d27ca85e
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u128.out
index 4b0bf6d00a..dc885f520b 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a8aa8a25489701e0208a801a0413261d4114debd3e8aadc943a0cdda6ea767d8
-      unrolled_ast: a8aa8a25489701e0208a801a0413261d4114debd3e8aadc943a0cdda6ea767d8
-      ssa_ast: f10633fac8eaeeb1f89413198682060d4a75bbe6a7ed13d2ee321eff1df621b9
-      flattened_ast: 9c35a6e1d3e7d1efbbb06b676f36fe411a33e270558b18d147093e19a64c8d23
-      inlined_ast: 9c35a6e1d3e7d1efbbb06b676f36fe411a33e270558b18d147093e19a64c8d23
-      dce_ast: 0ab9b5cfa623246b1e3fce004d320f0f9895f397938dbc0df054389405680274
+  - - initial_ast: 5c993d9422decc08d57e20796ee97b3096cf68ad7792a258b9e5b9dc907b9cf2
+      unrolled_ast: 5c993d9422decc08d57e20796ee97b3096cf68ad7792a258b9e5b9dc907b9cf2
+      ssa_ast: 15d0e967440755af0455ac283679683bbe9f41838f04c29ccb66c70dc93c5a4d
+      flattened_ast: 033c37b655cc939ff440bd47fdef72124dbce75657ce3ba16ed10c16d8bad008
+      inlined_ast: 033c37b655cc939ff440bd47fdef72124dbce75657ce3ba16ed10c16d8bad008
+      dce_ast: b7511adac360b665cce89cabae187276e4753bc7ae67839660656ad69e17637d
       bytecode: 812c0a0a2bf916091f80486f4290c6647a5a99501ebbea358ecbb40c78f705ff
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u16.out
index 886fe5fa5e..f37ddd65f5 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e4db76230a07cbf1b8545a5cf55e963fe410b0ba33f7e9e5d18924c948d5ccb3
-      unrolled_ast: e4db76230a07cbf1b8545a5cf55e963fe410b0ba33f7e9e5d18924c948d5ccb3
-      ssa_ast: 9a041b9fef97b277cc7399d60c0b4459b8e81ecdfac9075799430c74e190da59
-      flattened_ast: 076829b0a40abc4bfa0c4680589d8b5a8c9772b72708c16900beaaf858e4021a
-      inlined_ast: 076829b0a40abc4bfa0c4680589d8b5a8c9772b72708c16900beaaf858e4021a
-      dce_ast: 44dcfb3b858bdb44da3bf57f968876dd19059eafdf088a1fa4d39d4d4d7d34cc
+  - - initial_ast: 9b39bee06a62a4293078daa34e4efb69d3fbeaa9afde14f21928c33dd3d183b9
+      unrolled_ast: 9b39bee06a62a4293078daa34e4efb69d3fbeaa9afde14f21928c33dd3d183b9
+      ssa_ast: 8a86292d883e53f8ec3537611feb18ccd831e8fcdb667daaaaeccc167646d91b
+      flattened_ast: d07042512086a07eceedb38de193ccaeb3255c05857d7742d77907f267c142b1
+      inlined_ast: d07042512086a07eceedb38de193ccaeb3255c05857d7742d77907f267c142b1
+      dce_ast: 179cbee2910c349335d92f6ec00f4355396519f5b1118adf82fa5aef4443ad07
       bytecode: 390cdd7ae02a64f8f608fc4dfb3954a41342e8c58e988b5f3250542c970b9259
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u32.out
index f9b26dbae2..38efd2664d 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: caf55323ea9ea6b102cf766dedc0342bb4beac593ad10f3dafb6be4ce510a7a5
-      unrolled_ast: caf55323ea9ea6b102cf766dedc0342bb4beac593ad10f3dafb6be4ce510a7a5
-      ssa_ast: 26b20df300ae423b57b756bd155bd6dd9e58137070cd371ad092c476dda5a2b7
-      flattened_ast: e868c49569dd62335ed5c722d3fd053db4f67409b278f68c6289840e031966fa
-      inlined_ast: e868c49569dd62335ed5c722d3fd053db4f67409b278f68c6289840e031966fa
-      dce_ast: dd0449611714b6886712f93be0edd8f2b55b14380bb38f002ab89431ab9ed9be
+  - - initial_ast: f2c8114b7202e41e56b0bbd4026ed8abad65bdc5762425b5aa4fc8f9a82a181a
+      unrolled_ast: f2c8114b7202e41e56b0bbd4026ed8abad65bdc5762425b5aa4fc8f9a82a181a
+      ssa_ast: 8cfd238084f8631f3b1d210601520be4062d47762fc8e1a590f6edf726d1c3ef
+      flattened_ast: bce0db682d7a184e2039a89f35cfeb468fd1d84bb751181f7c4e96ca6e074b42
+      inlined_ast: bce0db682d7a184e2039a89f35cfeb468fd1d84bb751181f7c4e96ca6e074b42
+      dce_ast: 55f82bf6cbb92b4ac3a44ef4779d33d9455bc1cbac1c195df5bb14215955c1b1
       bytecode: 4c3b66767d08f35980f87af707822d182698bdd9c6de60aa8ed130e7f3a77ba5
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u64.out
index 5f12cd1c07..16d1d78cc8 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3a2b478843a97e1ee48f3123c97f7e2888d8ba97a3071a0482d8b74e46e0798e
-      unrolled_ast: 3a2b478843a97e1ee48f3123c97f7e2888d8ba97a3071a0482d8b74e46e0798e
-      ssa_ast: 6c1ac03baf7ee87c4cab2e2bcd6363cb78944266b4585b4824ee18045ec7dbd3
-      flattened_ast: 76a52e118c721f63279ef24680a23f03c1130222235c315f34c501a0a2bd81a1
-      inlined_ast: 76a52e118c721f63279ef24680a23f03c1130222235c315f34c501a0a2bd81a1
-      dce_ast: be81bc2345de83273bc272cba92710c08b43e944e8453b27d450ab63c1c42ec4
+  - - initial_ast: 428048f27e422110ad61d11caaf62d8eb326badd0a221ef986b9e12566891e96
+      unrolled_ast: 428048f27e422110ad61d11caaf62d8eb326badd0a221ef986b9e12566891e96
+      ssa_ast: f43bfc93a475f34417e524b41441945f3f58faf5b4e3117afc73c19c10e49970
+      flattened_ast: eb90959f438a10051f660bd4cd88109ef43aaaa22d2569f1a9c666c983a1d0f2
+      inlined_ast: eb90959f438a10051f660bd4cd88109ef43aaaa22d2569f1a9c666c983a1d0f2
+      dce_ast: faa254a34f15185d7e390e0694d96c6eab253bed4d4389f8b901c9ce66e5b264
       bytecode: 0360f58e0f7d1b1d9349c634ab348475f511b8ea486d48270fa3134c204bd1b4
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u8.out
index 1895713e8c..3734e0280f 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp512/bhp512_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1138dcf77e217550c8ad41561b552acf54a27c21d57fed34a8a3c7a0695efb47
-      unrolled_ast: 1138dcf77e217550c8ad41561b552acf54a27c21d57fed34a8a3c7a0695efb47
-      ssa_ast: acbf04a5e5f722b4b0e1119270364cb8ea2ea1d083e23a87bdc9e0c6c68ff325
-      flattened_ast: 25cf8770593ffd43dad20932f751e1ccbce691dba924ee5936c6cce9118a4b32
-      inlined_ast: 25cf8770593ffd43dad20932f751e1ccbce691dba924ee5936c6cce9118a4b32
-      dce_ast: 6a793bf993124efdd17768afd2087026e392323dcf17564adb52b87a61496670
+  - - initial_ast: 30f4559ee8579c67dc6b8665d981b3a4e6fafc3923e9dc51b241c80395c3c634
+      unrolled_ast: 30f4559ee8579c67dc6b8665d981b3a4e6fafc3923e9dc51b241c80395c3c634
+      ssa_ast: edba5e88d3ac920a3f404b67e703e055c403b9f636acdb2f122e4472f3788107
+      flattened_ast: 9c72f522068ba5f2994459701532ff75e587f21f40d47fb0e183646aa7f90249
+      inlined_ast: 9c72f522068ba5f2994459701532ff75e587f21f40d47fb0e183646aa7f90249
+      dce_ast: 9f8d38256454dcffe3b66226d0bab0bca3ef90c8be3b32a4823f94ca45b6f19e
       bytecode: c9e708ce2a325d1e97127ab8e4035eceb3dd877ebdc4d78dec8db4e10359d653
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i128.out
index aa69e95096..12f00768ec 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 86aadc363d862d6915af8e7e7325a745bda580c0bb3c767fb8594643f0fd442a
-      unrolled_ast: 86aadc363d862d6915af8e7e7325a745bda580c0bb3c767fb8594643f0fd442a
-      ssa_ast: fe0e88b24cea2ae644406549ff7d5e06ea58b36d4a8fe04e5afb9103c13baa5a
-      flattened_ast: 08a32b55a610a8a2e9013b0273ba14a4856c595c6731ea6301c92491d36721fa
-      inlined_ast: 08a32b55a610a8a2e9013b0273ba14a4856c595c6731ea6301c92491d36721fa
-      dce_ast: edbcd7a129fa2223dfb1d8455f79cf843fd93895db209d7bf5a571db68dbe109
+  - - initial_ast: b62d727a860b09620c5c75bc0af00048a67f1409257d563fb2f501aa9f0113f9
+      unrolled_ast: b62d727a860b09620c5c75bc0af00048a67f1409257d563fb2f501aa9f0113f9
+      ssa_ast: 9432aebfdc62968846960cce84724b7218780378a1f01d926ece14839948d05d
+      flattened_ast: 9acbdc4acd1319ce55cf5c83d621be7f4bdf97765a713c257a082ae8128d3329
+      inlined_ast: 9acbdc4acd1319ce55cf5c83d621be7f4bdf97765a713c257a082ae8128d3329
+      dce_ast: e11a2aed1770333e0a37493c0ee7ca087fb235fa14c5654993001a44df60b694
       bytecode: 41f9a2008eaa379a61dc855788a4491e1e5dc62a0d7c6ded89453ced43b60fc8
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i16.out
index 2bd9b43000..2a1f516020 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 25c54a3f667f368401c932aee13993cb6847efe9803571a49ad27202326a801e
-      unrolled_ast: 25c54a3f667f368401c932aee13993cb6847efe9803571a49ad27202326a801e
-      ssa_ast: 437916c57a9e976e0d015a76212b299913e7c8b357b519096faac4fcd3e704b5
-      flattened_ast: ab94bb40469b39e1913672bbf88beae2018db4109f693d1a2568c5f60dc14161
-      inlined_ast: ab94bb40469b39e1913672bbf88beae2018db4109f693d1a2568c5f60dc14161
-      dce_ast: fe78f506c4f4198905a09af4fa849e1d4eb5e2cc3907da028fe15a5641a73a66
+  - - initial_ast: 792a0da1d5023573246735870fe62012976c469814ce6a483ddc5829795d6338
+      unrolled_ast: 792a0da1d5023573246735870fe62012976c469814ce6a483ddc5829795d6338
+      ssa_ast: 57a6d9c252007ba8d34852ad10fa57afff3fcb5021677a52a6143e48e7016b3a
+      flattened_ast: b73c1aa0bcf66eee34a69ca204b2cfb6a5779fa16801d57ccf80d1e75d4fc0e1
+      inlined_ast: b73c1aa0bcf66eee34a69ca204b2cfb6a5779fa16801d57ccf80d1e75d4fc0e1
+      dce_ast: 4c93410c5edb4883062267f66dcc3a2d43d807030e97891d2468781071387a66
       bytecode: 45ad5a3ef8c99cd48278fbc38e797d96203b685f6f98819f30e7b5a3c84c1ba6
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i32.out
index 5aaa035023..93843b3754 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0814c246f7544c62915cf3eea8bddc790a8f2ded5c151660f3e3ff301595928a
-      unrolled_ast: 0814c246f7544c62915cf3eea8bddc790a8f2ded5c151660f3e3ff301595928a
-      ssa_ast: 41da6d2ebcf5ba5ba0b1fbf6344a9a83bb77c91a81e90e1ea2358d50196f6993
-      flattened_ast: ba5acea845d95d5c5c7bf6ab9012f96620a6a19ba875bf3b3c839d29f752946c
-      inlined_ast: ba5acea845d95d5c5c7bf6ab9012f96620a6a19ba875bf3b3c839d29f752946c
-      dce_ast: 85d8fad6810d4b3af5a4e7c107451c8cc38102e686663bde3326599f32f18f6c
+  - - initial_ast: 57e89e5f3aac36ff08aa2d21f135fdec539aa5b052dacc669e1d10705323f33a
+      unrolled_ast: 57e89e5f3aac36ff08aa2d21f135fdec539aa5b052dacc669e1d10705323f33a
+      ssa_ast: e6625efd42ef493e601ee7856fcf9047618ca2375dd170cc5ba330672edb4a9a
+      flattened_ast: fc964a707985885e1f8794dc8bb666210e61f3a9cf22cd177b6af64bd0461536
+      inlined_ast: fc964a707985885e1f8794dc8bb666210e61f3a9cf22cd177b6af64bd0461536
+      dce_ast: 7382783bd71b2e3ef1ac0bb186416ce18974e300470adc15db157e2dbe04e0d0
       bytecode: 7964da6bf0e7d8a10b9611ebede89ce40bb74f040326c5250c42fa85e5342dea
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i64.out
index 5b913f3318..e79e31703e 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 445056e0b4e04b10f03bede061b25b19804c35b6f2a2da5e24507a8e4777dc9a
-      unrolled_ast: 445056e0b4e04b10f03bede061b25b19804c35b6f2a2da5e24507a8e4777dc9a
-      ssa_ast: d2be0b1b301247f57e382e5baea0a62114e84118f46def6af0a20bc4fbe22248
-      flattened_ast: 36063908a963de82adf0fe05e3c4c8f073008920beefd582debb0dd97c4fcb08
-      inlined_ast: 36063908a963de82adf0fe05e3c4c8f073008920beefd582debb0dd97c4fcb08
-      dce_ast: f75a9a76f1cb5d5f865c438e9fcab1ee8f42dcdad9a3ffada5dad4472e6fed32
+  - - initial_ast: d74a0c3a7eb1db7b01632c16a1bed8cfc815333c4251e6e0e1a9146b094a9492
+      unrolled_ast: d74a0c3a7eb1db7b01632c16a1bed8cfc815333c4251e6e0e1a9146b094a9492
+      ssa_ast: fef5b96713db8555ad605976d7e422dd7ff29013805be5fc8631cb2de60f7ea1
+      flattened_ast: d840eedd3ebe5ab805dfe7a26d2e26a8af4e1228483e83c123633260decfec07
+      inlined_ast: d840eedd3ebe5ab805dfe7a26d2e26a8af4e1228483e83c123633260decfec07
+      dce_ast: 78d0bf117a107276f8908bf28b78f3a25da8cd9c5d492e489e8125b5c1d78b55
       bytecode: a1f93402bc36f31bde4beb079d0bf8ba6e56b664a8c4f63bceb5dadfbff3cac6
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i8.out
index b0c9c9ad1c..3f2b956541 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5a7ced615dd53bf2cacf8f9f225759976cf26ead86aaf7679d0ec42073a73474
-      unrolled_ast: 5a7ced615dd53bf2cacf8f9f225759976cf26ead86aaf7679d0ec42073a73474
-      ssa_ast: d57e1889117bb4b1311f38de4d40691681e1efd0b591971e58c690c50c264694
-      flattened_ast: 84835590e635276d3e69c11bef444e989bb3757922f6aed914259f974e879564
-      inlined_ast: 84835590e635276d3e69c11bef444e989bb3757922f6aed914259f974e879564
-      dce_ast: 9b7855d14059096fcf2e1098ece6a3f374dd5b8ee3b3cf88fce5eadb05dc203d
+  - - initial_ast: 12e427ffd9a614f06784d1351467907b76578b83fe4a70a3afb7c450cbc4211a
+      unrolled_ast: 12e427ffd9a614f06784d1351467907b76578b83fe4a70a3afb7c450cbc4211a
+      ssa_ast: 958f983b4b1adc42fec305942c4caa16c2f4d4582cc789258a7c2c1bf515d0fe
+      flattened_ast: f05d6f9fa525ebc2f52359a458a4b71c559d972947a5e684c52a46ecb772fbb8
+      inlined_ast: f05d6f9fa525ebc2f52359a458a4b71c559d972947a5e684c52a46ecb772fbb8
+      dce_ast: 6a126290f97440501ff43e2ab4ab89ffa12caea574582c336827bd1581ccfbe4
       bytecode: 87cffa30f3087bf128289379f6d67de9917c1313af521e63436c4658c0666be0
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u128.out
index ba6e81bcf1..7456bf77cd 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e84eb09ce77da2c8089e76b36af4c8bc45fab10370c3539f8c86acd0f4886879
-      unrolled_ast: e84eb09ce77da2c8089e76b36af4c8bc45fab10370c3539f8c86acd0f4886879
-      ssa_ast: 5c48d11bf442ec412a84405f29cd11fcd2ac0abb13990ce1c2f557b2c3ff253a
-      flattened_ast: c5c816a6e67ddd730e221203d15ee0c9005e004d4c197ed09e5297755bc03d0d
-      inlined_ast: c5c816a6e67ddd730e221203d15ee0c9005e004d4c197ed09e5297755bc03d0d
-      dce_ast: a9e6d2dbc78327417dd48bfd839a71652f3c2bbae2d9507e0cc546cbd5de213f
+  - - initial_ast: 6e92a250c426d9537c1499a16a48239b241bb4554e0e9361b10b76c993286737
+      unrolled_ast: 6e92a250c426d9537c1499a16a48239b241bb4554e0e9361b10b76c993286737
+      ssa_ast: 69e41b3af835dd6713aa32ec67027c8e9b3286dd2c38444352bd9058715777ba
+      flattened_ast: 50953ff9cfd1a7f602139d037726ca8ee3559973ef994d25d5fb8af76ea7729d
+      inlined_ast: 50953ff9cfd1a7f602139d037726ca8ee3559973ef994d25d5fb8af76ea7729d
+      dce_ast: 6d72ba6f42644a7d0cd58e2efc51493025fe880cbc7584e0383eeccada520643
       bytecode: 23c6880ffd90bedd85f4adfe46dcf71a491f1a4ce59bb24084396e11ac6de504
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u16.out
index 1d75c2433d..95fb947959 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 75425c4a40823f344ff9e559973433b2f49543b9f58359ea94762557b9254436
-      unrolled_ast: 75425c4a40823f344ff9e559973433b2f49543b9f58359ea94762557b9254436
-      ssa_ast: 231a3eb5143391a2c2cdb8bd6213dee1d57edd4cf48e6d42bc8334cc0ced28dd
-      flattened_ast: 30c63b8721a202659be90f92e0f6fbaf6150d1fc8f4c258c890d6bc118e6f1a3
-      inlined_ast: 30c63b8721a202659be90f92e0f6fbaf6150d1fc8f4c258c890d6bc118e6f1a3
-      dce_ast: 3a7305bb27224742fe2e3b0f254fe996c316db192f3c2d045580207aa0e201d8
+  - - initial_ast: e32229a2fcc1bda4b1aee19531590579ac61c83145a27655e2b1ae8e3ffe9cfc
+      unrolled_ast: e32229a2fcc1bda4b1aee19531590579ac61c83145a27655e2b1ae8e3ffe9cfc
+      ssa_ast: bebc2cf2429193befc5a1d9d783ba6153b87b2071eca33f47d5df0977cf651ee
+      flattened_ast: 709ff087619ecb34b04551868bb50ba4761f90921da978e04b155a8cdc54e669
+      inlined_ast: 709ff087619ecb34b04551868bb50ba4761f90921da978e04b155a8cdc54e669
+      dce_ast: c716758090e000cdcc611d97f06d432edf154ccd1f1416574eaa5e04fd888fc5
       bytecode: 99374b0fe5a134c71415a4ff8036f153046dfa095c1f05fb6d4a587a75b130d8
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u32.out
index f0e9caf16b..b8961ba7bf 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2bf7238fc3c208a45e874e09069eb2064a001b680a09b35b37dd3ef34a3c902e
-      unrolled_ast: 2bf7238fc3c208a45e874e09069eb2064a001b680a09b35b37dd3ef34a3c902e
-      ssa_ast: 99ae7eaf1eed16f3c0da5f0970011ccf49e8b661eee4a3af21a17f5fddc572cc
-      flattened_ast: dfcf95f8ab64775801a81846659425efbb10d98fe9999f711831b6f8be0625c4
-      inlined_ast: dfcf95f8ab64775801a81846659425efbb10d98fe9999f711831b6f8be0625c4
-      dce_ast: 18e6c65fafb9a9ec8e46783986205a5fcbd01d7767052158e5c7ad120785aa08
+  - - initial_ast: 148d39f94ff3aed952844b2d0f1eb58339c4f14b25f1e95df7556c3b0b0579b2
+      unrolled_ast: 148d39f94ff3aed952844b2d0f1eb58339c4f14b25f1e95df7556c3b0b0579b2
+      ssa_ast: 42b546323ee81a8b7e551f343beb7866cf6fcdad30edd1778009bee47f4e2b13
+      flattened_ast: 7d5c2f13a947de01a3e1cf8fa6dbdeafaa196e12ba7dc03f90f5c1ce94bb7816
+      inlined_ast: 7d5c2f13a947de01a3e1cf8fa6dbdeafaa196e12ba7dc03f90f5c1ce94bb7816
+      dce_ast: 7b74cd64b70cb5c2991539ac967e9909d68f2ee742b4c70275394a875780956f
       bytecode: 4e1bd80822d1b2e5f425410c03da560e43cdd179782e5dfdcb6354e1e7c7bf83
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u64.out
index 47d3cc4d83..91d62af2e4 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1d197d6d666e70e3e30bebab6f9417e10b4c1731cb96cac514472c781af9d6e7
-      unrolled_ast: 1d197d6d666e70e3e30bebab6f9417e10b4c1731cb96cac514472c781af9d6e7
-      ssa_ast: e09680b5984dd8536bd3a5360bfa73e7346c13286184ad035d5cbb8152ecfc25
-      flattened_ast: 313c37574c8ffd27f0f5faebe4b306f5bd8cd0d2a8f88337f7cdd8046debf258
-      inlined_ast: 313c37574c8ffd27f0f5faebe4b306f5bd8cd0d2a8f88337f7cdd8046debf258
-      dce_ast: 6e2e6059ffdb476a5edaee4a1863b81a66ec58c693c58cc9cb3f260e988fccf6
+  - - initial_ast: ee219dbb786bcb7d2b49a87067fd65d2d10f0b3b7beb1b5f5a17ec0a1663db05
+      unrolled_ast: ee219dbb786bcb7d2b49a87067fd65d2d10f0b3b7beb1b5f5a17ec0a1663db05
+      ssa_ast: 6a7d7b8d96649273ca7608591567b6a4e610cd2a52b599c30c9c536166e753fe
+      flattened_ast: dff70b1a80270e0256b69dc469c138f74dd87e8479709cfdf4788400e629aaee
+      inlined_ast: dff70b1a80270e0256b69dc469c138f74dd87e8479709cfdf4788400e629aaee
+      dce_ast: 0910a3e5b2d1a5aa8a34db41f847951d1162b0813f6e7d2aae9cfab9c4563dc7
       bytecode: c5995705157a00610ba4950ae685d110ec1ef0341b45e8d59626d42e9c62b83f
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u8.out
index e027a7ae9b..9ffaafe853 100644
--- a/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/bhp768/bhp768_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 57c93a8746094b69f02ff10aa740cb728ad42a1ca965a56b63b1439cd725071a
-      unrolled_ast: 57c93a8746094b69f02ff10aa740cb728ad42a1ca965a56b63b1439cd725071a
-      ssa_ast: 78bb7dc65d720299b52f90e8a46c26912aa04f6d5beb926ac32ce3f7cb558678
-      flattened_ast: 342f1774a39c87ff07bb043a4c9575176d4b40987e8ad47bfdb8b9e90b9d91ff
-      inlined_ast: 342f1774a39c87ff07bb043a4c9575176d4b40987e8ad47bfdb8b9e90b9d91ff
-      dce_ast: e210b766bb6bb22187ae6dd7ab5cabc581c0956e109330b781ba37e5dab271ad
+  - - initial_ast: 511b6e3c7882e5e4750da4d0747ef0ec0ee44bcc54640787747eaa03c49acc7e
+      unrolled_ast: 511b6e3c7882e5e4750da4d0747ef0ec0ee44bcc54640787747eaa03c49acc7e
+      ssa_ast: deb3f7efc09780827c46cd6146616f8856fea065402125ff1252f7ebc37e2d91
+      flattened_ast: 43e9aa54afbb761a31f0776f2d442bda2aa120fa04e59f933bb31b870e9c24e7
+      inlined_ast: 43e9aa54afbb761a31f0776f2d442bda2aa120fa04e59f933bb31b870e9c24e7
+      dce_ast: 5e1fef572bb8bc69431e257df9051694ac598ebee60fae50a556d7ed6e3d65ad
       bytecode: 96a1ad2124d89e5d080a3fdb36a9912092122562449bb5a57c5d0088d1795a9c
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i128.out
index 7e39d19a4c..942bcd5976 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f3dd12bdd8d2d8589ac18618a6e9f73104a7e2cb39eaf5ffa684f5143088f548
-      unrolled_ast: f3dd12bdd8d2d8589ac18618a6e9f73104a7e2cb39eaf5ffa684f5143088f548
-      ssa_ast: 49ee0bac998ed73b76da30c93e6fffe093d4a76a8e83ee844cf7dd3c4331ea09
-      flattened_ast: 743cf7e57b9bb14058094a6336870b0f45f6db2958e9fe6d32ce8e7e33f09a95
-      inlined_ast: 743cf7e57b9bb14058094a6336870b0f45f6db2958e9fe6d32ce8e7e33f09a95
-      dce_ast: bc42c555b31444efd05c6c074d6535307f7d619c756cb9486b1409e5e2192fa9
+  - - initial_ast: ad9f83d5a442d2d6783d0df789d08f3a9e4fcb5dbb37d68d2b3d8fe0e3fd4329
+      unrolled_ast: ad9f83d5a442d2d6783d0df789d08f3a9e4fcb5dbb37d68d2b3d8fe0e3fd4329
+      ssa_ast: 57ffbed85aa430b3ebf5b5770e4027a0549cedb3f64b9ec0763f36bf70cb6b4f
+      flattened_ast: 94e7f64bd10353a7ce5c4ff9356abffc5f79ef08a9d84963c807b107a166a235
+      inlined_ast: 94e7f64bd10353a7ce5c4ff9356abffc5f79ef08a9d84963c807b107a166a235
+      dce_ast: e53e5e5c1233f3fd5eb2922552f07f5132bd8ca6a2cbd66cd93834164e252e81
       bytecode: 14b32216e4be4a4551783a3a25e8b612e15f7a030d75ef04f2a946d0e5498486
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i16.out
index ecb3d769f5..5a28e4e6b8 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4d4bec1e820f895d01204c0d64283fe47c410294065bca32e30fbdd2c0cb20cc
-      unrolled_ast: 4d4bec1e820f895d01204c0d64283fe47c410294065bca32e30fbdd2c0cb20cc
-      ssa_ast: f62925484a665c09e1bf47b246481f2ed0d383dcb31d8540594d4bcb6a0ffc73
-      flattened_ast: 4c9ea900b3d47c6ef9063088e9f1b37dfc0be1d639f394833ab8f89ceb54a11a
-      inlined_ast: 4c9ea900b3d47c6ef9063088e9f1b37dfc0be1d639f394833ab8f89ceb54a11a
-      dce_ast: 72d7cea50187c3f46d2162cc07be9ca2aeaf986d010f8b6d71877d6cee3463a9
+  - - initial_ast: 43b8ef1a45067a52318da553f0406f059a4f25672bb65ab7120527e3cf364354
+      unrolled_ast: 43b8ef1a45067a52318da553f0406f059a4f25672bb65ab7120527e3cf364354
+      ssa_ast: cda519ff1506fe2a5bba5966d774658cd40d2a5b318c02fdba1eca46d27e88f2
+      flattened_ast: 43c50e7da3c3b7dcd533c5e5f16a1d2c9e9ec413b3264a01d10262cae2237895
+      inlined_ast: 43c50e7da3c3b7dcd533c5e5f16a1d2c9e9ec413b3264a01d10262cae2237895
+      dce_ast: fb27cb3b8b0cc311c4fb3c8f4803d6682b88a758518513c9d130a2022d0f4a72
       bytecode: bd41eafe882a2aab210bbbcee150459a4cf225fd567ec4fd1cf9993a11b1d945
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i32.out
index 09d554453a..894a1f96c7 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b5ba577aa4654e298469e54ba046ce302abf8f1993d5fb3af7b83964dd446c05
-      unrolled_ast: b5ba577aa4654e298469e54ba046ce302abf8f1993d5fb3af7b83964dd446c05
-      ssa_ast: f0a6570508246168d0673addd5686864dec1fdcb9db3a32390c6ce20c69ad08f
-      flattened_ast: 29b85fa3c879a143bca0e7c76da830b2386cc16f28f1ac322969e084caf47f5a
-      inlined_ast: 29b85fa3c879a143bca0e7c76da830b2386cc16f28f1ac322969e084caf47f5a
-      dce_ast: f3f95969ab503dab9001715cb4e971f8b53c5b59d39af438f759d916d09a4217
+  - - initial_ast: 0b7bade0ac9b280a2630f742661e7f3deb0d8d8a886eea57aa6c9bb256e92278
+      unrolled_ast: 0b7bade0ac9b280a2630f742661e7f3deb0d8d8a886eea57aa6c9bb256e92278
+      ssa_ast: 25e5989720b5e459cad3355e1e0f7c78c5201a42140a5f00e215d658007afe9b
+      flattened_ast: b649d1ce74c31d09d1cb4c2021bd1d7e79b5e2f0afc672e229dc0fbbbee737ca
+      inlined_ast: b649d1ce74c31d09d1cb4c2021bd1d7e79b5e2f0afc672e229dc0fbbbee737ca
+      dce_ast: af34f68552925d3a36845a94bbf4dd12eb3af27fb847f5ea8ab38e1a31c4c514
       bytecode: 3cc4af3dccf8815e315428a6888139eaea7f66345aeb7072c5d64d28c520800d
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i64.out
index f8c37512ec..9560f3fd3e 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0f1359bcfc8681b99914f84605fd8fc1bbcee2e778671566372e93a59cba0a36
-      unrolled_ast: 0f1359bcfc8681b99914f84605fd8fc1bbcee2e778671566372e93a59cba0a36
-      ssa_ast: 5ee9dc0ade3000d47490a8b1a380f797bba9c91cc1a721a822449d4deb0adf37
-      flattened_ast: bb2d74997456811ef6480fdf5add0b57e2061996d4d01e053a74e41b20b658eb
-      inlined_ast: bb2d74997456811ef6480fdf5add0b57e2061996d4d01e053a74e41b20b658eb
-      dce_ast: 7f005308de9927947713abf4ae83955d8fd30c5920687b1ed8620105ee669bad
+  - - initial_ast: 9518c330c9bd7d861ca8fbcfb57dcfdcfb24868d160aacdbbfbd64ae2cd54033
+      unrolled_ast: 9518c330c9bd7d861ca8fbcfb57dcfdcfb24868d160aacdbbfbd64ae2cd54033
+      ssa_ast: 90c6e003dc723d673c8ce1475d6344b42fcfc06c336089076a906125e09dc285
+      flattened_ast: 26fd4b261843a0c3148b731c989007c20d2199cab0b2ae88022ba5aaebfb7194
+      inlined_ast: 26fd4b261843a0c3148b731c989007c20d2199cab0b2ae88022ba5aaebfb7194
+      dce_ast: d9c5216e2f8dd187e1eea60c448f0e02a6fd7721abb6c40a86256c3a27ce281e
       bytecode: 1f0ae3178163cf804d246fb98addd6ce8dc4b49d62d5ff9b49cdeffa65e4a036
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i8.out
index 168afd6da8..ba39c6bf39 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 92a287c2aecc975dae8dc3b1ce50f37a766f5e0814fb799177664008b736dc50
-      unrolled_ast: 92a287c2aecc975dae8dc3b1ce50f37a766f5e0814fb799177664008b736dc50
-      ssa_ast: 614b3ab324c469a255444a8198fd910a0de034f170d26800535e1e73afcd8c3c
-      flattened_ast: c393ed4d2e3c8b8ea5c0fbdbb4eef309fa3c9dae597e9f786f7928fde86d202f
-      inlined_ast: c393ed4d2e3c8b8ea5c0fbdbb4eef309fa3c9dae597e9f786f7928fde86d202f
-      dce_ast: a85fe1222b13ca3a1846bad94eff3872e4a9653ebc221bcd68338459de451e0c
+  - - initial_ast: 7bdfc51bfa3d6040afc28952efce8ace0dd6c7cc33dd9cba06951efceb0dd4dd
+      unrolled_ast: 7bdfc51bfa3d6040afc28952efce8ace0dd6c7cc33dd9cba06951efceb0dd4dd
+      ssa_ast: 31fe761f3475b2b460166c26db07cb9959b88babe5a35a7d6469f895630b16bb
+      flattened_ast: 71903ac9abd4587adea3409e75475964ad687a3fce20f0820cd716015f9d7beb
+      inlined_ast: 71903ac9abd4587adea3409e75475964ad687a3fce20f0820cd716015f9d7beb
+      dce_ast: 16479957b54802043ea46a16eaeb39cfc78b17e9349fb8059983edbaa620bb43
       bytecode: fc1af5312e41d49834ea498e8a8abd61e083d0c533dc08b189f63e07d117138f
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u128.out
index 0df888f8fd..f8fa478cdd 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f74440c50397e8b74f5b455064ce1d8d5746594c6dbe3dd032c9561becf41958
-      unrolled_ast: f74440c50397e8b74f5b455064ce1d8d5746594c6dbe3dd032c9561becf41958
-      ssa_ast: c7ea78077d08f48aa7ae858b312ca689f1aeb83a5a8d8bd18a4abd0931566b6a
-      flattened_ast: 257ddca66e72e0cad5125253e4e4899e056cb6c49d487eb46720dc12fb633dde
-      inlined_ast: 257ddca66e72e0cad5125253e4e4899e056cb6c49d487eb46720dc12fb633dde
-      dce_ast: b1015cd492270b7a09cf281ede789e7dbf9c6157b9323e7e1be1272aeb773f5b
+  - - initial_ast: cd90d82f48919d7eb1e456c547198aa5a0bfd3da8f2729b48b46a7aa3b39a8e8
+      unrolled_ast: cd90d82f48919d7eb1e456c547198aa5a0bfd3da8f2729b48b46a7aa3b39a8e8
+      ssa_ast: 5ec87702b7ccd774d2b087780f8a575b5a75627ae5956d88149b09ec30acfe94
+      flattened_ast: 9e642d178749bb0ea983b2aa100f819cedd76d9fe686cb1fccda4fb82e5aa013
+      inlined_ast: 9e642d178749bb0ea983b2aa100f819cedd76d9fe686cb1fccda4fb82e5aa013
+      dce_ast: b185ea317786fcfbe4137adf062b7966b572db2a3b1449cacbe58d256eb20b69
       bytecode: 36867283c0d2982d7d31188301170771f72ddae754893774347a534979957947
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u16.out
index b87902e178..316f9692be 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d6a3c05fdb8ccb24e4a6616e1238c70f0510a9fb7f083f4e59fa7ab98d26e916
-      unrolled_ast: d6a3c05fdb8ccb24e4a6616e1238c70f0510a9fb7f083f4e59fa7ab98d26e916
-      ssa_ast: 17836aa232238573f9baa664f72d155901632296ab1fe39216a97bc1242935f6
-      flattened_ast: 636b7cb2d199217b51f2aa267e08c31becff21d4e033a3ad5eb356212e453164
-      inlined_ast: 636b7cb2d199217b51f2aa267e08c31becff21d4e033a3ad5eb356212e453164
-      dce_ast: 189487e4bf5c9361f95a6de218a8f63ffd149d122a6a4d84667f091fb42ade33
+  - - initial_ast: e5e55945a19bdac3ab01f568d2762ff3822185a48a7390eab6d62a5fc2f545a3
+      unrolled_ast: e5e55945a19bdac3ab01f568d2762ff3822185a48a7390eab6d62a5fc2f545a3
+      ssa_ast: 85268a0998410e1ec01b3da3229552cb48aaa90c9b2774f74a52f95eb691cb63
+      flattened_ast: 24f623a97e898ae2a30bf262acb2206366375ce9561d5ed4a4bd69f3fc35cb8c
+      inlined_ast: 24f623a97e898ae2a30bf262acb2206366375ce9561d5ed4a4bd69f3fc35cb8c
+      dce_ast: 7633b9f112d5722d68dc2e4aa5c266f0dd5bf26e29fffd4ddc7dc0b4117cc8c1
       bytecode: a75c54fb28085fe6309fc6ea8600cd7c675bef41f1a7b4d38b3d60d698aab82c
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u32.out
index 24aaa84d9f..dfd93d9532 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0aa04e1a37b13c222f3b27ca4bcca5924c8786a7793bb978cfe8d2240de1973a
-      unrolled_ast: 0aa04e1a37b13c222f3b27ca4bcca5924c8786a7793bb978cfe8d2240de1973a
-      ssa_ast: 571fcbaff244f232c5f02fd5411d9aaa8b798a527652901c981fd58439908aac
-      flattened_ast: dd679713c6362a52b3ed7a514674a377b66853f2bd2197dd334d3e1e8f1116ae
-      inlined_ast: dd679713c6362a52b3ed7a514674a377b66853f2bd2197dd334d3e1e8f1116ae
-      dce_ast: f98c0b368a32ec015a5a501e89c2d68023edfdc04dfbb1e9883caff9e84679c2
+  - - initial_ast: 61be86a1c706479038fa4c2ae5040c4c333cacdbf0c2412d967bcbe03f7e4d08
+      unrolled_ast: 61be86a1c706479038fa4c2ae5040c4c333cacdbf0c2412d967bcbe03f7e4d08
+      ssa_ast: 9acc49f097870c491c8d9af59986ecaf25fd32873d1ac34643f63b878bc9b06a
+      flattened_ast: 9ba7e6733d2a4e0139b491ba0e0e459d755a4133aac8ce536747c5a21d246419
+      inlined_ast: 9ba7e6733d2a4e0139b491ba0e0e459d755a4133aac8ce536747c5a21d246419
+      dce_ast: 2e8def573ad78f208f88e63fded0b7c4a364dcc6a4e9642a1701f477b65ad2be
       bytecode: 0c7247bc75746d2e9d102df77fc3d397f8d984741fe65134b9e68a2a9e14f2ae
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u64.out
index a1059641ac..1201db5da4 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c1eb677b7043de1446fe8b800c15252098266399e67f626a7dff262c944cd907
-      unrolled_ast: c1eb677b7043de1446fe8b800c15252098266399e67f626a7dff262c944cd907
-      ssa_ast: 48a8e1439b0b91480aff0f766e7dae57814c0083143895e036bdf1fdbcd1920a
-      flattened_ast: c7f4276ec0d7257222943d3270eb09c8634c2b0abf30f26580e866ed97d110e6
-      inlined_ast: c7f4276ec0d7257222943d3270eb09c8634c2b0abf30f26580e866ed97d110e6
-      dce_ast: 7bb1800ef976104077554bd78273333ab175b210c0650acc3947fdcbcd252686
+  - - initial_ast: 30373c274d0c0c5e3d9bd2b381fafc4446cc7ed1d03f1a599c5bfabf8da47e65
+      unrolled_ast: 30373c274d0c0c5e3d9bd2b381fafc4446cc7ed1d03f1a599c5bfabf8da47e65
+      ssa_ast: a43915f647da32c812cdeb30bf529363bcd2450f1027a677f2bf5f0be9b8cd8c
+      flattened_ast: 213f01e00a603763a67a609c14ccffc2bd03c5383512aa064a67bd71242ff8e7
+      inlined_ast: 213f01e00a603763a67a609c14ccffc2bd03c5383512aa064a67bd71242ff8e7
+      dce_ast: 76464c7217c421a39e875284c6029ce3970919722c11024738f63d579c986186
       bytecode: 1969305c5523d43797ebd5220fe738ce8e880d1d2bef41c239811be3a7d20200
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u8.out
index 3bc9d0410c..4666e2295b 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen128/pedersen128_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4ccea7d5f5fe523fff4005dece625177d96399df93077a9304c92bc8fe7b5b12
-      unrolled_ast: 4ccea7d5f5fe523fff4005dece625177d96399df93077a9304c92bc8fe7b5b12
-      ssa_ast: 195463214495e4e55e9d17016c7b1a7b9aa3f4280284201672b470a1427b4e33
-      flattened_ast: 566059ba1cf7bdf21e12bbba0736613fbcecd599d0fb87391d76520f82f10df9
-      inlined_ast: 566059ba1cf7bdf21e12bbba0736613fbcecd599d0fb87391d76520f82f10df9
-      dce_ast: f8585b875aa0b2b9ed08df769197d88ed7bdc0c898faebdf884420f4018cb03e
+  - - initial_ast: 59c845dd8e97171cb564dfb82f1d147982281128e714bd52265a6681a1d90a0a
+      unrolled_ast: 59c845dd8e97171cb564dfb82f1d147982281128e714bd52265a6681a1d90a0a
+      ssa_ast: b853c0ac79d07753da74442f716de10b037aa9a89d39d6e0445d855423f299c5
+      flattened_ast: 060da4fa421be711e1900ee7bc79b78f8584b4a2b87e30d71aa0adfdeb554650
+      inlined_ast: 060da4fa421be711e1900ee7bc79b78f8584b4a2b87e30d71aa0adfdeb554650
+      dce_ast: 3146eabe070a41ceefde3ea7eeb3c0bdf1d6afda200fc34e58912275132474e6
       bytecode: 8c4a6e0270c2e98ec14abb82ea2bf9da116b23837ea88e30d2a7c66e138b4aa5
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i128.out
index 12d24cae6e..9f8dd95732 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bd1f69080f117ff038912159cdcb146ecc0e24bfb1663f589db887219297eb87
-      unrolled_ast: bd1f69080f117ff038912159cdcb146ecc0e24bfb1663f589db887219297eb87
-      ssa_ast: 67a6b4a245389e3c51f881ebeec448669d307b0dfa58796e421cfa66397964e2
-      flattened_ast: 923f4cf35bc1e73a616aad2d38f21c477d65afec562c1a01915a38460d82d182
-      inlined_ast: 923f4cf35bc1e73a616aad2d38f21c477d65afec562c1a01915a38460d82d182
-      dce_ast: 0533b40f503a9636c8f48f5f978b3fa20d9768e6a3bb4c7512e70792dd5a7ac9
+  - - initial_ast: b7c7a4910c2f6aa9500e54a4b34768d33a01024ad3d322058e3f1440f31d6580
+      unrolled_ast: b7c7a4910c2f6aa9500e54a4b34768d33a01024ad3d322058e3f1440f31d6580
+      ssa_ast: 20ef5af8b3bdbe964134690b39cb33fd897929d9f93c7c0ea11fba1d781e0f3d
+      flattened_ast: 9c4aa6dc345d3b47e9619d36f9678608eeac208857d0c503b88e7930fa3c02e5
+      inlined_ast: 9c4aa6dc345d3b47e9619d36f9678608eeac208857d0c503b88e7930fa3c02e5
+      dce_ast: 62c25f39c4fbcd781a7a4e6f2eed457baf828e09ce2256273e751dd104c0ee62
       bytecode: 8ce997167fad98e0902c4ea9e1c9cc43cb7d3dca01aae8089fd70a01e45da304
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i16.out
index 1aaab82c0e..c7013753ea 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: abd665e4c465e4f2ce41512b60cea03a3193abc5ae88f743176af15c05b0fe52
-      unrolled_ast: abd665e4c465e4f2ce41512b60cea03a3193abc5ae88f743176af15c05b0fe52
-      ssa_ast: 0d604e2f8e24d236a335a8d12641c03f9e830afabfc6e4f104241374967d0029
-      flattened_ast: f67d1f804d8582507d3a9862cf382118c8c967442b257f8f66d373b9bd2401dc
-      inlined_ast: f67d1f804d8582507d3a9862cf382118c8c967442b257f8f66d373b9bd2401dc
-      dce_ast: 6c35580e587d7f2663430efa4eedd02cedcd268e4131473aa9726754fc9a0bcc
+  - - initial_ast: 214963fed03b127955470c87c0ce2550bdafe4cec7aab1d359cbc7aa04d5aae7
+      unrolled_ast: 214963fed03b127955470c87c0ce2550bdafe4cec7aab1d359cbc7aa04d5aae7
+      ssa_ast: 9254820e0af14c2c84abffe2896c6e42f5a18e9c657d6b238e38b18e7c6c701b
+      flattened_ast: f7d57744e59662e37f5e84d8f9f63b10c5a428376e49da5bfd3e167bc8c171d1
+      inlined_ast: f7d57744e59662e37f5e84d8f9f63b10c5a428376e49da5bfd3e167bc8c171d1
+      dce_ast: 0915e727210211aff12aaa0d6b955f60157f50a8dcf708446d725d036c8396b8
       bytecode: 11d3eb526786081e40ee33fde5e3f24ef0bc27a2eee1ab11a70e0c6593617f25
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i32.out
index db0d572d16..e57cb15b2f 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 09f112d75f96a8dfd118bd8688fe6500a03cf99e16e2e2a03a7c477fa2d59fed
-      unrolled_ast: 09f112d75f96a8dfd118bd8688fe6500a03cf99e16e2e2a03a7c477fa2d59fed
-      ssa_ast: 847843251674871c1042d0807d80342cb45875d98ac53dab15c0a1ddbcca5f11
-      flattened_ast: eed9d1ec137a5f085111c9846fb685f788b97062b2146fb5ffbba1caf49e4b78
-      inlined_ast: eed9d1ec137a5f085111c9846fb685f788b97062b2146fb5ffbba1caf49e4b78
-      dce_ast: ceeab9f79eda757c00708bcb4e5d060cf030f66b7bdfff6c3bba557940ecf0a5
+  - - initial_ast: d3e64d669dc1ce5078e6288a6c66b45a4e3d3ac935a1bfe91416cf1e6c3b9ced
+      unrolled_ast: d3e64d669dc1ce5078e6288a6c66b45a4e3d3ac935a1bfe91416cf1e6c3b9ced
+      ssa_ast: 62058113e468d4be12c46f9a778601cedd8c383cab87287f9b212de2467eb0da
+      flattened_ast: 27bb0dbeda2c126094d80baf20b46af017c29a1825853656d2df35a5de7ba372
+      inlined_ast: 27bb0dbeda2c126094d80baf20b46af017c29a1825853656d2df35a5de7ba372
+      dce_ast: d1e6ad90d3338511e44a34e0a8c6783e6278ed73c51f28b028db128422710e66
       bytecode: 2e306c778da6bcdcb2c36ac85a7f8ceeb9442250a2585a6fd096723479b2a86d
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i64.out
index 04c75458f8..9876ecadfd 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7ee5d9268f33d1225e7bf684b52e518431f8a738e0172aeaecb5742ccac603a9
-      unrolled_ast: 7ee5d9268f33d1225e7bf684b52e518431f8a738e0172aeaecb5742ccac603a9
-      ssa_ast: 4a179173f17c190c2572c3e3d16727308552f65786e97152d97ecc77c9b416c4
-      flattened_ast: cd6ec4f94bd6a3d371a76bce25b578a7bddc3f6401d9ac17630a2e3e41316fa6
-      inlined_ast: cd6ec4f94bd6a3d371a76bce25b578a7bddc3f6401d9ac17630a2e3e41316fa6
-      dce_ast: ae0fb9c16ed080e323859d84bab4f9607e8d502c89ebe9d644cbb0a0917387fa
+  - - initial_ast: 8db25377a1de009e7755695e21502fe82411d4f076063f40564cd064af2f0036
+      unrolled_ast: 8db25377a1de009e7755695e21502fe82411d4f076063f40564cd064af2f0036
+      ssa_ast: af9d6cbede5235f5ce9ac99ee9536b0e52c401d996f1a1591564fd897e66a7f7
+      flattened_ast: 27086c125066ed823d35dc5e9b6ca7159a599d2b4c48216ed85a607f244c8349
+      inlined_ast: 27086c125066ed823d35dc5e9b6ca7159a599d2b4c48216ed85a607f244c8349
+      dce_ast: b7f6af8fdd87856fb5d1615e82d354c9c11380c131e20f47e965eb4a2dbc6a18
       bytecode: 3b8935a55d03c5deb6b1c22c7a270142420e7857d9dac64da8b2b60d99787647
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i8.out
index 31babae45f..2edff15a45 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 640ae46feb879a2f02e5c12ee483fa5d03fc07fd9b3014438e7bb5a39a541fb7
-      unrolled_ast: 640ae46feb879a2f02e5c12ee483fa5d03fc07fd9b3014438e7bb5a39a541fb7
-      ssa_ast: 4cc4b3a84b503e5fe5cfa7d8fc2947c88861026a5caa35bd30ed9d45539fd33d
-      flattened_ast: 02226273395710d638adc404eef2c72c6e1558d6b2406d3653f24123864425f5
-      inlined_ast: 02226273395710d638adc404eef2c72c6e1558d6b2406d3653f24123864425f5
-      dce_ast: 8a688152c6312635d39b93443d662e31276ca01255dc36a1dca361ad26b6e39a
+  - - initial_ast: 10189e7b68ff649a573115f21390142e9874eebb4ffbee4fb8561c9a572f6ec2
+      unrolled_ast: 10189e7b68ff649a573115f21390142e9874eebb4ffbee4fb8561c9a572f6ec2
+      ssa_ast: 69480e6c1494fcdb458dabe2a1d500c495a771554c29675fdf50ef3a31c90ab9
+      flattened_ast: a1ba2fc5f9e2e79fceff16641f624fd7f0511f754635ec7d4c91dee21695619e
+      inlined_ast: a1ba2fc5f9e2e79fceff16641f624fd7f0511f754635ec7d4c91dee21695619e
+      dce_ast: 263c0c79216dfd548a8f9bb83751114e6b9ccf26e73ddbbfed5742c6623fb1b4
       bytecode: c145cfa22e148ac86c38d474fa50f1046fb622b7d920b58e3ce81d5b65f6fb43
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u128.out
index 922b89461d..b798b84e88 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e0d7f18bb9b846f81a3f7b33d365d3fd6d8485c13543f138c18878919ee22e0b
-      unrolled_ast: e0d7f18bb9b846f81a3f7b33d365d3fd6d8485c13543f138c18878919ee22e0b
-      ssa_ast: f6e41b0152ae4df0de2d0a1c5143d2f16579d647b0ecba32e8f95b5effa3f790
-      flattened_ast: 6bd634dc1d2d3ae461fd8b46cff359e3e6c31096459b2031326a305b44841e91
-      inlined_ast: 6bd634dc1d2d3ae461fd8b46cff359e3e6c31096459b2031326a305b44841e91
-      dce_ast: c032632044d3067a6528997399f5bb7dfa47854e2233259da3aedf50ff7f5462
+  - - initial_ast: 22f1e05efcefeca7e9e5afbc0a13dd0a55311f89458975287f17f66e4753dc54
+      unrolled_ast: 22f1e05efcefeca7e9e5afbc0a13dd0a55311f89458975287f17f66e4753dc54
+      ssa_ast: e3031255a8f7e2a09f46e038399365810083f0f2e8286a3fba5475a9e37b7920
+      flattened_ast: a77080087ce5d7ad59019b158f23a82f4e79c807db98cab53e763867506d4b10
+      inlined_ast: a77080087ce5d7ad59019b158f23a82f4e79c807db98cab53e763867506d4b10
+      dce_ast: c85462f597c569067e42225862bc101b500f6ab279f593c3acb0d9bfb9f1bb32
       bytecode: 2c6ea55f93bccc56b9e6348bfdc47d0cbbc0d190bd257d67ef208e012237139c
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u16.out
index dd8602c975..ffe0fc56bc 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4733567cba1dc425d67df691cb0a18a2b3dd3d8d43e923d665fd191926c2bfa9
-      unrolled_ast: 4733567cba1dc425d67df691cb0a18a2b3dd3d8d43e923d665fd191926c2bfa9
-      ssa_ast: 03764e0e2416cb4838f017e59fad061ae26f383d6c1a47f9550f5bc81279ec6e
-      flattened_ast: 9935b2e7a1b7df5f229d10275130ad81d092abbb84b4aeaf3cb3e4097c486386
-      inlined_ast: 9935b2e7a1b7df5f229d10275130ad81d092abbb84b4aeaf3cb3e4097c486386
-      dce_ast: 02903ef9d2eb3b4c2dd5b3e0bfe799caee75a9d7a22c2c972bc5e31148bde212
+  - - initial_ast: a8195594ea50d534d4416b2f568924ab5a8d363a88a3c5e304e71a2e60ed6dff
+      unrolled_ast: a8195594ea50d534d4416b2f568924ab5a8d363a88a3c5e304e71a2e60ed6dff
+      ssa_ast: 090a7004652fdc40f1585a0ecd0328bdbb69a51fc871f6649e61dd1b45bc8868
+      flattened_ast: 424bc2e244bfbeac63f8939da7e6ad729e2d4f4ffa753073e03c6ad3fe39e863
+      inlined_ast: 424bc2e244bfbeac63f8939da7e6ad729e2d4f4ffa753073e03c6ad3fe39e863
+      dce_ast: 854d9f00b0ade418420e6af7e85cb18059eec1a0b98fc4f6a443c09456fe576b
       bytecode: 5e104724dc8872ced6557c1437fe15b61846a01170dade55aaf69dc53e220b21
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u32.out
index d9844b3df0..7efb3a2a58 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 56e9d79c1117e3ead16cc2c8ba8289f55e9996783890001e4874978c2707b61a
-      unrolled_ast: 56e9d79c1117e3ead16cc2c8ba8289f55e9996783890001e4874978c2707b61a
-      ssa_ast: ab3a3bdb3218210aa6e3299a1921e79358384ff69eb147b69bfde12031c5bf37
-      flattened_ast: 7d447e3586828a78395c1ecd215e917e2c6e4f77ac1bd87b7ac98fbc494c2713
-      inlined_ast: 7d447e3586828a78395c1ecd215e917e2c6e4f77ac1bd87b7ac98fbc494c2713
-      dce_ast: d3bdd3dc445305549e74f47aa8f19ed986c356755b8cc69f9bc67075ba0b1b84
+  - - initial_ast: 4bd7ac1e57c84b610bbf47701ef4e28d56d388af63de6085f0d1b0f18cc40a45
+      unrolled_ast: 4bd7ac1e57c84b610bbf47701ef4e28d56d388af63de6085f0d1b0f18cc40a45
+      ssa_ast: d270af5bf4bb4e01e2edf68f29aab08b77995e3f9e2f217139ff79a3a64c1efa
+      flattened_ast: 7a2b5b048f5011fe3e061c64e6d4f52cbd1495304c944bc55a819a735fac0d6d
+      inlined_ast: 7a2b5b048f5011fe3e061c64e6d4f52cbd1495304c944bc55a819a735fac0d6d
+      dce_ast: 51db08039e5f70b2e942fcfcad6cdee7ba2b5f1cfcf26b0b0614921844eecb1d
       bytecode: 942c17c9ab6a4e94e68720321e5e9634ac47777113599b06013fd15992f92296
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u64.out
index d23d44208b..8ae3e9c8b1 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 77970fdcee247fab540f93d3daeaadf6379d92b626cc639974f8868662960455
-      unrolled_ast: 77970fdcee247fab540f93d3daeaadf6379d92b626cc639974f8868662960455
-      ssa_ast: 5292ccfb88e6ad46f97918269d5c26b27455eae2b75710e3cd90c5f3f6da726c
-      flattened_ast: 126873e7c83b1f11adbf6cdb064d9d8fda2518c229c623b126883255c1816143
-      inlined_ast: 126873e7c83b1f11adbf6cdb064d9d8fda2518c229c623b126883255c1816143
-      dce_ast: d98a945cdd5827f04378b992905e45a946d255f00ee0ebd91d83e5228665f971
+  - - initial_ast: c3e9dbc30cfe8403f0d93fb44f81c6cfb1fac0170f1a462e26ada03c68ca0d95
+      unrolled_ast: c3e9dbc30cfe8403f0d93fb44f81c6cfb1fac0170f1a462e26ada03c68ca0d95
+      ssa_ast: 3ed7c6d716a9a62625484d38c3e87c022ace3e2b8e334e2d3cff52f56289cd7e
+      flattened_ast: b8de93a38b04e26b06e88d1929857a3dd104bfa3a6354a8455ac03ea2de312fe
+      inlined_ast: b8de93a38b04e26b06e88d1929857a3dd104bfa3a6354a8455ac03ea2de312fe
+      dce_ast: 9b732ad8da3ec2043756d2edb61c0af3f4d5bda1df08a7d223aedc53e09b23c7
       bytecode: 750fe39f978ed554b5b928a983a3f84b6bd91354f8de79185d431ed040d7fab8
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u8.out
index 08c37ed932..75e52c74e8 100644
--- a/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/pedersen64/pedersen64_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7f7d1eb6b321308869ecc02017d22f936f90e9969b1d76adf32452fb97451fbe
-      unrolled_ast: 7f7d1eb6b321308869ecc02017d22f936f90e9969b1d76adf32452fb97451fbe
-      ssa_ast: 781661594204a8abc60fec5db7e650e14224bc63fbcaf644b092d6c81d21df65
-      flattened_ast: 95f4240b83d3e7dc30e529a9cee832dc4f733c2b104ef4c97bf44b1604dd111b
-      inlined_ast: 95f4240b83d3e7dc30e529a9cee832dc4f733c2b104ef4c97bf44b1604dd111b
-      dce_ast: 1fc01a7a72bb61075bef219fb8028c9e27f949b9e5d6c1ea53f7f4c32de1c16e
+  - - initial_ast: d4e0516b0036bb97336e4cf350584d1c17c883bf241dcdf8f992067f746aea19
+      unrolled_ast: d4e0516b0036bb97336e4cf350584d1c17c883bf241dcdf8f992067f746aea19
+      ssa_ast: bbbced561aaa6a75afbfbd8cd25e3c922232401cff56c4affa60a126007d79d3
+      flattened_ast: 78ab6a67f270b9ebdd10cfdbec385b50a2099e741a4023dda6b9ff28a0330174
+      inlined_ast: 78ab6a67f270b9ebdd10cfdbec385b50a2099e741a4023dda6b9ff28a0330174
+      dce_ast: ed5b46889ed0a8fcec534478f55398d9e49697d46506db65630a4fd3b93a2ffd
       bytecode: 79c9f2c8d1095db37b345cd14cb01f6facfab7de38c86d6f1a2a114a691b6d79
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i128.out
index c30f3c65c0..8c269219c9 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7324e9551c199d9d695f2c61f17e874b38ad34548dcaf62917de8dc719421887
-      unrolled_ast: 7324e9551c199d9d695f2c61f17e874b38ad34548dcaf62917de8dc719421887
-      ssa_ast: d3bb8e2687611f1aa3a78e35dede599977571ecc347d78d2992a62a420c5b764
-      flattened_ast: 74c2f6ed3310086fccf368d4200f479369c7e63e1f1aacfe022a649b28527819
-      inlined_ast: 74c2f6ed3310086fccf368d4200f479369c7e63e1f1aacfe022a649b28527819
-      dce_ast: 5549d4de9ba8d2e5ace5b086aa04ee7d4bbbd63472b52e8a882400b37309a7a5
+  - - initial_ast: 85f0026315f7bf73333c73af7f78524c50d44e9381afb215eb32bcdda32fba17
+      unrolled_ast: 85f0026315f7bf73333c73af7f78524c50d44e9381afb215eb32bcdda32fba17
+      ssa_ast: c5b5304e97c3614c5eeb2ca28f152d103fe119c521008ff300ceea8ce1a31c2e
+      flattened_ast: 1f7f04a352cc1166bb682009af14dde6c9b780c3b84cfd4528441f23a950ab66
+      inlined_ast: 1f7f04a352cc1166bb682009af14dde6c9b780c3b84cfd4528441f23a950ab66
+      dce_ast: ad9567e2c3b498cf7d806cc7f9211bd07e1f8bf8b952ac00e371a9fca0b7797c
       bytecode: ef658c8b42879a49da4223e18daa7526b0b8efcca9f7f3a9152231a1be8d3122
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i16.out
index f83b696f70..9c87ec8f75 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2a6cf998f8f6f777ade05dbaf6eee0d28c4bac2df6c8806dd1c297d46fd0b8a3
-      unrolled_ast: 2a6cf998f8f6f777ade05dbaf6eee0d28c4bac2df6c8806dd1c297d46fd0b8a3
-      ssa_ast: d43e525402c5bac54e063f6b747f1bd859c341bce62401a356eadd7dedfb42cb
-      flattened_ast: 78b1e1a70c4b8b7a238e373ccad400d4dce7e21db21b8c11e8a3c33355915a3f
-      inlined_ast: 78b1e1a70c4b8b7a238e373ccad400d4dce7e21db21b8c11e8a3c33355915a3f
-      dce_ast: ffc33149d2e73719cc3894e71a1a66341b2214cd4575f3a2932a028bcd38f911
+  - - initial_ast: 9bc74a2b3c332891f1a32858769af7f5c89ff468ce1a85ca3a961c4a04509b3d
+      unrolled_ast: 9bc74a2b3c332891f1a32858769af7f5c89ff468ce1a85ca3a961c4a04509b3d
+      ssa_ast: 9f8a46ebc06b8c4fcd81aab1448aef068a8352943491c596aff1eb1d6dfda7bf
+      flattened_ast: e63790996093b4e34256f4eea1857fbf9c712155714defb2487eabef9131ff8a
+      inlined_ast: e63790996093b4e34256f4eea1857fbf9c712155714defb2487eabef9131ff8a
+      dce_ast: d4549002db17f2117e469147a5f2c2a4a0442d98137cf905a7236f1e7a1b13b5
       bytecode: 6702de66c70639dbf41bc1400d37a5154729c864ce124c2fcc956c9bc7ec797e
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i32.out
index 6de7591113..b00202c1db 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8d60709bae914dfb74cf29bc7a83f3bf551403bf35f8ecbef1d93746e8625a8f
-      unrolled_ast: 8d60709bae914dfb74cf29bc7a83f3bf551403bf35f8ecbef1d93746e8625a8f
-      ssa_ast: 5660aceffc8a7e03df9d1da0317f66b1ba83f7a01d10a300cff28df00563554c
-      flattened_ast: 822db122eaccdfbeaa3d8627ad28c32eecea09dfc72ab01e5181a70c3cfa2887
-      inlined_ast: 822db122eaccdfbeaa3d8627ad28c32eecea09dfc72ab01e5181a70c3cfa2887
-      dce_ast: 3175353155cf665104a21b2ebb159018a27be3b6b0e3ad3db002ea7c6e03ed71
+  - - initial_ast: 8bd755b7753f7a7a9b03eb6fe1cdea82a47eb6ed8e3df23a40e1d12b7e7c6edf
+      unrolled_ast: 8bd755b7753f7a7a9b03eb6fe1cdea82a47eb6ed8e3df23a40e1d12b7e7c6edf
+      ssa_ast: e3007690d3a554928242517231cb5ceecac5ff78501f34d81100bb67f3391dad
+      flattened_ast: 46c3758382ec50240d34d11c04b6db58ef65fb1dfeb73f2f801cce00e47d3348
+      inlined_ast: 46c3758382ec50240d34d11c04b6db58ef65fb1dfeb73f2f801cce00e47d3348
+      dce_ast: 05e1bc158dd0f82f4a0076f0ae984d57c19119ad8fe5d92b865fd608f14b19e9
       bytecode: c0208c20a83afad266fad9bdb23726ab4060b0dcde4b5be3a798dadbf0cb9809
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i64.out
index 1a36f371f9..8797a68320 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0d2adca4fb668cba0c4c07bf91a452ed533f74daf803fe140f5b1409d36d3d76
-      unrolled_ast: 0d2adca4fb668cba0c4c07bf91a452ed533f74daf803fe140f5b1409d36d3d76
-      ssa_ast: 24a3a91a76b562319dd5a3f584a8d20dbd60763a24b3cc8e54952a07d32c4f62
-      flattened_ast: 7c0d0cfa4a608ddf2764f2efebb7d163c6c3d95046c49e093561fee0048976ee
-      inlined_ast: 7c0d0cfa4a608ddf2764f2efebb7d163c6c3d95046c49e093561fee0048976ee
-      dce_ast: 00fc418b3afe953b1111bcea6fdfd7caf9eb24f60af30e6224a5690f39c25e6b
+  - - initial_ast: b1bc2e1252b89fd0ff80f512bfed1828d02ed3d64dab48805495dd015918dd0a
+      unrolled_ast: b1bc2e1252b89fd0ff80f512bfed1828d02ed3d64dab48805495dd015918dd0a
+      ssa_ast: a54e94d34a089d9742a715b9d48fdd6f5831466bd013e41fd179aafe07980237
+      flattened_ast: 630481441ee7d4a1b74fbec66de4f5cb6e21b5daaa0b0131da73951dbb1e369c
+      inlined_ast: 630481441ee7d4a1b74fbec66de4f5cb6e21b5daaa0b0131da73951dbb1e369c
+      dce_ast: 5766cbb7b6077b24d56cc10e2f17abc513c802a51a21daa86a3bedb2785bdfbc
       bytecode: 0dabee018a5e3a513d4ae463b6361e73f3091d2be2e1106250e8fa4b3405f7ac
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i8.out
index 8b8fc2a3e6..c2b2562645 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d67d786f5438afd59fc97328958eeb49f3ead1d7c6039e01bd0e6c4e04d763a0
-      unrolled_ast: d67d786f5438afd59fc97328958eeb49f3ead1d7c6039e01bd0e6c4e04d763a0
-      ssa_ast: 8fee2cba116685c0bc52ef1cf3354580f6c31ea24b85bab5f02cb11e06daaf12
-      flattened_ast: ac371b3351b7443002d2e9d8340a5fed8aea3ff449058b51f9ae4d29ef4166d1
-      inlined_ast: ac371b3351b7443002d2e9d8340a5fed8aea3ff449058b51f9ae4d29ef4166d1
-      dce_ast: c26821a6d4a16ad741a6d4bccbd117ea407934d825df921f82d604e522042fbd
+  - - initial_ast: 8bc040110b869673c503808ba6bf2d21284de837720328e346926dd8037de2fd
+      unrolled_ast: 8bc040110b869673c503808ba6bf2d21284de837720328e346926dd8037de2fd
+      ssa_ast: a41a2204876c064e8f20980c40cb3174e4810a2c9c93ba6c05174c3660f0102a
+      flattened_ast: 9419ea945e124ecdf33d69ad3ac62fdd84d4a6c460154686e83f64b28e8997be
+      inlined_ast: 9419ea945e124ecdf33d69ad3ac62fdd84d4a6c460154686e83f64b28e8997be
+      dce_ast: 7c22a91b99866af0e42469403f5ab8d467dec16b492ea0584f93a5a7c26e4e4f
       bytecode: 219ff020d5ff4055913b8fdac53bf82bc277740cdcd18a56dfd4082b2b646089
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u128.out
index 17ca5fb866..399ad44e4a 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f85b32a92e932476dd54b5bb5b60500cc68087aeb7edbd7e45009646d2322669
-      unrolled_ast: f85b32a92e932476dd54b5bb5b60500cc68087aeb7edbd7e45009646d2322669
-      ssa_ast: 841ef0b66e1be80acd3b4d254b180431d547592cfb4f5e7947d1ebdd4b008af2
-      flattened_ast: f649e07d50a98b034bba55cba79cad5bc3eb72f86d1a17880ffb551ee1113bfa
-      inlined_ast: f649e07d50a98b034bba55cba79cad5bc3eb72f86d1a17880ffb551ee1113bfa
-      dce_ast: 37ed6188c790800680e6918095d3baddfba0690e942bcb8389c3c742f4d4e420
+  - - initial_ast: d1ce0d1a348d0d590a7fcf15cf2025e7bbcf5e2b5c1d9562fbc30fcd24bacf38
+      unrolled_ast: d1ce0d1a348d0d590a7fcf15cf2025e7bbcf5e2b5c1d9562fbc30fcd24bacf38
+      ssa_ast: 1548eb37455e0b8538422f4cee4898026f385178da9e39ff994041c460a26589
+      flattened_ast: a069d09edb9c64e8d4eaabeb0ea1ce80a7b0dc9cc76f68038d87abf5c9490be6
+      inlined_ast: a069d09edb9c64e8d4eaabeb0ea1ce80a7b0dc9cc76f68038d87abf5c9490be6
+      dce_ast: b414cdd5eba358c72aaeb5b9fa9d18b57c2ad6c78954cdb9f146de6670c76dd1
       bytecode: 59d557a5730fca9d3126663ee73847ff2c69b419621180e748cc3e3526e7be27
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u16.out
index 3af71aa6e0..2082667718 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 82aff043aefef3c137b551760e520d13246a729e4684234e70afb0bf47de111a
-      unrolled_ast: 82aff043aefef3c137b551760e520d13246a729e4684234e70afb0bf47de111a
-      ssa_ast: 69bf692467d2bc02e1b5cc5e90c8fffafa0e8bbaae315ee11a54b70879c22477
-      flattened_ast: 0c202541eb4c0ac2b8273d0f9c4e25ca8c80c32f211db062715947590b89dd37
-      inlined_ast: 0c202541eb4c0ac2b8273d0f9c4e25ca8c80c32f211db062715947590b89dd37
-      dce_ast: e2e8dd32f66b51ab5136dafb98c276b047bea355e9f5a75c364fe00652837550
+  - - initial_ast: 553b3c0a3de3e517960fb9a4f5165b46de1646adb7156b396a068183e5ca419d
+      unrolled_ast: 553b3c0a3de3e517960fb9a4f5165b46de1646adb7156b396a068183e5ca419d
+      ssa_ast: 8a64de1ac949712ce5b5aa1aa78538b8edde1d382963364f2e5d55f3656ea95a
+      flattened_ast: d5ee2a01960f97d1998bc4d440bc1afacc4c35e2fba9f400cd3ba524921f1bc7
+      inlined_ast: d5ee2a01960f97d1998bc4d440bc1afacc4c35e2fba9f400cd3ba524921f1bc7
+      dce_ast: dc8b3d7b1b13c41c318e74950439a72b624e845a59ace7da1e081393e9d41efa
       bytecode: b20ca102fd50f9c2e629490c640d5fbfb4b9ba549c8af2ef9e6dab03e972c3f6
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u32.out
index 0d1865ebf7..5c28b0438b 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e4fed79a01d88492dba27fd6cf4992279828043d3cef1c9f13ee95a8e0e70bae
-      unrolled_ast: e4fed79a01d88492dba27fd6cf4992279828043d3cef1c9f13ee95a8e0e70bae
-      ssa_ast: ccb7717a51f9d4b03d9d315b4752d2e7a1e191386a5ab34f0c41f0022d379630
-      flattened_ast: fdbde7a8b0e256b7fd4113605f72ee98dfb0bd94c0c8a5f3b4771621b04c0c5d
-      inlined_ast: fdbde7a8b0e256b7fd4113605f72ee98dfb0bd94c0c8a5f3b4771621b04c0c5d
-      dce_ast: dfd3192c5550be0d79f5d1eafbdb6348dd7b1fe370f0fd1932a51dc4050b0882
+  - - initial_ast: bb591c9dbd29fd3e614054279460c591ddfaab87bbbd10b21c05381bfdf405e8
+      unrolled_ast: bb591c9dbd29fd3e614054279460c591ddfaab87bbbd10b21c05381bfdf405e8
+      ssa_ast: 7420e9bb21270f080a53d0f4588ae9acf2985af4feb137c98ae19151c33ec2b8
+      flattened_ast: 1567cdeb289ce6c87a69a5f87ede29c751919084a9b8365719731c7915eb36f8
+      inlined_ast: 1567cdeb289ce6c87a69a5f87ede29c751919084a9b8365719731c7915eb36f8
+      dce_ast: fb3c7112e07224cc1cc92f1ee5c589f0533d333b1dc0f9868c3af607aeeb5fac
       bytecode: 7e52a08a8aca001c0124829b0831b95cd9f19d464436196df02dd120d589a339
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u64.out
index 2860013069..d018295597 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 981785344382a812db93437aac25dc8a809b07512631e48f185ac1239e105b14
-      unrolled_ast: 981785344382a812db93437aac25dc8a809b07512631e48f185ac1239e105b14
-      ssa_ast: d05731da89990b05dbcc2b3e4575c0ef9a10bce202051025ea98abf284add236
-      flattened_ast: 8bd985b7e390fa3b3a2b57670744739f906af0472ede53855771c7524c343668
-      inlined_ast: 8bd985b7e390fa3b3a2b57670744739f906af0472ede53855771c7524c343668
-      dce_ast: cf6de4f1148c602b128409bcecb54357f125fa23e8c7d8fe7c08e6b694b34866
+  - - initial_ast: e349023083e74c30764ffd25db0403a7b6bc148ac899f5b9194bed6209045774
+      unrolled_ast: e349023083e74c30764ffd25db0403a7b6bc148ac899f5b9194bed6209045774
+      ssa_ast: 0f4b6040ee4ec7e87908bceedad17383bcc522eaeab82aff3cd3f756d6aac10e
+      flattened_ast: a4ea0ae613cedb2db511275cef2a2780563067bbb551c00492f3588c18d5310a
+      inlined_ast: a4ea0ae613cedb2db511275cef2a2780563067bbb551c00492f3588c18d5310a
+      dce_ast: 437d5299bc38300726db573e8d3da1949cd079293a9f616e3657c11bbe15c9b9
       bytecode: c73070e485c778b9d36389cfdc5116194358fd603f8909c6d24438989a76f1d9
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u8.out
index d7bd07f8dd..a0734d622b 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon2/poseidon2_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 281b06e65560f8a98ff8c67eb7613926f9c3a616361feef2cb20bf32741594ea
-      unrolled_ast: 281b06e65560f8a98ff8c67eb7613926f9c3a616361feef2cb20bf32741594ea
-      ssa_ast: a26bef79dcf55e8f3a41d7f0adc4d8b64e71fa747dbd03239c03609dc5b650c2
-      flattened_ast: da5087dbdabd06bb7e5ee4bb31b7c302a6fb9bd871ca2127abad32b1bccf7c9c
-      inlined_ast: da5087dbdabd06bb7e5ee4bb31b7c302a6fb9bd871ca2127abad32b1bccf7c9c
-      dce_ast: dec3fcfca9857f87286c587ab092ea95e43a4b8f5ce3e3bce0dfeab441265580
+  - - initial_ast: 867efc7dd3972c689a6d2ac7f944d4a1ba3adc7899e4e862da14e16ad4bc095c
+      unrolled_ast: 867efc7dd3972c689a6d2ac7f944d4a1ba3adc7899e4e862da14e16ad4bc095c
+      ssa_ast: 2b8c35e550e14730429ea56536fc8d12734975581a33365584a84752318a71b3
+      flattened_ast: ddf7da2269000a7e8155afbce279b529ea5b2f9c5498d7d73eed22ad3f4d0a98
+      inlined_ast: ddf7da2269000a7e8155afbce279b529ea5b2f9c5498d7d73eed22ad3f4d0a98
+      dce_ast: af071f66b95d3e3b2171b34fc5735020f9385b079e1f453e3eab7a46f6ff4d69
       bytecode: 967cb04281f7aa3396b145104fb0e15029026386280b914bc1fc24ce3fd565f1
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i128.out
index 81c98c9b6d..7d4a153b21 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 86e77fe5ad3bcdf608be2984291c848a1117fefc80fdcaaee9a802fbc63c2587
-      unrolled_ast: 86e77fe5ad3bcdf608be2984291c848a1117fefc80fdcaaee9a802fbc63c2587
-      ssa_ast: f58b917965e42b2ff673b5667e84a6090075069e3ab3eb2ac44df857e58fed82
-      flattened_ast: e96bfb22d8f0cbab6613b2b9f974c866fc5d48c824dd0a8202ff42ca2ee856e5
-      inlined_ast: e96bfb22d8f0cbab6613b2b9f974c866fc5d48c824dd0a8202ff42ca2ee856e5
-      dce_ast: 12a1f04c333a3e39c41f34572eddef8c3825a2cc4932d517e2fe3fe98c69b6bd
+  - - initial_ast: 0294b801ae7b25fc077457948039fedd40c473697ef19dc9b29f063a686934a0
+      unrolled_ast: 0294b801ae7b25fc077457948039fedd40c473697ef19dc9b29f063a686934a0
+      ssa_ast: 7a054882b56e566b97b8270858c7ac818290ed03763fc420c4b71b29342aea6b
+      flattened_ast: 16febfebb8cde39a4613185fdf6178093fc1a7954b77240ec801aad5f6c510b0
+      inlined_ast: 16febfebb8cde39a4613185fdf6178093fc1a7954b77240ec801aad5f6c510b0
+      dce_ast: 6a27d4649575ab6e84b26d96da0cbea2ff0a40660926a5503f1738d8923715c3
       bytecode: 5bc660a6ab018e52270748b864dcd7ee994d9c6025740bff655458140e97c1f8
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i16.out
index 09c67be569..84016f31a9 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 20a078d1e29ebea54841abad5736f55e8f42d68fcdc71149b0fd24cb19adf359
-      unrolled_ast: 20a078d1e29ebea54841abad5736f55e8f42d68fcdc71149b0fd24cb19adf359
-      ssa_ast: bdd22889cef2f9eb2d94fd9a175ae9c1c403653688755f49f8b1bd731006ffd6
-      flattened_ast: 2f14f0933ebe44e6fee119676a3d8924aca65ff2af436812fca9658e65de1a6a
-      inlined_ast: 2f14f0933ebe44e6fee119676a3d8924aca65ff2af436812fca9658e65de1a6a
-      dce_ast: 9602ea33008ddcd83f1713296785d021e47ee86096eb644c1719b687d65317ca
+  - - initial_ast: 6b5f81950f92312f5e8c38ea1d735aa4d78cbeadfe922e7dac461e11bf42bb6f
+      unrolled_ast: 6b5f81950f92312f5e8c38ea1d735aa4d78cbeadfe922e7dac461e11bf42bb6f
+      ssa_ast: 835e360d4c8a37f0f9f099a5e293453650259a85001eab5dae891237c6f88aef
+      flattened_ast: 7eb4d331e795d40b4f04fc6b958f9f9a4ad3092c940066b0671f29543ebb9c79
+      inlined_ast: 7eb4d331e795d40b4f04fc6b958f9f9a4ad3092c940066b0671f29543ebb9c79
+      dce_ast: 55a68573f3ed4b963620065950de695647c3b231992c3c5b8f3849607bfb8776
       bytecode: df597e520f6c6b00ec0408debdc8923f85f243847680d26ca75b0e94886989c1
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i32.out
index 766aa5453c..efd0b84bbd 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 98d6c4d17bff82c13016603d4a9657167211525934281a4a7cf61426b1010e40
-      unrolled_ast: 98d6c4d17bff82c13016603d4a9657167211525934281a4a7cf61426b1010e40
-      ssa_ast: c571252031ac594093df9e96eb2a2a319d6885be959c837ba28b7acbb2a57579
-      flattened_ast: 5e2680db138ec515ef5d65897529fedd73fae1cf7f3a6d266aec125a144d04d7
-      inlined_ast: 5e2680db138ec515ef5d65897529fedd73fae1cf7f3a6d266aec125a144d04d7
-      dce_ast: d137c4c3385cbc720d3109496515f131a7c07c0678a4600c605d249510aea2fc
+  - - initial_ast: b2219ffaf225f252d700dfda87ab1c67f6049800ecd801b94e510ec3e94d1e71
+      unrolled_ast: b2219ffaf225f252d700dfda87ab1c67f6049800ecd801b94e510ec3e94d1e71
+      ssa_ast: d1d1c3b8136e658dbc559b7d429fad3ec8a60656b882fb1636ed724edfc54e7a
+      flattened_ast: 2ecd40a03ad92d1c4d4f4f5833a3df94fab9826dff2ac050e9532a6514e7f2f9
+      inlined_ast: 2ecd40a03ad92d1c4d4f4f5833a3df94fab9826dff2ac050e9532a6514e7f2f9
+      dce_ast: 32a25db016cc0f03d812056d1be524b8cca18e132da82c664cbbe6b64e772a74
       bytecode: 139cde2a83e628a1cbda7dcc3f976b20bc2cec60d0753131abf3a66c467a3067
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i64.out
index aab577216b..f93976a5fe 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d168f24ca68f1fac4fe342abb6cec64c6465d56dce1c4502a2dfb1ca9d5318c3
-      unrolled_ast: d168f24ca68f1fac4fe342abb6cec64c6465d56dce1c4502a2dfb1ca9d5318c3
-      ssa_ast: 4efdd4c1975de8aefb1c88517c70bae170f01da146d8b6b8bdccd8855da1e998
-      flattened_ast: b27ee423d80dfeefac5157fde5fefd3ba47660a0e4cdd32bee9a85d38e2ea15a
-      inlined_ast: b27ee423d80dfeefac5157fde5fefd3ba47660a0e4cdd32bee9a85d38e2ea15a
-      dce_ast: db9cb4d2dce613c9f3e83e55385a6c6be5a011e0177a17b4fc209cb06ad517d7
+  - - initial_ast: 4a307a101c3546f2ad646f8ab4b5675d9d4a5dfb97bd93bbb63cbb6c06939f13
+      unrolled_ast: 4a307a101c3546f2ad646f8ab4b5675d9d4a5dfb97bd93bbb63cbb6c06939f13
+      ssa_ast: 1468afcb520cdef43f659cabee34195a7f820d6881dbe05cf99732a50a0fe62c
+      flattened_ast: a8fa58b125b655fb25abca0fd19e1fa29988eb27f90297351f9858c7fe516a23
+      inlined_ast: a8fa58b125b655fb25abca0fd19e1fa29988eb27f90297351f9858c7fe516a23
+      dce_ast: 0aecd5973b0b08a125f2a536f24d8b45278214d1b60b464b9db4c9d4ac69ef57
       bytecode: 469711c9b3b4052393b72b3f702d82892a60d88e403284a158a9c6986c03d873
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i8.out
index 78b6ebc918..77ac4f20ef 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ea78bf4719249f7579144e3527a4a85b2754734eb462f3fdbfd23685b8754a63
-      unrolled_ast: ea78bf4719249f7579144e3527a4a85b2754734eb462f3fdbfd23685b8754a63
-      ssa_ast: 89fd7b8b499e0b8b713329f6842b5493d21873802094ed9ad370a71307c31a89
-      flattened_ast: 9d7510f81130ccb03afeac1b971a13d8895cc56344df55f322a7e441902db58c
-      inlined_ast: 9d7510f81130ccb03afeac1b971a13d8895cc56344df55f322a7e441902db58c
-      dce_ast: ae3e3633ee525a93d8ec99ef52144ca414a3329f449a473112b1e65f760f6785
+  - - initial_ast: 5c36ebce3947f5b0dbead9dd3bb3b8e708629a49a33861e778d437b14c1149e0
+      unrolled_ast: 5c36ebce3947f5b0dbead9dd3bb3b8e708629a49a33861e778d437b14c1149e0
+      ssa_ast: dbdbdfca5d5ab51e5e1083d793c8a2ed80b4d816f16767512a3edc1ac8e570d8
+      flattened_ast: 0f958e90e0b0a0a5ebc9654a3a65873beddc420ee69f8a2239abc6b56778e93b
+      inlined_ast: 0f958e90e0b0a0a5ebc9654a3a65873beddc420ee69f8a2239abc6b56778e93b
+      dce_ast: 3df4b8deeb0ff3eca9c0ffb4f09ae4203b97f4bedbe69fffd5724bef6ddf2997
       bytecode: a88e2020b4e4c6aaba72a63493de55e4ab8c0eb05d4641f2b99711027bc3a2e7
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u128.out
index 3be3443612..7f33f61b87 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 21d125181a94c0126a4e0e5c2e457e927a24c5410be801a185dd20f24def96b2
-      unrolled_ast: 21d125181a94c0126a4e0e5c2e457e927a24c5410be801a185dd20f24def96b2
-      ssa_ast: 77eef8520da6e73f4686155ad025dbc4fe4dc3ab33c460c9b928720e831fbe28
-      flattened_ast: a325e247c08147789ae112d3e27d3e3cb4ec226d7964e5c70a003f4e3d570e2e
-      inlined_ast: a325e247c08147789ae112d3e27d3e3cb4ec226d7964e5c70a003f4e3d570e2e
-      dce_ast: ec1a2824ad3a9c5ebf3987f82d221133d9b9326889339985b035770ad2ac604a
+  - - initial_ast: 9242134b78c67d58b3173f7ce51667ec8146cd922ad72e44e69c9aa9cad6fa25
+      unrolled_ast: 9242134b78c67d58b3173f7ce51667ec8146cd922ad72e44e69c9aa9cad6fa25
+      ssa_ast: 9738714bd555aa51f353f9a018313e81d00991f8b3a77cb8304cf660bc545f9a
+      flattened_ast: 79259fbb07961d8e660d84999c662e84912f57b4511bbe71847773419138bf5b
+      inlined_ast: 79259fbb07961d8e660d84999c662e84912f57b4511bbe71847773419138bf5b
+      dce_ast: f4987ea468d3d9c5d6bcbf502944a1b05c42a7e207fd7f78ac77da88574c83a3
       bytecode: a53fa7d5dcacc6d6469257417fd8f3d60082aad915264e052e86a81a597a50d2
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u16.out
index 43de9864c6..b5cc621533 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b37115389c8581bd131980abcc6c2bb64ebc5277142ff8813cf6c1dd15d1c2d5
-      unrolled_ast: b37115389c8581bd131980abcc6c2bb64ebc5277142ff8813cf6c1dd15d1c2d5
-      ssa_ast: 2d09502acf117f5ba43c79eb89e04205422dda52fd9545634e5a3b11e0433b6c
-      flattened_ast: c384fd9927288468d0cf282127157541594013de011436fe8ca51bbde08aec75
-      inlined_ast: c384fd9927288468d0cf282127157541594013de011436fe8ca51bbde08aec75
-      dce_ast: 06146dbaacca6fc2a6094d5d5ffc3583c993e9fd9f62b9e502f5de695be577e5
+  - - initial_ast: 8d79c7dfc8f8db6b6e32c8ac6e9ea40a05862f533e23ce2f70fac7800b1e7c2c
+      unrolled_ast: 8d79c7dfc8f8db6b6e32c8ac6e9ea40a05862f533e23ce2f70fac7800b1e7c2c
+      ssa_ast: 0c0cf322b2d64ee60bf22ed3c143c10cc2fcccd63a9ee8f6a81df89e6f679faa
+      flattened_ast: d5e7427ab764e52d260989983ad1aebe96691b804d1e6b103ce025ea15171c4d
+      inlined_ast: d5e7427ab764e52d260989983ad1aebe96691b804d1e6b103ce025ea15171c4d
+      dce_ast: 2b449718c3d8ba534e16b3cdf45c3ddd0c5b311444c094d3d6d62df1c83e7d04
       bytecode: 7b5bafae88c3f15ca7252d365ec006d8555d5b9e8059ab1bca48288cacaf46cc
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u32.out
index f5dafd05e5..8eb040cf5c 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fd6a69b002c34035cc1d0d463ee2c28f783ec17cc56ffc176fd4f8de3e33ec90
-      unrolled_ast: fd6a69b002c34035cc1d0d463ee2c28f783ec17cc56ffc176fd4f8de3e33ec90
-      ssa_ast: 51a4412163b63399be2c8034b201fe0f03867707d5bf9a8c888b10fff3b7ecef
-      flattened_ast: e03afaa6456bf8336622cfb2ab625916c214f923d0e40085526dde19ff41ad49
-      inlined_ast: e03afaa6456bf8336622cfb2ab625916c214f923d0e40085526dde19ff41ad49
-      dce_ast: f41e67f615850c09e68fc44a3a40887491e2a79e8a1a038ec10709812241211a
+  - - initial_ast: 167f6be7e6cab1cf79afd3593b008470db7fe20ef3b2a39a5f8241c1a1cf010d
+      unrolled_ast: 167f6be7e6cab1cf79afd3593b008470db7fe20ef3b2a39a5f8241c1a1cf010d
+      ssa_ast: cb95130e06000aba7d9bf0ceee8d258a67f0d61f214deceae7b20b1e68716951
+      flattened_ast: ffdd12216817bd2350fbf1b6e1be9f6c4382a57355c512f708cb9e6a512999ca
+      inlined_ast: ffdd12216817bd2350fbf1b6e1be9f6c4382a57355c512f708cb9e6a512999ca
+      dce_ast: 057ae84c2404342c21df9f03371f6fe29d69925d973ab51db3a3af1614459495
       bytecode: dde67540edc8bb4aaf7b7d874e1ded5c718b9a2549724691e61b410204080b14
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u64.out
index 741ea81de4..29eef135dc 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5641388155026c3dc97f6735eb689b737a1e21b5554eaff4b92f1a42190d93b4
-      unrolled_ast: 5641388155026c3dc97f6735eb689b737a1e21b5554eaff4b92f1a42190d93b4
-      ssa_ast: 46a76e1500c6d9729cb255eddcd080f52ef6a728b34ade791ee19118b5f45c3b
-      flattened_ast: 45649d17ae8aa93219f93ff604d5b9e9afe77c1fe48a556af324dce88f7ee49a
-      inlined_ast: 45649d17ae8aa93219f93ff604d5b9e9afe77c1fe48a556af324dce88f7ee49a
-      dce_ast: 7e3836e46aeae30e515d51160fbcb620173689ecb42864899aa0ed776b30dafa
+  - - initial_ast: 4731466e323a8243e8c35851c0a078a42ff30d6d92084add531629ded62e745e
+      unrolled_ast: 4731466e323a8243e8c35851c0a078a42ff30d6d92084add531629ded62e745e
+      ssa_ast: e1c02e69f9bdb5036b957c6c69a498bf09f4f38aaeb9512d441ebbf3c3a836b5
+      flattened_ast: 5ab521be301e978bb5e6751af0c93b0cf072a79c7b8a86d89d2dda1043595742
+      inlined_ast: 5ab521be301e978bb5e6751af0c93b0cf072a79c7b8a86d89d2dda1043595742
+      dce_ast: 80fb54266997b53f53d55320be40a5c41237e4428afe37aeaec44ae8e9d9fb19
       bytecode: 30654495212d106c40fa764ef024dac21dfd76b07dbf7494e546634d87e2072a
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u8.out
index 156f596c12..2ac58da7df 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon4/poseidon4_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4b23142202e849e18f4b75d4d4dc3cb7eae7921b38e65449b33175a344f79706
-      unrolled_ast: 4b23142202e849e18f4b75d4d4dc3cb7eae7921b38e65449b33175a344f79706
-      ssa_ast: 583e550c3dc815ac1b88efa537c5e7ab06440e8cdb48baf2df9adfc935411bfd
-      flattened_ast: feaf80e45d42f0a7fe0bfa971cab3d3eae79bb85e4e91e34c00e3b486edb4074
-      inlined_ast: feaf80e45d42f0a7fe0bfa971cab3d3eae79bb85e4e91e34c00e3b486edb4074
-      dce_ast: ddc2d519ff36181367ffcb13374c49e28a6df4b01b4db2c0976906290329a3fd
+  - - initial_ast: 57269e57ad610aeb7d3d4bf2cf37e334ffaf586e7c114d01e0a25de5500e0649
+      unrolled_ast: 57269e57ad610aeb7d3d4bf2cf37e334ffaf586e7c114d01e0a25de5500e0649
+      ssa_ast: 9c81f2d1e54f491eaa0c86901d0e4853d41f6f049039f4c9a20bfc53dfb38969
+      flattened_ast: 9449de43ed8ef205d7ebf5dd282f4234c8f7ea13c920677d671ff0673de0b469
+      inlined_ast: 9449de43ed8ef205d7ebf5dd282f4234c8f7ea13c920677d671ff0673de0b469
+      dce_ast: 7892ceebdd889b3fb857f80396231041f4234930af49e6372147c9fe158bae55
       bytecode: 9e89e30154352536cacc0dacc8bb07a9fe13368868c6238e77812b6efd2ba0aa
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i128.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i128.out
index 8aabe029de..8874752dd1 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e6d278dd37d88dd1b267b18cdc5ca6f41e4b988d72f94bda06d7f1f94ed823f6
-      unrolled_ast: e6d278dd37d88dd1b267b18cdc5ca6f41e4b988d72f94bda06d7f1f94ed823f6
-      ssa_ast: bbf91134a211ef90edea15ad3a2cab564447fcc476deed1c754008bf5b744cab
-      flattened_ast: aa34b5a0116d0b599397cea6ff5de488ea36f5ba6125bb9be78c0544f6383abd
-      inlined_ast: aa34b5a0116d0b599397cea6ff5de488ea36f5ba6125bb9be78c0544f6383abd
-      dce_ast: 69cb37ff6610810a0f21062f30f493a14e88fd29a7605510d4d75912cbc9eded
+  - - initial_ast: cd9185f41da654289686a52b4684127dadeda78c5f52dd3af92acb3378163a35
+      unrolled_ast: cd9185f41da654289686a52b4684127dadeda78c5f52dd3af92acb3378163a35
+      ssa_ast: 0db0d7a64ac7fd47183b6869dd11dad4335fb493b567211daa67df9806bcefb1
+      flattened_ast: e353c9973d682a2309ca62c90dd3eaf0b3be95ee0827345d0d4ab833bd23e3ee
+      inlined_ast: e353c9973d682a2309ca62c90dd3eaf0b3be95ee0827345d0d4ab833bd23e3ee
+      dce_ast: 2c40abf59c03ac0ee687cda4d6fdc2639ff42a28b4d2f69e1fe2f98cad068c42
       bytecode: 5290aaeef5522a1e293d4a300a6435164c7dae102af2a27d8c04c8dd1618d7ff
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i16.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i16.out
index d0fc5cba18..a19c7c82b3 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 46849025670d01dee8a7a1b9832304549ff54c842e3be7a5760bf3d317dbeecc
-      unrolled_ast: 46849025670d01dee8a7a1b9832304549ff54c842e3be7a5760bf3d317dbeecc
-      ssa_ast: fc36ce7687de670c5d8bf874ae5b90cf36f23ef7c00d4f3828ad767bf213d4f1
-      flattened_ast: aec7c14dcabad6504c1d91ab453bc04058f4f479a83e3ffbac9e42de7354cc56
-      inlined_ast: aec7c14dcabad6504c1d91ab453bc04058f4f479a83e3ffbac9e42de7354cc56
-      dce_ast: 2ff5bcdcaa1442c34c85c0dd4499f119f8536c37ca81852489a997249b4fb4f2
+  - - initial_ast: 29b741c58741de4d38be5a8908cb099ea3e936a6124b6ce605a9b5ac26b478b4
+      unrolled_ast: 29b741c58741de4d38be5a8908cb099ea3e936a6124b6ce605a9b5ac26b478b4
+      ssa_ast: 346c09ef8523702ee8594a82748e92995f493ee900c9e81f6b1e2f20af154e27
+      flattened_ast: adbc4cbf55109c02ca4cee9ddac69f1cbb4d95e848fb3bee15d2661694f927aa
+      inlined_ast: adbc4cbf55109c02ca4cee9ddac69f1cbb4d95e848fb3bee15d2661694f927aa
+      dce_ast: 642316b1bf43c60128defb0ef75fe14a583fa805bfffcb98a8367d445d6a5ec0
       bytecode: 7d886c7f992c4eb6790cbb8db01eaa8fe2c424b7c2e17423b2cb79704963fd33
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i32.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i32.out
index ddfdf9dc32..5c4f71f27d 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c29f6d609d4ba2a1b6143cebcfd2c009c4ef79ba34a0703b8ba1eb2499bda696
-      unrolled_ast: c29f6d609d4ba2a1b6143cebcfd2c009c4ef79ba34a0703b8ba1eb2499bda696
-      ssa_ast: 8e1114fa9c09ca7b64cda12f123dbb9c467ce8fd45494a5c4b0e0798f4c9bb1b
-      flattened_ast: ca0523c13e93802ef9b252fd7e8bdde997443acc7fd069bee0b1dab2d35f24be
-      inlined_ast: ca0523c13e93802ef9b252fd7e8bdde997443acc7fd069bee0b1dab2d35f24be
-      dce_ast: a7874b845321606b69407cfe326886d712e8ede7c44c57280d2b76fff45c802e
+  - - initial_ast: fe43ec7e40602333c13ac24432be95acc9169fe5020d5b172aa7b5281b04b8e2
+      unrolled_ast: fe43ec7e40602333c13ac24432be95acc9169fe5020d5b172aa7b5281b04b8e2
+      ssa_ast: bb54d62687c4878e7e07fb0428cac61d60374805c6f41a3453588d0deed0b0be
+      flattened_ast: 35ad99085229682c06920303d4553a9406dfc357d92b8e5b923b52aeda85dcad
+      inlined_ast: 35ad99085229682c06920303d4553a9406dfc357d92b8e5b923b52aeda85dcad
+      dce_ast: 02013880c608aeef24f6f9768a3f7a9be99d74e71491339e9edae180d8e092be
       bytecode: c0081af9fe61dd367493dc7120ea30b9444fa5b70c8cc60b773e4094f10edb99
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i64.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i64.out
index b1fffd2cad..bd64d96921 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 381e0b7b437a0fd8b61595e1525d35041bbf5db4290288804e7e005a5e1703fb
-      unrolled_ast: 381e0b7b437a0fd8b61595e1525d35041bbf5db4290288804e7e005a5e1703fb
-      ssa_ast: 75b00717ebd02a25dbd578cf306b853346d395d4e500a674ba821aeaf2e90277
-      flattened_ast: 6c822cb6e1ec178f60bc1a73f5da8196774c8b20db6baa90dd5066ebcfdb2b33
-      inlined_ast: 6c822cb6e1ec178f60bc1a73f5da8196774c8b20db6baa90dd5066ebcfdb2b33
-      dce_ast: 7c52055bfb03ded1e92135aa2e0ed0a58c4db95f907099f8bd0ea7d99cf2a64e
+  - - initial_ast: 2d204907d80b8b17d750be1ff778caaf35bcd2b1443a11ddf7526e7523073c87
+      unrolled_ast: 2d204907d80b8b17d750be1ff778caaf35bcd2b1443a11ddf7526e7523073c87
+      ssa_ast: f64d45887c98fb30c191d60bf4a54ea175301ab8106daec7e8210be396b4862f
+      flattened_ast: 0a215a6c5f1475a6b15b45d200308ca467c74dc61273f68fcce395f5d13850ff
+      inlined_ast: 0a215a6c5f1475a6b15b45d200308ca467c74dc61273f68fcce395f5d13850ff
+      dce_ast: 5e025064f00f571e70c0e8d3529268a033ace550fc9ab6d66d56e5ad20dc355d
       bytecode: 9178264b6b1a74502f105a5b156634a7b3abd0c8e0820b542711e4c4e94f4ee3
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i8.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i8.out
index 128d00dab2..87cc1ad879 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_i8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 90dfd784cf3eeb6a1853267ea6c88202bd6341971b7219024c06cb6fbe240178
-      unrolled_ast: 90dfd784cf3eeb6a1853267ea6c88202bd6341971b7219024c06cb6fbe240178
-      ssa_ast: 482c29d199f5fe6ff57125be65b0610534289eb935f6d44d711311df4d1b4adf
-      flattened_ast: f887b959a4dbc8c5ee754f31aceabadd7c43378d56bdaaaf5c76e299cf572a43
-      inlined_ast: f887b959a4dbc8c5ee754f31aceabadd7c43378d56bdaaaf5c76e299cf572a43
-      dce_ast: 188ab54aa8661e103c0a30c78915a0cdc2ab2c528921a4eb9781da0707ce372b
+  - - initial_ast: ec8ec8356f2f6221ae7bf7b2b7db9e15da64ee16255109c6561db909cfa70aeb
+      unrolled_ast: ec8ec8356f2f6221ae7bf7b2b7db9e15da64ee16255109c6561db909cfa70aeb
+      ssa_ast: 5b3bd12e7387a2eeaee33122508701336a114564d21ee827c327eb98e4c1b2cc
+      flattened_ast: 6a5a5f41dfd6eb404276952d90e495f6eca7033a362fddc2ddc0dd60ce578706
+      inlined_ast: 6a5a5f41dfd6eb404276952d90e495f6eca7033a362fddc2ddc0dd60ce578706
+      dce_ast: 74349c5017c68875ee8d41e8b6042c4724fdc48f6e1b9b21cf385668d6b06ed9
       bytecode: d8a23082726f0f63320c5999af50ec9039c980413ece31fad7d44457cbca524f
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u128.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u128.out
index 1193fb2d7b..7865f13c22 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u128.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u128.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2f8248b8b4d0d86d7fe01776b96bd17d9522cdc3e44008071391f39305516910
-      unrolled_ast: 2f8248b8b4d0d86d7fe01776b96bd17d9522cdc3e44008071391f39305516910
-      ssa_ast: c5469e1ae73be4205dc0deff65f970a2cc62b85fd800ae65f77e8e742ebe24ce
-      flattened_ast: 4738a1d4c9a49a3ea37fc3d168f2c163b3f9e2fc17e03550a75175204819059c
-      inlined_ast: 4738a1d4c9a49a3ea37fc3d168f2c163b3f9e2fc17e03550a75175204819059c
-      dce_ast: b419450c895a257101466a35704ce3b83e6b544721ba3e05192f212921f0e143
+  - - initial_ast: 6c7e3937e56ddd6b97bc878f9104b3b728ab59547a80e4ee746b1673c3e42d02
+      unrolled_ast: 6c7e3937e56ddd6b97bc878f9104b3b728ab59547a80e4ee746b1673c3e42d02
+      ssa_ast: b253774c399488f6ad41abfccc3c0fe8f3fb35f492ad166b801a2ca9ad2d7821
+      flattened_ast: 30f53bc130e15c2caf35da631acc42324e19813e65a818087053c8f31b1ba195
+      inlined_ast: 30f53bc130e15c2caf35da631acc42324e19813e65a818087053c8f31b1ba195
+      dce_ast: 22c7cc372ab0b7a6fd1039422c463915303d4a1d9788a99dcdc7bd9915783f7c
       bytecode: b236fa1708b81dbcfc5d839bfba2ef6683c22ecf004edf64e3fc563c436d2675
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u16.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u16.out
index 6adc01f564..72e0c26a8f 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u16.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u16.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a193ae9221ea6880a8f5d4705cd15302ca1cb830f3bc0d00153a96bb7ff61ff1
-      unrolled_ast: a193ae9221ea6880a8f5d4705cd15302ca1cb830f3bc0d00153a96bb7ff61ff1
-      ssa_ast: 269a6c4ba9d7684e1727832526045d5ec429664cc91079c9d69ecf747505f74b
-      flattened_ast: e62a321973b8aa6319cd74a7867979f7f4dc7c8a80d1bdb9c9f6754e6c1b975b
-      inlined_ast: e62a321973b8aa6319cd74a7867979f7f4dc7c8a80d1bdb9c9f6754e6c1b975b
-      dce_ast: 406871a981a71865e95f229a29c07bced92e97ce23efebeae532b8896059f85d
+  - - initial_ast: b6ea1a62838b8ee92a9178ccdca34dd0a393223271e21474bb7f663e83f0cc75
+      unrolled_ast: b6ea1a62838b8ee92a9178ccdca34dd0a393223271e21474bb7f663e83f0cc75
+      ssa_ast: 59f23d0e3252c8f0cb8128d0236cd7bbbfba53baa91cb7fcbc21814ed07a2450
+      flattened_ast: 6f34ade1664acf11bb8f7186909a5ccd35e10d0948508381a436e00f4b3c6468
+      inlined_ast: 6f34ade1664acf11bb8f7186909a5ccd35e10d0948508381a436e00f4b3c6468
+      dce_ast: 16a1c8a02b3ba4e1ec1cae7a4e019ce3c494edd0190deb7f41cfbc3186f454c9
       bytecode: 578ab81973a37f598557c18ec88e180fc252085f3c22cc725ce1b954dca97fb1
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u32.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u32.out
index 0c72561b8c..faf809e7d2 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u32.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u32.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a045ecc372274fcc7f323d16460c6b0bb02bc3fab53246e8309170b9c975b000
-      unrolled_ast: a045ecc372274fcc7f323d16460c6b0bb02bc3fab53246e8309170b9c975b000
-      ssa_ast: e74df06abdf9ed8a377767c2a0ffb022c374567345c45eab02ee445e22501332
-      flattened_ast: 27ae02c6ed88dba418acbb13c44e333a3dde223449751dd7d66614ad8637dcef
-      inlined_ast: 27ae02c6ed88dba418acbb13c44e333a3dde223449751dd7d66614ad8637dcef
-      dce_ast: f9f3fe2d2144c5a16ae5cc20d5f38da2fd5050d6c0978e43284f2cd4a521ceed
+  - - initial_ast: 37eea0382a0bdc819e6bb30840f070e61afc8a1736070f3e6fdd34a7466c2efb
+      unrolled_ast: 37eea0382a0bdc819e6bb30840f070e61afc8a1736070f3e6fdd34a7466c2efb
+      ssa_ast: 9dfffa9996f211a70d26e2901660e11bd07420515ff3c8016d469d52667ee6aa
+      flattened_ast: 8b500443a021375ab6c8c36b84613c4030c6f89b49f72135750a1c80b32ed0c9
+      inlined_ast: 8b500443a021375ab6c8c36b84613c4030c6f89b49f72135750a1c80b32ed0c9
+      dce_ast: c620cd78012fb91df7acbdddd281e410edc4c23faae6861e3dd5b1dd7c56b4d0
       bytecode: 281f2a2d3e6e078fed0f753ca80ab4cc59999688b8c49781c8065731199925fc
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u64.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u64.out
index f0a27cf207..9ca81f5206 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u64.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u64.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bb1e9f64b4136527e004034e330afbab29e8c89c8c217680dd8e4d8317d866be
-      unrolled_ast: bb1e9f64b4136527e004034e330afbab29e8c89c8c217680dd8e4d8317d866be
-      ssa_ast: 418540c4095f3e831100b5430673005a80f320d3c75689a58257b3a21812b6d8
-      flattened_ast: 4021c581b5536d1fc99ef47a7c88b325b83d8cd959611e2e75893aca4bacef40
-      inlined_ast: 4021c581b5536d1fc99ef47a7c88b325b83d8cd959611e2e75893aca4bacef40
-      dce_ast: 64cd62c62c6b98cddcf4f8c458ea5d414390d7a32dcbc722848b5ff0beef7e24
+  - - initial_ast: 7afbf9083993066c678d48043184fb8c7280e6999025b06995513884f28029ba
+      unrolled_ast: 7afbf9083993066c678d48043184fb8c7280e6999025b06995513884f28029ba
+      ssa_ast: bd5e2f78e3f6f46df2fb89796a5180b962d78772bb56d8084255ba7423d1b3a6
+      flattened_ast: 4ae2a5b0152744783c47f54e54117c944be898209add6fc50cec9cbd33fbb6cc
+      inlined_ast: 4ae2a5b0152744783c47f54e54117c944be898209add6fc50cec9cbd33fbb6cc
+      dce_ast: 9abcceb24c08cda78fd4e56c27b0821afdb43c6ab4f45adf73dd762d91cb81c4
       bytecode: 351a1decde01006bb233a6f677371c63182bee83f6a02d7e394cdfc13253a74c
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u8.out b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u8.out
index 8e3bcf2450..cca77b9a40 100644
--- a/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u8.out
+++ b/tests/expectations/compiler/core/algorithms/integers/poseidon8/poseidon8_hash_to_u8.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 16f7b6314c5533cb6e9baa65af93b12177dc2ccf306638d6e49fcbae421014b6
-      unrolled_ast: 16f7b6314c5533cb6e9baa65af93b12177dc2ccf306638d6e49fcbae421014b6
-      ssa_ast: 371ee81f84474e33c3288ef14318464e971c324e2fb3930d13387130a301e243
-      flattened_ast: f3fbe964794a897dfce5f4880f4c83fe92c1f6dc9d41d9a0661ebcf97a3e973e
-      inlined_ast: f3fbe964794a897dfce5f4880f4c83fe92c1f6dc9d41d9a0661ebcf97a3e973e
-      dce_ast: 502f35383f00e048323822175d5e3e9ba44e072d1a856ada5962bc7defccecaf
+  - - initial_ast: d2ef7b1d3ed4b3b4b4d45decb2ef296d65bc51bd166878acec48b7765c09dbf4
+      unrolled_ast: d2ef7b1d3ed4b3b4b4d45decb2ef296d65bc51bd166878acec48b7765c09dbf4
+      ssa_ast: 68f771abd74244ec9d65abf3a4707f3df1ab049cd8d61ba05dd0ba4d3b28ff6c
+      flattened_ast: 25966dd86a68b5597d1f4d19e01e8dcf1192f15775a774a700a3d0956c39b404
+      inlined_ast: 25966dd86a68b5597d1f4d19e01e8dcf1192f15775a774a700a3d0956c39b404
+      dce_ast: ee6ab987332234b9b85548857199adff937dc9cb2c193d54f146a4f7beba5d61
       bytecode: 13d8c455a1780777a2032c00220ca31074ae10e74a758ded74674c7c6ac77cb4
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_address.out b/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_address.out
index 038e152c36..25085f5e43 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 62e1d6260e7c57cfd311dde8c03282163418b7a4210d7c6bc918485f584b6f3f
-      unrolled_ast: 62e1d6260e7c57cfd311dde8c03282163418b7a4210d7c6bc918485f584b6f3f
-      ssa_ast: b1e48ffae4b32fd8ca6f3798d07bf0968071fc5f1342e562d32f3df399d41aa0
-      flattened_ast: 77ce8c6e3c7b99e54a5b9bb65007d45fe9cb20353cb96564ccc4c1d818b5b4aa
-      inlined_ast: 77ce8c6e3c7b99e54a5b9bb65007d45fe9cb20353cb96564ccc4c1d818b5b4aa
-      dce_ast: b607fe343a9af69cc8375717469820ea57af375f055c8477d30107288539c420
+  - - initial_ast: f4cb8d264a1ad52f91321eba96c28ad9f246d056b0ce94023c3c02243e328ca8
+      unrolled_ast: f4cb8d264a1ad52f91321eba96c28ad9f246d056b0ce94023c3c02243e328ca8
+      ssa_ast: 2d161501cbb50217fbd41b7d779b356c924824f418ca39372e16ed22be2d7131
+      flattened_ast: e84304a7aae5318b08eab4be137e23c6f6e5720684f6efccf60b743bb4507579
+      inlined_ast: e84304a7aae5318b08eab4be137e23c6f6e5720684f6efccf60b743bb4507579
+      dce_ast: c6eeda246a5d3950f3695149db026a2317ae769ebf4fb8ea3a5cc6c70cf8492d
       bytecode: 0177d2ff68ef7c80cc34b0c23b80fe43b1a48641b091d96c31fc4aaf605f1fee
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_field.out b/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_field.out
index fab13146e3..7a89db1ab4 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b1758e9884f3cac1cf37c93fe65a37e0c3aed1cf5021ab4fea7f41ba7b93f200
-      unrolled_ast: b1758e9884f3cac1cf37c93fe65a37e0c3aed1cf5021ab4fea7f41ba7b93f200
-      ssa_ast: b0316c9bbe7c568969fd72c2456b5737b4ecd2f6d2484eb2c8d68a8ee1bba829
-      flattened_ast: fe00175fcfb5245f7ef8bd602407ab69be1686398b3f0c4c212464ba4586b294
-      inlined_ast: fe00175fcfb5245f7ef8bd602407ab69be1686398b3f0c4c212464ba4586b294
-      dce_ast: 370bc7f476840cf6f21342a463e136081b1f11d70e14307ad77a4f75958f9102
+  - - initial_ast: 0f98fac1006838d1738bbc082e5c6e35ccc2f73e6d40836b7533a27c33f08854
+      unrolled_ast: 0f98fac1006838d1738bbc082e5c6e35ccc2f73e6d40836b7533a27c33f08854
+      ssa_ast: 1156b7cf2738e6a567bd6ce48c282f3bfe9665a141ddb96c9e8a3da9819d2326
+      flattened_ast: 83a852fb1641567d928b41117226e3839ea1c7b18baf7a2b08349c34249f8696
+      inlined_ast: 83a852fb1641567d928b41117226e3839ea1c7b18baf7a2b08349c34249f8696
+      dce_ast: 3b5b4dce25f41bc23f98d4b953362f9d09a98f554875c7bb12ac87cef3ff0472
       bytecode: 898a0b3e75f8315ef55119941cbb8544017d3e0dc2e57b14881099bc04b3144e
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_group.out b/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_group.out
index 752365e68b..fb97e6c985 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_commit_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4d51b3a24b495d7727167cb333052254d5df0acf669562be0dceba46e12daa17
-      unrolled_ast: 4d51b3a24b495d7727167cb333052254d5df0acf669562be0dceba46e12daa17
-      ssa_ast: 9f5f19c5483e559c9a1ec684949fee435880e9d414bbf159e0b9bce4b47960af
-      flattened_ast: 19a3b80c05737798112d1a24d5f07ade491257d7ca450046f939ec9d710a91b8
-      inlined_ast: 19a3b80c05737798112d1a24d5f07ade491257d7ca450046f939ec9d710a91b8
-      dce_ast: 4daafc5cb2261863f6f55ffa7a39a632f11d21e5b04b7cac4f7c3af9563e30e7
+  - - initial_ast: 2b4bcd4b9cd5a39d8b7d28904b5c95d640b514cf50b81de4085757875040c752
+      unrolled_ast: 2b4bcd4b9cd5a39d8b7d28904b5c95d640b514cf50b81de4085757875040c752
+      ssa_ast: ff2886c6d933ec5adcdc9f8086e7d0693a5af8f8004a45f451c938bd180ff71d
+      flattened_ast: 5778fff1ab2c29571550a3147984c8cd5ab8b4e3ec5e8b75abc4b55acf237e81
+      inlined_ast: 5778fff1ab2c29571550a3147984c8cd5ab8b4e3ec5e8b75abc4b55acf237e81
+      dce_ast: 29f4d33ef11bdd85f6d4c73f5088c4a003af0113203f06b7a829fa1866af2a16
       bytecode: e58ba6177a4d34fdf2d61c32d2c759504c8fc2c21b0c11d6843931796d77a477
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_address.out b/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_address.out
index ced8e0ad2a..7b51e7b3bc 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d90fa7646c92af76f8e38be18ec0e8d100d7b1d2fb18976d422d275db8770336
-      unrolled_ast: d90fa7646c92af76f8e38be18ec0e8d100d7b1d2fb18976d422d275db8770336
-      ssa_ast: 4935687bfa2ba3f7a7e7d4d6dee488b53b71b7cfcaed58229891bf565a269ed8
-      flattened_ast: b3c909db2e6cfd9b3d64f3120b4d1f2a1e0577e0b8c48a13e417f9cf7c666558
-      inlined_ast: b3c909db2e6cfd9b3d64f3120b4d1f2a1e0577e0b8c48a13e417f9cf7c666558
-      dce_ast: ed3950270f254a3a0eae404eaee553abff40b237aaac8b0edd3c8fd622094c42
+  - - initial_ast: ac02c8b2f363896fe10598295bc50fbf93bd29b5294aa7c2bae3001ea85c905b
+      unrolled_ast: ac02c8b2f363896fe10598295bc50fbf93bd29b5294aa7c2bae3001ea85c905b
+      ssa_ast: d57e542e23aee39a8f4c2358312e827e017f6723b187138a8b73c6859e6e1c47
+      flattened_ast: 1e0af4270e70d5d11dc54e039caf543eecd89c74e92a036d93f00c8721cd481b
+      inlined_ast: 1e0af4270e70d5d11dc54e039caf543eecd89c74e92a036d93f00c8721cd481b
+      dce_ast: 87818d2afde86c21d43da90f96a7a5c9a94e54824284631ce1238396d3dc3ca1
       bytecode: 3b9c561c7394019db020d85732d9c1cd33d6c7d02b06e7e2becd5b19d5bcfb0c
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_field.out b/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_field.out
index 032be7d233..61a1e31906 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 108da38c110e4708ecf350cb4a190b0716876b7c4fbc7bde92c8b1373d357b0d
-      unrolled_ast: 108da38c110e4708ecf350cb4a190b0716876b7c4fbc7bde92c8b1373d357b0d
-      ssa_ast: 1454a8c932786ac0fafab967a0d9309997e58b6fdfb50cdda083224ea077120e
-      flattened_ast: ac4f7de3aef1d94e8d233b0f65a19afe5e8420279a98eb410eb6e74245492fac
-      inlined_ast: ac4f7de3aef1d94e8d233b0f65a19afe5e8420279a98eb410eb6e74245492fac
-      dce_ast: cef2e7c5f40d4c89f53910244c54036dbed7edf39dae89c4d26d25915343dd29
+  - - initial_ast: 459d6f7a85a1c92294eb0dbbeac21a14409fa7bc184a844b1a1b52f6bf25df76
+      unrolled_ast: 459d6f7a85a1c92294eb0dbbeac21a14409fa7bc184a844b1a1b52f6bf25df76
+      ssa_ast: f4836c9515feb92e04c2236e0037f8311e969ac6f1c6a56110bad75a2b826784
+      flattened_ast: 309e6abdddd80d864a2e9719cd27930d905a218ccf03d9215f3cd0444a254071
+      inlined_ast: 309e6abdddd80d864a2e9719cd27930d905a218ccf03d9215f3cd0444a254071
+      dce_ast: beda4ddcfe66aec2ff807848efd0f7c6a2eb06aaf071beb95d0b8e9713703cc6
       bytecode: 6ef9516edbaf306f537cd26386515c4e48c776e4b41701eed9f077de782fd9e5
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_group.out b/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_group.out
index fc1063cb04..85fadef37f 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen128_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 510f2a8b0957d6b9db0835fe535013ae3645261dddfa2557a158ca1568e0cbb2
-      unrolled_ast: 510f2a8b0957d6b9db0835fe535013ae3645261dddfa2557a158ca1568e0cbb2
-      ssa_ast: 72556e40ea361f7848ff5a6f3e8865dcd33db40487af1baed57cc1384e4d635a
-      flattened_ast: 58d1c227646f6bb66ddef0f75138d16bdbfa9a09398d0012e243294443fdcc6b
-      inlined_ast: 58d1c227646f6bb66ddef0f75138d16bdbfa9a09398d0012e243294443fdcc6b
-      dce_ast: b4a54fba23a7d656026c8ade5e518ac15a67ce932319cc6e1ff08c473dd1307e
+  - - initial_ast: ef322cdcff3309d0ff2c42175c0e743e023c9d380a9bf1319b16699b8efecb46
+      unrolled_ast: ef322cdcff3309d0ff2c42175c0e743e023c9d380a9bf1319b16699b8efecb46
+      ssa_ast: 36e24f81c5a6e62ee9138f59fbf7f32b1af336d6dc7a2f26f2482739ad8f73b2
+      flattened_ast: 2a0dec1b72871681ce3b9eeb8c5a1d2c5d815daee50fbf0452a48cc2a9f63f98
+      inlined_ast: 2a0dec1b72871681ce3b9eeb8c5a1d2c5d815daee50fbf0452a48cc2a9f63f98
+      dce_ast: d473e47d6521c5f9bd5ac4c60417994021fc7ec06feff9669a36b749f4a988bf
       bytecode: 6142be1c72fd4cd0cf4df52effc0116a7978942229b4eafbb122acb7fa1cf2ce
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_address.out b/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_address.out
index df7e13a4b2..2eba48d5b6 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 316c5c47f1b2c000e46d79d74397c6a932daa751c53c6f008415537cf6755648
-      unrolled_ast: 316c5c47f1b2c000e46d79d74397c6a932daa751c53c6f008415537cf6755648
-      ssa_ast: 859800fd7ad01e45fd1971ad30c26be4181baedb24f5c72e90399634a91bdaf6
-      flattened_ast: 8e4fc05aa76070a81be03ab2a0d89b2009c895aa10b123d5f1676052f4fa42cd
-      inlined_ast: 8e4fc05aa76070a81be03ab2a0d89b2009c895aa10b123d5f1676052f4fa42cd
-      dce_ast: d8905a95fe074f9cb2d75473b5ea48b4e4a58ab0696eb55764d8a6dea3426368
+  - - initial_ast: 481c27f2e7c460311daefd3b50d73886846dc57c8569d55321e78f3c3e00b999
+      unrolled_ast: 481c27f2e7c460311daefd3b50d73886846dc57c8569d55321e78f3c3e00b999
+      ssa_ast: 9b4b55666fd0aaddd1818e562a3609f78fb0f0d479a458b9b270d36643ae9310
+      flattened_ast: 4c101d991a8dfb8b214704c02343791886997711072e717f1396b3b6d32c5b46
+      inlined_ast: 4c101d991a8dfb8b214704c02343791886997711072e717f1396b3b6d32c5b46
+      dce_ast: 18c608143b85988426339eda12f7c406a961b30bc427eaf07d5fc7bdbe62036b
       bytecode: 248499417589965ed3595cba61fff5d160c03f1b13240ba41dec8edda85d9207
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_field.out b/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_field.out
index f2b7fe416c..87e9eff786 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fd83a40ec3d2559b99e42fddc30a43464d095bd429bc5138ab5317be528a9f7d
-      unrolled_ast: fd83a40ec3d2559b99e42fddc30a43464d095bd429bc5138ab5317be528a9f7d
-      ssa_ast: 3dfb2b48be6ab5df4caa5de4ae0b496e8710c598d81fc53d03adeaa28e7d8eb4
-      flattened_ast: 63a0732ad03d0b15cbbbe3fa862887d0a1fb17fce174f772535345c68977f594
-      inlined_ast: 63a0732ad03d0b15cbbbe3fa862887d0a1fb17fce174f772535345c68977f594
-      dce_ast: a823557f307c2cac01d64376d87ed0754ad4d57cbde390a8f59564ae294fb9ec
+  - - initial_ast: 91e9f4956cad1585f563b8b46066c5b30f5e7d2478914ee0f4c852210e2da9d6
+      unrolled_ast: 91e9f4956cad1585f563b8b46066c5b30f5e7d2478914ee0f4c852210e2da9d6
+      ssa_ast: ec7d03f8a81f164a9e3b5a1d3219004db47e67c6472c93f5b9abfc4e330801e1
+      flattened_ast: 69e5a8a7372de34b8e7bea48017de4bfeb674be1d8f998ad6eefc83132120865
+      inlined_ast: 69e5a8a7372de34b8e7bea48017de4bfeb674be1d8f998ad6eefc83132120865
+      dce_ast: eb1bc4b903d504e574c160a614a08f565257b0845fdfddd9c94e828c92f694ed
       bytecode: 987081378130ef8d5a10a06a4fca335683681906c84365737ed452fa61684b25
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_group.out b/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_group.out
index 7a0ce1440d..ccb603256e 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_commit_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9930cafac8111cb2d10f66f369a5423d53d5b95cbc054ff17b089df07f1d9827
-      unrolled_ast: 9930cafac8111cb2d10f66f369a5423d53d5b95cbc054ff17b089df07f1d9827
-      ssa_ast: 2d07ee4f88b2ff8cfd4042aa767925085c074f1fec48f5a0508439334aef1f4d
-      flattened_ast: 8810841f7761d7f930e572982fff20bddf633bea390800ca71d667db12f4f4fb
-      inlined_ast: 8810841f7761d7f930e572982fff20bddf633bea390800ca71d667db12f4f4fb
-      dce_ast: de6563bbee2531fb24e22cff177da47c17a8b051c8de2655be057dcc7679f895
+  - - initial_ast: df8d8df05ac30f8718b24dc297f1df0790fa73780b3c2b23b5c5cb00213897bc
+      unrolled_ast: df8d8df05ac30f8718b24dc297f1df0790fa73780b3c2b23b5c5cb00213897bc
+      ssa_ast: 0ab6b144a0a0da0afc0f946ff842487ad28a4a6a802a7a2414ccdc2088e5c4c4
+      flattened_ast: efedf571ba5f871e150bb66e02f619478f62df690845873fb310103a2cfe9b78
+      inlined_ast: efedf571ba5f871e150bb66e02f619478f62df690845873fb310103a2cfe9b78
+      dce_ast: 64c0726dc2addc398502e8e502c870170be4d5cbb43f66cd9f45e43f3e69f804
       bytecode: 5cef5bd2862f91fca8121b9469a3a9709ae371fe9733af974da913b78c38e5d1
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_address.out b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_address.out
index 8710fa232e..c72d69b0fb 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 86a908924dae96de645d021204f1312612fb982a533bcce23829b66ce79eb6e4
-      unrolled_ast: 86a908924dae96de645d021204f1312612fb982a533bcce23829b66ce79eb6e4
-      ssa_ast: 2928970d9f52a3d627b683142672bd0fdba6d0dc49bdb6ac6dfc0a0c40883b97
-      flattened_ast: 6511e97a8400cf30eb62abea1fb6616b2d3a865a7c544735d2ebe01881f7d10c
-      inlined_ast: 6511e97a8400cf30eb62abea1fb6616b2d3a865a7c544735d2ebe01881f7d10c
-      dce_ast: 147a9f1cba81c127de04261f3d548eb2204cb215ec0d6f8029ddf8543cd15332
+  - - initial_ast: 3de6da92ec6bb8ce356af9c35941a7a28b49da6d9f38d84c83d13c7ca24f7f7b
+      unrolled_ast: 3de6da92ec6bb8ce356af9c35941a7a28b49da6d9f38d84c83d13c7ca24f7f7b
+      ssa_ast: fdfb568b8d8aa194b5413bf11c88341dd53597c4e00aba9f5836b4403ee1b365
+      flattened_ast: eed47acb1ac00a7e2a0e9a68e4021a65a3613f3396c77e11d434661a0f657b69
+      inlined_ast: eed47acb1ac00a7e2a0e9a68e4021a65a3613f3396c77e11d434661a0f657b69
+      dce_ast: 267393fc6bd93a7a88513402164412fee1a4816e67970f9ab4858f0c1406a871
       bytecode: e53214ce0491e3d906129beb3239b59992202e958b79382b2712ff65f5d3f2b5
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_field.out b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_field.out
index d8eb9bb7e3..22562f52d1 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 07693302eb3604dc88fb1e7e30f2e7b506e530daac1e23f169c479ce2dbd6ec6
-      unrolled_ast: 07693302eb3604dc88fb1e7e30f2e7b506e530daac1e23f169c479ce2dbd6ec6
-      ssa_ast: d1abe87ec9bdce7aa2cfb03c1ca12a0071c493078729325ea93070962a3adf74
-      flattened_ast: 895ab045254cb4cc206c721cdc41d8ca7cb92e8e898dbc54b87ff1a63ccb91d8
-      inlined_ast: 895ab045254cb4cc206c721cdc41d8ca7cb92e8e898dbc54b87ff1a63ccb91d8
-      dce_ast: 356e966c9fd99ece809c74604cb4fb9cb49a731b4880e16ff50491727046b024
+  - - initial_ast: c4b25e0fbc0e1f198b2e4f19bc75324006a483f7bec6edb7fa1624947d33c4d1
+      unrolled_ast: c4b25e0fbc0e1f198b2e4f19bc75324006a483f7bec6edb7fa1624947d33c4d1
+      ssa_ast: cfb06a38f799296e40a0891987c99f79b0ecd381e665210613aca13c58a906e9
+      flattened_ast: 25ddfbb66e93884cadb14999769fbaf763f9a024620790235bb28272db690c76
+      inlined_ast: 25ddfbb66e93884cadb14999769fbaf763f9a024620790235bb28272db690c76
+      dce_ast: 6b4cb0c7b1f7ee3065f16a6c07f601f698fb94517f14992aa1feec0154769b3e
       bytecode: 97371d4c5d1d597704318f2a30da1e201a51713d43ee611c0e668749b3b18508
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_group.out b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_group.out
index b65184f4d5..049bfc8771 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ce5f7a9f46345cccc28fc9b6aec78625b39d7a92e170fd58f18a52b7ad87648e
-      unrolled_ast: ce5f7a9f46345cccc28fc9b6aec78625b39d7a92e170fd58f18a52b7ad87648e
-      ssa_ast: 8614365c777cf2f675ed175c68d288cd76e66f8b0369a1e403ae85c2ec5ff6cc
-      flattened_ast: a2a6f544486dcce447ebef6049b8b1fdf12010676a9ebf1d78848cf26a3fa3ed
-      inlined_ast: a2a6f544486dcce447ebef6049b8b1fdf12010676a9ebf1d78848cf26a3fa3ed
-      dce_ast: 8031d3fdb1509cd9558ca8d4b50de4c8b560d890b7473cc3ba7e96cd48c9a70d
+  - - initial_ast: a61318e53c5423022e253d9107f027cd6c2fea5f205895ebbf937ee00f9bc4a5
+      unrolled_ast: a61318e53c5423022e253d9107f027cd6c2fea5f205895ebbf937ee00f9bc4a5
+      ssa_ast: 29c629eea640583e4ebc1ffa09620ddb4cdf51ff8dcdb2ae1a3e675557f2dadd
+      flattened_ast: 4fdba015457dccf49765bed5e5b8d0ddea06772fc94dbfaef6649f9a3956fe10
+      inlined_ast: 4fdba015457dccf49765bed5e5b8d0ddea06772fc94dbfaef6649f9a3956fe10
+      dce_ast: ba2a25d582fecb38c8863763a4473afbd98916163451815d7909675e1eda5d04
       bytecode: 560e02f77b8fad85f881ae59dd5ec102eba0703a78af752c43ed23ff3d6910f9
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_scalar.out
index 19b29d2336..568e67c40c 100644
--- a/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/pedersen64_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ed86f5776728a9860517e002946fbe361354f5e04ab26c8e5e5d68ad60dbbf0d
-      unrolled_ast: ed86f5776728a9860517e002946fbe361354f5e04ab26c8e5e5d68ad60dbbf0d
-      ssa_ast: 1d6077dcbb9991f68591bfa54d625e96003be6e42d4f1ca0be68686f44ee20ad
-      flattened_ast: 5c51f590c1d053b6af1407677d719e7cd3c95b77acfdc59a4b613facfcddca1e
-      inlined_ast: 5c51f590c1d053b6af1407677d719e7cd3c95b77acfdc59a4b613facfcddca1e
-      dce_ast: 44825aaf32e5be41bbbae758f6315cde6e0acdf8b66a22cd834fcb723a77fe95
+  - - initial_ast: 72e7e5264bcebef8b8993758ba25e54a19e79cd8008a37d367bef84d45251d6f
+      unrolled_ast: 72e7e5264bcebef8b8993758ba25e54a19e79cd8008a37d367bef84d45251d6f
+      ssa_ast: f6763fb17331aae67145ab887ae6d172003bc2d9addb06ebe1a559ccb9df9ded
+      flattened_ast: a8fb007187ca28da3d9495ce6a1fddf4644eb97e5dc3869b5feb763cd4d2132b
+      inlined_ast: a8fb007187ca28da3d9495ce6a1fddf4644eb97e5dc3869b5feb763cd4d2132b
+      dce_ast: 8c6bb2bb53a06e8548e81a6eaeb35ac085cc919342f41b9e37195a91276c5e40
       bytecode: 1cc9e5a7ccbe6bbd7512b87e1d972b750f062ecbc5be556ba9aff4d99098fd07
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_address.out b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_address.out
index 941d366f0a..4010f6cbb6 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 34f7573a5671444bb3d3d1e450a14a5610fa18ada28c9052ef24117c24195cb4
-      unrolled_ast: 34f7573a5671444bb3d3d1e450a14a5610fa18ada28c9052ef24117c24195cb4
-      ssa_ast: 3cd3b3c29bc39ccc9c5a7e9e26e1a34256a83acfd135743813d519356d5a0b48
-      flattened_ast: ef2ab6db0f6f826e66b1965b5c3abee03d4266660bdc1bf72910cd456fd35832
-      inlined_ast: ef2ab6db0f6f826e66b1965b5c3abee03d4266660bdc1bf72910cd456fd35832
-      dce_ast: 83455083ba51c7c3b332d5973109d65dd91d6f9dd4d3134004af7f7059a6126a
+  - - initial_ast: c49509dbfc95a9b45e2eb381f138f234ec096ad0b4ab337536e1e9fa599e1819
+      unrolled_ast: c49509dbfc95a9b45e2eb381f138f234ec096ad0b4ab337536e1e9fa599e1819
+      ssa_ast: 84678d3e3dc413dd7c1ba741f0ce57d4c354e57e6a79e86f2e1b2230321cc8d2
+      flattened_ast: 594ddafae000e05d13097318184863d282a4a15f2a5dfaa05e68577776170cad
+      inlined_ast: 594ddafae000e05d13097318184863d282a4a15f2a5dfaa05e68577776170cad
+      dce_ast: c773651a072fd6e8864ddba3652a807bfc98497b1d26a2316f3b9dc4b8a013c8
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_field.out b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_field.out
index 0c996c3dbb..87e73e5838 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0149d6d61dfcaa30d24cee1644fb6c8f98b788ff801c59f8bd425533b6067ba4
-      unrolled_ast: 0149d6d61dfcaa30d24cee1644fb6c8f98b788ff801c59f8bd425533b6067ba4
-      ssa_ast: fde5f699640991394555a05d9648967bb35496113707359800252647622ef583
-      flattened_ast: e71e1b058f45014508f92c28581572f11acbc2675591cafa2aa582c446aa7837
-      inlined_ast: e71e1b058f45014508f92c28581572f11acbc2675591cafa2aa582c446aa7837
-      dce_ast: e3611bac7e8619b53e21961a36a3057e758a221b14e847bc5bb357e6e63e09f1
+  - - initial_ast: a3a9bf181461b4061f8f879c1a936ac69faf27e54cb824709215ad9bf2f23826
+      unrolled_ast: a3a9bf181461b4061f8f879c1a936ac69faf27e54cb824709215ad9bf2f23826
+      ssa_ast: 345899eef93107a7b2238187b71525ae92ade8e614fe33ceb142e93811150898
+      flattened_ast: e23f7eb31175695fb469c1c3645712c11b3539d7883b3a6d58247bb4ddfbbecc
+      inlined_ast: e23f7eb31175695fb469c1c3645712c11b3539d7883b3a6d58247bb4ddfbbecc
+      dce_ast: 4ece627c90a457cf91fac405da975085d90622c28b92f25cde448baf0bbdd291
       bytecode: 507f46fbf504e65a3b6a0abafe45b0864ea39d49d7f73773e10ec478c5681dd9
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_group.out b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_group.out
index 48c0b87839..b82c8327d4 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f975dfcdcc34d5bd0844262d1a90402fc327ed402ab314426afb65a34637b294
-      unrolled_ast: f975dfcdcc34d5bd0844262d1a90402fc327ed402ab314426afb65a34637b294
-      ssa_ast: 092fa84ffa4b9c072fd5e4decb407e070f6d037fdf45d31c91e7e6e44c3d103b
-      flattened_ast: e7013ac39355e030694015d888cd52de46ebaaf443068423a4d134328eb7c5b8
-      inlined_ast: e7013ac39355e030694015d888cd52de46ebaaf443068423a4d134328eb7c5b8
-      dce_ast: 8a42768ad6bec203da119f941db53b86e51a32507a4427f65d7f4ca0b85cb27d
+  - - initial_ast: 73fe09839dd54c0e250a8a76be1296cd1da1e8e6c027d513fd03a2106605a451
+      unrolled_ast: 73fe09839dd54c0e250a8a76be1296cd1da1e8e6c027d513fd03a2106605a451
+      ssa_ast: 6aaf95d52a7dbb12009117f7ce3936e32f71c2d6fdb8c0abff2ed9522e3bc971
+      flattened_ast: 0bf349f80ad8c3dad3b03375d0dd3e717f4a4451dee2bf149449b840d2c3390a
+      inlined_ast: 0bf349f80ad8c3dad3b03375d0dd3e717f4a4451dee2bf149449b840d2c3390a
+      dce_ast: f5b88ebe4d5368092577b031aea1c2e7abe9aeb95e9d82fcf867dc7cfa7ea468
       bytecode: 312d746623b72d73679ce4d41501f8472340295050f4f7e32b705a4f29cde748
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_scalar.out
index 0d71a1507a..dbd169e2ab 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon2_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a89e51599fe6adfe7884a9e183aedf4c068af51237236a7eed44599dc2a86a29
-      unrolled_ast: a89e51599fe6adfe7884a9e183aedf4c068af51237236a7eed44599dc2a86a29
-      ssa_ast: 452392bd76e064881a7a01fd0815acfbaf67725be169378df56d1a5bb5948b21
-      flattened_ast: 3523eb5e3430129379f475da523b1e7d8f8525bea650b2a60aeacad72f94591a
-      inlined_ast: 3523eb5e3430129379f475da523b1e7d8f8525bea650b2a60aeacad72f94591a
-      dce_ast: 970dd20b31d8f35bc902fb06733b05ffe5e53e7bc23ebd829d7ccd8a9e58916a
+  - - initial_ast: 0ce33300e3f216cc73d634993f095f71dff73899a48df296ad3dd152dae09da5
+      unrolled_ast: 0ce33300e3f216cc73d634993f095f71dff73899a48df296ad3dd152dae09da5
+      ssa_ast: 83ff5093b1c9f3c4eaf6fe124593aacc83023a3bdf3dde7c86f7598b3b991473
+      flattened_ast: 5be23a3b43920b09a05b8ac58642ded87e1e768a4ba4693662c2a94c58880e48
+      inlined_ast: 5be23a3b43920b09a05b8ac58642ded87e1e768a4ba4693662c2a94c58880e48
+      dce_ast: 5f59cecef0255b81f406455bf3059e6c8708b549a84f0b154e7fa51f0c494ea9
       bytecode: ed28aed75d56b20394a3fed65da466eacac5b1ba9acc17aed2936517aac269f9
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_address.out b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_address.out
index 21f08c636d..be6f666173 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7c8eb2ee3f553f6368b94cbca66dce7c154d62653df9aca8a13282f9a8902ec1
-      unrolled_ast: 7c8eb2ee3f553f6368b94cbca66dce7c154d62653df9aca8a13282f9a8902ec1
-      ssa_ast: 4965cc2085f8d06849d6780ffdbd86c722951bb10789656acba7592bbbecbd62
-      flattened_ast: ea90b5377bb31c7faacd711537878cf6fa87361d8a2c56072e2bceb24a4a09f2
-      inlined_ast: ea90b5377bb31c7faacd711537878cf6fa87361d8a2c56072e2bceb24a4a09f2
-      dce_ast: 83455083ba51c7c3b332d5973109d65dd91d6f9dd4d3134004af7f7059a6126a
+  - - initial_ast: ba9ca7398e2465dfc308b7fe3d83efdb44178278cac0b9eed64fc5fc0a025ebc
+      unrolled_ast: ba9ca7398e2465dfc308b7fe3d83efdb44178278cac0b9eed64fc5fc0a025ebc
+      ssa_ast: dfa22f7160683888fa8232faeaac983ba1432207f3fa58382e17d40afd902159
+      flattened_ast: 0b96b368b22819a10eabb3aeacba4f7371fc03bd819f7b0e8545b6f01aa0bef9
+      inlined_ast: 0b96b368b22819a10eabb3aeacba4f7371fc03bd819f7b0e8545b6f01aa0bef9
+      dce_ast: c773651a072fd6e8864ddba3652a807bfc98497b1d26a2316f3b9dc4b8a013c8
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_field.out b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_field.out
index ca9f50abdd..3104a4883d 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b52cde3d66900fe6ff9edc51bd0db5d5e66b7a07484023b5f8cdcaea3db4c1d4
-      unrolled_ast: b52cde3d66900fe6ff9edc51bd0db5d5e66b7a07484023b5f8cdcaea3db4c1d4
-      ssa_ast: b3a85d1ad46376a1133a587d0297749e2f7b399bd2e16a27aad9ee96fe38330b
-      flattened_ast: f3c896d6d707851730b289fb27d4f4ccd64aed1a0d5d33cea9e996f70d148d10
-      inlined_ast: f3c896d6d707851730b289fb27d4f4ccd64aed1a0d5d33cea9e996f70d148d10
-      dce_ast: 88f68045ef1778e6406b969425d54861c4e7ff22d581e497c144433fe8aa0a1b
+  - - initial_ast: 1fa04a660fe563cf592c5a281ad2ef94d553f92910093ce47480e25e5e608aa8
+      unrolled_ast: 1fa04a660fe563cf592c5a281ad2ef94d553f92910093ce47480e25e5e608aa8
+      ssa_ast: 3689c44bc2fcaa1702e0e553985836d8b1cbdf1f0629e0c58b086e0dce554600
+      flattened_ast: e47e488fd875c65f0e1f09a4ec3e90825942f96e3e2ef8f4a7563a9dc14e8e42
+      inlined_ast: e47e488fd875c65f0e1f09a4ec3e90825942f96e3e2ef8f4a7563a9dc14e8e42
+      dce_ast: 469290e7867d7bacca0a312f75e1b820cef086472006e8a3000687619a634cd8
       bytecode: 95a4995dce719c4217aa50f2d53231c114f7b7298bc0026f82f49193ac7b5b6c
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_group.out b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_group.out
index 5761577454..36e1f78bca 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: daa2b9659be356cf72dcaa9a76ccc253481f00e98b1b342177e6eb137eb1b7a2
-      unrolled_ast: daa2b9659be356cf72dcaa9a76ccc253481f00e98b1b342177e6eb137eb1b7a2
-      ssa_ast: 23609a16e82758d6af905469377b68bd66a52b0a69e12384a5f0a851f4e10f8d
-      flattened_ast: 1a225b79931a9ee5ed8bea7d78bca4ae3f5c90b2fd2ec67870da51f834018f0e
-      inlined_ast: 1a225b79931a9ee5ed8bea7d78bca4ae3f5c90b2fd2ec67870da51f834018f0e
-      dce_ast: d3ff566e6129b038fef2149df8e014d9ca05e663b788f15318210b3b9eda4081
+  - - initial_ast: 1232bc45ec779677465fd3c23f9cac79e2f7e3cca78f80d3d62bf057caa8d264
+      unrolled_ast: 1232bc45ec779677465fd3c23f9cac79e2f7e3cca78f80d3d62bf057caa8d264
+      ssa_ast: 5180ad4d314dfdaee7192afa4b2d36f4ff8810188c40c400871f6e41848f297b
+      flattened_ast: feab7f44da5e10eaa9c79d822e0c56d0a6e89858472c02289dfbe46588aa3c91
+      inlined_ast: feab7f44da5e10eaa9c79d822e0c56d0a6e89858472c02289dfbe46588aa3c91
+      dce_ast: 66326a8321d3090d0c8e31702fef7b58361d854cc064aa047e1008883e521587
       bytecode: e1b9cdc432a207945931a8d758bd97e7ef777d1a8dc9987bf3bfaab2dd0c9ed1
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_scalar.out
index 31da756622..41c5f745ef 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon4_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9b594500189527984ba5c28a5bd8b220ddece06380777b19fc29786cf3c92440
-      unrolled_ast: 9b594500189527984ba5c28a5bd8b220ddece06380777b19fc29786cf3c92440
-      ssa_ast: cf8abb6b4d1d8300c06d6390dc8a6e0309e464d9a38fee00c3c8395584d2093d
-      flattened_ast: 207cf092f685de0d2c563dd882b0fd6a77f646008efc774eb65081c09faff704
-      inlined_ast: 207cf092f685de0d2c563dd882b0fd6a77f646008efc774eb65081c09faff704
-      dce_ast: a8f52ef9a9e8a2f255d263e0f653fd942f5cd67123b6dc994f0a433cc163b2e0
+  - - initial_ast: e7ff4f3306b7a94f29a3cfd9dcb00954129f739e41f63645f50ec40c16617657
+      unrolled_ast: e7ff4f3306b7a94f29a3cfd9dcb00954129f739e41f63645f50ec40c16617657
+      ssa_ast: 8661ceeffca66bf69e3f24af7ffd413b98d8933ef72746398642650abd348068
+      flattened_ast: 6b9b4c6270563ef9c35787a6320c1a895eb694186dfdd362d44dc128a14f59f3
+      inlined_ast: 6b9b4c6270563ef9c35787a6320c1a895eb694186dfdd362d44dc128a14f59f3
+      dce_ast: e0123e5c349a70d06041f43c3744fa021bbb24385786b5f28f56c832ffca9ae4
       bytecode: 053ee2b47fe15b6913c2003b3bff4e3c19f6aa37c4cb98aa8559d2ba6f835e19
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_address.out b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_address.out
index 8e0a1d627c..c8d2c5586a 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_address.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_address.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 28068d28520c5780bc9321ebf20d89ef036c65766f6aeb7128215930a98c3de4
-      unrolled_ast: 28068d28520c5780bc9321ebf20d89ef036c65766f6aeb7128215930a98c3de4
-      ssa_ast: fbbb6780e2535ce4172756a2a2d241edb9c382ba4d95df21a2874afbefe76f96
-      flattened_ast: 24d179297293efa17ac2e62d3d899bb676358ddd4562f4084ecfa8c29a04f404
-      inlined_ast: 24d179297293efa17ac2e62d3d899bb676358ddd4562f4084ecfa8c29a04f404
-      dce_ast: 83455083ba51c7c3b332d5973109d65dd91d6f9dd4d3134004af7f7059a6126a
+  - - initial_ast: db7e1aba7857094f094e78fa45416b3dfd0692383e6a4111fd3cac9b203650d4
+      unrolled_ast: db7e1aba7857094f094e78fa45416b3dfd0692383e6a4111fd3cac9b203650d4
+      ssa_ast: bcab73166019ada5953d84b557278c109f37d0b24c7cde9fc28366e325995b5f
+      flattened_ast: 4a3ced7268548e1b4c77d59b82b7f42839b8a9760e6177407705530150e97716
+      inlined_ast: 4a3ced7268548e1b4c77d59b82b7f42839b8a9760e6177407705530150e97716
+      dce_ast: c773651a072fd6e8864ddba3652a807bfc98497b1d26a2316f3b9dc4b8a013c8
       bytecode: 03845ec2f54d49f71640659603ead8f68ad067a15fda438e5e13524777d1559b
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_field.out b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_field.out
index 6cd37185d8..fce36606fc 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_field.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f8fa520340af3319d0d8202ca65c6d6592de0ef3b535242e96f530e533a52ba5
-      unrolled_ast: f8fa520340af3319d0d8202ca65c6d6592de0ef3b535242e96f530e533a52ba5
-      ssa_ast: b691af7e618811238798dfcd5ba586ea3924c4ba982fbd6649954500d616722b
-      flattened_ast: 6f5d2c6c0e7eea812cc56353a0f1e31bb26cb2a6b34c73e0001c2a600ca5c6b8
-      inlined_ast: 6f5d2c6c0e7eea812cc56353a0f1e31bb26cb2a6b34c73e0001c2a600ca5c6b8
-      dce_ast: f5b2965bc8f4ccd6d87820330ef2d528b3f9606d7a7ce5951ed5423b7e4e32c8
+  - - initial_ast: 7814317048f11a03b8f07392ce6c5b8a271b6bce7664ea38905e96f7d0cb6582
+      unrolled_ast: 7814317048f11a03b8f07392ce6c5b8a271b6bce7664ea38905e96f7d0cb6582
+      ssa_ast: 30718e65d907f73409d01a7266bdbd4818e41d3adbe385d3a26d39cab587a261
+      flattened_ast: 7ac55a222667b792e48a6395c177859489eefed856cc42536a057f9d3edadf7f
+      inlined_ast: 7ac55a222667b792e48a6395c177859489eefed856cc42536a057f9d3edadf7f
+      dce_ast: bcc5b9fb4af73730bc70b2f00f31a3bb8a8fadcdd9ccef12a71a745b507ca092
       bytecode: 690ee68f3499ff63092a3d791d892fb7d2aeeb6c6b3d2d5f6f63d9c011795dae
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_group.out b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_group.out
index d9aec8ecde..8a6ef76986 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_group.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_group.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 89abe536bba4d41f14002c35db3805af05a0f4865ffcca56893d2b245fb84f29
-      unrolled_ast: 89abe536bba4d41f14002c35db3805af05a0f4865ffcca56893d2b245fb84f29
-      ssa_ast: 1bb39547297553da0558bb162f279fe8ee6e20faf0f9cc776c5f140bc5462c59
-      flattened_ast: d92147a9f923d27eb29dda605763075fade86216c8a166c87f1fbd5710ae1efd
-      inlined_ast: d92147a9f923d27eb29dda605763075fade86216c8a166c87f1fbd5710ae1efd
-      dce_ast: 5e1c57b05ad85660b6124c4f364dc574bb518ca0c451f7e6b52a9f8135877f49
+  - - initial_ast: 279f741d17af015d7a9028c7c6f83b3619c8d3d2d0240c8ea2648066af2c7847
+      unrolled_ast: 279f741d17af015d7a9028c7c6f83b3619c8d3d2d0240c8ea2648066af2c7847
+      ssa_ast: 76bc62b8820733f744e67067ab71547f4390c420ac6e0996413c08bb6f15bd8b
+      flattened_ast: f4b04d503e5dd695b34d758fa188124d4e21049749740102fb59cfe9fba24cd1
+      inlined_ast: f4b04d503e5dd695b34d758fa188124d4e21049749740102fb59cfe9fba24cd1
+      dce_ast: f93ca591857e8b049d22d2055dc4b7f3a4d7f3aa4beb184527199142469aa899
       bytecode: 5229bae4818cb4e8a8ba29f432a3a01ccef9bf8a0b8e08fe74812ee11cef1a77
       warnings: ""
diff --git a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_scalar.out b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_scalar.out
index a47b251b06..b3d9ef3cc6 100644
--- a/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_scalar.out
+++ b/tests/expectations/compiler/core/algorithms/poseidon8_hash_to_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ef5b33bdbf5214dc577e1a3631481225154c80927d16446596e6f931580413c5
-      unrolled_ast: ef5b33bdbf5214dc577e1a3631481225154c80927d16446596e6f931580413c5
-      ssa_ast: ad390eac6c6a19786569ee12637425672535815c43ffe0f9e439e8f801f56366
-      flattened_ast: 8520b7127c6293cb23ff10db4f2b75e329999cc35265dcda66f3ccc06ae76c90
-      inlined_ast: 8520b7127c6293cb23ff10db4f2b75e329999cc35265dcda66f3ccc06ae76c90
-      dce_ast: 8a446f7c19b8fbeef4f98167074509208f036d2a00695c54de5546e6df62029e
+  - - initial_ast: bd2b5358f1b34d6a04408cad6e9dd59e62361153793f4f69cb3ee64c74634233
+      unrolled_ast: bd2b5358f1b34d6a04408cad6e9dd59e62361153793f4f69cb3ee64c74634233
+      ssa_ast: bbc839b3af067d85e2a5f755be1363c42ba0c30414ebbb2a25979960427ac153
+      flattened_ast: ad95e2d3ed8e0362be836fa86430229b8bc7ff1b91c5026e727bb6eca667a863
+      inlined_ast: ad95e2d3ed8e0362be836fa86430229b8bc7ff1b91c5026e727bb6eca667a863
+      dce_ast: ad1028854937c981f38a5f9e36bcd9c65f7c241a3975768ad9be154f0605e002
       bytecode: 397b98917e888dd3277208cbe7d4957b3f89434f37c3bdd483fc76144303196d
       warnings: ""
diff --git a/tests/expectations/compiler/core/constants/group_gen.out b/tests/expectations/compiler/core/constants/group_gen.out
index eaeb2bb8b6..5694b0a92d 100644
--- a/tests/expectations/compiler/core/constants/group_gen.out
+++ b/tests/expectations/compiler/core/constants/group_gen.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f13e78e605d04e42af8d2a617dd9715637bb4d254f4087e7a202a37d0493da3b
-      unrolled_ast: f13e78e605d04e42af8d2a617dd9715637bb4d254f4087e7a202a37d0493da3b
-      ssa_ast: cb45d3a8a4013582a892d94322562c61e499c97a39215ad93c28ef0fd5f0f861
-      flattened_ast: 9a9007e3625a5394398b2309a67d1ee4b91eb7e1a5018abc539e86a5b66a6b29
-      inlined_ast: 9a9007e3625a5394398b2309a67d1ee4b91eb7e1a5018abc539e86a5b66a6b29
-      dce_ast: 9a9007e3625a5394398b2309a67d1ee4b91eb7e1a5018abc539e86a5b66a6b29
+  - - initial_ast: 57a421e1f4bca396493b97f82baeae7e58b641d925add025991b89b4e2e9b5a5
+      unrolled_ast: 57a421e1f4bca396493b97f82baeae7e58b641d925add025991b89b4e2e9b5a5
+      ssa_ast: 196fc97eef0ebd69083e41dd5b386e29d2009e228d777f7e2a0910a38e2a2cc7
+      flattened_ast: 8946f3d1b32fafd644deeb402e538fe1523bc40fb943f7329ef1679a6980853e
+      inlined_ast: 8946f3d1b32fafd644deeb402e538fe1523bc40fb943f7329ef1679a6980853e
+      dce_ast: 8946f3d1b32fafd644deeb402e538fe1523bc40fb943f7329ef1679a6980853e
       bytecode: cd542f776048c64f42b745a4be5ebe93fe7a8638c8d1692d3d774d491cadfe45
       warnings: ""
diff --git a/tests/expectations/compiler/definition/out_of_order.out b/tests/expectations/compiler/definition/out_of_order.out
index 327af65746..188b0db1aa 100644
--- a/tests/expectations/compiler/definition/out_of_order.out
+++ b/tests/expectations/compiler/definition/out_of_order.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6c0ccdf23f835f3b279218cc4d75d2c6967c0ac2a5fbeb66f1e9467d13f63a5a
-      unrolled_ast: 6c0ccdf23f835f3b279218cc4d75d2c6967c0ac2a5fbeb66f1e9467d13f63a5a
-      ssa_ast: 6c0a5d9e5afcaed275a5bfd37eff3e8c2dbe83f5c965d21b1a1511c619f439b3
-      flattened_ast: 8fea8a7e69fde9981a57b0577c80691f7169b54c9cb5970f55b7bd8c76435e9b
-      inlined_ast: 8fea8a7e69fde9981a57b0577c80691f7169b54c9cb5970f55b7bd8c76435e9b
-      dce_ast: 8fea8a7e69fde9981a57b0577c80691f7169b54c9cb5970f55b7bd8c76435e9b
+  - - initial_ast: 49989a6807d105a2e17ce794a41f04ee53727f569d365ae2eee8aa3962c58a00
+      unrolled_ast: 49989a6807d105a2e17ce794a41f04ee53727f569d365ae2eee8aa3962c58a00
+      ssa_ast: 66a6dbe97e2f12b7cc109a308b2cf11dd50622a3d733672f4a23a9c03237ee0c
+      flattened_ast: 2576f6bdbddfedce4f546ed26b62de266b84e32181ea494bc6ae0e1d6c80e25d
+      inlined_ast: 2576f6bdbddfedce4f546ed26b62de266b84e32181ea494bc6ae0e1d6c80e25d
+      dce_ast: 2576f6bdbddfedce4f546ed26b62de266b84e32181ea494bc6ae0e1d6c80e25d
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/examples/auction.out b/tests/expectations/compiler/examples/auction.out
index 7a85da3ee6..de18966d2a 100644
--- a/tests/expectations/compiler/examples/auction.out
+++ b/tests/expectations/compiler/examples/auction.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 36e57e8b703fdf6bc31a1dad1dceea1555a44ff3efc56243a5e71c639d020ab3
-      unrolled_ast: 36e57e8b703fdf6bc31a1dad1dceea1555a44ff3efc56243a5e71c639d020ab3
-      ssa_ast: 56da2223f44516b66ec11d9d7d7a317061908922520b42cf8b84c3cb2e672341
-      flattened_ast: 775d946b6161596c921b28912da8637c259560aa7e7a4900c6841dca9d321e55
-      inlined_ast: 775d946b6161596c921b28912da8637c259560aa7e7a4900c6841dca9d321e55
-      dce_ast: 775d946b6161596c921b28912da8637c259560aa7e7a4900c6841dca9d321e55
+  - - initial_ast: c93fd56043d2a83608473948d6e6efcde42c4253fe7b704ad0db8e436ee66fd3
+      unrolled_ast: c93fd56043d2a83608473948d6e6efcde42c4253fe7b704ad0db8e436ee66fd3
+      ssa_ast: afda6fc7a505a9577ab97f55f8d23f9426de4c5a34521242b44ebc1e10851473
+      flattened_ast: 43666c838ec0d008395a531d01955051f214116fdd7efe49aaa2fc374a1bae95
+      inlined_ast: 43666c838ec0d008395a531d01955051f214116fdd7efe49aaa2fc374a1bae95
+      dce_ast: 43666c838ec0d008395a531d01955051f214116fdd7efe49aaa2fc374a1bae95
       bytecode: ae52309998de7e291d82e92418fdbf583b182ce12e710e844550132d8743380e
       warnings: ""
diff --git a/tests/expectations/compiler/examples/basic_bank.out b/tests/expectations/compiler/examples/basic_bank.out
index 0ee15de4a8..18076ad014 100644
--- a/tests/expectations/compiler/examples/basic_bank.out
+++ b/tests/expectations/compiler/examples/basic_bank.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3feb893cd0da7691df20fec71fca6c7a54f20f2f1f21879cf9701f97010a1b35
-      unrolled_ast: 28188456b54adda11175fff151879d1e3939dae9b56c1199c22468407e69160a
-      ssa_ast: 3790d3ccf1fa85c8b3cc7f8dd9eee446dd4ae07dcacff734b60797bf79f6a90b
-      flattened_ast: aa0614b9766729ead5aac71c49a42697c3b0e758b22a84125bb2cac06d2a1051
-      inlined_ast: 0c964a9a77bab09d2da8874a20caa8099855fec39c65eff8cc5a18860c431d76
-      dce_ast: 0c964a9a77bab09d2da8874a20caa8099855fec39c65eff8cc5a18860c431d76
+  - - initial_ast: c9bc5928056fd0fe53f17a7c08118b5663f6b60bc6c97aff295787fc81eba97f
+      unrolled_ast: ec3f9e17e3c26a082b30c7eb85770850552fc9f97645e50c1c79045a33feb64f
+      ssa_ast: 49281053d4c1680fd6293f6f9f08a372a63051dc2e8df88ee4b2a3426a0c2948
+      flattened_ast: 604abbbf8e8d10c7784f83ce201dd9150155e04d2d5158e1af38770f7f721db7
+      inlined_ast: c1888dc8a7d058a6c9642744321c49213185481a10a27c396362666c603bea6e
+      dce_ast: c1888dc8a7d058a6c9642744321c49213185481a10a27c396362666c603bea6e
       bytecode: be8569b9078a1e6b21fe4e02ce9ab03cbe599d3cddb777fb6a146da15ca71559
       warnings: ""
diff --git a/tests/expectations/compiler/examples/board.out b/tests/expectations/compiler/examples/board.out
index 9897a1b0f6..64e7199b3f 100644
--- a/tests/expectations/compiler/examples/board.out
+++ b/tests/expectations/compiler/examples/board.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4c87c2e4c446376e5a5c5d8826a4196b827e49e89e453620f42102a1c3aa5878
-      unrolled_ast: 4c87c2e4c446376e5a5c5d8826a4196b827e49e89e453620f42102a1c3aa5878
-      ssa_ast: c77918d0c3545f108cd4fcc6cab2c3095792874bf04e1495db9dff2744a89ed4
-      flattened_ast: 52a891d5c6919ddefff2f2daec06fcce0bce1966181c3f6d47789efd159db1da
-      inlined_ast: 52a891d5c6919ddefff2f2daec06fcce0bce1966181c3f6d47789efd159db1da
-      dce_ast: 52a891d5c6919ddefff2f2daec06fcce0bce1966181c3f6d47789efd159db1da
+  - - initial_ast: d5be8fee6d81e342960c0422830cad66747617795c5fa7adaedb2088dce3be97
+      unrolled_ast: d5be8fee6d81e342960c0422830cad66747617795c5fa7adaedb2088dce3be97
+      ssa_ast: 304bd2dd3450cd385a9f760eea0519cd86025712e4a11da1403b8bffb23816fe
+      flattened_ast: 2826ed0f1c04c254a9caef5459eeeb756f0868b9680d6dda27689c86ec856602
+      inlined_ast: 2826ed0f1c04c254a9caef5459eeeb756f0868b9680d6dda27689c86ec856602
+      dce_ast: 2826ed0f1c04c254a9caef5459eeeb756f0868b9680d6dda27689c86ec856602
       bytecode: aefb5e5a0f121ad8132981b01cc28fb487f749faf8306b7dc9d1b6c3400af180
       warnings: ""
diff --git a/tests/expectations/compiler/examples/bubblesort.out b/tests/expectations/compiler/examples/bubblesort.out
index f3cf13d78e..86ac38f4c8 100644
--- a/tests/expectations/compiler/examples/bubblesort.out
+++ b/tests/expectations/compiler/examples/bubblesort.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 758a3756cf155a410b6f550cc4c3dc0a678faadbaf93a880d6d5637aa03a0004
-      unrolled_ast: 758a3756cf155a410b6f550cc4c3dc0a678faadbaf93a880d6d5637aa03a0004
-      ssa_ast: 9b5419a8a1ae1074cff47895cf7bfb40ac51b5d165e61d0debdffd0d5abda0ce
-      flattened_ast: e254e0df3ef5cf54aed0224972fa5cbb1bc585d422b301bda87bcdb744c8f005
-      inlined_ast: e254e0df3ef5cf54aed0224972fa5cbb1bc585d422b301bda87bcdb744c8f005
-      dce_ast: e254e0df3ef5cf54aed0224972fa5cbb1bc585d422b301bda87bcdb744c8f005
+  - - initial_ast: 7a3df30fd8ea81640528bff4f3fb76ec9b31982c85e549591763b07b43272e25
+      unrolled_ast: 7a3df30fd8ea81640528bff4f3fb76ec9b31982c85e549591763b07b43272e25
+      ssa_ast: 91d7c87a5f9193ab05a7d20aa18802dd65a1e045ece38c0726807e6adf11a5a9
+      flattened_ast: 36fa25c2c265da330970a994866140ca181be922ad00f86eeb7cd03dd082cd06
+      inlined_ast: 36fa25c2c265da330970a994866140ca181be922ad00f86eeb7cd03dd082cd06
+      dce_ast: 36fa25c2c265da330970a994866140ca181be922ad00f86eeb7cd03dd082cd06
       bytecode: 5adbf2387ed6209b64c8248741f74929f524771803ef803d5d9f9f8fb0d66ee7
       warnings: ""
diff --git a/tests/expectations/compiler/examples/core.out b/tests/expectations/compiler/examples/core.out
index 056322b276..e9e115f914 100644
--- a/tests/expectations/compiler/examples/core.out
+++ b/tests/expectations/compiler/examples/core.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c3298df8bc58c9e8ac5b769978ce645a752c0fb727d07d4ef3104989bdb85c8a
-      unrolled_ast: c3298df8bc58c9e8ac5b769978ce645a752c0fb727d07d4ef3104989bdb85c8a
-      ssa_ast: f71e476e2fe42cd06d7e9fcb9ad5d8f13dec1d8c8891030ab42581532c848c77
-      flattened_ast: 466af3044b17ee880559becf47b8104fa7b0f38528aea46805867e9bfc886d70
-      inlined_ast: 466af3044b17ee880559becf47b8104fa7b0f38528aea46805867e9bfc886d70
-      dce_ast: 466af3044b17ee880559becf47b8104fa7b0f38528aea46805867e9bfc886d70
+  - - initial_ast: d597a45330c7ee85ebf11051fcf24ad713f2c453fedee62200c9bc44c800901d
+      unrolled_ast: d597a45330c7ee85ebf11051fcf24ad713f2c453fedee62200c9bc44c800901d
+      ssa_ast: fc3929c9bcee6d1b1b0f4b27b4adc92440504d370cf6263f6307cfd0276c6896
+      flattened_ast: b10b0e4c31b8e5b225e38a4d15f28392bd7a05ced8533ef082b64f049acdfaac
+      inlined_ast: b10b0e4c31b8e5b225e38a4d15f28392bd7a05ced8533ef082b64f049acdfaac
+      dce_ast: b10b0e4c31b8e5b225e38a4d15f28392bd7a05ced8533ef082b64f049acdfaac
       bytecode: 97f5fb0da6f869aa976736f28bedc7d21d49fc7debdb7c5eda6789c82ec61d67
       warnings: ""
diff --git a/tests/expectations/compiler/examples/fibonacci.out b/tests/expectations/compiler/examples/fibonacci.out
index 3a9a64243f..169e95f466 100644
--- a/tests/expectations/compiler/examples/fibonacci.out
+++ b/tests/expectations/compiler/examples/fibonacci.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f8f8b45bf6af6236fc3c4f5606ce8c0c1ae6e5d0d64cb7cb701ce94d11c7493f
-      unrolled_ast: beecd4df9f6c499c2bd519a2b236e966d9fa06a02ecf739e14a52fac7282ef1c
-      ssa_ast: 9b99aab2868930aca414cbcd2ae5949de2bf914709e613fc3b128881310eadaf
-      flattened_ast: d1502d8ee4d9c2a907ec51ae98dcfda14a4c0efe1a3b941cec5744bebdbd42e4
-      inlined_ast: a8c86fc88864ad71f874d3951056e213cca67a1caae8bb5e82bbb0e6eb82fc13
-      dce_ast: 3380603123782bc7b5374bfebc2f1e384c7c4603b2c5f4e418e1d90642fe9e02
+  - - initial_ast: 7bfb505ef89d0f5fe1dbbc7ab85e62100461dd73e3b4d128b00edae6622e0c3c
+      unrolled_ast: 4204838ef63825c0452f5d296bb0968f90462cb0b42becdf1a1f4fc2a3c05477
+      ssa_ast: 63c080b738ea1bf8b032145271e1c32cce08ff13378d82e73f86a658555aa2b6
+      flattened_ast: 10298e686e42c9d2d1ba492ebf2091320944255b1c8a34386ff78651d93eafb2
+      inlined_ast: 3e4d5b084f1b1d163aad4652a8f30893c50906b83fc9a3748485fea1d635eff0
+      dce_ast: 4bae1b5925647919f1f2656213c2ba01d15783161a8cd7ce78db9b1bca37bef5
       bytecode: 3b90abd4333a964993382d9f47ba381cdd732a342f8b28828b99870c6dfafffc
       warnings: ""
diff --git a/tests/expectations/compiler/examples/groups.out b/tests/expectations/compiler/examples/groups.out
index 516e1e7810..fdbb2ae112 100644
--- a/tests/expectations/compiler/examples/groups.out
+++ b/tests/expectations/compiler/examples/groups.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3aa16f9de09c25f30f3d399f9751e61ea7123bb17cf77ca569aeb0d9d95819f1
-      unrolled_ast: 3aa16f9de09c25f30f3d399f9751e61ea7123bb17cf77ca569aeb0d9d95819f1
-      ssa_ast: 02c918cb6387d79718dfc739ed5bab59f53d29a108c0dd3bf38b31fd46f8feab
-      flattened_ast: 3982d821c20ed71d3e1ee7719db92ff3f8613a729da0839fd8535cd67f802b62
-      inlined_ast: 3982d821c20ed71d3e1ee7719db92ff3f8613a729da0839fd8535cd67f802b62
-      dce_ast: 3982d821c20ed71d3e1ee7719db92ff3f8613a729da0839fd8535cd67f802b62
+  - - initial_ast: b1af3b70a9cee944e37d5fac81d911fbcc9a3375179cd86aaee367de81c4d42e
+      unrolled_ast: b1af3b70a9cee944e37d5fac81d911fbcc9a3375179cd86aaee367de81c4d42e
+      ssa_ast: 4e522695cc0d19152fb7dcd41ca6de60135a4d07ff3fd478efab304c5c49ba93
+      flattened_ast: 57fae88173f84f18daf99a74588786b43050289a32c2774b9651dbef3b9c5cc9
+      inlined_ast: 57fae88173f84f18daf99a74588786b43050289a32c2774b9651dbef3b9c5cc9
+      dce_ast: 57fae88173f84f18daf99a74588786b43050289a32c2774b9651dbef3b9c5cc9
       bytecode: 45196976b60c465ad542b11fe200c16d15959a4bf4d4a48f348aab42df3407ef
       warnings: ""
diff --git a/tests/expectations/compiler/examples/helloworld.out b/tests/expectations/compiler/examples/helloworld.out
index b5b18eaa6d..875ff13e20 100644
--- a/tests/expectations/compiler/examples/helloworld.out
+++ b/tests/expectations/compiler/examples/helloworld.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 68232c96230e9acd154a34a50545b8847672b9d1d04e8841768eab4b256f087c
-      unrolled_ast: 68232c96230e9acd154a34a50545b8847672b9d1d04e8841768eab4b256f087c
-      ssa_ast: 54e1eb7663c0697bd768b8aeb1bec147c7db80de49d63687cc68ef2813094b80
-      flattened_ast: fe4eb4dd9e26b7e32f3461dd1f2aee200c3d9e10f1569fa51483cb3b279b6851
-      inlined_ast: fe4eb4dd9e26b7e32f3461dd1f2aee200c3d9e10f1569fa51483cb3b279b6851
-      dce_ast: fe4eb4dd9e26b7e32f3461dd1f2aee200c3d9e10f1569fa51483cb3b279b6851
+  - - initial_ast: ec3b71190af98867641771bbc880280b2f2e9d3f5258de1b7925eced8b448c97
+      unrolled_ast: ec3b71190af98867641771bbc880280b2f2e9d3f5258de1b7925eced8b448c97
+      ssa_ast: 95b062630f901b79564ba60cc249f03d4a7ab3536d76795b32909581b0343239
+      flattened_ast: 88c594e758f45506b9ec9eccfb028cfe1a5029fd3829bf2eee3e9d7916417e13
+      inlined_ast: 88c594e758f45506b9ec9eccfb028cfe1a5029fd3829bf2eee3e9d7916417e13
+      dce_ast: 88c594e758f45506b9ec9eccfb028cfe1a5029fd3829bf2eee3e9d7916417e13
       bytecode: 774672545059d524d17b2709ca4d2f66dcc7fca13c4199ff8b5bf4a03d4d6c6a
       warnings: ""
diff --git a/tests/expectations/compiler/examples/interest.out b/tests/expectations/compiler/examples/interest.out
index eeb5844510..bf899608b7 100644
--- a/tests/expectations/compiler/examples/interest.out
+++ b/tests/expectations/compiler/examples/interest.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6ac80263697cb0834ce577617134e7f55b9c1d93b2b6337e20eed88d45a301e7
-      unrolled_ast: 0ecb48e775aa990fe7e13ace6242125e3454eae914f3cdfadc8bcafce90f9d48
-      ssa_ast: 6c076e84d35182885e5dc20cff6fe2b7d0ed0fbc2aed94f84c84f0ce307f5387
-      flattened_ast: d7e677b6d9889f5835a45f4de932ba5435c72a0cc472478df751053c754595e5
-      inlined_ast: d7e677b6d9889f5835a45f4de932ba5435c72a0cc472478df751053c754595e5
-      dce_ast: 3dd09c4169bc6cb996a9c3faece143715ead8b3059a9a9ea78e0d848b4a36ffd
+  - - initial_ast: 753007d8849c2cd906688497f3540e27c52d53d2822dadf2d8aadff155631734
+      unrolled_ast: 7b0ce0a1a7b4367be19e37234ffee093014c1e884855bb9f7a5f26e0fab36359
+      ssa_ast: a9c3136594bdca6b73fb06bd44d485d23f35126e0b5ff584f0e9ef046850fbc4
+      flattened_ast: eaa7f286d75d91ec80501d0dbcd94c11dca3ca1d9e253117c0fdc6b9f6f22c46
+      inlined_ast: eaa7f286d75d91ec80501d0dbcd94c11dca3ca1d9e253117c0fdc6b9f6f22c46
+      dce_ast: 21ede0529c29ddea7f15765a380e8bb50e1ea2d2cccb2e2400f738e579d41bd8
       bytecode: 1425e7c87a38072c342ef9505090c0b039663ac1c5ce41632f999b376c81d348
       warnings: ""
diff --git a/tests/expectations/compiler/examples/lottery.out b/tests/expectations/compiler/examples/lottery.out
index 1612d7de53..435a890305 100644
--- a/tests/expectations/compiler/examples/lottery.out
+++ b/tests/expectations/compiler/examples/lottery.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 073edb19a9a61a05e639cb802f8b63aa9ebf4d50f962d63c8bb07431b4226d5a
-      unrolled_ast: 073edb19a9a61a05e639cb802f8b63aa9ebf4d50f962d63c8bb07431b4226d5a
-      ssa_ast: 062b7d3a773b0f36385106250f30dce22cdcfc03c0fe737051496d8dad8ee2ee
-      flattened_ast: 40ed1586869cd5bfad8d9cc6572103d572d898ff8fa9a1bd3c75cfe9819d9887
-      inlined_ast: 40ed1586869cd5bfad8d9cc6572103d572d898ff8fa9a1bd3c75cfe9819d9887
-      dce_ast: 40ed1586869cd5bfad8d9cc6572103d572d898ff8fa9a1bd3c75cfe9819d9887
+  - - initial_ast: 55016c70a854d6a579cefdcae66b17d221b4334e32cd252692dbbb0b77b36d27
+      unrolled_ast: 55016c70a854d6a579cefdcae66b17d221b4334e32cd252692dbbb0b77b36d27
+      ssa_ast: bdc2e2f3f79aae3924fd343988dad3d7e27a76318d60537683e876a91767fd47
+      flattened_ast: 5b035cdee93dd7a9066e49783ff1305a319fd6fa2c3900df59b54e742ac027e6
+      inlined_ast: 5b035cdee93dd7a9066e49783ff1305a319fd6fa2c3900df59b54e742ac027e6
+      dce_ast: 5b035cdee93dd7a9066e49783ff1305a319fd6fa2c3900df59b54e742ac027e6
       bytecode: e37c8723337c177f6b9b7b5eac3e4b9aa8e45b28d26ea76439161cb97e4d251a
       warnings: ""
diff --git a/tests/expectations/compiler/examples/message.out b/tests/expectations/compiler/examples/message.out
index 7120794ffb..d7bba0fd5e 100644
--- a/tests/expectations/compiler/examples/message.out
+++ b/tests/expectations/compiler/examples/message.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c670b1f0ff734d789b8bdff8f9bd445e72418792f731475627c0604dfc5695e9
-      unrolled_ast: c670b1f0ff734d789b8bdff8f9bd445e72418792f731475627c0604dfc5695e9
-      ssa_ast: 968319609ce71996bf6302b9012c8ead1e917fbd0474db3c5f9654bd4f2c64fe
-      flattened_ast: 7980723bc3f66516f70c5c5865d4bcfcd959220aba1e1ca2dbeff14f0c4f7b3b
-      inlined_ast: 7980723bc3f66516f70c5c5865d4bcfcd959220aba1e1ca2dbeff14f0c4f7b3b
-      dce_ast: 7980723bc3f66516f70c5c5865d4bcfcd959220aba1e1ca2dbeff14f0c4f7b3b
+  - - initial_ast: 298a793f4e4e3ae8e461362fa8e8cbabfd7491331a19088eb0bd487f1dc62ea3
+      unrolled_ast: 298a793f4e4e3ae8e461362fa8e8cbabfd7491331a19088eb0bd487f1dc62ea3
+      ssa_ast: 948ff608f3950f0c495e97ff9d929df3773a782adbb7f197f311a38f84a09bfb
+      flattened_ast: 9ea9358fc3032e81a81c3124d4048645fcac7c4beb4607dd80bec09c2140cabf
+      inlined_ast: 9ea9358fc3032e81a81c3124d4048645fcac7c4beb4607dd80bec09c2140cabf
+      dce_ast: 9ea9358fc3032e81a81c3124d4048645fcac7c4beb4607dd80bec09c2140cabf
       bytecode: ecb647f74261a2c1212405edf2024aed89ab5e3c19353127dacdc9e31ccaf0f1
       warnings: ""
diff --git a/tests/expectations/compiler/examples/move.out b/tests/expectations/compiler/examples/move.out
index 519924dbef..388a42f581 100644
--- a/tests/expectations/compiler/examples/move.out
+++ b/tests/expectations/compiler/examples/move.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7eada070a3be92bd7be0c60f373f326e0f9f50f84c20b1a8b3cb68c9b5a47e8a
-      unrolled_ast: 7eada070a3be92bd7be0c60f373f326e0f9f50f84c20b1a8b3cb68c9b5a47e8a
-      ssa_ast: 543089384ab81fd89fdb4a7eef0956a510af4f3d75bdd1ef308450752733212e
-      flattened_ast: 316b1aefa1f3494d150f7e9812673292df8ca8dbc157e6829050972a2d9c3ab6
-      inlined_ast: 316b1aefa1f3494d150f7e9812673292df8ca8dbc157e6829050972a2d9c3ab6
-      dce_ast: 316b1aefa1f3494d150f7e9812673292df8ca8dbc157e6829050972a2d9c3ab6
+  - - initial_ast: bd5d74d72808b4c41ce341a9de74a1c97c825cdf6f682e37c24500468f10be7f
+      unrolled_ast: bd5d74d72808b4c41ce341a9de74a1c97c825cdf6f682e37c24500468f10be7f
+      ssa_ast: bdf2b040f0aa692dabb75d575d09d874194812e717ea89ae36c0bbbd8477a686
+      flattened_ast: ebabd9d811704b1e60109ca18e2091c63c740005712e3b8e475f8bd0ed48f110
+      inlined_ast: ebabd9d811704b1e60109ca18e2091c63c740005712e3b8e475f8bd0ed48f110
+      dce_ast: ebabd9d811704b1e60109ca18e2091c63c740005712e3b8e475f8bd0ed48f110
       bytecode: 6ea0a455c7cc5f2bd868d5780a7735c599fb95c99157997d156dce175d6c6e94
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzdebruijn.out b/tests/expectations/compiler/examples/ntzdebruijn.out
index 1a4fbb0b89..3815a06c99 100644
--- a/tests/expectations/compiler/examples/ntzdebruijn.out
+++ b/tests/expectations/compiler/examples/ntzdebruijn.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 82bcfcad25380faed88f3147488106d2d4ae3046ba9fab796cf2979997ea1232
-      unrolled_ast: 82bcfcad25380faed88f3147488106d2d4ae3046ba9fab796cf2979997ea1232
-      ssa_ast: 944eeca224118f5cbc1b80ddf21273bdfe225ecb98c5c8b60d180e919b77131f
-      flattened_ast: 0160ba8010e656ff5bdc63b41d3b09e5da0bac1dfcfcb3827fca97561dec2dad
-      inlined_ast: d7beb67cca74d30994639364d87a7c59a91db08de9c9a5de6e0197776865c4a4
-      dce_ast: d7beb67cca74d30994639364d87a7c59a91db08de9c9a5de6e0197776865c4a4
+  - - initial_ast: 5bb9ac7d799f0bbebee652d35695cd9d925263229171a9b79e13d3e2ea93e652
+      unrolled_ast: 5bb9ac7d799f0bbebee652d35695cd9d925263229171a9b79e13d3e2ea93e652
+      ssa_ast: 4e8f0e10a40149769f407fb8cc5d9f3ddc5fe7d840680c186ec3e25a3fae4b59
+      flattened_ast: 4502248f13b20cb58379b702b02fb5fe9a39e746fc05288ae683b37875fb1c0d
+      inlined_ast: 04b8e99bcd5f03eb6d793491e1ab8052dd23c99b894ce3070d370c7b9161ff86
+      dce_ast: 04b8e99bcd5f03eb6d793491e1ab8052dd23c99b894ce3070d370c7b9161ff86
       bytecode: ecf52756cc54e0e43ccfeb4db8369ff820a309fd7061bfaad5dcf535b58782b3
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzgaudet.out b/tests/expectations/compiler/examples/ntzgaudet.out
index 5f182090ad..4b0e6bc0d7 100644
--- a/tests/expectations/compiler/examples/ntzgaudet.out
+++ b/tests/expectations/compiler/examples/ntzgaudet.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c15227790ac7808884864e33c61926bc540cb9c5bbac8cf97225d35273b3204d
-      unrolled_ast: c15227790ac7808884864e33c61926bc540cb9c5bbac8cf97225d35273b3204d
-      ssa_ast: 5fe5d598d9652d8dbcae64dc9df0ee52bb9072135fc4095341d2e5ad58690404
-      flattened_ast: ca031cca45092ec0e34114673a3c20d978dabba8274cbe65b132a17be9a82ee6
-      inlined_ast: ca031cca45092ec0e34114673a3c20d978dabba8274cbe65b132a17be9a82ee6
-      dce_ast: ca031cca45092ec0e34114673a3c20d978dabba8274cbe65b132a17be9a82ee6
+  - - initial_ast: 08836fc9111ff390e1ed662520a358ea20ca461d9fa588af593790669f01f277
+      unrolled_ast: 08836fc9111ff390e1ed662520a358ea20ca461d9fa588af593790669f01f277
+      ssa_ast: 7b2c041f84b6051004cc85c39f2e7a25cab576883fcc3ac2b3f45cc87d097792
+      flattened_ast: 0068c0fa6036d7821155ef1e9822144f99d610960af4d12b58f1c50f015e5a55
+      inlined_ast: 0068c0fa6036d7821155ef1e9822144f99d610960af4d12b58f1c50f015e5a55
+      dce_ast: 0068c0fa6036d7821155ef1e9822144f99d610960af4d12b58f1c50f015e5a55
       bytecode: 5fd0ec18707f7e6af93b8eacd72590b4bfd68559dba48ab95574a0b44a0b3313
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzloops.out b/tests/expectations/compiler/examples/ntzloops.out
index 3849e9b58f..6a2d9f48e2 100644
--- a/tests/expectations/compiler/examples/ntzloops.out
+++ b/tests/expectations/compiler/examples/ntzloops.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1e32e93ae7582f2e0fe27888557079014924051c8878dce3214ba0013c6ca8fa
-      unrolled_ast: e226c71203a62194c51f3bac97e1c65faded001626a327c939c6022b9d8e5ca0
-      ssa_ast: cc1a1e538e6e24cc4591d6c2636d48ca53dd356ed0fa95bbd8e0310b58bb50a5
-      flattened_ast: 9782db147c21248caba58c482b5167c245f66c5a4c20ff4134f63d8fc41ab22c
-      inlined_ast: 9782db147c21248caba58c482b5167c245f66c5a4c20ff4134f63d8fc41ab22c
-      dce_ast: 03ad21f546d2f21939e34df41d54475f77e21468bbc20e02386d4132fa560f4e
+  - - initial_ast: bd70e594628c9044ee11bcb6afc4749fa0432da35e3865915e54862369b116c3
+      unrolled_ast: 99b8e20c68e3ddff3e7ae23caefd0a56fdc5307b0599b4bfce3317af9fbf86f4
+      ssa_ast: a30f4d53d76670846193d28bd6d35ca25825eb8e891b0f00fb15e606268a06d4
+      flattened_ast: 87c7ec9d2fa51c838eb3dd61a963815bb6e8ddaa9a01adbbf7eb567e189eaf5a
+      inlined_ast: 87c7ec9d2fa51c838eb3dd61a963815bb6e8ddaa9a01adbbf7eb567e189eaf5a
+      dce_ast: e55d57a7ec79d1cc3571ee8a60ce9163b6d1a0fff549d8a458e671b8013b1089
       bytecode: cca4637103b23653c5a99744693068186bc6d89052df73b09c1601c7f85f0eed
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzmasks.out b/tests/expectations/compiler/examples/ntzmasks.out
index fa473b7113..08823cb19e 100644
--- a/tests/expectations/compiler/examples/ntzmasks.out
+++ b/tests/expectations/compiler/examples/ntzmasks.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 545163551411271e1ca8c2be9820554fe043ba944e48357e6f74fb47b8373dd7
-      unrolled_ast: 545163551411271e1ca8c2be9820554fe043ba944e48357e6f74fb47b8373dd7
-      ssa_ast: 80638a7f9f199447fc4b05b578c6d875e2cd727667bb83199e69e5ed48460a5d
-      flattened_ast: 0d8c07d2175221c2e6302f796be911abf7b45f9456e8c3a1d59a1913819e0335
-      inlined_ast: 0d8c07d2175221c2e6302f796be911abf7b45f9456e8c3a1d59a1913819e0335
-      dce_ast: 0d8c07d2175221c2e6302f796be911abf7b45f9456e8c3a1d59a1913819e0335
+  - - initial_ast: 5de201a73126dbcaedb37a3aac622086277f627cb5d713577edfd94c9aae5d80
+      unrolled_ast: 5de201a73126dbcaedb37a3aac622086277f627cb5d713577edfd94c9aae5d80
+      ssa_ast: 5b77f7106b9eedc9f60da8f2b9f4ea997a2b19282dd04e699341812746c9f000
+      flattened_ast: 1b217cb3309ce46036bde955ff75a324f10bbcdd3e67e7275eb76455d2d348fc
+      inlined_ast: 1b217cb3309ce46036bde955ff75a324f10bbcdd3e67e7275eb76455d2d348fc
+      dce_ast: 1b217cb3309ce46036bde955ff75a324f10bbcdd3e67e7275eb76455d2d348fc
       bytecode: 9aba49a906bfc3f931cb314bd970e04dc8b74966ec2888efecc4f0f8795dc368
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzreisers.out b/tests/expectations/compiler/examples/ntzreisers.out
index 5f363c2b0d..580bae86fd 100644
--- a/tests/expectations/compiler/examples/ntzreisers.out
+++ b/tests/expectations/compiler/examples/ntzreisers.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a5926917c12c89f405e96918cdd5436ac994315fb049ebb972544c36068d8b4f
-      unrolled_ast: a5926917c12c89f405e96918cdd5436ac994315fb049ebb972544c36068d8b4f
-      ssa_ast: 69683355c8ffaf9357b3d299a162d8ae1601a2b09b71d56cf6e17bd707b6d534
-      flattened_ast: 7d5678ee0f785e3f8182ec61267ab41c1bfceefaf2120f5de98b1e2d7dd74e38
-      inlined_ast: a04c2ee3bb82fcdd3d84b95b1bc3aba02de92f20b0e99dd85f9485252b8030d7
-      dce_ast: a04c2ee3bb82fcdd3d84b95b1bc3aba02de92f20b0e99dd85f9485252b8030d7
+  - - initial_ast: 9a44c33037b1242bfa46f75122eb4e38816b8eef7d213265878a3b1cbcf2632a
+      unrolled_ast: 9a44c33037b1242bfa46f75122eb4e38816b8eef7d213265878a3b1cbcf2632a
+      ssa_ast: de5dc43480ed438ca2fe6d91fe4bc6f24433da961331ef0ade5cd80290d8e9b3
+      flattened_ast: 948b19e835b6395d4721b012264b2199c0e88bc0a70cab5e7a0720acfa3c7575
+      inlined_ast: e6e68b2bdf75ce8801e082e5e6545236d9dc8aeb3ca783dff94a5fcbf6d514e9
+      dce_ast: e6e68b2bdf75ce8801e082e5e6545236d9dc8aeb3ca783dff94a5fcbf6d514e9
       bytecode: 38e21ed198874357b0a83d451d9498a59838a7f5ad979d372a405b5e6e5a4e17
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzseals.out b/tests/expectations/compiler/examples/ntzseals.out
index 60e1c8ea08..9a4f3b4b5e 100644
--- a/tests/expectations/compiler/examples/ntzseals.out
+++ b/tests/expectations/compiler/examples/ntzseals.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 25f4a732b48585dbd6ea737ea5a60289f64857f4b1dccc86ac4fc5f75038ea80
-      unrolled_ast: 25f4a732b48585dbd6ea737ea5a60289f64857f4b1dccc86ac4fc5f75038ea80
-      ssa_ast: 2b4c1ecd46e339e1320e318c95fa574f6f17e5a69f891fadb69abc9131884097
-      flattened_ast: 5ed9e828678cc696412b8263766d9634817b383d47eda3906619fb98d8af5a91
-      inlined_ast: 745aaed24f3290e686f1a75efaff416d9865c490c95069856f80f80d519b71a1
-      dce_ast: 745aaed24f3290e686f1a75efaff416d9865c490c95069856f80f80d519b71a1
+  - - initial_ast: f9f85783f0c4119ea5a149326a9b6ab9a8bcbb60575aaec4ad5c33500f383e56
+      unrolled_ast: f9f85783f0c4119ea5a149326a9b6ab9a8bcbb60575aaec4ad5c33500f383e56
+      ssa_ast: 04f994691d01fc25f3d580bde2dd14b7ea9751de4c68e50eecd987db7b902011
+      flattened_ast: fade9668896877538ef6c2e053e9664eaaca4edcff16a31c61b8ed2f249b5d67
+      inlined_ast: 023da4cf5ac61a711b31769c22bfe76e5b87089e78e5bd8960e426672d4314f2
+      dce_ast: 023da4cf5ac61a711b31769c22bfe76e5b87089e78e5bd8960e426672d4314f2
       bytecode: d2f0d0e9487f69b3c04cf702ee2d6a8d780ed928cee6d3d05a0fe423b3ad3c6b
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzsearchtree.out b/tests/expectations/compiler/examples/ntzsearchtree.out
index 41f7a7b453..216e36f0a6 100644
--- a/tests/expectations/compiler/examples/ntzsearchtree.out
+++ b/tests/expectations/compiler/examples/ntzsearchtree.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0c7dd39dc2cafb688bbe916523c4d6a3f7ed3ed129314ff87a3e9c4c9aa9459c
-      unrolled_ast: 0c7dd39dc2cafb688bbe916523c4d6a3f7ed3ed129314ff87a3e9c4c9aa9459c
-      ssa_ast: ac90525ada85ad72997fc264027fe2bdb95b7caa64999d2bc6960cf733701d75
-      flattened_ast: 90ea06dc5fc51749195284a4101845c61d0c4db4af1f94015b9187653e5bfd0f
-      inlined_ast: 90ea06dc5fc51749195284a4101845c61d0c4db4af1f94015b9187653e5bfd0f
-      dce_ast: 90ea06dc5fc51749195284a4101845c61d0c4db4af1f94015b9187653e5bfd0f
+  - - initial_ast: b18300dee0a3f2a9b0d011a754f521841efc19037a7e637e0f80e68e2a3ebff2
+      unrolled_ast: b18300dee0a3f2a9b0d011a754f521841efc19037a7e637e0f80e68e2a3ebff2
+      ssa_ast: fd2c54b086ad2dd66b1ef37e78c0b050a86cbf677643c2b4d1619a186d1ce691
+      flattened_ast: a30b4e8a22dec96c14cf5389c5424baaa1842bc2a0ae61c4bd23bd327d1ca67a
+      inlined_ast: a30b4e8a22dec96c14cf5389c5424baaa1842bc2a0ae61c4bd23bd327d1ca67a
+      dce_ast: a30b4e8a22dec96c14cf5389c5424baaa1842bc2a0ae61c4bd23bd327d1ca67a
       bytecode: 3516104be238849345d986d90ff7aa2bc01fe31609f34330e279eef25edb7752
       warnings: ""
diff --git a/tests/expectations/compiler/examples/ntzsmallvals.out b/tests/expectations/compiler/examples/ntzsmallvals.out
index 185083ae0c..33ff9bb983 100644
--- a/tests/expectations/compiler/examples/ntzsmallvals.out
+++ b/tests/expectations/compiler/examples/ntzsmallvals.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6433eae847909e936b7cdb880473f40b8ef936d377575ebb70ff613502c41b49
-      unrolled_ast: 6433eae847909e936b7cdb880473f40b8ef936d377575ebb70ff613502c41b49
-      ssa_ast: 7467277bdab83b14e48136808824723ceb88f9331e70a9a94d8a7f5eded6b661
-      flattened_ast: 03ea72fa550f72587c46e8c8fcaf662c50fcf572e79d777895b2b2cffee2f468
-      inlined_ast: 03ea72fa550f72587c46e8c8fcaf662c50fcf572e79d777895b2b2cffee2f468
-      dce_ast: 03ea72fa550f72587c46e8c8fcaf662c50fcf572e79d777895b2b2cffee2f468
+  - - initial_ast: aeb964c41e8ef558b1639395fe82e74b019d9d0ee8473eb05ead48777e00ea7e
+      unrolled_ast: aeb964c41e8ef558b1639395fe82e74b019d9d0ee8473eb05ead48777e00ea7e
+      ssa_ast: 84799812b55f07c1da0a09872e89afdb95bb90b8cad5a2c525985ef4c1a47e7d
+      flattened_ast: 096b7672454b4d92d9d59302efbbf80e1f05dc619fa52a23ebbffcb24f60f5e7
+      inlined_ast: 096b7672454b4d92d9d59302efbbf80e1f05dc619fa52a23ebbffcb24f60f5e7
+      dce_ast: 096b7672454b4d92d9d59302efbbf80e1f05dc619fa52a23ebbffcb24f60f5e7
       bytecode: 447867c0cff55fb14313d71ddd48f1a8fbee509cd357304c12fba830841dcd09
       warnings: ""
diff --git a/tests/expectations/compiler/examples/simple_token.out b/tests/expectations/compiler/examples/simple_token.out
index 5c38bd2033..1425777581 100644
--- a/tests/expectations/compiler/examples/simple_token.out
+++ b/tests/expectations/compiler/examples/simple_token.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5cd5cdb1286c61f6295fb975a29268f3a553df50f75c3b3dd47fbad53af67da7
-      unrolled_ast: 5cd5cdb1286c61f6295fb975a29268f3a553df50f75c3b3dd47fbad53af67da7
-      ssa_ast: 7c1c0dd238a0ca40cf690d62834b3e36886dccbe0e1c88f5d87b2fbb0b72c15f
-      flattened_ast: 189665aec19f0349c0b3f67a8aa134039be12ccf7d7a0293e55bc9f31a0af725
-      inlined_ast: 189665aec19f0349c0b3f67a8aa134039be12ccf7d7a0293e55bc9f31a0af725
-      dce_ast: 189665aec19f0349c0b3f67a8aa134039be12ccf7d7a0293e55bc9f31a0af725
+  - - initial_ast: 59ed32dddc500e94d5d4317b7a975af85922c47ac95c43ccc1dee8f7347dc806
+      unrolled_ast: 59ed32dddc500e94d5d4317b7a975af85922c47ac95c43ccc1dee8f7347dc806
+      ssa_ast: 4ae289094cc32604b98bb49e0ebe2fa9cdb6e0e31421581b9163a38493bd7417
+      flattened_ast: d9bab1cc549fd70c588f97b3b8482d8fbc30d9ee3cb65e9cce4e8cc1d45fb1c6
+      inlined_ast: d9bab1cc549fd70c588f97b3b8482d8fbc30d9ee3cb65e9cce4e8cc1d45fb1c6
+      dce_ast: d9bab1cc549fd70c588f97b3b8482d8fbc30d9ee3cb65e9cce4e8cc1d45fb1c6
       bytecode: 1fb1eb1a0d28634e2e0ac374be81010d733d3749be3b2700cead1f03266ddfb0
       warnings: ""
diff --git a/tests/expectations/compiler/examples/tictactoe.out b/tests/expectations/compiler/examples/tictactoe.out
index 40b5f6e030..906d0bd926 100644
--- a/tests/expectations/compiler/examples/tictactoe.out
+++ b/tests/expectations/compiler/examples/tictactoe.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8fd93c82f5e11c609b7d3b1ee9e07ef74922338b5b780a6f830c02c28e29caa0
-      unrolled_ast: 8fd93c82f5e11c609b7d3b1ee9e07ef74922338b5b780a6f830c02c28e29caa0
-      ssa_ast: d953c55ec9b87815cc7a19f665cb3c1cd4a8691744135b3760de8ff55b422075
-      flattened_ast: b4b4fa61179a8a93e8a78c5360ee38a4fa56fdae080b225c6d01210b8b1fdfd8
-      inlined_ast: b4b4fa61179a8a93e8a78c5360ee38a4fa56fdae080b225c6d01210b8b1fdfd8
-      dce_ast: 290b4fe40b546d39c441f55a2491b23c9c9307d3919096f38521c95a753c1c0c
+  - - initial_ast: 31e09e7dfb8ade54d9e51593c1bc9c5cc85ac93079f765a2abb44bfe5e065c07
+      unrolled_ast: 31e09e7dfb8ade54d9e51593c1bc9c5cc85ac93079f765a2abb44bfe5e065c07
+      ssa_ast: aa2c6e7c6c279d0029c454a5b6708d8ae581ebca02a62cba60b83ae1d6609028
+      flattened_ast: 312c015334b73688dde476847a63aae979335f8ce700eb47c366e17946d52bc9
+      inlined_ast: 312c015334b73688dde476847a63aae979335f8ce700eb47c366e17946d52bc9
+      dce_ast: b49e85acd14a30146e02c7ca0e1bff2a55e44c87d657cde159b08e62423fdc1d
       bytecode: 82d12cfea48eff976f9f70a6846c7f25870209fc3edf10b45b5f862a25ad3f40
       warnings: ""
diff --git a/tests/expectations/compiler/examples/token.out b/tests/expectations/compiler/examples/token.out
index b5ebd0cbf0..91334c8ec7 100644
--- a/tests/expectations/compiler/examples/token.out
+++ b/tests/expectations/compiler/examples/token.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1a72894e209cee9349c5931c3d2777c63f40a0de176ab94afab57de831f81094
-      unrolled_ast: 1a72894e209cee9349c5931c3d2777c63f40a0de176ab94afab57de831f81094
-      ssa_ast: 458f00b6dc764dcf581bb6e5275b4a37ced53fa6e32c48738175991bc19088f9
-      flattened_ast: 7af223c69a902902c38640b8176c263879f5445cfdd4cda4a3bacbccd8a6171f
-      inlined_ast: 7af223c69a902902c38640b8176c263879f5445cfdd4cda4a3bacbccd8a6171f
-      dce_ast: 7af223c69a902902c38640b8176c263879f5445cfdd4cda4a3bacbccd8a6171f
+  - - initial_ast: d9f6f8944cd0b6a84ae906bee51faa7950012d5ea8ce0f03f9a017cfade75b01
+      unrolled_ast: d9f6f8944cd0b6a84ae906bee51faa7950012d5ea8ce0f03f9a017cfade75b01
+      ssa_ast: 2779c36272937fe31024335285e440d46fcabdd5a35720f03ff97ffd4d09aa2a
+      flattened_ast: f49abd1a5b6d679109fa0efe026cddfa81c9d04c8d0377498e0efa7c2345d599
+      inlined_ast: f49abd1a5b6d679109fa0efe026cddfa81c9d04c8d0377498e0efa7c2345d599
+      dce_ast: f49abd1a5b6d679109fa0efe026cddfa81c9d04c8d0377498e0efa7c2345d599
       bytecode: d3a0ab755832ab3078442873d2740259f9e7d344c3f2d628dfea477a2bb86d86
       warnings: ""
diff --git a/tests/expectations/compiler/examples/twoadicity.out b/tests/expectations/compiler/examples/twoadicity.out
index 1483e97c56..ca6fbe67e1 100644
--- a/tests/expectations/compiler/examples/twoadicity.out
+++ b/tests/expectations/compiler/examples/twoadicity.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d0574e6ad6a9ec7a67ca0a68506130e8e01b8f1bb5a97b6674e6b394d96113ec
-      unrolled_ast: 687efe901901492e30029cbafe5094bc39a5621151e5c92d0708c53c22452d5f
-      ssa_ast: b0ae32898cda955aba348c31c93901354e0ab79f986d2cfe1336e5047bbd5629
-      flattened_ast: ddbffd7a7748fe8364c60919f48b21c71c0af23c7f27661e0610e13bfee29439
-      inlined_ast: 7b383bb4e84ab8c91225bcc2509c66c4c3937a347a5b25a95efa20b6f07b4f2c
-      dce_ast: 5c008b57f15d61d2f8e357a0ef81fad2c9422ccb1f0eb0eaaccfa8173433ff73
+  - - initial_ast: 1d24b651afaeaa45505a0c469da681f72005bbd9db78ee9e21639a7bd0d3fc84
+      unrolled_ast: aedeb507e600e5d340dc7470df8d489f788e792f17f6ced1a5d37b7f6bb76940
+      ssa_ast: f59153326f02302ca9442d7da38936baa6b06b22cc7a92eb62ff84a8af5bf196
+      flattened_ast: e5d0efb55194ee472841445cb767c1b3715d4a9cc6338bf721dc983e3815ae34
+      inlined_ast: 0457f213b081e578f81601d3c56f900c14c5a437e0bf147d194cd3a2cf46e9a6
+      dce_ast: eedf698d22838911f471308c05fa84b971747bda9e5d39f7ec9e6f771e27c6b9
       bytecode: c5073e255b7504fbc368079e634a99935c6c645c9db6830212e2c6077f8ebf3f
       warnings: ""
diff --git a/tests/expectations/compiler/examples/verify.out b/tests/expectations/compiler/examples/verify.out
index 5c3c21f499..7d6cda9e1d 100644
--- a/tests/expectations/compiler/examples/verify.out
+++ b/tests/expectations/compiler/examples/verify.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7ed7c2b81918b9deb2ea839b0e0ee495f4b0db39b571a24a830fd55c6ff0d099
-      unrolled_ast: 7ed7c2b81918b9deb2ea839b0e0ee495f4b0db39b571a24a830fd55c6ff0d099
-      ssa_ast: 069ae0edce4b83902c147e1c7781593bcfe43641bff4b56e12e0920276442a4b
-      flattened_ast: a48b7ba6f0a76b1ecbb4a1528c82e119d33727d6ae5ffc73074c23cacc8d7f40
-      inlined_ast: a48b7ba6f0a76b1ecbb4a1528c82e119d33727d6ae5ffc73074c23cacc8d7f40
-      dce_ast: a48b7ba6f0a76b1ecbb4a1528c82e119d33727d6ae5ffc73074c23cacc8d7f40
+  - - initial_ast: 886cace431175361291e290de7abb550496854cbb6933121d405b1fd4050f99b
+      unrolled_ast: 886cace431175361291e290de7abb550496854cbb6933121d405b1fd4050f99b
+      ssa_ast: bc62539ec710fce28c2967994739f5af5899069175ec7d0b9636254f65d47342
+      flattened_ast: bec9a406eb7d6423d0c99b0898643dd3ab2e2e6a3ec6e8075ab3373e0b3c8e92
+      inlined_ast: bec9a406eb7d6423d0c99b0898643dd3ab2e2e6a3ec6e8075ab3373e0b3c8e92
+      dce_ast: bec9a406eb7d6423d0c99b0898643dd3ab2e2e6a3ec6e8075ab3373e0b3c8e92
       bytecode: 153cfd2616e879c311c136713624e83ef42642241ffebf540e308a29a610b058
       warnings: ""
diff --git a/tests/expectations/compiler/examples/vote.out b/tests/expectations/compiler/examples/vote.out
index 918a802d97..b70cbf65cc 100644
--- a/tests/expectations/compiler/examples/vote.out
+++ b/tests/expectations/compiler/examples/vote.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9efa47cb147eddb1d48f20ba6854b97a7385d914ce1377224496f804d444aa71
-      unrolled_ast: 9efa47cb147eddb1d48f20ba6854b97a7385d914ce1377224496f804d444aa71
-      ssa_ast: d4e699bf52c3a3905e9f4faaff0be9a03b8bb6ed033d3e7573c36712426ea1b8
-      flattened_ast: 59d5c2b11fddba15832337b729656223291027b6e560dbd7027177b6d8618a91
-      inlined_ast: 59d5c2b11fddba15832337b729656223291027b6e560dbd7027177b6d8618a91
-      dce_ast: 59d5c2b11fddba15832337b729656223291027b6e560dbd7027177b6d8618a91
+  - - initial_ast: cfa18935bddbcde425dfcd4420cdc332bc22cb8f20347c19e974e5745175c448
+      unrolled_ast: cfa18935bddbcde425dfcd4420cdc332bc22cb8f20347c19e974e5745175c448
+      ssa_ast: 9db70fe3ef5b857ba47ade60a4dce039ff7afed2fcccd82ed484f5f0d10a839b
+      flattened_ast: f766a37610cbe458b5a2cc6a22652be6041b07a128899d66b1f449c4bc6ebb65
+      inlined_ast: f766a37610cbe458b5a2cc6a22652be6041b07a128899d66b1f449c4bc6ebb65
+      dce_ast: f766a37610cbe458b5a2cc6a22652be6041b07a128899d66b1f449c4bc6ebb65
       bytecode: 60c1cfd246e9ec22ae7489ba2712e71fbc832552d2aa0af46013c4a398c02fc6
       warnings: ""
diff --git a/tests/expectations/compiler/expression/cast.out b/tests/expectations/compiler/expression/cast.out
index 417cd5b808..3e0e4384c0 100644
--- a/tests/expectations/compiler/expression/cast.out
+++ b/tests/expectations/compiler/expression/cast.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 89ca4220271334bae58b02081a10f74f257f77b3829460b5c5f1c34a76b760a0
-      unrolled_ast: 89ca4220271334bae58b02081a10f74f257f77b3829460b5c5f1c34a76b760a0
-      ssa_ast: 8329427e29cbaddce864d9c940aa33fa73b51039c231872a530f05459e38c2af
-      flattened_ast: 70de02c53c3db6e105afb492ce725c4c194995a6b7cd105a15aded6c16074b03
-      inlined_ast: 70de02c53c3db6e105afb492ce725c4c194995a6b7cd105a15aded6c16074b03
-      dce_ast: 6f800ecafbe425a9cfcf22872eac4f412c83c1cbae851493537fd07270c9858c
+  - - initial_ast: 87efd356374dfc839ec5da2977784886b77e5760500545ac5de268a6062a9bc4
+      unrolled_ast: 87efd356374dfc839ec5da2977784886b77e5760500545ac5de268a6062a9bc4
+      ssa_ast: 24645870eee0dcc1d19e8d9c3ee183440ee380fe8d5c24dd19478608e63b1c2a
+      flattened_ast: 9af039ccce582fdb74001f254a7223b1369110c2d8d75832d73a517bfd4b1e27
+      inlined_ast: 9af039ccce582fdb74001f254a7223b1369110c2d8d75832d73a517bfd4b1e27
+      dce_ast: 9fd43cd3f562a8be7c43b338d3bcbd47bb299b22c17750d3348012e05bac02a6
       bytecode: 3c8ea2338433747c1805ff0086031f7be0d253cf25b173de2f145945fdbf2c98
       warnings: ""
diff --git a/tests/expectations/compiler/expression/cast_coersion.out b/tests/expectations/compiler/expression/cast_coersion.out
index fda5242203..3fab6db3ee 100644
--- a/tests/expectations/compiler/expression/cast_coersion.out
+++ b/tests/expectations/compiler/expression/cast_coersion.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a7cb02232b6f9d8e33436926af175836f043f4bfc64e23ab60045991d80b1de9
-      unrolled_ast: a7cb02232b6f9d8e33436926af175836f043f4bfc64e23ab60045991d80b1de9
-      ssa_ast: f5872bdba93fac52632e71b53713fe708412557a8b2a3e7367bcbdef6d0f2b36
-      flattened_ast: 7f29e06daeb7de6c15371d3f3f5c2d277b1b28094a6eac4bd4948b85d60bd703
-      inlined_ast: 7f29e06daeb7de6c15371d3f3f5c2d277b1b28094a6eac4bd4948b85d60bd703
-      dce_ast: 7f29e06daeb7de6c15371d3f3f5c2d277b1b28094a6eac4bd4948b85d60bd703
+  - - initial_ast: d67fe912e3c3427c15b910461c059b508123c12dc685af92c6439c79d064975b
+      unrolled_ast: d67fe912e3c3427c15b910461c059b508123c12dc685af92c6439c79d064975b
+      ssa_ast: 7fbe4c15c6ba4294b51c1f2926d431e1a2266b44f4c5b168c9ef625b9dfe69af
+      flattened_ast: bfafcc4c80d2161b67041096bedea6ed9e4064fba2647cbf6c3097b802cf2004
+      inlined_ast: bfafcc4c80d2161b67041096bedea6ed9e4064fba2647cbf6c3097b802cf2004
+      dce_ast: bfafcc4c80d2161b67041096bedea6ed9e4064fba2647cbf6c3097b802cf2004
       bytecode: 675912267b82b91bd854fa2ef169b85c74ecaac6b73a157d7e99818e256b53b1
       warnings: ""
diff --git a/tests/expectations/compiler/field/add.out b/tests/expectations/compiler/field/add.out
index 8434ad1ca7..4249328453 100644
--- a/tests/expectations/compiler/field/add.out
+++ b/tests/expectations/compiler/field/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3d3714a7b5ae03299b032d6b9321e393286cf46726b7b0021c57592454a5689e
-      unrolled_ast: 3d3714a7b5ae03299b032d6b9321e393286cf46726b7b0021c57592454a5689e
-      ssa_ast: f02dce3c833954d8d47243a3d60a8e00d38a03ae8ebb78ab61ea0feab18bf970
-      flattened_ast: c5cb3c3127c088c0ae36bb5fcfb46dfa83104222b210f288a08efaf206c40214
-      inlined_ast: c5cb3c3127c088c0ae36bb5fcfb46dfa83104222b210f288a08efaf206c40214
-      dce_ast: c5cb3c3127c088c0ae36bb5fcfb46dfa83104222b210f288a08efaf206c40214
+  - - initial_ast: 4d326fa684018ba0ffeb0123232bd2420c709e4ac9445e2c1a0bf0b1221a4cf3
+      unrolled_ast: 4d326fa684018ba0ffeb0123232bd2420c709e4ac9445e2c1a0bf0b1221a4cf3
+      ssa_ast: 570e87b06c38650d78ec74ebf2ecbe0efa57fdbf77c15ec36d39f28681bca56a
+      flattened_ast: c4349c2ba3d1f574c0b4c8f5fe6ee81a08de2ecb56f7b20a9c4fd2fba5cd8a6b
+      inlined_ast: c4349c2ba3d1f574c0b4c8f5fe6ee81a08de2ecb56f7b20a9c4fd2fba5cd8a6b
+      dce_ast: c4349c2ba3d1f574c0b4c8f5fe6ee81a08de2ecb56f7b20a9c4fd2fba5cd8a6b
       bytecode: 587770d63e2d2fe866f99683df9a32da50b718ee3a92aec0d9491cbb8569b80d
       warnings: ""
diff --git a/tests/expectations/compiler/field/div.out b/tests/expectations/compiler/field/div.out
index 0b4993eaaf..4586658e37 100644
--- a/tests/expectations/compiler/field/div.out
+++ b/tests/expectations/compiler/field/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ea001f5062168f38f17afde940864690959cefa161ca6c27165a1b53ae22533f
-      unrolled_ast: ea001f5062168f38f17afde940864690959cefa161ca6c27165a1b53ae22533f
-      ssa_ast: dd3f1daf84288c2509ba83d39f5385b946e2fb54fe045db44ce44e8eed83cf30
-      flattened_ast: ff60e6ee113bdb84a0042ee547464d50a624c60ea7dd715e4ab377ebb2db1d23
-      inlined_ast: ff60e6ee113bdb84a0042ee547464d50a624c60ea7dd715e4ab377ebb2db1d23
-      dce_ast: ff60e6ee113bdb84a0042ee547464d50a624c60ea7dd715e4ab377ebb2db1d23
+  - - initial_ast: d53810ea2de3fe904b42e8dd4decb640a9921eb55b759ef830875b3fd5edc401
+      unrolled_ast: d53810ea2de3fe904b42e8dd4decb640a9921eb55b759ef830875b3fd5edc401
+      ssa_ast: c217cbc9f9b31954493f72e090c97d53b49f50a6948e7015356174f2b4d0fb62
+      flattened_ast: 3c5b478b48372c9b9e7923c348f6face994617d372ec780030e7420608816df9
+      inlined_ast: 3c5b478b48372c9b9e7923c348f6face994617d372ec780030e7420608816df9
+      dce_ast: 3c5b478b48372c9b9e7923c348f6face994617d372ec780030e7420608816df9
       bytecode: 8076383080c6f141d8c6038360d4c9494a44f39b20f85614faf57bb7f6e3a10d
       warnings: ""
diff --git a/tests/expectations/compiler/field/eq.out b/tests/expectations/compiler/field/eq.out
index 94da95b189..a1262a2262 100644
--- a/tests/expectations/compiler/field/eq.out
+++ b/tests/expectations/compiler/field/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9b3287b9c0fef88ec226840bcf8e9e0a50d340267c82dc1535a6acce01dab12e
-      unrolled_ast: 9b3287b9c0fef88ec226840bcf8e9e0a50d340267c82dc1535a6acce01dab12e
-      ssa_ast: a324e5c9be52774c809a69ea98fbc55dda0b990cfe3a4cd73d497a6237a133b0
-      flattened_ast: cfda1f2f364a7728b556ea2d49dd2765a46ce18e11d3992a99c5324c50f579a9
-      inlined_ast: cfda1f2f364a7728b556ea2d49dd2765a46ce18e11d3992a99c5324c50f579a9
-      dce_ast: cfda1f2f364a7728b556ea2d49dd2765a46ce18e11d3992a99c5324c50f579a9
+  - - initial_ast: c254e5bf8ea29cb5e6dd71c795bbc81927713ac989d240d2340ae247fb99b7a0
+      unrolled_ast: c254e5bf8ea29cb5e6dd71c795bbc81927713ac989d240d2340ae247fb99b7a0
+      ssa_ast: 8860f164dc6b9ee5d237c49cb53cb0902570d8aed0c301098dd44f3bb81ef77b
+      flattened_ast: 9e92c4c3710df4c332632dc47bec18e6beb8cbba7903c18a4dabf3e9139f5252
+      inlined_ast: 9e92c4c3710df4c332632dc47bec18e6beb8cbba7903c18a4dabf3e9139f5252
+      dce_ast: 9e92c4c3710df4c332632dc47bec18e6beb8cbba7903c18a4dabf3e9139f5252
       bytecode: 935fb69a9229d935e0f2ec6ce8774b279e8d2ab9496ef8dfcf061aec2088db31
       warnings: ""
diff --git a/tests/expectations/compiler/field/field.out b/tests/expectations/compiler/field/field.out
index f1cc8f9104..4fed0616ec 100644
--- a/tests/expectations/compiler/field/field.out
+++ b/tests/expectations/compiler/field/field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6d63a964333e8e3f9cbeb385612e01a55d99f7329203cd0915016e1124f369e1
-      unrolled_ast: 6d63a964333e8e3f9cbeb385612e01a55d99f7329203cd0915016e1124f369e1
-      ssa_ast: 13d6332d225f146851e16714bfc03c73ebf115120f687a61371f839dc8c8a599
-      flattened_ast: 6b3173b7c75f9890006078434da4f6a01954f2316cb57044dd7bc7f14ffbbd14
-      inlined_ast: 6b3173b7c75f9890006078434da4f6a01954f2316cb57044dd7bc7f14ffbbd14
-      dce_ast: 7b0ea500a3ac7434e08b0563394a7a9fdd58fb9d76e699fe8932ab2164e23083
+  - - initial_ast: bc54de3dab7149782775ce416c9a3d197dc70e1ee2d941f41f428ebb96a26b53
+      unrolled_ast: bc54de3dab7149782775ce416c9a3d197dc70e1ee2d941f41f428ebb96a26b53
+      ssa_ast: e7c336e5157528452f86cdb6d935fb1f5ded85b969bfc45d6f531cd71de3751c
+      flattened_ast: fb7c576b317f04778093d613b057aff6e2d8f525e5f5e3787ca70ff9415427ee
+      inlined_ast: fb7c576b317f04778093d613b057aff6e2d8f525e5f5e3787ca70ff9415427ee
+      dce_ast: 005873dd819802c644dd39e7ead4ee438c9b4fef29d5498a980ff5da9b509aba
       bytecode: 649e93daf1fbf2a9870cd22788b26685b9f873b10ced0b6844974081b511080b
       warnings: ""
diff --git a/tests/expectations/compiler/field/mul.out b/tests/expectations/compiler/field/mul.out
index 05a5ac0640..97a5b5ac7e 100644
--- a/tests/expectations/compiler/field/mul.out
+++ b/tests/expectations/compiler/field/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1a252518208a6738724ef8d50cf5c53c718d4058557757e7117b3bc5908b0fb1
-      unrolled_ast: 1a252518208a6738724ef8d50cf5c53c718d4058557757e7117b3bc5908b0fb1
-      ssa_ast: 4b0c31c0e51fcec52c51fd81ca5a18e84c603626cac8821bbb4d95e0e385c341
-      flattened_ast: feac8740c6da4d299501dfd489f1082b02548f67081302f749718fadee1fd06e
-      inlined_ast: feac8740c6da4d299501dfd489f1082b02548f67081302f749718fadee1fd06e
-      dce_ast: feac8740c6da4d299501dfd489f1082b02548f67081302f749718fadee1fd06e
+  - - initial_ast: 925008f7148af45ea8c62c8c56bfa7818836cb326975eb39f1e0e3dc4bf324c5
+      unrolled_ast: 925008f7148af45ea8c62c8c56bfa7818836cb326975eb39f1e0e3dc4bf324c5
+      ssa_ast: a2fa5074c7994f9a76043ed123f0baeb826dddf62a63d1a645708a12c88b451a
+      flattened_ast: 07d74e8d9b199fa09c3428b7e02665b094ab921b061da36c446381aa678d8183
+      inlined_ast: 07d74e8d9b199fa09c3428b7e02665b094ab921b061da36c446381aa678d8183
+      dce_ast: 07d74e8d9b199fa09c3428b7e02665b094ab921b061da36c446381aa678d8183
       bytecode: b66977ddf8c6be2363f9c584853adf0dc546d28df9c4eb87ab94d393e9c39c59
       warnings: ""
diff --git a/tests/expectations/compiler/field/negate.out b/tests/expectations/compiler/field/negate.out
index d7938bfd8c..dca11b34bf 100644
--- a/tests/expectations/compiler/field/negate.out
+++ b/tests/expectations/compiler/field/negate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0b136780cdd7a07ea3f7485130b378ecc9c9de0f0b147fb00eb55375253595ab
-      unrolled_ast: 0b136780cdd7a07ea3f7485130b378ecc9c9de0f0b147fb00eb55375253595ab
-      ssa_ast: edde045925fa617d75dc74dd53becc156cc5c7d0a6c976dc72d4466296805aa1
-      flattened_ast: fd78fcde7145d25c60057a3f948c596efd9a8281805fc95a2cdc165ca4fc8711
-      inlined_ast: fd78fcde7145d25c60057a3f948c596efd9a8281805fc95a2cdc165ca4fc8711
-      dce_ast: fd78fcde7145d25c60057a3f948c596efd9a8281805fc95a2cdc165ca4fc8711
+  - - initial_ast: 5d0f3bbf49a77af933592a3d029efb226f33fa2bdef99c452e01218da186406b
+      unrolled_ast: 5d0f3bbf49a77af933592a3d029efb226f33fa2bdef99c452e01218da186406b
+      ssa_ast: 76f40f50f6bcc3daa964c01dcac8b94ef46cd7cba1f8d30c6f3bd1b361f058c5
+      flattened_ast: 79c75c92125b330c014787763a8300b5e7e36b9d8b6c27cfdc9891d35031d169
+      inlined_ast: 79c75c92125b330c014787763a8300b5e7e36b9d8b6c27cfdc9891d35031d169
+      dce_ast: 79c75c92125b330c014787763a8300b5e7e36b9d8b6c27cfdc9891d35031d169
       bytecode: b9e119319f6a86cf6b4820d47924a35737646c2bee28ef72882d8e255cdaf7fb
       warnings: ""
diff --git a/tests/expectations/compiler/field/operator_methods.out b/tests/expectations/compiler/field/operator_methods.out
index 58ea20b5f4..6ad3c245ed 100644
--- a/tests/expectations/compiler/field/operator_methods.out
+++ b/tests/expectations/compiler/field/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 09c7cd76ea82f3ad9628c0a2501562c714d60e57d43d514d77919693456f38e7
-      unrolled_ast: 09c7cd76ea82f3ad9628c0a2501562c714d60e57d43d514d77919693456f38e7
-      ssa_ast: 9cfa13f7c3e4d194aa1df497179daebfbe18dc815273bb58c2ad696b89386749
-      flattened_ast: 02e45164cc04820b076dfb1a40d22633b80527e96f49dbef7f26dfa764021036
-      inlined_ast: 02e45164cc04820b076dfb1a40d22633b80527e96f49dbef7f26dfa764021036
-      dce_ast: c9b3b4282e93e0aca38c6327a448501ba0cef6cb234e9e86dd7ce9f3b3741c95
+  - - initial_ast: a2b82fa589b308c27be1a9f2d33fe16754b6abdde38ab317c3af187eb7de9df7
+      unrolled_ast: a2b82fa589b308c27be1a9f2d33fe16754b6abdde38ab317c3af187eb7de9df7
+      ssa_ast: 7c368a500855b3bb5f1d4a494fbbc3532c37e02a8a4874fe7f3eb66adda9f04a
+      flattened_ast: 643a21e90ce39a812a778b17ec052dc19ed02ba1e0be00ec32489157f1004f05
+      inlined_ast: 643a21e90ce39a812a778b17ec052dc19ed02ba1e0be00ec32489157f1004f05
+      dce_ast: 0597601940fadc37a05f17b949d3484d8122aea5b2c53e097cf1d34a4b74794d
       bytecode: bc2da8a1b63f9c24fb14b7468faa8cc14da40ce5c61c9a1c86804b808533b92a
       warnings: ""
diff --git a/tests/expectations/compiler/field/pow.out b/tests/expectations/compiler/field/pow.out
index 2b9cf8474f..b9f24111d2 100644
--- a/tests/expectations/compiler/field/pow.out
+++ b/tests/expectations/compiler/field/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2164bacac3ecb88ac10b55d2962975dd68a368c3d9924d1f40c27cb66d4824de
-      unrolled_ast: 2164bacac3ecb88ac10b55d2962975dd68a368c3d9924d1f40c27cb66d4824de
-      ssa_ast: 73f9e7d49d9eac5f7ad2d85f6f9607fcf42f22fe2f3098615e3a7a01bdbbbbde
-      flattened_ast: 2d9179760c80f5fc4a6106359cb686d9fc1c5792e9c7941f1cd8970bc9f6f94f
-      inlined_ast: 2d9179760c80f5fc4a6106359cb686d9fc1c5792e9c7941f1cd8970bc9f6f94f
-      dce_ast: 2d9179760c80f5fc4a6106359cb686d9fc1c5792e9c7941f1cd8970bc9f6f94f
+  - - initial_ast: c835b416988b973a578c1847d329535287c9682a89257ad07fd132e1426e11e9
+      unrolled_ast: c835b416988b973a578c1847d329535287c9682a89257ad07fd132e1426e11e9
+      ssa_ast: f6c88be915da7caf3d59a526b5f6d435e95540580098e8c524dec3537e6e8a90
+      flattened_ast: 8c4927b1c73b258b254b822279a8ce03dc7607f7161d3b521331fb1ebbed6500
+      inlined_ast: 8c4927b1c73b258b254b822279a8ce03dc7607f7161d3b521331fb1ebbed6500
+      dce_ast: 8c4927b1c73b258b254b822279a8ce03dc7607f7161d3b521331fb1ebbed6500
       bytecode: e31bed8381ccd85c771e3eba7b52867ed99d7cfbfadf9fed69211d5a815f89e2
       warnings: ""
diff --git a/tests/expectations/compiler/field/sub.out b/tests/expectations/compiler/field/sub.out
index a3c1f09f5a..e982f52308 100644
--- a/tests/expectations/compiler/field/sub.out
+++ b/tests/expectations/compiler/field/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 932decea35847ffc2629d78b311c91929c6f9902c96b8acd9251b9c070dc59a7
-      unrolled_ast: 932decea35847ffc2629d78b311c91929c6f9902c96b8acd9251b9c070dc59a7
-      ssa_ast: 79bece0d8f81831eb4f8e71cebd222524237f00f3836c001a2fb7d525ee7afbd
-      flattened_ast: 9ab17f3062d1a3a2291add0a497b66893e355f1709df01a8f88aa59347f7ac50
-      inlined_ast: 9ab17f3062d1a3a2291add0a497b66893e355f1709df01a8f88aa59347f7ac50
-      dce_ast: 9ab17f3062d1a3a2291add0a497b66893e355f1709df01a8f88aa59347f7ac50
+  - - initial_ast: 467a824f2974492667f80a8aae88fd906debfd047cf4621e134a23a136189c4f
+      unrolled_ast: 467a824f2974492667f80a8aae88fd906debfd047cf4621e134a23a136189c4f
+      ssa_ast: e634d858cff2e30f33b786824d16fdd6ca52189b0018c0cf0a0d94ce9616274e
+      flattened_ast: 49d579ef18afe90c560ff78c14897e878734ce6682b5b088ee6ddbfad4ec4c3c
+      inlined_ast: 49d579ef18afe90c560ff78c14897e878734ce6682b5b088ee6ddbfad4ec4c3c
+      dce_ast: 49d579ef18afe90c560ff78c14897e878734ce6682b5b088ee6ddbfad4ec4c3c
       bytecode: ad633a49970484d1285719af828974f068669c6aef5a1d0e6471cc1285469d09
       warnings: ""
diff --git a/tests/expectations/compiler/field/ternary.out b/tests/expectations/compiler/field/ternary.out
index a2b83e9257..33b787f6ab 100644
--- a/tests/expectations/compiler/field/ternary.out
+++ b/tests/expectations/compiler/field/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 17c68e82008ab8a741d6b2d5e02da086f5104ce677c330c8ed59de2c4d92de9c
-      unrolled_ast: 17c68e82008ab8a741d6b2d5e02da086f5104ce677c330c8ed59de2c4d92de9c
-      ssa_ast: 0de2a0dff8cdb94d84f99d9636d8a3b213df0ac811e581c0f055ef75de091f7a
-      flattened_ast: 75eb6fe3f4d60368e8ce8262283a869317c9b05fdb37409a3acf2245b8355a0a
-      inlined_ast: 75eb6fe3f4d60368e8ce8262283a869317c9b05fdb37409a3acf2245b8355a0a
-      dce_ast: 75eb6fe3f4d60368e8ce8262283a869317c9b05fdb37409a3acf2245b8355a0a
+  - - initial_ast: e207c128c7615f4db7365d68e598d69ace8ffbda6ab789847f93709063699181
+      unrolled_ast: e207c128c7615f4db7365d68e598d69ace8ffbda6ab789847f93709063699181
+      ssa_ast: f805837fe273afcac81f85a94c351521eb6197fd3bb03d78f7ed7a1fcba76018
+      flattened_ast: 7c3b20e5dc7d4c11153723e2addf18a77bfbc2b44cd1b6fb99315f0a5492f777
+      inlined_ast: 7c3b20e5dc7d4c11153723e2addf18a77bfbc2b44cd1b6fb99315f0a5492f777
+      dce_ast: 7c3b20e5dc7d4c11153723e2addf18a77bfbc2b44cd1b6fb99315f0a5492f777
       bytecode: 483aebac4ea170dd82b9056a667b2be13c0b9e0b957a151e5f833e0119f7650b
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/block_height.out b/tests/expectations/compiler/finalize/block_height.out
index 95a223b2a8..d42c7a70e5 100644
--- a/tests/expectations/compiler/finalize/block_height.out
+++ b/tests/expectations/compiler/finalize/block_height.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e44b9304fd4e91632ec57efbd39cbafa4edabf7b4dc39af288a8a178520ae1e9
-      unrolled_ast: e44b9304fd4e91632ec57efbd39cbafa4edabf7b4dc39af288a8a178520ae1e9
-      ssa_ast: 9f3fa2b187520bd26531de5f562ff52d8449dc43de172f8762dc869c54aaf658
-      flattened_ast: c74dfd1552239039de657c7cf5886953b42eb74a9785572aa1f586b69c8181b6
-      inlined_ast: c74dfd1552239039de657c7cf5886953b42eb74a9785572aa1f586b69c8181b6
-      dce_ast: c74dfd1552239039de657c7cf5886953b42eb74a9785572aa1f586b69c8181b6
+  - - initial_ast: 6801e5154517bff4e3d2589955e56d9407e8dea1f9ec6295a8073430ba07fec2
+      unrolled_ast: 6801e5154517bff4e3d2589955e56d9407e8dea1f9ec6295a8073430ba07fec2
+      ssa_ast: aa6008c5021aa7645a97a0db762c9eb00a4e944ae21c02cdf501aa6b7f145b46
+      flattened_ast: bfd3ebe8ec0cc3b0b6d28f8f7cafa8ef734cc011b231ab8b9fcaf5c0b86d2faa
+      inlined_ast: bfd3ebe8ec0cc3b0b6d28f8f7cafa8ef734cc011b231ab8b9fcaf5c0b86d2faa
+      dce_ast: bfd3ebe8ec0cc3b0b6d28f8f7cafa8ef734cc011b231ab8b9fcaf5c0b86d2faa
       bytecode: 281a5561f5fb7961210659c7926a0402f391c3e32648bf0cea7c3bd1090dec9e
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/contains.out b/tests/expectations/compiler/finalize/contains.out
index 68ff85ce3e..a4993f5bef 100644
--- a/tests/expectations/compiler/finalize/contains.out
+++ b/tests/expectations/compiler/finalize/contains.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 281c79cc4db52253dd66c203d7f4b8ace50620f5a9a1a1cfbd2fdfa32d8f341b
-      unrolled_ast: 281c79cc4db52253dd66c203d7f4b8ace50620f5a9a1a1cfbd2fdfa32d8f341b
-      ssa_ast: 6decb42bc07933c88c07b2e1a57974b1856384e493d8b1d012c21f681f23dd4d
-      flattened_ast: 05647a88879d53cf0302726021f06cb33a57b48bb9bcacd382cb88070cb621c1
-      inlined_ast: 05647a88879d53cf0302726021f06cb33a57b48bb9bcacd382cb88070cb621c1
-      dce_ast: 05647a88879d53cf0302726021f06cb33a57b48bb9bcacd382cb88070cb621c1
+  - - initial_ast: 35d911fcb99de8a35cc16502963f96a9389a8532b9c0ef4767624b7a8de64770
+      unrolled_ast: 35d911fcb99de8a35cc16502963f96a9389a8532b9c0ef4767624b7a8de64770
+      ssa_ast: 02c5c6e477bc7cf34cae076eeb93077674fd5025f9a9bf0ce4ef810ade1bd642
+      flattened_ast: 4cce88cc2985c3b0ba4ddcca0ab3686d8fd0bf27241638c9549554a7b363980a
+      inlined_ast: 4cce88cc2985c3b0ba4ddcca0ab3686d8fd0bf27241638c9549554a7b363980a
+      dce_ast: 4cce88cc2985c3b0ba4ddcca0ab3686d8fd0bf27241638c9549554a7b363980a
       bytecode: b8da9b000713a8ba980f8fa632c27a18563320758826f1f6cca908650ed8505a
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/decrement_via_get_set.out b/tests/expectations/compiler/finalize/decrement_via_get_set.out
index 0ec0fe0858..d9d20d101a 100644
--- a/tests/expectations/compiler/finalize/decrement_via_get_set.out
+++ b/tests/expectations/compiler/finalize/decrement_via_get_set.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6e1ffd48d515e6e68db72c36618c7defd4d775d33dcda21e4c69f71270eea3f6
-      unrolled_ast: 6e1ffd48d515e6e68db72c36618c7defd4d775d33dcda21e4c69f71270eea3f6
-      ssa_ast: b8c05a7801c699464435584dde0a3342ab26fd316979721bb29921502014dda1
-      flattened_ast: 16e268993d01ca333a75d2f181100c352dd68b9071ad2645aa4d967ba0effe5d
-      inlined_ast: 16e268993d01ca333a75d2f181100c352dd68b9071ad2645aa4d967ba0effe5d
-      dce_ast: 16e268993d01ca333a75d2f181100c352dd68b9071ad2645aa4d967ba0effe5d
+  - - initial_ast: 347e1acee860437efb0a993fb5ce993d89efbc079ba9e016f2f4d4869c7d7e2d
+      unrolled_ast: 347e1acee860437efb0a993fb5ce993d89efbc079ba9e016f2f4d4869c7d7e2d
+      ssa_ast: 2f9b02adad92d533276dbde5c062a31ada8c5abf148ebb970a4bf2c6c7e9b79d
+      flattened_ast: adb8cbb25daae2e3535dd5160b54a2c9256f113082a710632fe94191190503e3
+      inlined_ast: adb8cbb25daae2e3535dd5160b54a2c9256f113082a710632fe94191190503e3
+      dce_ast: adb8cbb25daae2e3535dd5160b54a2c9256f113082a710632fe94191190503e3
       bytecode: 934e0fc8c35f7f0ac3e0403f24f1581573ba6742e9693f9d2a2b56c86e3a6281
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/finalize.out b/tests/expectations/compiler/finalize/finalize.out
index 83ceb2eefa..2d0a7baad3 100644
--- a/tests/expectations/compiler/finalize/finalize.out
+++ b/tests/expectations/compiler/finalize/finalize.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a415353533831277daf3365626a79ebdeac88def75963142ddfa7dfb8ecf07b5
-      unrolled_ast: a415353533831277daf3365626a79ebdeac88def75963142ddfa7dfb8ecf07b5
-      ssa_ast: e0db9779e6df05b128e736d6b31709603854e0e1df8859ef1e812a47dbd3af7a
-      flattened_ast: d17aeda4da61ee2244ca3147265f95846ec7512e8c008831c49275f4b961b09b
-      inlined_ast: d17aeda4da61ee2244ca3147265f95846ec7512e8c008831c49275f4b961b09b
-      dce_ast: d17aeda4da61ee2244ca3147265f95846ec7512e8c008831c49275f4b961b09b
+  - - initial_ast: e9b4d0a8b6a97d2b45ea80c4f6617b1a9162119037c6bde2993e3b6d42392158
+      unrolled_ast: e9b4d0a8b6a97d2b45ea80c4f6617b1a9162119037c6bde2993e3b6d42392158
+      ssa_ast: 6238be61aea414fc56937b2493889c01ddf12869cf74518ecc95e0ef4b53e386
+      flattened_ast: e4ac83d38761e45838a1054ddccd3d089bc037047e600294991aa16d6fb1d88a
+      inlined_ast: e4ac83d38761e45838a1054ddccd3d089bc037047e600294991aa16d6fb1d88a
+      dce_ast: e4ac83d38761e45838a1054ddccd3d089bc037047e600294991aa16d6fb1d88a
       bytecode: afd66fceedf41c7ebf4efa65c4df8817fe890b3c15654d25ec1fac2273dcbe00
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/finalize_with_method_calls.out b/tests/expectations/compiler/finalize/finalize_with_method_calls.out
index def3a75027..7f485e48d2 100644
--- a/tests/expectations/compiler/finalize/finalize_with_method_calls.out
+++ b/tests/expectations/compiler/finalize/finalize_with_method_calls.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2912c37a52463de949f963017d3c50c9bc988e5ee7e5062b5a3eb10277f056c4
-      unrolled_ast: 2912c37a52463de949f963017d3c50c9bc988e5ee7e5062b5a3eb10277f056c4
-      ssa_ast: be497076fc4a87f64bad014cda996317ef94a87fa579da9b6b203aab746cba61
-      flattened_ast: 0f5ef0322a1fc20b84d2f443e624455fc00f434963f12d80c25833ee2f2e9ca2
-      inlined_ast: 0f5ef0322a1fc20b84d2f443e624455fc00f434963f12d80c25833ee2f2e9ca2
-      dce_ast: 0f5ef0322a1fc20b84d2f443e624455fc00f434963f12d80c25833ee2f2e9ca2
+  - - initial_ast: fa7dbf4b3ad6e0bef2d9bf0584bef308db5f8cda4b7a51a0287467bc2f7ec0ae
+      unrolled_ast: fa7dbf4b3ad6e0bef2d9bf0584bef308db5f8cda4b7a51a0287467bc2f7ec0ae
+      ssa_ast: 5f5590b3f7e7caa0ced30bf891792c2856d373d4841a52a21b62f0bf8a3fdc0a
+      flattened_ast: 739cc5d50e99f76b3dc5c4ec5e4458b3e9621a01d493108682e766ec6260c10b
+      inlined_ast: 739cc5d50e99f76b3dc5c4ec5e4458b3e9621a01d493108682e766ec6260c10b
+      dce_ast: 739cc5d50e99f76b3dc5c4ec5e4458b3e9621a01d493108682e766ec6260c10b
       bytecode: 5145cf1156f847432eb0772420f35c696047acdb94dc7db316a9db5cd5c9dfe7
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/increment_via_get_set.out b/tests/expectations/compiler/finalize/increment_via_get_set.out
index 2d08b441a4..bf2b248d82 100644
--- a/tests/expectations/compiler/finalize/increment_via_get_set.out
+++ b/tests/expectations/compiler/finalize/increment_via_get_set.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d0be1a172b50e879d878b79028fb720f049a08d96f141f0254a12db29fbffda1
-      unrolled_ast: d0be1a172b50e879d878b79028fb720f049a08d96f141f0254a12db29fbffda1
-      ssa_ast: 3d4ea2906c2d080a805cf6073b3cadf717a21ab78bf7a0554a79fd6280029c03
-      flattened_ast: a2c01ea9b0c2cdb2d8840cfa64dab9c299d7248a3e3f0123f960360d4c13aae6
-      inlined_ast: a2c01ea9b0c2cdb2d8840cfa64dab9c299d7248a3e3f0123f960360d4c13aae6
-      dce_ast: a2c01ea9b0c2cdb2d8840cfa64dab9c299d7248a3e3f0123f960360d4c13aae6
+  - - initial_ast: 88a79e944aa19c175f0b631bb9e465c68970a5aa591baeb7277762563703101a
+      unrolled_ast: 88a79e944aa19c175f0b631bb9e465c68970a5aa591baeb7277762563703101a
+      ssa_ast: 1cb6460c97c0204ef8253251cddc4c059cbb1aa44757c359f506cd180796efda
+      flattened_ast: 84cb7025fbb8f3a873458359b973e63952b8476bf31eba146b9f080624791e12
+      inlined_ast: 84cb7025fbb8f3a873458359b973e63952b8476bf31eba146b9f080624791e12
+      dce_ast: 84cb7025fbb8f3a873458359b973e63952b8476bf31eba146b9f080624791e12
       bytecode: df488c3c9cd967cc6c7edb491bc348fda4341d88b90887168ae50f2f047ac17c
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/inline_in_finalize.out b/tests/expectations/compiler/finalize/inline_in_finalize.out
index 2e9b658d0b..a13c8b1ca2 100644
--- a/tests/expectations/compiler/finalize/inline_in_finalize.out
+++ b/tests/expectations/compiler/finalize/inline_in_finalize.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7fcc5d63b7fa2799b668128a7714e1bcb77ea375dd5982c46292021f3eef3286
-      unrolled_ast: 7fcc5d63b7fa2799b668128a7714e1bcb77ea375dd5982c46292021f3eef3286
-      ssa_ast: 854800427d49ce572704a0f9b4871790d28c23b16fb638d9d6b18412725b7249
-      flattened_ast: 77d22279118c707c5942b9bfc24c89a3b124f0d700a6b1cfd5b1c7361817c189
-      inlined_ast: f6f382e8b91631652d63b730d68f542b431dd4825bd7bc8ea3766a68d68c8456
-      dce_ast: f6f382e8b91631652d63b730d68f542b431dd4825bd7bc8ea3766a68d68c8456
+  - - initial_ast: c5c40ee37c87f40854c3fea2a9dc8dab1fbf881a4a80973c0a4049fd7c0cc15b
+      unrolled_ast: c5c40ee37c87f40854c3fea2a9dc8dab1fbf881a4a80973c0a4049fd7c0cc15b
+      ssa_ast: 60c6617597a1b5954b0986dd33b61f1d01189ba3e82a65a8f7ff2ba04cf87885
+      flattened_ast: 7c24fc0ba5490e8982db6955dad34e6a958f0f7a0d98dd4b9d831cd295b7bac2
+      inlined_ast: 1476998eca8cfcb931d4d6c2125d997624d36a2615ba8d4c7230e23d7201d66e
+      dce_ast: 1476998eca8cfcb931d4d6c2125d997624d36a2615ba8d4c7230e23d7201d66e
       bytecode: d57d4b2a7ad5a81ba9bac91b5ac94c8bcd6862d3da1a4728f81fbc05c1d2f281
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/mapping.out b/tests/expectations/compiler/finalize/mapping.out
index 6cec2a72fe..472b07f036 100644
--- a/tests/expectations/compiler/finalize/mapping.out
+++ b/tests/expectations/compiler/finalize/mapping.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0f7b5abbba5ba0bb84ffadfdb6f1bbef70586c91f5be489ed6182384a31a3a6f
-      unrolled_ast: 0f7b5abbba5ba0bb84ffadfdb6f1bbef70586c91f5be489ed6182384a31a3a6f
-      ssa_ast: 44dec1491abf09c198d6b3c38251da233d52cae971430943c270174f4ad0543f
-      flattened_ast: a86f909fcae2a4613a7dccffea0f70c8f9a4b3c073166d070d8c53e067fa4c37
-      inlined_ast: a86f909fcae2a4613a7dccffea0f70c8f9a4b3c073166d070d8c53e067fa4c37
-      dce_ast: a86f909fcae2a4613a7dccffea0f70c8f9a4b3c073166d070d8c53e067fa4c37
+  - - initial_ast: acd09d17125a71928281e4ccb4d77b153cb73a0791bcb4e41a255aabd200ccf6
+      unrolled_ast: acd09d17125a71928281e4ccb4d77b153cb73a0791bcb4e41a255aabd200ccf6
+      ssa_ast: a63ab3c1f0b92306282d9968c3dfefe78fe492747e03069fd069334f378416d4
+      flattened_ast: 99355faa7be29ae969a8672972e8f568a95f7b8d20defb1bf4136098d8e13a32
+      inlined_ast: 99355faa7be29ae969a8672972e8f568a95f7b8d20defb1bf4136098d8e13a32
+      dce_ast: 99355faa7be29ae969a8672972e8f568a95f7b8d20defb1bf4136098d8e13a32
       bytecode: 3252a839820ec4b72248f23507600486375cd3d7702b5b6c980b031be5a7f80c
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/only_finalize_with_flattening.out b/tests/expectations/compiler/finalize/only_finalize_with_flattening.out
index 18c29d7a2d..96a1923a45 100644
--- a/tests/expectations/compiler/finalize/only_finalize_with_flattening.out
+++ b/tests/expectations/compiler/finalize/only_finalize_with_flattening.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d507fd3e065b7bfd38bab933375a99934c04f420876991a777b9cbcb0dfa22b1
-      unrolled_ast: d507fd3e065b7bfd38bab933375a99934c04f420876991a777b9cbcb0dfa22b1
-      ssa_ast: e3588e2bfb61a303f69841a33e9bb2002d514ae2100416cc2308b75aa0be43c9
-      flattened_ast: 0f4dc618eaf209d8bed6980c01404a8c16b307aacf4775ac700c06616cdeb485
-      inlined_ast: 0f4dc618eaf209d8bed6980c01404a8c16b307aacf4775ac700c06616cdeb485
-      dce_ast: 0f4dc618eaf209d8bed6980c01404a8c16b307aacf4775ac700c06616cdeb485
+  - - initial_ast: 36aa978ad541c72054e8e0149de00d581abe89384f0737ac9599351e0ee25f06
+      unrolled_ast: 36aa978ad541c72054e8e0149de00d581abe89384f0737ac9599351e0ee25f06
+      ssa_ast: cee014b8d48bdce422decadaf09105ec47d215090d4f566d04ddd683716beca4
+      flattened_ast: 7e9b35cb417d6699f2fe3b7447ea597b8f624d02cb8af91873c49bdefa6b6e13
+      inlined_ast: 7e9b35cb417d6699f2fe3b7447ea597b8f624d02cb8af91873c49bdefa6b6e13
+      dce_ast: 7e9b35cb417d6699f2fe3b7447ea597b8f624d02cb8af91873c49bdefa6b6e13
       bytecode: a356c4e2ae737a491b9037444b791bfe04aab10a8f4274501143ed0505d82e05
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/rand.out b/tests/expectations/compiler/finalize/rand.out
index 886f8c9df8..edb045e985 100644
--- a/tests/expectations/compiler/finalize/rand.out
+++ b/tests/expectations/compiler/finalize/rand.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 35e710fc166c5ab891f1a3462fd20329515bac36365ef2d9fb5f9be30b1c7b46
-      unrolled_ast: 35e710fc166c5ab891f1a3462fd20329515bac36365ef2d9fb5f9be30b1c7b46
-      ssa_ast: 841056432bb5827903cc5ed0ab33f8687f84ff14e7f2b6dd8c89c9a290fd7be8
-      flattened_ast: 7bc8b12da3660037243b1aca2cb1f1b4abef0ca744a305f49ec7f5b36df40376
-      inlined_ast: 7bc8b12da3660037243b1aca2cb1f1b4abef0ca744a305f49ec7f5b36df40376
-      dce_ast: 92a82024d9db05753b8159e6be37ffad8c388a43d394704a8dcc49c6ed516590
+  - - initial_ast: 92f750b9f8835e10c948cbebd2be956f4938594039d6e6af4aeeafe545f806c3
+      unrolled_ast: 92f750b9f8835e10c948cbebd2be956f4938594039d6e6af4aeeafe545f806c3
+      ssa_ast: 53c86d1f6961e90ab0ec869602308155c16529c46b16a8da9500349163b25286
+      flattened_ast: ed687948b9d933a8d0a68574bfb6b76e2e349b3fff105d805bdbeac057dda039
+      inlined_ast: ed687948b9d933a8d0a68574bfb6b76e2e349b3fff105d805bdbeac057dda039
+      dce_ast: 5e3bb0d4929d5aabcc7ce0ec200196b4672f4a92f3e2192a2d29424fd5c9cff4
       bytecode: 268f9afb6b8472b88b0c91f927b0cd4a69c10ad4457714dbb6faddeee5405cc6
       warnings: ""
diff --git a/tests/expectations/compiler/finalize/remove.out b/tests/expectations/compiler/finalize/remove.out
index a7305df657..d16a8b5ffe 100644
--- a/tests/expectations/compiler/finalize/remove.out
+++ b/tests/expectations/compiler/finalize/remove.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 19c090e263e0f40dc8eeb511eba4e263af94bc8be6e63e2f4c0dd4ae62adc046
-      unrolled_ast: 19c090e263e0f40dc8eeb511eba4e263af94bc8be6e63e2f4c0dd4ae62adc046
-      ssa_ast: 369f201ad0aaac30bb0482d0097bb1a7c86ea2a368ad537347fffc435829c2db
-      flattened_ast: 5420959f8b0caa34c04f44a9debd0c473ed786b0dd806ae33fd58e30ccd328b1
-      inlined_ast: 5420959f8b0caa34c04f44a9debd0c473ed786b0dd806ae33fd58e30ccd328b1
-      dce_ast: 5420959f8b0caa34c04f44a9debd0c473ed786b0dd806ae33fd58e30ccd328b1
+  - - initial_ast: 4433135ff29b61bfc55ed812445abb7f5eb67702d665b8fc199625279099c6fb
+      unrolled_ast: 4433135ff29b61bfc55ed812445abb7f5eb67702d665b8fc199625279099c6fb
+      ssa_ast: f7bc37751e5fef2dbb722c30376d7c0033e94ca8e9d76304d175a4649eaebed9
+      flattened_ast: dcd59b036e9e8a3659e604e086d552dcf5276bfe37d045feaacf1435030c44c4
+      inlined_ast: dcd59b036e9e8a3659e604e086d552dcf5276bfe37d045feaacf1435030c44c4
+      dce_ast: dcd59b036e9e8a3659e604e086d552dcf5276bfe37d045feaacf1435030c44c4
       bytecode: 5cae19c2ed8e380e13836028054b78e89448558fcf7af717be63d5737fe92edc
       warnings: ""
diff --git a/tests/expectations/compiler/function/conditional_return.out b/tests/expectations/compiler/function/conditional_return.out
index 906c397897..93b66043ae 100644
--- a/tests/expectations/compiler/function/conditional_return.out
+++ b/tests/expectations/compiler/function/conditional_return.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: dedc2b0c38ccc8b70aed9453e88c9f0364052385f198ac8c5d86e08751dc4181
-      unrolled_ast: dedc2b0c38ccc8b70aed9453e88c9f0364052385f198ac8c5d86e08751dc4181
-      ssa_ast: 168fdda0960be9b682b77ee77240865d4699292d6cb02c3c6652e37facef0d2c
-      flattened_ast: 95039577bb5e3c2eb95eaa7e2bb9dab1b1f941851c6ed2492ad4474782c3957f
-      inlined_ast: 95039577bb5e3c2eb95eaa7e2bb9dab1b1f941851c6ed2492ad4474782c3957f
-      dce_ast: 95039577bb5e3c2eb95eaa7e2bb9dab1b1f941851c6ed2492ad4474782c3957f
+  - - initial_ast: 7cecfd126678834c332a23f5be23af6739630232284df2e1967442b2fae66e49
+      unrolled_ast: 7cecfd126678834c332a23f5be23af6739630232284df2e1967442b2fae66e49
+      ssa_ast: f767c8e138e7265662bc24bd58cb9d11a035fc57e6af612bf9a1117ee9e455ac
+      flattened_ast: 85a0f3dc2f3bd0b8b3b3c6720286eb899c290be66d3765432c01ee33d9274aab
+      inlined_ast: 85a0f3dc2f3bd0b8b3b3c6720286eb899c290be66d3765432c01ee33d9274aab
+      dce_ast: 85a0f3dc2f3bd0b8b3b3c6720286eb899c290be66d3765432c01ee33d9274aab
       bytecode: 7fe490ec8230a29dea04ba2ade935868530bcdcde28707abfa794c90833cc678
       warnings: ""
diff --git a/tests/expectations/compiler/function/dead_code_elimination.out b/tests/expectations/compiler/function/dead_code_elimination.out
index 4a09208b14..6a9d2e32ad 100644
--- a/tests/expectations/compiler/function/dead_code_elimination.out
+++ b/tests/expectations/compiler/function/dead_code_elimination.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: afdee1d47b2ad1d67c08e0beb627ccc2048e55eec4d65f3ef8ed6ae235007846
-      unrolled_ast: afdee1d47b2ad1d67c08e0beb627ccc2048e55eec4d65f3ef8ed6ae235007846
-      ssa_ast: 281dbe027cc039884a587523990727eb07a2a64c6e6cc96af658063892a78a9b
-      flattened_ast: c3aa9d7e884a39dc21fa3c802460d849281317a440bf8d30df5dc9694a9b2ec5
-      inlined_ast: a1899d412410eec20b0a117969cc04f9483744eb098ed25db900ed52ffc1a643
-      dce_ast: 5b2656bac6f2e131bab4774b3bfb6e4ef4297750ca2b9fc923639f5aae8b12a6
+  - - initial_ast: 38859964f6aa805b9ff0d68e3995992a276ed2fc4926422d21dbee34fcca22bb
+      unrolled_ast: 38859964f6aa805b9ff0d68e3995992a276ed2fc4926422d21dbee34fcca22bb
+      ssa_ast: 6c9003a71e378ee6dfbd084ef7a4fbcae27dcf8707821f5c4e5bad3ec4f1ca64
+      flattened_ast: 0610f3e5bc80657dee039394e65532ae80f5823927811a42060b742f1791efb9
+      inlined_ast: d27283a93eb0254338ce84444b14a4a8cbc2e0f975046ec552c478d2755f64fd
+      dce_ast: 71c41aefd89fb241d81925c69920653d2e1847aca237aeae220963b950d680c5
       bytecode: 68f3c939bd54966a95293dd018927a50887a633eea6d5dc60fca8a1ba5400607
       warnings: ""
diff --git a/tests/expectations/compiler/function/flatten_inlined_tuples_of_structs.out b/tests/expectations/compiler/function/flatten_inlined_tuples_of_structs.out
index 96ef4895b1..f9c54e0061 100644
--- a/tests/expectations/compiler/function/flatten_inlined_tuples_of_structs.out
+++ b/tests/expectations/compiler/function/flatten_inlined_tuples_of_structs.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 46f76aac66412c2e9f0c2639df3894a387b7180a3ff0c53f137a94e5b009229e
-      unrolled_ast: 46f76aac66412c2e9f0c2639df3894a387b7180a3ff0c53f137a94e5b009229e
-      ssa_ast: c62c9b733eb98fb68aa9e7e0171d262ce849283faffb0c0b41c54b569a2c4b68
-      flattened_ast: a2f0f88bf061dc6befadc282c49efa92de32991ea051280c33a6d0772439ed2a
-      inlined_ast: e6b97eb727cec695f8e4b4c8d571099d12e2144df26ece81eda7ba469bafd127
-      dce_ast: e6b97eb727cec695f8e4b4c8d571099d12e2144df26ece81eda7ba469bafd127
+  - - initial_ast: bd57ac53308a67d19485d7f29a006bdd8d780ca05f2427ba0393e63ac000afd9
+      unrolled_ast: bd57ac53308a67d19485d7f29a006bdd8d780ca05f2427ba0393e63ac000afd9
+      ssa_ast: 028180997e2f609c93e912c59bb2b84dc43c33ea8aec28ef1e651659f05e961c
+      flattened_ast: 48008bc440590f8d6f7eec80daffb815a5c340efe5d389fe73a8bf28e236f025
+      inlined_ast: 8b336b9b7625dcdcb9f70568d2aacf41386860af6f2d8b34789dff18c0b18e9c
+      dce_ast: 8b336b9b7625dcdcb9f70568d2aacf41386860af6f2d8b34789dff18c0b18e9c
       bytecode: 7602c293bf2fee12ca5d58f3651e9a5699a3c1350fc34b8000dfc598ecd77226
       warnings: ""
diff --git a/tests/expectations/compiler/function/flatten_test.out b/tests/expectations/compiler/function/flatten_test.out
index a60654bb36..b49e38d480 100644
--- a/tests/expectations/compiler/function/flatten_test.out
+++ b/tests/expectations/compiler/function/flatten_test.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 553a15c4e6a7ba676683e622a541b09ac29854cbd2f8820788dfce027e05fb7c
-      unrolled_ast: 553a15c4e6a7ba676683e622a541b09ac29854cbd2f8820788dfce027e05fb7c
-      ssa_ast: d85a69dad841d2467f6bdce8b450e6bc482d59d492e9dbe4fb3041829f8e1422
-      flattened_ast: 0d85466c124b15586e6a9c23dfa5d647c743c6bfa7c869ccc0ecd6bd8b206886
-      inlined_ast: 0d85466c124b15586e6a9c23dfa5d647c743c6bfa7c869ccc0ecd6bd8b206886
-      dce_ast: 0d85466c124b15586e6a9c23dfa5d647c743c6bfa7c869ccc0ecd6bd8b206886
+  - - initial_ast: 85d5a9e44849a08aa87bd1c9669bb1df2e0a69b3e5feca28dcd5b7db0d525dbe
+      unrolled_ast: 85d5a9e44849a08aa87bd1c9669bb1df2e0a69b3e5feca28dcd5b7db0d525dbe
+      ssa_ast: 75cb7a1c368fde5a525996a1e3712ea771601f6cbd9d6e8d0ace3f9ae2f807fa
+      flattened_ast: 81bcb20799aa8a43f765773f1e0c0d88676b9c0dc5f06cf229bf783a5c34d9ed
+      inlined_ast: 81bcb20799aa8a43f765773f1e0c0d88676b9c0dc5f06cf229bf783a5c34d9ed
+      dce_ast: 81bcb20799aa8a43f765773f1e0c0d88676b9c0dc5f06cf229bf783a5c34d9ed
       bytecode: 6b4668099fa04bf4027b390ce9def813a3ade976add6104944433b3fab6a4ad9
       warnings: ""
diff --git a/tests/expectations/compiler/function/flatten_test_2.out b/tests/expectations/compiler/function/flatten_test_2.out
index 2f4e98295f..7c929edcef 100644
--- a/tests/expectations/compiler/function/flatten_test_2.out
+++ b/tests/expectations/compiler/function/flatten_test_2.out
@@ -2,19 +2,19 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 879c5b07be37d0c93c47f7b973d51523e780685d245f5a582d5842bbb98dcfd1
-      unrolled_ast: 879c5b07be37d0c93c47f7b973d51523e780685d245f5a582d5842bbb98dcfd1
-      ssa_ast: cfa628b5f1796b4ee7aae023f0e26d10b0bb6a63848489fe714a53339064afa2
-      flattened_ast: 8744cd23665709a55e9095cdffdf36d4ba5749c88ac567e6ddc01ee9396cc163
-      inlined_ast: 8744cd23665709a55e9095cdffdf36d4ba5749c88ac567e6ddc01ee9396cc163
-      dce_ast: 66b99fe83e081a346f8fa37960e683667d7be46313c54bd2bfc17cedc02106eb
+  - - initial_ast: 9c67f232924b5019a87dd872413155b601fe1e2476863d0c9cfedb49215f943e
+      unrolled_ast: 9c67f232924b5019a87dd872413155b601fe1e2476863d0c9cfedb49215f943e
+      ssa_ast: 5a86e8ff48345a19c293e21adf0366ace5b36305587a111cbf7176055e03338d
+      flattened_ast: b4b9c4e92ef132f2e3d2f52d6d43ffec761c670a7bd19c4bdd7941c4657aed94
+      inlined_ast: b4b9c4e92ef132f2e3d2f52d6d43ffec761c670a7bd19c4bdd7941c4657aed94
+      dce_ast: 442ca9b6f2806524dace9e8fe669d11957980009fea1e65b526265d1d849b8e8
       bytecode: 34ea2316698e1b32c9a8cecafbc7ec613d38e33d39bc50b517a10f255e9c8a03
       warnings: ""
-    - initial_ast: 9d9759ae2bad97a673964fc73150bcec7711418058a3b3c03040be147dff8a9b
-      unrolled_ast: 9d9759ae2bad97a673964fc73150bcec7711418058a3b3c03040be147dff8a9b
-      ssa_ast: e5a597ff297d99222133db6f5b1f52ca5a338b1f1973789a19dc91913138ff58
-      flattened_ast: 3acb915ce9a75dea3ea2d7af35a23fbdf70c92f7fc189aaa6c9eab4b6e9a760e
-      inlined_ast: 3acb915ce9a75dea3ea2d7af35a23fbdf70c92f7fc189aaa6c9eab4b6e9a760e
-      dce_ast: 3acb915ce9a75dea3ea2d7af35a23fbdf70c92f7fc189aaa6c9eab4b6e9a760e
+    - initial_ast: c2a4dd0b7df92f706b131d70ac34e4869604fa44439b42fb72f595f7a47de2b4
+      unrolled_ast: c2a4dd0b7df92f706b131d70ac34e4869604fa44439b42fb72f595f7a47de2b4
+      ssa_ast: 4cab8364f059eb25a6751766964ce5bdca86b3988a879523730c31e768e65b2f
+      flattened_ast: 7a436d70aff2619255b32f65379e0b3acb4acab5c42891731f3a042bb82e6f16
+      inlined_ast: 7a436d70aff2619255b32f65379e0b3acb4acab5c42891731f3a042bb82e6f16
+      dce_ast: 7a436d70aff2619255b32f65379e0b3acb4acab5c42891731f3a042bb82e6f16
       bytecode: b42d3c958c08364d974824a28437565b32bce03a6dc86c38a03cfe741cac6995
       warnings: ""
diff --git a/tests/expectations/compiler/function/flatten_tuples_of_structs.out b/tests/expectations/compiler/function/flatten_tuples_of_structs.out
index 8a66817f25..1c05bdb6c9 100644
--- a/tests/expectations/compiler/function/flatten_tuples_of_structs.out
+++ b/tests/expectations/compiler/function/flatten_tuples_of_structs.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d9150d548a217549db3a92ebdd846fc0018a7a468060011221092871a03d22d2
-      unrolled_ast: d9150d548a217549db3a92ebdd846fc0018a7a468060011221092871a03d22d2
-      ssa_ast: fc6310dead7f63375e770b3db75809fd1e4e66d95d284375d79ec0e8bf0d56a5
-      flattened_ast: ad8865a01522e958858bc939990ba92515d5ec3d6b4a947a75efb1e0c87a899e
-      inlined_ast: ad8865a01522e958858bc939990ba92515d5ec3d6b4a947a75efb1e0c87a899e
-      dce_ast: ad8865a01522e958858bc939990ba92515d5ec3d6b4a947a75efb1e0c87a899e
+  - - initial_ast: 9b694fa15f6b1464f818058b5573a80e16af735e683732051fbef4d36ab91a77
+      unrolled_ast: 9b694fa15f6b1464f818058b5573a80e16af735e683732051fbef4d36ab91a77
+      ssa_ast: ecb705995e35706308c23e9c7462c96a4faa45f2636f46416b84798fd37875f3
+      flattened_ast: fd6ca180918f6c2fcee4cfaad99cc9dfa275333ef4f31ad41ce11276717aff8e
+      inlined_ast: fd6ca180918f6c2fcee4cfaad99cc9dfa275333ef4f31ad41ce11276717aff8e
+      dce_ast: fd6ca180918f6c2fcee4cfaad99cc9dfa275333ef4f31ad41ce11276717aff8e
       bytecode: 023b08025f2aa0f03538528dde0e9b8e6ddf7efb3feb3af35ff79a1d930e42cc
       warnings: ""
diff --git a/tests/expectations/compiler/function/flatten_unit_expressions.out b/tests/expectations/compiler/function/flatten_unit_expressions.out
index 1c0d0d540d..7c366647e4 100644
--- a/tests/expectations/compiler/function/flatten_unit_expressions.out
+++ b/tests/expectations/compiler/function/flatten_unit_expressions.out
@@ -2,19 +2,19 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 084c7bc979634a37723be23f2208360f25ea43f2d4ebb4e98f3e4b721bfc3ff0
-      unrolled_ast: 084c7bc979634a37723be23f2208360f25ea43f2d4ebb4e98f3e4b721bfc3ff0
-      ssa_ast: 084c7bc979634a37723be23f2208360f25ea43f2d4ebb4e98f3e4b721bfc3ff0
-      flattened_ast: ee89c0c15a0d49c5dcd955a699385da1647edf30ac5779468c903ce03ba64554
-      inlined_ast: ee89c0c15a0d49c5dcd955a699385da1647edf30ac5779468c903ce03ba64554
-      dce_ast: ee89c0c15a0d49c5dcd955a699385da1647edf30ac5779468c903ce03ba64554
+  - - initial_ast: 2ae17fedf13645facb0ed4bbf54817dab6cf3412171dbc763ee8f2f7cbcc3fa4
+      unrolled_ast: 2ae17fedf13645facb0ed4bbf54817dab6cf3412171dbc763ee8f2f7cbcc3fa4
+      ssa_ast: 2ae17fedf13645facb0ed4bbf54817dab6cf3412171dbc763ee8f2f7cbcc3fa4
+      flattened_ast: 43ccd676aba24236ff4af0d7d2c04cfd000f247439bef2090fe921fd81436d28
+      inlined_ast: 43ccd676aba24236ff4af0d7d2c04cfd000f247439bef2090fe921fd81436d28
+      dce_ast: 43ccd676aba24236ff4af0d7d2c04cfd000f247439bef2090fe921fd81436d28
       bytecode: b5e0f18e08535e19b2bc80bd0bc3d2893e58223cea4d006a8a8de262d3ab41fd
       warnings: ""
-    - initial_ast: 4acf1be208ed2282ac69a085faa5cb48b1b1698e728718da715332721cdb3d35
-      unrolled_ast: 4acf1be208ed2282ac69a085faa5cb48b1b1698e728718da715332721cdb3d35
-      ssa_ast: 4acf1be208ed2282ac69a085faa5cb48b1b1698e728718da715332721cdb3d35
-      flattened_ast: 9e9b2e60f711da8ac100c4783022adb0469016e887fdb87335d25d011a0a0455
-      inlined_ast: 9e9b2e60f711da8ac100c4783022adb0469016e887fdb87335d25d011a0a0455
-      dce_ast: 9e9b2e60f711da8ac100c4783022adb0469016e887fdb87335d25d011a0a0455
+    - initial_ast: 8425b7644b8106c8ff77a2970bbb7267ce67e410ec41160efc7ffc72b66240bc
+      unrolled_ast: 8425b7644b8106c8ff77a2970bbb7267ce67e410ec41160efc7ffc72b66240bc
+      ssa_ast: 8425b7644b8106c8ff77a2970bbb7267ce67e410ec41160efc7ffc72b66240bc
+      flattened_ast: 845ec1083170b2b9a18791d54aee9d25e754c3c2930d4882a1d555492e9f0472
+      inlined_ast: 845ec1083170b2b9a18791d54aee9d25e754c3c2930d4882a1d555492e9f0472
+      dce_ast: 845ec1083170b2b9a18791d54aee9d25e754c3c2930d4882a1d555492e9f0472
       bytecode: b5e0f18e08535e19b2bc80bd0bc3d2893e58223cea4d006a8a8de262d3ab41fd
       warnings: ""
diff --git a/tests/expectations/compiler/function/function_call.out b/tests/expectations/compiler/function/function_call.out
index 51e24602b5..c4874f73a7 100644
--- a/tests/expectations/compiler/function/function_call.out
+++ b/tests/expectations/compiler/function/function_call.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ba7b78e22ba8d948e3c4826fc20e006be8277bdbeb59418086941e5ff213b1a6
-      unrolled_ast: ba7b78e22ba8d948e3c4826fc20e006be8277bdbeb59418086941e5ff213b1a6
-      ssa_ast: ddf17c3cddee46c4ee443bcc941a6480501bd1064367b8a1dfabcd3cc541ed96
-      flattened_ast: 7958370f025e32035e743fac787a851c001e9914de62721ddf3f0fbf08701982
-      inlined_ast: cbbd41850b1454a2ef0d93b7197af9d16eaeccf2efc86cbff3487692bc0cee37
-      dce_ast: cbbd41850b1454a2ef0d93b7197af9d16eaeccf2efc86cbff3487692bc0cee37
+  - - initial_ast: c261fe5652c6691558ebef15e57d6537abc19675b292fb6aa592ee505b2bf21f
+      unrolled_ast: c261fe5652c6691558ebef15e57d6537abc19675b292fb6aa592ee505b2bf21f
+      ssa_ast: 1cf37393873492467fe9719bcc390f59d074c900d677fde895241b34e54c1655
+      flattened_ast: 36127ec99f56fde53f0e985a36e5629001aa4e35f8c6ec1a8c88fa0d7b0efc1f
+      inlined_ast: ef8c51ef63b52f461e868af1b474d9a8847afe64e465bf4174d3a8b75275982f
+      dce_ast: ef8c51ef63b52f461e868af1b474d9a8847afe64e465bf4174d3a8b75275982f
       bytecode: ce0dbf69a657e1fbc866ccc8c4a1cb4f8080a561d1ba4bafca831cee80a3ef81
       warnings: ""
diff --git a/tests/expectations/compiler/function/function_call_inline.out b/tests/expectations/compiler/function/function_call_inline.out
index 6ddd49b313..7223c98699 100644
--- a/tests/expectations/compiler/function/function_call_inline.out
+++ b/tests/expectations/compiler/function/function_call_inline.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c07856eb9f91deb085e16aaae33832bf714b35169185f68c79b222f07ac5a203
-      unrolled_ast: c07856eb9f91deb085e16aaae33832bf714b35169185f68c79b222f07ac5a203
-      ssa_ast: cd296e734bbd81fbbee1b0938f65d29902290ecdf38819b52b945ce91bc0713e
-      flattened_ast: 57c5d2e626deded61a2e8993b690cacebd6b7ee1249b7970ffcdc43485bbee9b
-      inlined_ast: bd7d1ef04e7a16acb2b2ee7b3a62e2acbd33c817fa183319ddb124dfbcf4130e
-      dce_ast: bd7d1ef04e7a16acb2b2ee7b3a62e2acbd33c817fa183319ddb124dfbcf4130e
+  - - initial_ast: 9747d4e072c5b0882d43becb366d2ef3aa7cf944618ffdb052af1404b83880ac
+      unrolled_ast: 9747d4e072c5b0882d43becb366d2ef3aa7cf944618ffdb052af1404b83880ac
+      ssa_ast: 282138041d734eccb6b2f2c958ccf3c2e3c703595492fd6b826785691b845edf
+      flattened_ast: eade77463b93446f555dfa874b3dd0df56084f6851c161a74fd12b7e04d0b1d9
+      inlined_ast: 65fb843b4458d2eef1e07658058a6c013f92ba1c28913502c9fbf98a4647adee
+      dce_ast: 65fb843b4458d2eef1e07658058a6c013f92ba1c28913502c9fbf98a4647adee
       bytecode: 44ea5bc8171ad40715c28c40333b673e70474ef9ba2d8f60d6517c0bfc3539e0
       warnings: ""
diff --git a/tests/expectations/compiler/function/function_call_out_of_order.out b/tests/expectations/compiler/function/function_call_out_of_order.out
index abf54a792d..e9741cdd24 100644
--- a/tests/expectations/compiler/function/function_call_out_of_order.out
+++ b/tests/expectations/compiler/function/function_call_out_of_order.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7175f919c08700ea197faeb7327f3ec856abf7cdf5caafd44870719a5d43e269
-      unrolled_ast: 7175f919c08700ea197faeb7327f3ec856abf7cdf5caafd44870719a5d43e269
-      ssa_ast: 0a73abcb994d0a61c426c87ac848bc82d152db3a71c18a64d45ce62b92926d85
-      flattened_ast: ae3cff17ebee2c44163bb9338ba4925359de4bc3dbe6783625f5722aea60f1f4
-      inlined_ast: 0f7052b957603c534a47b9c58813b8622be890a4ad08a1bea55faa94e2c8264a
-      dce_ast: 0f7052b957603c534a47b9c58813b8622be890a4ad08a1bea55faa94e2c8264a
+  - - initial_ast: 3aa673fb35a28b4b3edca553323419e620423e5ea50a813170cb5e3b9781788e
+      unrolled_ast: 3aa673fb35a28b4b3edca553323419e620423e5ea50a813170cb5e3b9781788e
+      ssa_ast: 7ce347c94f7d064848866638d83a65d4011ca79b899cbde690f52d77f0b8730c
+      flattened_ast: 2ad2de2e14c5ffa98e2e77843c6cc2be03e8ea468fdbcac29716b9fc1894bf08
+      inlined_ast: 07eb752fde2b1c53ccecdcaa5f8a336aeecda4d8b328921ab3867136b63d84ef
+      dce_ast: 07eb752fde2b1c53ccecdcaa5f8a336aeecda4d8b328921ab3867136b63d84ef
       bytecode: 0d1f4cbd82531fbd8e3be16dd6b130e30da05f95568ab89856527ead1a0d68a3
       warnings: ""
diff --git a/tests/expectations/compiler/function/helper_function_with_interface.out b/tests/expectations/compiler/function/helper_function_with_interface.out
index 7b0cf1889f..a3f8eb6777 100644
--- a/tests/expectations/compiler/function/helper_function_with_interface.out
+++ b/tests/expectations/compiler/function/helper_function_with_interface.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e9b96153b31289f46f4c21f5972bb930eb9bbede54292033cbc38e207c6d9d92
-      unrolled_ast: e9b96153b31289f46f4c21f5972bb930eb9bbede54292033cbc38e207c6d9d92
-      ssa_ast: c5fbe2fc7f59470fd6b094c42a088f623a6553cb7a9386fdf75b13217ea3a000
-      flattened_ast: b83d16a5c6c19fb37232d2886ca6079187ae554d1e76c800c12100483e42b91f
-      inlined_ast: b83d16a5c6c19fb37232d2886ca6079187ae554d1e76c800c12100483e42b91f
-      dce_ast: b83d16a5c6c19fb37232d2886ca6079187ae554d1e76c800c12100483e42b91f
+  - - initial_ast: e1813e1ffd86510ae605ce06a3fa77632dd707c6c5d08d4b3b987481c10b2c82
+      unrolled_ast: e1813e1ffd86510ae605ce06a3fa77632dd707c6c5d08d4b3b987481c10b2c82
+      ssa_ast: c85c801441c891b87f95dd74c517005a3cf5a27553b0e844eecb34dee7324895
+      flattened_ast: ca96d8d0f0267c65eb4045fd64ed52032b17b8e77cbe08e55170d3e35bdc522a
+      inlined_ast: ca96d8d0f0267c65eb4045fd64ed52032b17b8e77cbe08e55170d3e35bdc522a
+      dce_ast: ca96d8d0f0267c65eb4045fd64ed52032b17b8e77cbe08e55170d3e35bdc522a
       bytecode: b48e67a8ef2d6c9c20bb5d14b831c6fdcccc5093212bccf31f75483613edb518
       warnings: ""
diff --git a/tests/expectations/compiler/function/inline_expr_statement.out b/tests/expectations/compiler/function/inline_expr_statement.out
index 338afbde96..e896ffd4f5 100644
--- a/tests/expectations/compiler/function/inline_expr_statement.out
+++ b/tests/expectations/compiler/function/inline_expr_statement.out
@@ -2,19 +2,19 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 94680d20e7d20c7dd198aa3bb14dd2c07619a3818a708681462f384c2b52fc17
-      unrolled_ast: 94680d20e7d20c7dd198aa3bb14dd2c07619a3818a708681462f384c2b52fc17
-      ssa_ast: 0501e79ce94e1e6a7cea1d6e0ccf6c13225febf640a14ace5223f02740cfdf52
-      flattened_ast: 3ffb4b9bdc0714dee8652ae47f60690e526b8a3d2ab34823a8143d725acee262
-      inlined_ast: 49478d9de76bc035f0a0531c55e9bae6cdbf834a8a4c2ab92fc63624df53e8ab
-      dce_ast: ea5d18a799a4f32c980243873862f1ade2147f04e266eb77361830adfe1ab800
+  - - initial_ast: e95a499f2244ac7750650e7c6b54268956b8c3b2114d09411fbef08532136d4f
+      unrolled_ast: e95a499f2244ac7750650e7c6b54268956b8c3b2114d09411fbef08532136d4f
+      ssa_ast: 6a05dd3e4a41b5e2d44ae47d2ba237e710e2966a1857b0fbc802c5568d5946cf
+      flattened_ast: 25d4973edcdf1d4d0e6661124f71ae957cca381fc70569749ab50b7c5fc82398
+      inlined_ast: 7dd829cf175724d63b7498ca230dd02f28001fbaaab4718f6fcd09473fbb4489
+      dce_ast: 4cee5677b8ca859392b0390b6d54a0045c1618a46b126c40761966b26963550f
       bytecode: 3c05138e2787f4f82e5e0503d73b7a23b55758efa05449d5fd6f691902e575f3
       warnings: ""
-    - initial_ast: 3d99a36c9c94a31e093a1b9ead440001719b2ec21d8268ea5b7398029dfecbee
-      unrolled_ast: 3d99a36c9c94a31e093a1b9ead440001719b2ec21d8268ea5b7398029dfecbee
-      ssa_ast: 7ebd093d2e1c2dac657b7748704093b13c005da716b12e07955596fc24660258
-      flattened_ast: e530f704193e5e9ebb7df90be3ebfd60a7af0578044aeb755c3a0a3b24cd6b9e
-      inlined_ast: 1949058971fb619222f2b977126de5afbb4848fc09bf0e466dd9dd0aca7cefef
-      dce_ast: 1949058971fb619222f2b977126de5afbb4848fc09bf0e466dd9dd0aca7cefef
+    - initial_ast: 82e23d78993a141df332869f20a1be9a829fb5499377b2579367e3e25af148dd
+      unrolled_ast: 82e23d78993a141df332869f20a1be9a829fb5499377b2579367e3e25af148dd
+      ssa_ast: 74f8f4e14f5c668f9924d70339e2581c934cf3c7482826e398c91caf7f87eb65
+      flattened_ast: cab673a4bb72221c0d38fc0a8813986438f82efa9fcac357aeb7e79234eb956c
+      inlined_ast: a4b5075c78844f6d02f59de099d7bd2f6fa8a3f6b6b460df8d5615346861967f
+      dce_ast: a4b5075c78844f6d02f59de099d7bd2f6fa8a3f6b6b460df8d5615346861967f
       bytecode: a0b5126f2fda64d2ee08377b08a787af8dcdb825268db2acf45a4a9d94dd8887
       warnings: ""
diff --git a/tests/expectations/compiler/function/inline_twice.out b/tests/expectations/compiler/function/inline_twice.out
index 0c6de7154f..0f2836e02b 100644
--- a/tests/expectations/compiler/function/inline_twice.out
+++ b/tests/expectations/compiler/function/inline_twice.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c99742bfc1c4acfeb26724c953f5824aed0042a5154adb26b4cca530fe9dc82d
-      unrolled_ast: c99742bfc1c4acfeb26724c953f5824aed0042a5154adb26b4cca530fe9dc82d
-      ssa_ast: 72bee03feec0c50c7ebcd55a6162a7bd83e4b9a70facdbd4bc2075ff7b6cc215
-      flattened_ast: 42266a9f2a3ffbafdef6022e70bf73ebb2742c5ab08960fcdaf2a57279bd9f3b
-      inlined_ast: 71eeb3ac5576dc2e47def5e1d0aef86ae28d0e21460afd954e72fddd34553051
-      dce_ast: 71eeb3ac5576dc2e47def5e1d0aef86ae28d0e21460afd954e72fddd34553051
+  - - initial_ast: 5f00db40a457779f6470f53375f91b24da52deef4593c95b0089b7f4902a97ca
+      unrolled_ast: 5f00db40a457779f6470f53375f91b24da52deef4593c95b0089b7f4902a97ca
+      ssa_ast: 6cbe0a59ae6304cb62d0dee9f1c9a0cf04b01d7195f4019390b0f8b2a1eae6db
+      flattened_ast: 02d0301fbb422716ce9a2fcdc4a65b984c548ba170c39f682bcb767ff3246928
+      inlined_ast: 8150b0c3a8eb13cec4f1218ad516e3fd38c54ce45962008c2c020dceea371549
+      dce_ast: 8150b0c3a8eb13cec4f1218ad516e3fd38c54ce45962008c2c020dceea371549
       bytecode: 0d572a58b3609a5835754184c0d7b55b9bb11b101a11a1be25546a212a668e25
       warnings: ""
diff --git a/tests/expectations/compiler/function/private_input_output.out b/tests/expectations/compiler/function/private_input_output.out
index 23fa4503dc..3a76fd04da 100644
--- a/tests/expectations/compiler/function/private_input_output.out
+++ b/tests/expectations/compiler/function/private_input_output.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2d587f8511c03a52fb9cd48bf4c4bd2f302cba8781a9cb68a7560dd1c9eda344
-      unrolled_ast: 2d587f8511c03a52fb9cd48bf4c4bd2f302cba8781a9cb68a7560dd1c9eda344
-      ssa_ast: 0ba888a193ffc6987d206cca8a59fed6ce5e448f479dea16bb5d06d90261ab27
-      flattened_ast: bb4ff2d394cbfe26f448d015e4e8fbff3c6bb3b320c2422e8c788a188d3c7499
-      inlined_ast: bb4ff2d394cbfe26f448d015e4e8fbff3c6bb3b320c2422e8c788a188d3c7499
-      dce_ast: bb4ff2d394cbfe26f448d015e4e8fbff3c6bb3b320c2422e8c788a188d3c7499
+  - - initial_ast: f70252e96e291e58fcca7a161f931e2547d6fecd9abc9c41368c2f59fe9cdf66
+      unrolled_ast: f70252e96e291e58fcca7a161f931e2547d6fecd9abc9c41368c2f59fe9cdf66
+      ssa_ast: 49d8553a376d7248ce26db2e4a118fbed198a1eda6ef2238a3917cdb7a9d26bc
+      flattened_ast: 202e6e6235e152846c6342f68ca006c7cc067f5ec8470c1b13c0a6591e023a38
+      inlined_ast: 202e6e6235e152846c6342f68ca006c7cc067f5ec8470c1b13c0a6591e023a38
+      dce_ast: 202e6e6235e152846c6342f68ca006c7cc067f5ec8470c1b13c0a6591e023a38
       bytecode: 9b307e37c2c37a7ce3a9817079f2c4701e09be5a72610792a62a26d9e2027e0d
       warnings: ""
diff --git a/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out b/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
index 0fea0b18cf..33f3a35828 100644
--- a/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
+++ b/tests/expectations/compiler/function/program_function_any_number_of_inputs_and_outputs.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5912687d64df82b64dd461e5cebb91f8a82bf8046ec30398178b96a12b39173d
-      unrolled_ast: 5912687d64df82b64dd461e5cebb91f8a82bf8046ec30398178b96a12b39173d
-      ssa_ast: 2236622aa3debd847f52de2d950dd4289f89712f14437a1a8200669a0ac0b68e
-      flattened_ast: e404d8ebfd2cf8845b8751ddd34fe0fa184f9eea0dd34ab494da3ff28077db27
-      inlined_ast: e404d8ebfd2cf8845b8751ddd34fe0fa184f9eea0dd34ab494da3ff28077db27
-      dce_ast: e404d8ebfd2cf8845b8751ddd34fe0fa184f9eea0dd34ab494da3ff28077db27
+  - - initial_ast: c305ec2384a32235b140556b43bb277ce3d4d9bb251adb46fae2bad8461be8ae
+      unrolled_ast: c305ec2384a32235b140556b43bb277ce3d4d9bb251adb46fae2bad8461be8ae
+      ssa_ast: 497a3e96ed8b38866ac3f7ef46b72bffe4d1a0ec6940754373f65775ddc3f71c
+      flattened_ast: d46bc43af1b86ac76969fee6c292a1c99d3fe28b3dcf11360aea3a5ac556d6eb
+      inlined_ast: d46bc43af1b86ac76969fee6c292a1c99d3fe28b3dcf11360aea3a5ac556d6eb
+      dce_ast: d46bc43af1b86ac76969fee6c292a1c99d3fe28b3dcf11360aea3a5ac556d6eb
       bytecode: eac5d0cfbac44a017f12d12a655088f7aa15d0567afa771b5ff8d83ba7a9eacd
       warnings: ""
diff --git a/tests/expectations/compiler/function/program_function_empty_body.out b/tests/expectations/compiler/function/program_function_empty_body.out
index 01c0ac94b9..8b00bf80d6 100644
--- a/tests/expectations/compiler/function/program_function_empty_body.out
+++ b/tests/expectations/compiler/function/program_function_empty_body.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0c4a42d58a0ca5ab17a7b979dd695400a33bde675de010d981d80bfe9e4e81cc
-      unrolled_ast: 0c4a42d58a0ca5ab17a7b979dd695400a33bde675de010d981d80bfe9e4e81cc
-      ssa_ast: 0c4a42d58a0ca5ab17a7b979dd695400a33bde675de010d981d80bfe9e4e81cc
-      flattened_ast: 0c4a42d58a0ca5ab17a7b979dd695400a33bde675de010d981d80bfe9e4e81cc
-      inlined_ast: 0c4a42d58a0ca5ab17a7b979dd695400a33bde675de010d981d80bfe9e4e81cc
-      dce_ast: 0c4a42d58a0ca5ab17a7b979dd695400a33bde675de010d981d80bfe9e4e81cc
+  - - initial_ast: 6711278aa7da82d9a4db4c6f9c93d5f605e395e1e0d508860c5ecb7d4ffcbd5e
+      unrolled_ast: 6711278aa7da82d9a4db4c6f9c93d5f605e395e1e0d508860c5ecb7d4ffcbd5e
+      ssa_ast: 6711278aa7da82d9a4db4c6f9c93d5f605e395e1e0d508860c5ecb7d4ffcbd5e
+      flattened_ast: 6aa3caca60d68d74fdd3018c1c0ad7e20bf3dcff076b00f938eed896e4267d6c
+      inlined_ast: 6aa3caca60d68d74fdd3018c1c0ad7e20bf3dcff076b00f938eed896e4267d6c
+      dce_ast: 6aa3caca60d68d74fdd3018c1c0ad7e20bf3dcff076b00f938eed896e4267d6c
       bytecode: abc411306856bb13d787153cb890d742f962dfe924477954c427b7a3ab4e279b
       warnings: ""
diff --git a/tests/expectations/compiler/function/program_function_unit_type.out b/tests/expectations/compiler/function/program_function_unit_type.out
index af150aa0a9..c238118454 100644
--- a/tests/expectations/compiler/function/program_function_unit_type.out
+++ b/tests/expectations/compiler/function/program_function_unit_type.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 673304b96a3e4472415af69a6ed9c8341c3522ec20207d413c282d65f0b4f055
-      unrolled_ast: 673304b96a3e4472415af69a6ed9c8341c3522ec20207d413c282d65f0b4f055
-      ssa_ast: 673304b96a3e4472415af69a6ed9c8341c3522ec20207d413c282d65f0b4f055
-      flattened_ast: 673304b96a3e4472415af69a6ed9c8341c3522ec20207d413c282d65f0b4f055
-      inlined_ast: 673304b96a3e4472415af69a6ed9c8341c3522ec20207d413c282d65f0b4f055
-      dce_ast: 673304b96a3e4472415af69a6ed9c8341c3522ec20207d413c282d65f0b4f055
+  - - initial_ast: 845519529252ec222695d614751f2fc50102b2451b4233310a181acfc980d7f0
+      unrolled_ast: 845519529252ec222695d614751f2fc50102b2451b4233310a181acfc980d7f0
+      ssa_ast: 845519529252ec222695d614751f2fc50102b2451b4233310a181acfc980d7f0
+      flattened_ast: 6f8b1d8d8be1d34b72f3a701bbe6237caeef92c2757f9363f6f65f2396f33490
+      inlined_ast: 6f8b1d8d8be1d34b72f3a701bbe6237caeef92c2757f9363f6f65f2396f33490
+      dce_ast: 6f8b1d8d8be1d34b72f3a701bbe6237caeef92c2757f9363f6f65f2396f33490
       bytecode: 8ed93150ef7e3de74faaace88f995a65373e73428068d75142100775684d2fe7
       warnings: ""
diff --git a/tests/expectations/compiler/function/program_function_with_mode.out b/tests/expectations/compiler/function/program_function_with_mode.out
index 3ad7fb611b..7cf78a4d3c 100644
--- a/tests/expectations/compiler/function/program_function_with_mode.out
+++ b/tests/expectations/compiler/function/program_function_with_mode.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 666a17919b11d3883495cb8b871af96937bbb2b48093f33514455c2d28383c79
-      unrolled_ast: 666a17919b11d3883495cb8b871af96937bbb2b48093f33514455c2d28383c79
-      ssa_ast: d3d36880d0e6149f87a845fa0954b37f4258afb127f975427cc90faf3d422379
-      flattened_ast: 73a4090d206d60892ad5148c6adeb64c09d99148e10af3b15a1317e7cb4b5c70
-      inlined_ast: 73a4090d206d60892ad5148c6adeb64c09d99148e10af3b15a1317e7cb4b5c70
-      dce_ast: 73a4090d206d60892ad5148c6adeb64c09d99148e10af3b15a1317e7cb4b5c70
+  - - initial_ast: 2bbaeb7f10f76377ac3a2a44269d524d140982e4918ea58dbee8b23c515280b6
+      unrolled_ast: 2bbaeb7f10f76377ac3a2a44269d524d140982e4918ea58dbee8b23c515280b6
+      ssa_ast: 264ac617a517719b6b0b9ed179244f031d7178ecb06a322049b6d5b5732360c2
+      flattened_ast: 5ab607cf53d0a9b13f0cce2e533498bfbb99fa1cacbf20b025694a16fdeb7759
+      inlined_ast: 5ab607cf53d0a9b13f0cce2e533498bfbb99fa1cacbf20b025694a16fdeb7759
+      dce_ast: 5ab607cf53d0a9b13f0cce2e533498bfbb99fa1cacbf20b025694a16fdeb7759
       bytecode: 7d4b43f8c90f7d5050fe8df5f3e44485187d882e4ecd4a9fcf9aae5ae14413df
       warnings: ""
diff --git a/tests/expectations/compiler/function/record_in_conditional_return.out b/tests/expectations/compiler/function/record_in_conditional_return.out
index b15a3b4776..0f0c5a35da 100644
--- a/tests/expectations/compiler/function/record_in_conditional_return.out
+++ b/tests/expectations/compiler/function/record_in_conditional_return.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b275f9502a824a6e591bd11bb9c92d261b93fffea7c80f24e24e475cfde00af3
-      unrolled_ast: b275f9502a824a6e591bd11bb9c92d261b93fffea7c80f24e24e475cfde00af3
-      ssa_ast: 2cd2becdf0a5960bb83f7ab31f5fa1ff2a84f8ca9615362dca5cd46f18f86e70
-      flattened_ast: 5e660774965ed7a207f9384ae924426b097f5d14786acead84827b0c1f41cb5e
-      inlined_ast: 5e660774965ed7a207f9384ae924426b097f5d14786acead84827b0c1f41cb5e
-      dce_ast: 5e660774965ed7a207f9384ae924426b097f5d14786acead84827b0c1f41cb5e
+  - - initial_ast: 54d66b6639fa4a76a4345a1c29f028bb2b18f92f206a52ef80a3d8b588e48ef2
+      unrolled_ast: 54d66b6639fa4a76a4345a1c29f028bb2b18f92f206a52ef80a3d8b588e48ef2
+      ssa_ast: 4446f8a269f91440de1678448b1830aba0bdb708b2e27e062005901027a41f39
+      flattened_ast: 2e99bcbc10c25049355c16e777e0efe5311e6f9152bb4075f0d25be94e5ce2b2
+      inlined_ast: 2e99bcbc10c25049355c16e777e0efe5311e6f9152bb4075f0d25be94e5ce2b2
+      dce_ast: 2e99bcbc10c25049355c16e777e0efe5311e6f9152bb4075f0d25be94e5ce2b2
       bytecode: 09eb168678e6d283b54048071265b282a4e47edb37a9544b4e44f478cbf21dff
       warnings: ""
diff --git a/tests/expectations/compiler/function/self.out b/tests/expectations/compiler/function/self.out
index 61e87bffc1..98ac0057e3 100644
--- a/tests/expectations/compiler/function/self.out
+++ b/tests/expectations/compiler/function/self.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 417c3f99c0241a5722f637fdb3ab8e5e70a9685a9cbd8b13c3544943023814b1
-      unrolled_ast: 417c3f99c0241a5722f637fdb3ab8e5e70a9685a9cbd8b13c3544943023814b1
-      ssa_ast: d3276e8eda38b2dd338fc6e46d6009c62612220fd354bb130928ae23d1436170
-      flattened_ast: 93d3ad814c3cce0a6980b1eefbfc33573f1c2ef3c4df449ab06b5fb54a37589d
-      inlined_ast: 93d3ad814c3cce0a6980b1eefbfc33573f1c2ef3c4df449ab06b5fb54a37589d
-      dce_ast: 93d3ad814c3cce0a6980b1eefbfc33573f1c2ef3c4df449ab06b5fb54a37589d
+  - - initial_ast: 85e89df51a34e7c0c397ab15581fde0c17d2191453d14dbe99ded7f5b6dd2eea
+      unrolled_ast: 85e89df51a34e7c0c397ab15581fde0c17d2191453d14dbe99ded7f5b6dd2eea
+      ssa_ast: b632601c6fc5051053c2d05dd0496a28e8db9ee1d10c292941b63429a8e574f4
+      flattened_ast: aeab5b05aa1b4c3c4b0dc85f3adb71244f9c71620fa717181f59d4a59ad1d4a0
+      inlined_ast: aeab5b05aa1b4c3c4b0dc85f3adb71244f9c71620fa717181f59d4a59ad1d4a0
+      dce_ast: aeab5b05aa1b4c3c4b0dc85f3adb71244f9c71620fa717181f59d4a59ad1d4a0
       bytecode: 189a1342c4be53d495f4ebae39c645cb1f27532c1cc1f27f4ed656ed200f05af
       warnings: ""
diff --git a/tests/expectations/compiler/group/add.out b/tests/expectations/compiler/group/add.out
index 90bfcf4c7e..359401dc72 100644
--- a/tests/expectations/compiler/group/add.out
+++ b/tests/expectations/compiler/group/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d063f7eb8cc112be410a45976d6de9c1eec7ec2036eec85d563546c945559998
-      unrolled_ast: d063f7eb8cc112be410a45976d6de9c1eec7ec2036eec85d563546c945559998
-      ssa_ast: 1cbb5276a931bece7e00ed1db43583783fa078020f618ce6c3b972430ce34507
-      flattened_ast: a7234ed32bc0bbfc6f53785816b94ba33d2a3ee488c45607dbd5008538c52d3c
-      inlined_ast: a7234ed32bc0bbfc6f53785816b94ba33d2a3ee488c45607dbd5008538c52d3c
-      dce_ast: a7234ed32bc0bbfc6f53785816b94ba33d2a3ee488c45607dbd5008538c52d3c
+  - - initial_ast: 36f42ebc0f39eaa43a2f6ef33abd5b8962594b8252f09c72f01b2358035f9caf
+      unrolled_ast: 36f42ebc0f39eaa43a2f6ef33abd5b8962594b8252f09c72f01b2358035f9caf
+      ssa_ast: 32596154c26c7ac0b7dace42f3288d6893888d9b8bdfc6893f1eed4b7d0926de
+      flattened_ast: cf64387b790f2fef2d2fdabf1b9f2d2cf79307ca4251d16828b8adf3a960ec3a
+      inlined_ast: cf64387b790f2fef2d2fdabf1b9f2d2cf79307ca4251d16828b8adf3a960ec3a
+      dce_ast: cf64387b790f2fef2d2fdabf1b9f2d2cf79307ca4251d16828b8adf3a960ec3a
       bytecode: e5ff5cd670d0f32a96530eeba1b403bf2d6d5ff8ed31f4328227bb8857708f76
       warnings: ""
diff --git a/tests/expectations/compiler/group/assert_eq.out b/tests/expectations/compiler/group/assert_eq.out
index a96dea78fc..1c4a718fcd 100644
--- a/tests/expectations/compiler/group/assert_eq.out
+++ b/tests/expectations/compiler/group/assert_eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 535c9e01def563c4fc17d5046e9cd18a3cc085a996244bcd0c4bce7b70639bdd
-      unrolled_ast: 535c9e01def563c4fc17d5046e9cd18a3cc085a996244bcd0c4bce7b70639bdd
-      ssa_ast: f032f2c5c78968b1f8cf1befcba874bcf6b8579441d65be7f4646f8667526019
-      flattened_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
-      inlined_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
-      dce_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
+  - - initial_ast: 1de533b4f92919d798c4730ec52b527cd2242237596bb4f68398632961ff0337
+      unrolled_ast: 1de533b4f92919d798c4730ec52b527cd2242237596bb4f68398632961ff0337
+      ssa_ast: 20fc24a66cf59ec1a57628030785e6aabc15a6db5539786049ce2fd163ef4a77
+      flattened_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
+      inlined_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
+      dce_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
       bytecode: eb0861b61cc665bd3edf10993c284116f86a8853e5c44847b4f0ec2d99fd6c3f
       warnings: ""
diff --git a/tests/expectations/compiler/group/eq.out b/tests/expectations/compiler/group/eq.out
index a96dea78fc..1c4a718fcd 100644
--- a/tests/expectations/compiler/group/eq.out
+++ b/tests/expectations/compiler/group/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 535c9e01def563c4fc17d5046e9cd18a3cc085a996244bcd0c4bce7b70639bdd
-      unrolled_ast: 535c9e01def563c4fc17d5046e9cd18a3cc085a996244bcd0c4bce7b70639bdd
-      ssa_ast: f032f2c5c78968b1f8cf1befcba874bcf6b8579441d65be7f4646f8667526019
-      flattened_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
-      inlined_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
-      dce_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
+  - - initial_ast: 1de533b4f92919d798c4730ec52b527cd2242237596bb4f68398632961ff0337
+      unrolled_ast: 1de533b4f92919d798c4730ec52b527cd2242237596bb4f68398632961ff0337
+      ssa_ast: 20fc24a66cf59ec1a57628030785e6aabc15a6db5539786049ce2fd163ef4a77
+      flattened_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
+      inlined_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
+      dce_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
       bytecode: eb0861b61cc665bd3edf10993c284116f86a8853e5c44847b4f0ec2d99fd6c3f
       warnings: ""
diff --git a/tests/expectations/compiler/group/group_mul.out b/tests/expectations/compiler/group/group_mul.out
index d2b552f9c4..172c43c530 100644
--- a/tests/expectations/compiler/group/group_mul.out
+++ b/tests/expectations/compiler/group/group_mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6f7948ae4476df75e896b934dbbecc2b6cdb912123a66122e96cf50dfe73e0dd
-      unrolled_ast: 6f7948ae4476df75e896b934dbbecc2b6cdb912123a66122e96cf50dfe73e0dd
-      ssa_ast: 330d7ec83f0aa56479f68cc03c2060e8e60a59b1c56af5712ca5d3fd941254d2
-      flattened_ast: 82c2a121b0d736042a2fefbb998ada3093711d3eeb832880dc75134a59535d63
-      inlined_ast: 82c2a121b0d736042a2fefbb998ada3093711d3eeb832880dc75134a59535d63
-      dce_ast: 7469823e9e90c2bc72b776186f8c5bd9af74d33f9ff3ed4fd3b37e065e3b71ec
+  - - initial_ast: 9b69ef8889ad7c92b67a69db5f1b282cf53767ace7c72e6f823e09f11ed63f1e
+      unrolled_ast: 9b69ef8889ad7c92b67a69db5f1b282cf53767ace7c72e6f823e09f11ed63f1e
+      ssa_ast: fb4600396fe07b0273fd6c96f7826c11b6c854b84f6f8a3c778c249bcc90b940
+      flattened_ast: 86f5fbbf061a3b38bbdf48ab4d57fa8c2d347bca1f5a5f82a33922a3a18cfcad
+      inlined_ast: 86f5fbbf061a3b38bbdf48ab4d57fa8c2d347bca1f5a5f82a33922a3a18cfcad
+      dce_ast: 6d0ce5d21d955f73720d623499377df9f154c20575bb1734e67579aa76ddfa7d
       bytecode: 893927d508e10659ff793c68266c2702a5002dab713b22c8e5d00abec91925e7
       warnings: ""
diff --git a/tests/expectations/compiler/group/input.out b/tests/expectations/compiler/group/input.out
index a96dea78fc..1c4a718fcd 100644
--- a/tests/expectations/compiler/group/input.out
+++ b/tests/expectations/compiler/group/input.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 535c9e01def563c4fc17d5046e9cd18a3cc085a996244bcd0c4bce7b70639bdd
-      unrolled_ast: 535c9e01def563c4fc17d5046e9cd18a3cc085a996244bcd0c4bce7b70639bdd
-      ssa_ast: f032f2c5c78968b1f8cf1befcba874bcf6b8579441d65be7f4646f8667526019
-      flattened_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
-      inlined_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
-      dce_ast: 64b4e69f1638dc911098416cc5f64fa119fe7fc4df9ded921ca8e937f221af6d
+  - - initial_ast: 1de533b4f92919d798c4730ec52b527cd2242237596bb4f68398632961ff0337
+      unrolled_ast: 1de533b4f92919d798c4730ec52b527cd2242237596bb4f68398632961ff0337
+      ssa_ast: 20fc24a66cf59ec1a57628030785e6aabc15a6db5539786049ce2fd163ef4a77
+      flattened_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
+      inlined_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
+      dce_ast: 9eaf6f8a03eaf9c9e57ea323234f5579efd8d7cda548fa82ef54685c7e80c861
       bytecode: eb0861b61cc665bd3edf10993c284116f86a8853e5c44847b4f0ec2d99fd6c3f
       warnings: ""
diff --git a/tests/expectations/compiler/group/mul.out b/tests/expectations/compiler/group/mul.out
index 6aa8eb81bf..ffcbd2b166 100644
--- a/tests/expectations/compiler/group/mul.out
+++ b/tests/expectations/compiler/group/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 58ab037af14f17fb0b909575276a98b51a267dc3f1f6773a46483d4f5f2c2fad
-      unrolled_ast: 58ab037af14f17fb0b909575276a98b51a267dc3f1f6773a46483d4f5f2c2fad
-      ssa_ast: f802a5291da6427c97ddc1d7ff5d76a02bb3d34b17d6e4eb128e0c1e8dc5dbfc
-      flattened_ast: fb9b32abd3f503aee3ca56e5719438ee15c7560491ab3ea56d6029f94e7e055d
-      inlined_ast: fb9b32abd3f503aee3ca56e5719438ee15c7560491ab3ea56d6029f94e7e055d
-      dce_ast: fb9b32abd3f503aee3ca56e5719438ee15c7560491ab3ea56d6029f94e7e055d
+  - - initial_ast: 22c6d0f90f56ddde7993d3d28881f24c2c436d5f4f68487e99d346fea0a6be57
+      unrolled_ast: 22c6d0f90f56ddde7993d3d28881f24c2c436d5f4f68487e99d346fea0a6be57
+      ssa_ast: 5adecaa9d3a6b0f63480da5a0177043252fb191e6cbb2fe448fd73a0f0558ccb
+      flattened_ast: 4035e5dc580c5b9cdac7c90dde3d4f34bfcdb17cc7d5302a3f6ad3da8c0092a2
+      inlined_ast: 4035e5dc580c5b9cdac7c90dde3d4f34bfcdb17cc7d5302a3f6ad3da8c0092a2
+      dce_ast: 4035e5dc580c5b9cdac7c90dde3d4f34bfcdb17cc7d5302a3f6ad3da8c0092a2
       bytecode: 5ae93b430e99846cd18eedb09361257138ec9e2708bdb12c5f8de43ee470c031
       warnings: ""
diff --git a/tests/expectations/compiler/group/mult_by_scalar.out b/tests/expectations/compiler/group/mult_by_scalar.out
index 263b442a9c..c7791ea614 100644
--- a/tests/expectations/compiler/group/mult_by_scalar.out
+++ b/tests/expectations/compiler/group/mult_by_scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a3a067c8ecc32f815a58b98ee6bb6200f4a24983ab264f68cf3c64f871b5b244
-      unrolled_ast: a3a067c8ecc32f815a58b98ee6bb6200f4a24983ab264f68cf3c64f871b5b244
-      ssa_ast: bf644bb764bff5472f1dc62ff66e3cc3d65f43efdfa30b2904fdb7effea737e1
-      flattened_ast: 040778190370ff57432ece4c84b129a8b42818c57e10f4e3eba3dfb79ab61b86
-      inlined_ast: 040778190370ff57432ece4c84b129a8b42818c57e10f4e3eba3dfb79ab61b86
-      dce_ast: 040778190370ff57432ece4c84b129a8b42818c57e10f4e3eba3dfb79ab61b86
+  - - initial_ast: 3f233be7e232ce00e516c26067ff7cdcac30312715f83de343cef5b759292f4d
+      unrolled_ast: 3f233be7e232ce00e516c26067ff7cdcac30312715f83de343cef5b759292f4d
+      ssa_ast: 3697f9057a951db62e7da1ab4473d596770463abb3b0ecbedf3a190de884af5b
+      flattened_ast: 2fab55cd31c421d46ccd58b94a639f9b230a059176a5c3d1ac236674825215b7
+      inlined_ast: 2fab55cd31c421d46ccd58b94a639f9b230a059176a5c3d1ac236674825215b7
+      dce_ast: 2fab55cd31c421d46ccd58b94a639f9b230a059176a5c3d1ac236674825215b7
       bytecode: 8d98c485074bce1870f038811bfa40e7910f16e7e489f22263f9b1816b1e2d8c
       warnings: ""
diff --git a/tests/expectations/compiler/group/negate.out b/tests/expectations/compiler/group/negate.out
index 27796fa340..178d7f3e8d 100644
--- a/tests/expectations/compiler/group/negate.out
+++ b/tests/expectations/compiler/group/negate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d0ff0a3499d7ad95d2331d0ca37c70a555b59a2a54767abf56d1d31373ea1bef
-      unrolled_ast: d0ff0a3499d7ad95d2331d0ca37c70a555b59a2a54767abf56d1d31373ea1bef
-      ssa_ast: 80ca3e8962b66ac795c8dde0b6325a5e9f599a5019ca58e58b355ed2ae9697a0
-      flattened_ast: 794a932001938db4a01aba5f2e8399497c6f2bdff337d922bb3e026b2a1aba59
-      inlined_ast: 794a932001938db4a01aba5f2e8399497c6f2bdff337d922bb3e026b2a1aba59
-      dce_ast: 794a932001938db4a01aba5f2e8399497c6f2bdff337d922bb3e026b2a1aba59
+  - - initial_ast: 297172f141b5a11cd7addb730eb5889037efee73d157919f1d8e224bec335822
+      unrolled_ast: 297172f141b5a11cd7addb730eb5889037efee73d157919f1d8e224bec335822
+      ssa_ast: 7a63e657c8eb744d6056e01575d4182698a6eb8735e64b145083c17ee5a49098
+      flattened_ast: 7d5c0895963be68a53f67791f66924621eab434cc643d7add75199250e806d00
+      inlined_ast: 7d5c0895963be68a53f67791f66924621eab434cc643d7add75199250e806d00
+      dce_ast: 7d5c0895963be68a53f67791f66924621eab434cc643d7add75199250e806d00
       bytecode: 0d7662a131d11ba04a4f945b24906a6f1899ac4260e423cc48aadd781371d3f5
       warnings: ""
diff --git a/tests/expectations/compiler/group/operator_methods.out b/tests/expectations/compiler/group/operator_methods.out
index 9dc644b566..487185cf72 100644
--- a/tests/expectations/compiler/group/operator_methods.out
+++ b/tests/expectations/compiler/group/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f9b4eaa61b601d31b1fb87510fa173185645d02572755627d1837b6018c2f399
-      unrolled_ast: f9b4eaa61b601d31b1fb87510fa173185645d02572755627d1837b6018c2f399
-      ssa_ast: 95214344d65f15d3d1cc9e85ed95270a49df8abe5a95d891b7865253c160bb65
-      flattened_ast: 46aa6e1b9c28994aefb22473beb3c8205f7ac318e778eb00965a7ba92a0d7af8
-      inlined_ast: 46aa6e1b9c28994aefb22473beb3c8205f7ac318e778eb00965a7ba92a0d7af8
-      dce_ast: 9bc23c2eb5008e8d5af7b8ff4adb45e9067d18efca63deba222c43235c6acabe
+  - - initial_ast: 10807192c7d1f0faaca50fc27b80f34c971778d7fd5d12a2b27988aff9288c80
+      unrolled_ast: 10807192c7d1f0faaca50fc27b80f34c971778d7fd5d12a2b27988aff9288c80
+      ssa_ast: f37e6a43fab9b1e91abf50c78ede30327c096c922ae590706fb2272e78eade69
+      flattened_ast: a78886701d8046e20e20ecdf1319445baf0268735caf3bab2e80231ce0d821bc
+      inlined_ast: a78886701d8046e20e20ecdf1319445baf0268735caf3bab2e80231ce0d821bc
+      dce_ast: e058dad521a668c12449b0849c39feac9eb6bd772bf85e3092a7d0e6285501c3
       bytecode: f8f1b8520fc2b0b64155f840db31d03aeee1afecd309f7a4be10038ee72fc5ea
       warnings: ""
diff --git a/tests/expectations/compiler/group/point_input.out b/tests/expectations/compiler/group/point_input.out
index 52d7980237..fa7ba552a1 100644
--- a/tests/expectations/compiler/group/point_input.out
+++ b/tests/expectations/compiler/group/point_input.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d68a294d45e93c9d1b407b27a0edf7e7fdee1e1d1ab91b3bd932ebe5b64218e0
-      unrolled_ast: d68a294d45e93c9d1b407b27a0edf7e7fdee1e1d1ab91b3bd932ebe5b64218e0
-      ssa_ast: 4866f85fe36a80c4ba9d08fd68bc13825adf300b55bd830be09c560bf330dbd7
-      flattened_ast: c6cc4a033d316b2661080be928d3eb0c34c784bd7e303f8646c983efd8337214
-      inlined_ast: c6cc4a033d316b2661080be928d3eb0c34c784bd7e303f8646c983efd8337214
-      dce_ast: c6cc4a033d316b2661080be928d3eb0c34c784bd7e303f8646c983efd8337214
+  - - initial_ast: 42760982d77a077b6f33686d6f62c63eef5221dae4d51b2dc9ec910f3edc442e
+      unrolled_ast: 42760982d77a077b6f33686d6f62c63eef5221dae4d51b2dc9ec910f3edc442e
+      ssa_ast: 9c11d7feb984f360de962fdbc16114e9bdab4e1f7b19fa0fa28ff413b8fc7fd0
+      flattened_ast: 5396b75e80bfed0c9bb372fa88d8c7b1533272fe1881f2e82d582cd48f2820c5
+      inlined_ast: 5396b75e80bfed0c9bb372fa88d8c7b1533272fe1881f2e82d582cd48f2820c5
+      dce_ast: 5396b75e80bfed0c9bb372fa88d8c7b1533272fe1881f2e82d582cd48f2820c5
       bytecode: e7f080384059049f2c24ec0a010b5ec6b055497b51b78d736a5e2e8fa7b441eb
       warnings: ""
diff --git a/tests/expectations/compiler/group/sub.out b/tests/expectations/compiler/group/sub.out
index fd71f14ca8..70b9ff0e3c 100644
--- a/tests/expectations/compiler/group/sub.out
+++ b/tests/expectations/compiler/group/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5dc762304f4fb5163029b60650e30ef414cc5420b20945168801068d0c59376b
-      unrolled_ast: 5dc762304f4fb5163029b60650e30ef414cc5420b20945168801068d0c59376b
-      ssa_ast: bbc5412996002e09684a4f0c923acdd42b91eff237279f066a2344a555def9ca
-      flattened_ast: b3fcfa059a42e63faad40e677b7744053bafb01f2bf7801d854ac324bd47733a
-      inlined_ast: b3fcfa059a42e63faad40e677b7744053bafb01f2bf7801d854ac324bd47733a
-      dce_ast: b3fcfa059a42e63faad40e677b7744053bafb01f2bf7801d854ac324bd47733a
+  - - initial_ast: d9189295ebb66bc3a6ce84f6af5a16e610a025a1456c0095504aee325910f487
+      unrolled_ast: d9189295ebb66bc3a6ce84f6af5a16e610a025a1456c0095504aee325910f487
+      ssa_ast: 82f3f4558eb1e26a3a12429485162c9021ed65f1f16b8288cf2ca9973bb0dcf2
+      flattened_ast: b02f4b01ce7bae81aafde21ae4042015b00079a5153649271e8564465571eab6
+      inlined_ast: b02f4b01ce7bae81aafde21ae4042015b00079a5153649271e8564465571eab6
+      dce_ast: b02f4b01ce7bae81aafde21ae4042015b00079a5153649271e8564465571eab6
       bytecode: cab98d3ba5835201a8db5ce82ab32e51dc68f37a01156374e2f00a8bcbd82308
       warnings: ""
diff --git a/tests/expectations/compiler/group/ternary.out b/tests/expectations/compiler/group/ternary.out
index 5928850c7a..d93c9434bd 100644
--- a/tests/expectations/compiler/group/ternary.out
+++ b/tests/expectations/compiler/group/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1e3ca481a60cc9c530eaa5ef718200ed559e10d75c8b8f10a3530ee3f91c5cef
-      unrolled_ast: 1e3ca481a60cc9c530eaa5ef718200ed559e10d75c8b8f10a3530ee3f91c5cef
-      ssa_ast: 931973d047b7d57a938556bbeeca78b59e1d19ac57f5e4f9ada1eee396f9202f
-      flattened_ast: d7babf9c07d7af2cb5bfb2d608b98816ba99fff1ec539b8de5824f4550d832d4
-      inlined_ast: d7babf9c07d7af2cb5bfb2d608b98816ba99fff1ec539b8de5824f4550d832d4
-      dce_ast: d7babf9c07d7af2cb5bfb2d608b98816ba99fff1ec539b8de5824f4550d832d4
+  - - initial_ast: 63b2a89ddc1f8a29c7ade9c158a62b9201913579bb6ab8298a82904dcf0f5e36
+      unrolled_ast: 63b2a89ddc1f8a29c7ade9c158a62b9201913579bb6ab8298a82904dcf0f5e36
+      ssa_ast: 9d70b0f87bbd521af530d4f8f7852021545e067d5bdcdf0c34f1c6f67449dfe2
+      flattened_ast: 36d0104d60e61bb307d77d5be35a8638c866e23b222b761e3a516b7b3e0f6ee6
+      inlined_ast: 36d0104d60e61bb307d77d5be35a8638c866e23b222b761e3a516b7b3e0f6ee6
+      dce_ast: 36d0104d60e61bb307d77d5be35a8638c866e23b222b761e3a516b7b3e0f6ee6
       bytecode: d60be9014c6563fb9bb800891ce6238d2f99473faf47c92cf99893ad1474a64e
       warnings: ""
diff --git a/tests/expectations/compiler/group/to_x_coordinate.out b/tests/expectations/compiler/group/to_x_coordinate.out
index 72ad59b628..e35f5749a9 100644
--- a/tests/expectations/compiler/group/to_x_coordinate.out
+++ b/tests/expectations/compiler/group/to_x_coordinate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0dbcbb169e9aeeb8780029b2693b67ee69b7c72f6650cc343322da413f62ab86
-      unrolled_ast: 0dbcbb169e9aeeb8780029b2693b67ee69b7c72f6650cc343322da413f62ab86
-      ssa_ast: 3aec3281c4fe52210cec95bc2638cda34208a73d5194b5ce7fc104b95d927919
-      flattened_ast: f6bd03925a3cd15b527d31d2022ff9d3da7389a5866873d8c755e6b733d08116
-      inlined_ast: f6bd03925a3cd15b527d31d2022ff9d3da7389a5866873d8c755e6b733d08116
-      dce_ast: 44bfad549691bae85d759d5ea86b91e482b71671290def0e83f8630cdce0cc0f
+  - - initial_ast: 0c01966b8a352add4260f28c45dc9c2cd30769cedd6d87462344f73940e84532
+      unrolled_ast: 0c01966b8a352add4260f28c45dc9c2cd30769cedd6d87462344f73940e84532
+      ssa_ast: a8af88d40b03e1c5bedd16941e50b01370a5054d1790aa76dd058ca206eb0f23
+      flattened_ast: cf796e7ff65020208604db477fdb77c5ef99ce396df136e6b3df435e3acedd63
+      inlined_ast: cf796e7ff65020208604db477fdb77c5ef99ce396df136e6b3df435e3acedd63
+      dce_ast: f94bd4a2d4172450859dfe817b22c56868ca6116fbd54e15588e4f6ee6c05b9a
       bytecode: 51e95e10668242bec30e9917715d9856da632e933c33207ee41c5ed38d6366aa
       warnings: ""
diff --git a/tests/expectations/compiler/group/to_y_coordinate.out b/tests/expectations/compiler/group/to_y_coordinate.out
index 8479141ff0..e8bbab43a0 100644
--- a/tests/expectations/compiler/group/to_y_coordinate.out
+++ b/tests/expectations/compiler/group/to_y_coordinate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c507383c1ab76177af879038bc10c041383cc7a8c279608090e748086dbc7280
-      unrolled_ast: c507383c1ab76177af879038bc10c041383cc7a8c279608090e748086dbc7280
-      ssa_ast: ca84dfa0d1d72e56e0c3c1cec5fa051917ab9de240a93fa249adc4c5df835b71
-      flattened_ast: 55c0729e70762952c978d6b93ad94c6028d7ad7b794ba8295639c4ec664fb25e
-      inlined_ast: 55c0729e70762952c978d6b93ad94c6028d7ad7b794ba8295639c4ec664fb25e
-      dce_ast: 9143f5ebe2811be9f8bd1c7263701b54638fb544804f96834a41d1b426fa5a7f
+  - - initial_ast: 4e050d63cfe43c07b16941bd7b3b784a70395cbd7dd01f85914dd2a3acec27a1
+      unrolled_ast: 4e050d63cfe43c07b16941bd7b3b784a70395cbd7dd01f85914dd2a3acec27a1
+      ssa_ast: 02b89e1f1f447030573dc691004fdfc1d898ac9527d1344ea75e0ab765e3002a
+      flattened_ast: c5c8c3bc892902b1afa601dfd26edfd5051df82f3873c9acfd5ab994f750c1c6
+      inlined_ast: c5c8c3bc892902b1afa601dfd26edfd5051df82f3873c9acfd5ab994f750c1c6
+      dce_ast: 7ac2e95bc514cfdf60c54b802433b42f77ba02411f34fb55420e3085d7783016
       bytecode: ea2e94f0f589fac4565040575643b1b7cd7813fe513d5b09b17c191bbf0f727e
       warnings: ""
diff --git a/tests/expectations/compiler/group/x_and_y.out b/tests/expectations/compiler/group/x_and_y.out
index 8bc29c7d9a..6b8ba4790d 100644
--- a/tests/expectations/compiler/group/x_and_y.out
+++ b/tests/expectations/compiler/group/x_and_y.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bf10281b3c45a0353c2ce919266637edbdfcaea0c54ca05cb7f1fcad1d77e0ba
-      unrolled_ast: bf10281b3c45a0353c2ce919266637edbdfcaea0c54ca05cb7f1fcad1d77e0ba
-      ssa_ast: 5a7c0a95537ccebc8ddc593cad945583a4ed80e8022a2c2cd1db0774bd5cc7cd
-      flattened_ast: fbe05258258b5d1b647cee7d08e40ab565fbe26c8b959288a99889b7b2d69b66
-      inlined_ast: fbe05258258b5d1b647cee7d08e40ab565fbe26c8b959288a99889b7b2d69b66
-      dce_ast: fbe05258258b5d1b647cee7d08e40ab565fbe26c8b959288a99889b7b2d69b66
+  - - initial_ast: d011524fdf4977be2ff184a54b5e3c765db3190ad5274f800acd36536b8d6597
+      unrolled_ast: d011524fdf4977be2ff184a54b5e3c765db3190ad5274f800acd36536b8d6597
+      ssa_ast: 178aba7bd0f5840a53c695275d435718921ad3f2b971f6ab74ff5326f94dd6cd
+      flattened_ast: a07a3e6a4f85c670c0c9cfa140c35c7ecfb69dbca001c683e7df3fadb7d2bd6c
+      inlined_ast: a07a3e6a4f85c670c0c9cfa140c35c7ecfb69dbca001c683e7df3fadb7d2bd6c
+      dce_ast: a07a3e6a4f85c670c0c9cfa140c35c7ecfb69dbca001c683e7df3fadb7d2bd6c
       bytecode: c8688cd1fc15c816d4af483fa444f44414acb4b679b0165f9fb7093f77738f5a
       warnings: ""
diff --git a/tests/expectations/compiler/group/x_sign_high.out b/tests/expectations/compiler/group/x_sign_high.out
index a62748be52..cfe9a9fb8b 100644
--- a/tests/expectations/compiler/group/x_sign_high.out
+++ b/tests/expectations/compiler/group/x_sign_high.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 88b587fb22383986e4bb34027e4f730ea942846c727adad33aa2e511bde2fece
-      unrolled_ast: 88b587fb22383986e4bb34027e4f730ea942846c727adad33aa2e511bde2fece
-      ssa_ast: 263f205d0db56b92e2a51a37bcecf9e9c2a43f86f9421641359f76c2fa0a36f7
-      flattened_ast: 487615045ca8ca316f3e615cbf909dd743d6dafdf3b1b8ef1ede99eb3066e7e2
-      inlined_ast: 487615045ca8ca316f3e615cbf909dd743d6dafdf3b1b8ef1ede99eb3066e7e2
-      dce_ast: 487615045ca8ca316f3e615cbf909dd743d6dafdf3b1b8ef1ede99eb3066e7e2
+  - - initial_ast: 3b2d2e3a149c28b420ea4e041563a43aeac849f30f1bb457b5388f76d5723022
+      unrolled_ast: 3b2d2e3a149c28b420ea4e041563a43aeac849f30f1bb457b5388f76d5723022
+      ssa_ast: 0b7e6149e3b7158829835b17eed5ef2faa1958cd7b0f057cf87f77489b523d75
+      flattened_ast: 4dd9d839933c8c7ae38f762a81b80bea5622483baa00e096d47c395e07b9a55a
+      inlined_ast: 4dd9d839933c8c7ae38f762a81b80bea5622483baa00e096d47c395e07b9a55a
+      dce_ast: 4dd9d839933c8c7ae38f762a81b80bea5622483baa00e096d47c395e07b9a55a
       bytecode: c8688cd1fc15c816d4af483fa444f44414acb4b679b0165f9fb7093f77738f5a
       warnings: ""
diff --git a/tests/expectations/compiler/group/x_sign_inferred.out b/tests/expectations/compiler/group/x_sign_inferred.out
index 3febdcc27e..dc05037c7e 100644
--- a/tests/expectations/compiler/group/x_sign_inferred.out
+++ b/tests/expectations/compiler/group/x_sign_inferred.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: dde52f0c437a58c3092ac594347ccca267c58aefade0d611f542360d5390ea6d
-      unrolled_ast: dde52f0c437a58c3092ac594347ccca267c58aefade0d611f542360d5390ea6d
-      ssa_ast: 8c0103bbc1a294f5e803965d3f3fcfeea08c87e2c5b16c569000d50eabb05199
-      flattened_ast: 07f09e38b8cc6c12d2ff2f8bb45c483e7fee2080bdd373a13aa1f7f39f464551
-      inlined_ast: 07f09e38b8cc6c12d2ff2f8bb45c483e7fee2080bdd373a13aa1f7f39f464551
-      dce_ast: 07f09e38b8cc6c12d2ff2f8bb45c483e7fee2080bdd373a13aa1f7f39f464551
+  - - initial_ast: 2044fd921d15f5920838f32135fcd13c73d110a01423e67284357c8bead32388
+      unrolled_ast: 2044fd921d15f5920838f32135fcd13c73d110a01423e67284357c8bead32388
+      ssa_ast: 79b45cf49de85874841f4ef22e1cbe0ef3c1289c6b462a493a2578acb8185946
+      flattened_ast: 557358db2c67ac2d6cf56ba5c5a0421f84420cf85b1975ae57b94e4cb9bf273b
+      inlined_ast: 557358db2c67ac2d6cf56ba5c5a0421f84420cf85b1975ae57b94e4cb9bf273b
+      dce_ast: 557358db2c67ac2d6cf56ba5c5a0421f84420cf85b1975ae57b94e4cb9bf273b
       bytecode: c8688cd1fc15c816d4af483fa444f44414acb4b679b0165f9fb7093f77738f5a
       warnings: ""
diff --git a/tests/expectations/compiler/group/x_sign_low.out b/tests/expectations/compiler/group/x_sign_low.out
index 433e31cf08..5812804422 100644
--- a/tests/expectations/compiler/group/x_sign_low.out
+++ b/tests/expectations/compiler/group/x_sign_low.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 69db03f56a1f503d071f3c945165bccade2f6f357774d02d25cf7495696fca85
-      unrolled_ast: 69db03f56a1f503d071f3c945165bccade2f6f357774d02d25cf7495696fca85
-      ssa_ast: 6d2acde6d343558d5a0caeea9532ded3a426d95f3859087eefcfcc02b1b085ba
-      flattened_ast: 8b72f5dbbb22e4d2aad47709b5ab6e898bacc6d9fdf2da2a9e1d45159f90cb72
-      inlined_ast: 8b72f5dbbb22e4d2aad47709b5ab6e898bacc6d9fdf2da2a9e1d45159f90cb72
-      dce_ast: 8b72f5dbbb22e4d2aad47709b5ab6e898bacc6d9fdf2da2a9e1d45159f90cb72
+  - - initial_ast: 38b480cd260f91b6ad1db493e2bcf8a45b43ee4b072a58aa93a911c181d4229c
+      unrolled_ast: 38b480cd260f91b6ad1db493e2bcf8a45b43ee4b072a58aa93a911c181d4229c
+      ssa_ast: 6c2182a6f0b8944d8623677bddaca0c3d173aecd4b1013926409ce02bd0c0f09
+      flattened_ast: d14d59e763cbbb0da762c3f9d65a7297a650e90a81ff3daf75fa9f7ef6bc8ff9
+      inlined_ast: d14d59e763cbbb0da762c3f9d65a7297a650e90a81ff3daf75fa9f7ef6bc8ff9
+      dce_ast: d14d59e763cbbb0da762c3f9d65a7297a650e90a81ff3daf75fa9f7ef6bc8ff9
       bytecode: c8688cd1fc15c816d4af483fa444f44414acb4b679b0165f9fb7093f77738f5a
       warnings: ""
diff --git a/tests/expectations/compiler/group/zero.out b/tests/expectations/compiler/group/zero.out
index 43b7606590..c4c16e2d40 100644
--- a/tests/expectations/compiler/group/zero.out
+++ b/tests/expectations/compiler/group/zero.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ac982e5e3a9558f6c2362b2217416d8af867149c10516fa3c9f3f7617ad79993
-      unrolled_ast: ac982e5e3a9558f6c2362b2217416d8af867149c10516fa3c9f3f7617ad79993
-      ssa_ast: 209d454125e57db4ecffb16985bf46d352c51ee223f13cee5513dcd046dcb7a7
-      flattened_ast: 544f9f4b7482e4e68f757e5d3f6f6c5ebce7c0529b4365d8768f2330b4887590
-      inlined_ast: 544f9f4b7482e4e68f757e5d3f6f6c5ebce7c0529b4365d8768f2330b4887590
-      dce_ast: 544f9f4b7482e4e68f757e5d3f6f6c5ebce7c0529b4365d8768f2330b4887590
+  - - initial_ast: 129104f1e8de5ff26484492b6fc4f7d43d09d2828c5c7fa2122117d1585ec3a2
+      unrolled_ast: 129104f1e8de5ff26484492b6fc4f7d43d09d2828c5c7fa2122117d1585ec3a2
+      ssa_ast: beabe9752d3bed4585a1d6867d87d7accd150ae559ac6d8a3b758d2f06d166dc
+      flattened_ast: df379202b13105668b8aab17b58602355109413a749fb4281325187fe82e7e52
+      inlined_ast: df379202b13105668b8aab17b58602355109413a749fb4281325187fe82e7e52
+      dce_ast: df379202b13105668b8aab17b58602355109413a749fb4281325187fe82e7e52
       bytecode: 1d6fcff80cb39d7f9451de676f70ab1e4dd1bcca8f7c9d0f1ddd34d12f159594
       warnings: ""
diff --git a/tests/expectations/compiler/input/main.out b/tests/expectations/compiler/input/main.out
index 3d7d786279..8400bfd996 100644
--- a/tests/expectations/compiler/input/main.out
+++ b/tests/expectations/compiler/input/main.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ef3f280aaa7cf40d0d002971115b3f62d1f0e57182cd95358f7da1a701f75906
-      unrolled_ast: ef3f280aaa7cf40d0d002971115b3f62d1f0e57182cd95358f7da1a701f75906
-      ssa_ast: 5fcbd2f21288057a01f7a9b1a3f5e5d852103a4ffd2f947a6904d7e1a22dac39
-      flattened_ast: 45382add72be6206b7c9a63114fbc796af11f6c994f8e9eca2bdba9d33d9a895
-      inlined_ast: 45382add72be6206b7c9a63114fbc796af11f6c994f8e9eca2bdba9d33d9a895
-      dce_ast: 45382add72be6206b7c9a63114fbc796af11f6c994f8e9eca2bdba9d33d9a895
+  - - initial_ast: ac5f677bd78cd922bd9692b6af8713e17569df22acaef02f41f46fdf30708206
+      unrolled_ast: ac5f677bd78cd922bd9692b6af8713e17569df22acaef02f41f46fdf30708206
+      ssa_ast: 09077dc64f95ecc607daccb0ae909e0862c17143d130c713a0c42ed70a6e1773
+      flattened_ast: c876e0c7d4e4cb7d702df69a03bb6203a5cd995d943af33f613696d225b009c1
+      inlined_ast: c876e0c7d4e4cb7d702df69a03bb6203a5cd995d943af33f613696d225b009c1
+      dce_ast: c876e0c7d4e4cb7d702df69a03bb6203a5cd995d943af33f613696d225b009c1
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/input/main_field.out b/tests/expectations/compiler/input/main_field.out
index 18926b70df..7d1825b1b1 100644
--- a/tests/expectations/compiler/input/main_field.out
+++ b/tests/expectations/compiler/input/main_field.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 63bf9f02be9e66d9282e468397ff82691f0b459febfe87b5ff228180afb6cbdd
-      unrolled_ast: 63bf9f02be9e66d9282e468397ff82691f0b459febfe87b5ff228180afb6cbdd
-      ssa_ast: b31f9e682101c165490ec13939da3b30566ac8ce2f6e3f58c795450beae165d7
-      flattened_ast: 5c4d3072411254eaaf2f1810c5a53a4e9ae45234ae150d386824df3b0c2001b2
-      inlined_ast: 5c4d3072411254eaaf2f1810c5a53a4e9ae45234ae150d386824df3b0c2001b2
-      dce_ast: 5c4d3072411254eaaf2f1810c5a53a4e9ae45234ae150d386824df3b0c2001b2
+  - - initial_ast: 58dc35ee3949e841674a860ce6786537d8265bf5edca48baadb37afd8f515b20
+      unrolled_ast: 58dc35ee3949e841674a860ce6786537d8265bf5edca48baadb37afd8f515b20
+      ssa_ast: 4f8a2553eff8489d25405428de4b873fc2f5e9c1788d903d300cbe2fb132b1a2
+      flattened_ast: 5c9c9e98dad4edf7b865314771bd8155a59185c870ef71c4f6bb4152a3db2135
+      inlined_ast: 5c9c9e98dad4edf7b865314771bd8155a59185c870ef71c4f6bb4152a3db2135
+      dce_ast: 5c9c9e98dad4edf7b865314771bd8155a59185c870ef71c4f6bb4152a3db2135
       bytecode: 5634fe853e1a2815f0828063a855b798b56cc6051b24205568908a5490c7d531
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/add.out b/tests/expectations/compiler/integers/i128/add.out
index 794b137ef8..81b42deb81 100644
--- a/tests/expectations/compiler/integers/i128/add.out
+++ b/tests/expectations/compiler/integers/i128/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 881d1e667f856e87d58825757e7f8df28374f6251642bba4d16a3787eb1ab9e9
-      unrolled_ast: 881d1e667f856e87d58825757e7f8df28374f6251642bba4d16a3787eb1ab9e9
-      ssa_ast: 733901df8c746f47cec4d17129c186ad550225c766fddc6c69e00563254dffa7
-      flattened_ast: 7757c41ee621908ca3f75dc30ff8bf8db94941d35c7dcb7f70412389be8f3060
-      inlined_ast: 7757c41ee621908ca3f75dc30ff8bf8db94941d35c7dcb7f70412389be8f3060
-      dce_ast: 7757c41ee621908ca3f75dc30ff8bf8db94941d35c7dcb7f70412389be8f3060
+  - - initial_ast: 43c5371cdf7e2fdd8844a0f3ab7a98e80bedc1d28366a8c143924dcd8d833294
+      unrolled_ast: 43c5371cdf7e2fdd8844a0f3ab7a98e80bedc1d28366a8c143924dcd8d833294
+      ssa_ast: 2b7d8db79e393b2965bf2f935dfddd9e18e365e7534497cbfff03930229421a7
+      flattened_ast: eb83686c03ee21804c8594ba760b7b27ecd670e03cb3538194ae677f97fe3246
+      inlined_ast: eb83686c03ee21804c8594ba760b7b27ecd670e03cb3538194ae677f97fe3246
+      dce_ast: eb83686c03ee21804c8594ba760b7b27ecd670e03cb3538194ae677f97fe3246
       bytecode: 494e6857a1963542c9c28acd1b0d3584e2fa7aa4541a3c4d2accdaffa21a5363
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/and.out b/tests/expectations/compiler/integers/i128/and.out
index 70ae1a6b00..d9b8c98cbd 100644
--- a/tests/expectations/compiler/integers/i128/and.out
+++ b/tests/expectations/compiler/integers/i128/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 24c110bb4114493bc8bbfb9f80a752fee92bc5418b5779b7a7e684a4cd8fd6f2
-      unrolled_ast: 24c110bb4114493bc8bbfb9f80a752fee92bc5418b5779b7a7e684a4cd8fd6f2
-      ssa_ast: a3d91b870888039afad14cc55d48549b8e00736ce8cc9e2ca52581f7adf487a5
-      flattened_ast: 78725228759353e04888fddcd4a87bc288279c762e81f00fdcf83baea47d6b9c
-      inlined_ast: 78725228759353e04888fddcd4a87bc288279c762e81f00fdcf83baea47d6b9c
-      dce_ast: 78725228759353e04888fddcd4a87bc288279c762e81f00fdcf83baea47d6b9c
+  - - initial_ast: 24dd6278c18b8263b42e757e71be512a86b0b40bc721010a6b6ccb6878dcb6f2
+      unrolled_ast: 24dd6278c18b8263b42e757e71be512a86b0b40bc721010a6b6ccb6878dcb6f2
+      ssa_ast: 8f779bf7bf867a845dcc6d95da0646b35fe321848a1c1bad39106699df4d4a49
+      flattened_ast: dad0567951c1470168ae04c7ec686b5460968b3af555de273c45421386ce3e91
+      inlined_ast: dad0567951c1470168ae04c7ec686b5460968b3af555de273c45421386ce3e91
+      dce_ast: dad0567951c1470168ae04c7ec686b5460968b3af555de273c45421386ce3e91
       bytecode: 8285a2e1709b0ec4a12c265fcbfc8fafe3168599b60c587c0c4cb2eead7d4cb5
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/console_assert.out b/tests/expectations/compiler/integers/i128/console_assert.out
index 11650c9664..6fca50ddc7 100644
--- a/tests/expectations/compiler/integers/i128/console_assert.out
+++ b/tests/expectations/compiler/integers/i128/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 02e620e2d5bcd50f286acebd492e25a2dd5a95b380f54d2a242a74b2681546af
-      unrolled_ast: 02e620e2d5bcd50f286acebd492e25a2dd5a95b380f54d2a242a74b2681546af
-      ssa_ast: 645973ae17df77eb61d5dff041194a3ff0b8253d7d3edc71a1d4cb4641a9b4f6
-      flattened_ast: 94ed3d90aaeb075da616865b8a2082ecdafb85af7f087770bf3316cbdd608a42
-      inlined_ast: 94ed3d90aaeb075da616865b8a2082ecdafb85af7f087770bf3316cbdd608a42
-      dce_ast: 94ed3d90aaeb075da616865b8a2082ecdafb85af7f087770bf3316cbdd608a42
+  - - initial_ast: a3339c64844b81f395e343497f2e972b7f58930a602a96e2204807ed4f99dd02
+      unrolled_ast: a3339c64844b81f395e343497f2e972b7f58930a602a96e2204807ed4f99dd02
+      ssa_ast: d371dd372d008b9d5d9d581d7c46278bdbea0af9b4367f5c1e053135e01a5d4a
+      flattened_ast: f3b7ec4a25580617c911c97bcce551d93fd42bfd48413b645b42e3f038f6ba0c
+      inlined_ast: f3b7ec4a25580617c911c97bcce551d93fd42bfd48413b645b42e3f038f6ba0c
+      dce_ast: f3b7ec4a25580617c911c97bcce551d93fd42bfd48413b645b42e3f038f6ba0c
       bytecode: cfb775c32747a200198579e073ead1a4acd478ed2346b0e51ff488e71b5f806c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/div.out b/tests/expectations/compiler/integers/i128/div.out
index 71de55ab8f..53c600cc71 100644
--- a/tests/expectations/compiler/integers/i128/div.out
+++ b/tests/expectations/compiler/integers/i128/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5b11652ffcb9043dabfd40e21c446b92e867a542e466038347d0f660123ae28e
-      unrolled_ast: 5b11652ffcb9043dabfd40e21c446b92e867a542e466038347d0f660123ae28e
-      ssa_ast: fa53110a613f2834b95ac992d2c75ba54f65b7ac0828e5d72b90b0570d74952e
-      flattened_ast: 3d0475ba75ef5624b587205f167792905b42d35182f2cb4a1c615f6ccc5db2ef
-      inlined_ast: 3d0475ba75ef5624b587205f167792905b42d35182f2cb4a1c615f6ccc5db2ef
-      dce_ast: 3d0475ba75ef5624b587205f167792905b42d35182f2cb4a1c615f6ccc5db2ef
+  - - initial_ast: dfdeb6bd90a13fbef439343433308383bc20cf8516c4d7c6d73d86120686739d
+      unrolled_ast: dfdeb6bd90a13fbef439343433308383bc20cf8516c4d7c6d73d86120686739d
+      ssa_ast: 5a77dfd465e0233853f223525afdd5594058c31e72573966bca4f2b832365999
+      flattened_ast: b18f7331daaf5ce658b37accaa776ecabe97559147c22f674655d27460f8b4b5
+      inlined_ast: b18f7331daaf5ce658b37accaa776ecabe97559147c22f674655d27460f8b4b5
+      dce_ast: b18f7331daaf5ce658b37accaa776ecabe97559147c22f674655d27460f8b4b5
       bytecode: 65f57028681592ca0f5c4fed50abb89f4aa53139b2371bc00c3e701d5b8e896f
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/eq.out b/tests/expectations/compiler/integers/i128/eq.out
index d532766eb6..d75c9c370e 100644
--- a/tests/expectations/compiler/integers/i128/eq.out
+++ b/tests/expectations/compiler/integers/i128/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 23307861ba95b0a012847d4532da89303c5de0e1ca1fbc0ecd21cc08d23d3f26
-      unrolled_ast: 23307861ba95b0a012847d4532da89303c5de0e1ca1fbc0ecd21cc08d23d3f26
-      ssa_ast: 95faf5440b07e55f292b28cea7c0bb6e572af5a559950dc9a8cdb288d984a207
-      flattened_ast: 9047703b2fff7fecd17d8b13a9465317e9e3484317fd3266a24109b40039bd4f
-      inlined_ast: 9047703b2fff7fecd17d8b13a9465317e9e3484317fd3266a24109b40039bd4f
-      dce_ast: 9047703b2fff7fecd17d8b13a9465317e9e3484317fd3266a24109b40039bd4f
+  - - initial_ast: c181eb2c2e590390788473e93a45d9d575d7713a7f8c1e69d40dea350930f2b9
+      unrolled_ast: c181eb2c2e590390788473e93a45d9d575d7713a7f8c1e69d40dea350930f2b9
+      ssa_ast: b9b594f726759b2f1e7e23dc2156a61e3cc82016de0278960f97f1d281cec8c6
+      flattened_ast: 6b4d807a1124fa0ac61848130c91da7967b54255c4b82eb55890217119746a68
+      inlined_ast: 6b4d807a1124fa0ac61848130c91da7967b54255c4b82eb55890217119746a68
+      dce_ast: 6b4d807a1124fa0ac61848130c91da7967b54255c4b82eb55890217119746a68
       bytecode: 3cdd93b31b489b0c21ed940752b5f00fdbde28dc7e52fbe97bd6c0f5b3f2e2e3
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/ge.out b/tests/expectations/compiler/integers/i128/ge.out
index f95dacd0b9..3816e301e8 100644
--- a/tests/expectations/compiler/integers/i128/ge.out
+++ b/tests/expectations/compiler/integers/i128/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 064ebacd11ee83e4b73977bb57ab9c6f35ac019d2f5e3c5b71379b086e59aea8
-      unrolled_ast: 064ebacd11ee83e4b73977bb57ab9c6f35ac019d2f5e3c5b71379b086e59aea8
-      ssa_ast: d138d3f5175739ec809c0427d80088fbd4c6ef9f00b2147866a57bfff1813c73
-      flattened_ast: 1e0caa5e6c3e83820447b5bdca9961cf1c1e89e450002962b792257bdb2406fe
-      inlined_ast: 1e0caa5e6c3e83820447b5bdca9961cf1c1e89e450002962b792257bdb2406fe
-      dce_ast: 1e0caa5e6c3e83820447b5bdca9961cf1c1e89e450002962b792257bdb2406fe
+  - - initial_ast: 2b4b1ecd4df4b55de694045de8cad83c5fa83f97cff41f976330fcfb66cd4cd6
+      unrolled_ast: 2b4b1ecd4df4b55de694045de8cad83c5fa83f97cff41f976330fcfb66cd4cd6
+      ssa_ast: afd83f0b6ad1ef80d6e7170a4f67b90a159a3502c50f6e91b40a144121b21001
+      flattened_ast: 1f9705d2cfee8d5d887035cace4c6a106e250b652aba87f1b3b73a937123e746
+      inlined_ast: 1f9705d2cfee8d5d887035cace4c6a106e250b652aba87f1b3b73a937123e746
+      dce_ast: 1f9705d2cfee8d5d887035cace4c6a106e250b652aba87f1b3b73a937123e746
       bytecode: 10cd5a11422cda879fb35cd61b5e1b83e0a3b954e6583f44762802917d338085
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/gt.out b/tests/expectations/compiler/integers/i128/gt.out
index ad29c2e4e0..57f52a8752 100644
--- a/tests/expectations/compiler/integers/i128/gt.out
+++ b/tests/expectations/compiler/integers/i128/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2c90fb91d77bcb92392584c607ac4b1243ff78b9d8e67b5d8fe5151ec0100d3c
-      unrolled_ast: 2c90fb91d77bcb92392584c607ac4b1243ff78b9d8e67b5d8fe5151ec0100d3c
-      ssa_ast: b0cf14fed540799c81afd60d324509cbd9b213d0eb15d538e5b2fa4b892ffe59
-      flattened_ast: 2c5c778f0534bab8aa1a12b6b9e4f57fcec98338e11a47873f506c7211376e6c
-      inlined_ast: 2c5c778f0534bab8aa1a12b6b9e4f57fcec98338e11a47873f506c7211376e6c
-      dce_ast: 2c5c778f0534bab8aa1a12b6b9e4f57fcec98338e11a47873f506c7211376e6c
+  - - initial_ast: daf06b6823364c88d4b85d590f087bdcf15f808121c78eda15d948643440ce54
+      unrolled_ast: daf06b6823364c88d4b85d590f087bdcf15f808121c78eda15d948643440ce54
+      ssa_ast: ebaab596b47fd4e7850ad7b83af756b2af4377e72806d1d5aac11ed9af255346
+      flattened_ast: 74c63ace1d369014b20907dd055a06c943fbb81dde880a657c029085339211e7
+      inlined_ast: 74c63ace1d369014b20907dd055a06c943fbb81dde880a657c029085339211e7
+      dce_ast: 74c63ace1d369014b20907dd055a06c943fbb81dde880a657c029085339211e7
       bytecode: 484e03eaf5d4db72c6c47e37433ad15e9bf225f8ee65964eebcbbb627e1229d5
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/le.out b/tests/expectations/compiler/integers/i128/le.out
index 6bad63850b..f0c82d312a 100644
--- a/tests/expectations/compiler/integers/i128/le.out
+++ b/tests/expectations/compiler/integers/i128/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 40e0300905cf12d67049422e1060e39057b30071679f554f8660570fff3b0618
-      unrolled_ast: 40e0300905cf12d67049422e1060e39057b30071679f554f8660570fff3b0618
-      ssa_ast: 6d24ca52f17b12b823e9528f6f1ecf25b62ff89d7f180c201c0f3f96e04119a7
-      flattened_ast: 1cf5e2ffe84e596b266bc558ec0f025ac56fac8a3e25ceb0002a0f672b31ec74
-      inlined_ast: 1cf5e2ffe84e596b266bc558ec0f025ac56fac8a3e25ceb0002a0f672b31ec74
-      dce_ast: 1cf5e2ffe84e596b266bc558ec0f025ac56fac8a3e25ceb0002a0f672b31ec74
+  - - initial_ast: e3f369a4d7becb78c8ca01763044182cafae2736c23b9e0b902308a1df420345
+      unrolled_ast: e3f369a4d7becb78c8ca01763044182cafae2736c23b9e0b902308a1df420345
+      ssa_ast: 91071c7c0477620587df1585f384dd975d14cde7ba76ced0e30a0b8bda63eac5
+      flattened_ast: 743085c7f1096465cf391d56fba3f3d43c5c78aa9d0897b0c18526cc1cbeb8d5
+      inlined_ast: 743085c7f1096465cf391d56fba3f3d43c5c78aa9d0897b0c18526cc1cbeb8d5
+      dce_ast: 743085c7f1096465cf391d56fba3f3d43c5c78aa9d0897b0c18526cc1cbeb8d5
       bytecode: cc1ee4fde8609e495d29513d4f1ba6088310c0b68929e619e6fef2fbcf127b13
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/lt.out b/tests/expectations/compiler/integers/i128/lt.out
index 5412414ac2..1dc46b5d36 100644
--- a/tests/expectations/compiler/integers/i128/lt.out
+++ b/tests/expectations/compiler/integers/i128/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: eed1c19df8c932e1e2ffbbde47fca3f8a0ea13ddf83067afe2e187b403dc84dc
-      unrolled_ast: eed1c19df8c932e1e2ffbbde47fca3f8a0ea13ddf83067afe2e187b403dc84dc
-      ssa_ast: 947646124e4ddebefec4404ad71d1aaf4c928dd04c71f6c4858db6bf302dab0d
-      flattened_ast: 740ef8b0c03c69489441ef9850a9a2f73e6e716bc15979bfecc3b2b86d045cec
-      inlined_ast: 740ef8b0c03c69489441ef9850a9a2f73e6e716bc15979bfecc3b2b86d045cec
-      dce_ast: 740ef8b0c03c69489441ef9850a9a2f73e6e716bc15979bfecc3b2b86d045cec
+  - - initial_ast: 1b5d2790a3a744af19852f9a493fa890f5e753180f41c952bcff2b7ac639b043
+      unrolled_ast: 1b5d2790a3a744af19852f9a493fa890f5e753180f41c952bcff2b7ac639b043
+      ssa_ast: 59fce46c0a995496e2ca382b8859368a25d59218b3f34cba529f0b48eaf4172a
+      flattened_ast: 36d110278a59bf5df05448b8802fd7babea21fa486cd00faaa4076c07dfd8108
+      inlined_ast: 36d110278a59bf5df05448b8802fd7babea21fa486cd00faaa4076c07dfd8108
+      dce_ast: 36d110278a59bf5df05448b8802fd7babea21fa486cd00faaa4076c07dfd8108
       bytecode: b1fc620dc1f15fe250bfd4e7bbf7ec3e51d72f7a47867a1b0ad680f7d97906aa
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/max.out b/tests/expectations/compiler/integers/i128/max.out
index c339c4bee4..913de74c1b 100644
--- a/tests/expectations/compiler/integers/i128/max.out
+++ b/tests/expectations/compiler/integers/i128/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bcee3aa787f873ce8d8a283e855d65ef1cbe9751ccbade286988ef6fabd4fabc
-      unrolled_ast: bcee3aa787f873ce8d8a283e855d65ef1cbe9751ccbade286988ef6fabd4fabc
-      ssa_ast: 4bc8c5b448d3acdde8bbf839bd85386e667fce3133eec7400c24cc8a2053dc3b
-      flattened_ast: f062fb11cb3c8601ffc535d3f344f1340cbd75850bdc8f423077b0243952c3e2
-      inlined_ast: f062fb11cb3c8601ffc535d3f344f1340cbd75850bdc8f423077b0243952c3e2
-      dce_ast: f062fb11cb3c8601ffc535d3f344f1340cbd75850bdc8f423077b0243952c3e2
+  - - initial_ast: 856f8b4d79ce1c36c325d7daf7680609289dac880f1b425d3510cb6ca84860f9
+      unrolled_ast: 856f8b4d79ce1c36c325d7daf7680609289dac880f1b425d3510cb6ca84860f9
+      ssa_ast: 3afa52815dceabcba5dbb580511b8087f8c9c5c9d4a105b6e672a5901e36ea4e
+      flattened_ast: e5fd42a56d789e880c2b06fac62d6457d30fd5c1dc4a7e2c8f368feea2fd19a7
+      inlined_ast: e5fd42a56d789e880c2b06fac62d6457d30fd5c1dc4a7e2c8f368feea2fd19a7
+      dce_ast: e5fd42a56d789e880c2b06fac62d6457d30fd5c1dc4a7e2c8f368feea2fd19a7
       bytecode: 0c9250cc00df66aac1199455cdfacc5d1a37bbf3719a4661a022b02d023ef962
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/min.out b/tests/expectations/compiler/integers/i128/min.out
index 7fc796054d..e7516a22db 100644
--- a/tests/expectations/compiler/integers/i128/min.out
+++ b/tests/expectations/compiler/integers/i128/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f10f37b3652994cff5fb5a1cd8abc99781b08e2e9d62212be429261a710ccc4f
-      unrolled_ast: f10f37b3652994cff5fb5a1cd8abc99781b08e2e9d62212be429261a710ccc4f
-      ssa_ast: f674088f7a620eb9cff0db56b266e3d5ea5fe92b837be0a29a256ce6ac11b730
-      flattened_ast: dd5e2130228018515b6df24f51deda8976c93e34897c9827f2b2277b4c5aaae8
-      inlined_ast: dd5e2130228018515b6df24f51deda8976c93e34897c9827f2b2277b4c5aaae8
-      dce_ast: dd5e2130228018515b6df24f51deda8976c93e34897c9827f2b2277b4c5aaae8
+  - - initial_ast: 0e1fa1bf76f448f1b7198998d7544f8647d9f40be3371f7c2afaf9d42de4c81e
+      unrolled_ast: 0e1fa1bf76f448f1b7198998d7544f8647d9f40be3371f7c2afaf9d42de4c81e
+      ssa_ast: 6eee5e264df7a634795d153d24551a6ff08d487634b312568aceeca42534bc7b
+      flattened_ast: 942a72ee13032dfade850a01dc11bf7fc8da93968a3d9daff9acc586701a6319
+      inlined_ast: 942a72ee13032dfade850a01dc11bf7fc8da93968a3d9daff9acc586701a6319
+      dce_ast: 942a72ee13032dfade850a01dc11bf7fc8da93968a3d9daff9acc586701a6319
       bytecode: 3371e90020913ff2646967d8f24bd5da1033f31c46c1b46c1996331bb488b96e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/min_fail.out b/tests/expectations/compiler/integers/i128/min_fail.out
index d00ba925dd..98c9ab31d3 100644
--- a/tests/expectations/compiler/integers/i128/min_fail.out
+++ b/tests/expectations/compiler/integers/i128/min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6d76b8226708d8e9ad07eee316b168a042f61021ab88fa5c420082880f321d3e
-      unrolled_ast: 6d76b8226708d8e9ad07eee316b168a042f61021ab88fa5c420082880f321d3e
-      ssa_ast: 7b9677d292f944dbe49167d37b34f4ba12a4007ef89b9da49e6efebf5b060662
-      flattened_ast: cb89b03cbaf58b4b733f75cd475ee6de82e17d84eec1e45d601d95007c7a8a85
-      inlined_ast: cb89b03cbaf58b4b733f75cd475ee6de82e17d84eec1e45d601d95007c7a8a85
-      dce_ast: cb89b03cbaf58b4b733f75cd475ee6de82e17d84eec1e45d601d95007c7a8a85
+  - - initial_ast: c7633cfe399d4efba63b395f8834dead466f1e1f14dd81d08657661d1b2d80e6
+      unrolled_ast: c7633cfe399d4efba63b395f8834dead466f1e1f14dd81d08657661d1b2d80e6
+      ssa_ast: 008ffe65153d67e17058e53dceddbf7ca8a84a217da5b2f8e274fe0b7ddfcb27
+      flattened_ast: bbceda2529057b0b72b9d324eb69a7961c7ed77ef2b2ead390e89761793b96be
+      inlined_ast: bbceda2529057b0b72b9d324eb69a7961c7ed77ef2b2ead390e89761793b96be
+      dce_ast: bbceda2529057b0b72b9d324eb69a7961c7ed77ef2b2ead390e89761793b96be
       bytecode: 01713226f7ba799a801ed169d73aa94e4a3cb8048c6c069fdc874c2807e8ead6
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/mul.out b/tests/expectations/compiler/integers/i128/mul.out
index 60b631cc75..fbdd0184cd 100644
--- a/tests/expectations/compiler/integers/i128/mul.out
+++ b/tests/expectations/compiler/integers/i128/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2a018d551d27b9026d8cf52266d047e0b7cc655c799c34951e820958621c91e2
-      unrolled_ast: 2a018d551d27b9026d8cf52266d047e0b7cc655c799c34951e820958621c91e2
-      ssa_ast: c30c3e0625d9d0b8aa9aacd0528027154c2a9597d5aa7f87dca5b64165e54b3f
-      flattened_ast: bc881d0389026da5a62411fa3676f76c561ec93468be83e772391b454f11b013
-      inlined_ast: bc881d0389026da5a62411fa3676f76c561ec93468be83e772391b454f11b013
-      dce_ast: bc881d0389026da5a62411fa3676f76c561ec93468be83e772391b454f11b013
+  - - initial_ast: e0b040a28c05ee2ba215aefba8fdf0c9e596031ee8aad8da19e5ce6b07266831
+      unrolled_ast: e0b040a28c05ee2ba215aefba8fdf0c9e596031ee8aad8da19e5ce6b07266831
+      ssa_ast: 52ebc7e6f3e15d13730539df5b320e36c689f54c7e148437e189a332ee4e6f43
+      flattened_ast: 83f382d05f2e855ad67276702ce039acd75c17a41641f2e8c5a76dc32d6c1682
+      inlined_ast: 83f382d05f2e855ad67276702ce039acd75c17a41641f2e8c5a76dc32d6c1682
+      dce_ast: 83f382d05f2e855ad67276702ce039acd75c17a41641f2e8c5a76dc32d6c1682
       bytecode: d0d6aecd823bb5cd501ed807e6a169820dbee3db351de35303d4b8dda007e0d8
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/ne.out b/tests/expectations/compiler/integers/i128/ne.out
index 0cfa078589..e195fcf64b 100644
--- a/tests/expectations/compiler/integers/i128/ne.out
+++ b/tests/expectations/compiler/integers/i128/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b6acf5d2794c47010d4cd5ce72916dc7ae39aebd855eaeb1c129f7c81ea37a60
-      unrolled_ast: b6acf5d2794c47010d4cd5ce72916dc7ae39aebd855eaeb1c129f7c81ea37a60
-      ssa_ast: 06bd46258b881f80498204feb6963577c741f87a1f5f30d489660be0ba8030d9
-      flattened_ast: 686f616a2a31ec1308a7afbaf966cbeb89cf5cd25f4de35bf1d9123b8bdb716a
-      inlined_ast: 686f616a2a31ec1308a7afbaf966cbeb89cf5cd25f4de35bf1d9123b8bdb716a
-      dce_ast: 686f616a2a31ec1308a7afbaf966cbeb89cf5cd25f4de35bf1d9123b8bdb716a
+  - - initial_ast: 99cbea0ee1d9dc1e9b5736330799295db44da9a5e7d6bf435f6ba046cf0ca704
+      unrolled_ast: 99cbea0ee1d9dc1e9b5736330799295db44da9a5e7d6bf435f6ba046cf0ca704
+      ssa_ast: c0f73e1ee6685543035953d7cd4d8632ff03517e9c00111dc667deb600ec1de6
+      flattened_ast: c00f776194bd50e237c6204960675a23ed88701441798246aebbbd4983f65949
+      inlined_ast: c00f776194bd50e237c6204960675a23ed88701441798246aebbbd4983f65949
+      dce_ast: c00f776194bd50e237c6204960675a23ed88701441798246aebbbd4983f65949
       bytecode: 234d1c18ac19b0979e3bf09581be0370faa2e2b322474f693d90c52cb2991177
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/negate.out b/tests/expectations/compiler/integers/i128/negate.out
index 815bc30cbe..f603ff2cb4 100644
--- a/tests/expectations/compiler/integers/i128/negate.out
+++ b/tests/expectations/compiler/integers/i128/negate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 50dfb1d48315b35d25de6d5d3e0255ad140950e77be215b2cc5a24072348a6a2
-      unrolled_ast: 50dfb1d48315b35d25de6d5d3e0255ad140950e77be215b2cc5a24072348a6a2
-      ssa_ast: 1eb253617c747726d0470ec2e006a3192b12298d2892a2a25b08849826d2c367
-      flattened_ast: 248decaa243a283a331ed821976abc44476ff517868a7a611b7e783280303b84
-      inlined_ast: 248decaa243a283a331ed821976abc44476ff517868a7a611b7e783280303b84
-      dce_ast: 248decaa243a283a331ed821976abc44476ff517868a7a611b7e783280303b84
+  - - initial_ast: df80544ce3e5e4107cded1dafcaec0f29190e29efa74be75a0c3d507824ac745
+      unrolled_ast: df80544ce3e5e4107cded1dafcaec0f29190e29efa74be75a0c3d507824ac745
+      ssa_ast: 624799afc68c808af8164502a5a26cee66fdf5d8810d34db49ee7600e7010956
+      flattened_ast: 12ff1c8e708ca8489c81d083a7c18bbe1dca68b8993299503a599e0497c7f213
+      inlined_ast: 12ff1c8e708ca8489c81d083a7c18bbe1dca68b8993299503a599e0497c7f213
+      dce_ast: 12ff1c8e708ca8489c81d083a7c18bbe1dca68b8993299503a599e0497c7f213
       bytecode: 8fbbd1ffdc2128ce18c84c8eee60a408dd29cdc99ca197ffe094a8be0c4019c4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/negate_min_fail.out b/tests/expectations/compiler/integers/i128/negate_min_fail.out
index d46dd5e87c..2ec765950f 100644
--- a/tests/expectations/compiler/integers/i128/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i128/negate_min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a2b991967c45e8771cdc1729604b5e3f70b740d726744190bce882e588d718cd
-      unrolled_ast: a2b991967c45e8771cdc1729604b5e3f70b740d726744190bce882e588d718cd
-      ssa_ast: bfbac1ce9acbe2d891bf128c73f0a7397c15c8386550950ff69d9562c7dcb0a0
-      flattened_ast: ca5dc8bc6bc7895ac637107b734294214775171d4629b6dd916c453ab3c3439b
-      inlined_ast: ca5dc8bc6bc7895ac637107b734294214775171d4629b6dd916c453ab3c3439b
-      dce_ast: ca5dc8bc6bc7895ac637107b734294214775171d4629b6dd916c453ab3c3439b
+  - - initial_ast: 468d2019b873dcbe03224567698ed5fb69eda79b675be605cf32760e4275eeff
+      unrolled_ast: 468d2019b873dcbe03224567698ed5fb69eda79b675be605cf32760e4275eeff
+      ssa_ast: 181a50de0fe57fafb9c0734ea741ca1c501dd5d04b95adbd3c7eb0286bf7c8a6
+      flattened_ast: 0386ef5b1ac4465e60d81f7d9f0125bf2d98bda97f74b3f0a5212c8a95d9f16a
+      inlined_ast: 0386ef5b1ac4465e60d81f7d9f0125bf2d98bda97f74b3f0a5212c8a95d9f16a
+      dce_ast: 0386ef5b1ac4465e60d81f7d9f0125bf2d98bda97f74b3f0a5212c8a95d9f16a
       bytecode: a9a22fd3ceba8f7aa3bc7f1e577a63bfdf395c9cad00987880cf75066bdf85c8
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/negate_zero.out b/tests/expectations/compiler/integers/i128/negate_zero.out
index 2269c13f20..5ac7990a8f 100644
--- a/tests/expectations/compiler/integers/i128/negate_zero.out
+++ b/tests/expectations/compiler/integers/i128/negate_zero.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8643c3266896627fb8e44907e1ff94fc93dc49578467fc4688308a60a8d1a29c
-      unrolled_ast: 8643c3266896627fb8e44907e1ff94fc93dc49578467fc4688308a60a8d1a29c
-      ssa_ast: eda5b002576a9b7f6c33f85828475415415cc18a9a5cfa4638dc39a1a893bc10
-      flattened_ast: 6d0a3d80230d51567c1a0d8f31f64fa5caf5322a7b1c1abed587e125d373fc68
-      inlined_ast: 6d0a3d80230d51567c1a0d8f31f64fa5caf5322a7b1c1abed587e125d373fc68
-      dce_ast: 6d0a3d80230d51567c1a0d8f31f64fa5caf5322a7b1c1abed587e125d373fc68
+  - - initial_ast: 9b47d8bd7ce93d416b10bdf49b4b6519d642919a4aac802dcced3cab43533bdf
+      unrolled_ast: 9b47d8bd7ce93d416b10bdf49b4b6519d642919a4aac802dcced3cab43533bdf
+      ssa_ast: 98cdf915bedb2f544ac8aa765ca83f0bee18176c6f9ce71f1c0846488558ae24
+      flattened_ast: 945fe5d52f704087f3af6c07f70b0f4882bdbfa6759cf92565f0ae32a0877f7b
+      inlined_ast: 945fe5d52f704087f3af6c07f70b0f4882bdbfa6759cf92565f0ae32a0877f7b
+      dce_ast: 945fe5d52f704087f3af6c07f70b0f4882bdbfa6759cf92565f0ae32a0877f7b
       bytecode: 163f69d6df6294a79a4f27ccb9ed64ebd0e5df96c5205cf176f1201eab229deb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/operator_methods.out b/tests/expectations/compiler/integers/i128/operator_methods.out
index 19f652a596..a5739925fe 100644
--- a/tests/expectations/compiler/integers/i128/operator_methods.out
+++ b/tests/expectations/compiler/integers/i128/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3dc0300ba8d3261328c76dfcbcf222f3017915ba32dd152a2bba52df627922b6
-      unrolled_ast: 3dc0300ba8d3261328c76dfcbcf222f3017915ba32dd152a2bba52df627922b6
-      ssa_ast: 730ab618d51d5f8e89361f18af197581070d0fb14a6e726dccdd1faa51960dff
-      flattened_ast: 6a7214ba99fe8da88e0af5c8fffc0ccc8f279151061b0079310cb42d1b7f38c3
-      inlined_ast: 6a7214ba99fe8da88e0af5c8fffc0ccc8f279151061b0079310cb42d1b7f38c3
-      dce_ast: d504fb596240b302b92f147e968a7e06f0a51f927af7f9fd9402e8fbc675d7fe
+  - - initial_ast: f998bf863cf87ed59d3548565afc524df85678274efe1f1d31710ae706ac64c9
+      unrolled_ast: f998bf863cf87ed59d3548565afc524df85678274efe1f1d31710ae706ac64c9
+      ssa_ast: 82fad7d6c2a67c2805b2aca80fb16decd0c357ca585f3a8bb32c69affeb86af8
+      flattened_ast: f1b24df4b12f93502fa82bd3c85858d6305d9e7592b401a78f404d54add6aa8b
+      inlined_ast: f1b24df4b12f93502fa82bd3c85858d6305d9e7592b401a78f404d54add6aa8b
+      dce_ast: e0292dfebbaf2de7950df667be9e84ebd4cdeb83520cd0fff359061f3817eb8b
       bytecode: 3f9bcd59307e76bb9f1ec70f6b5aa9d7d279141fd0ac17f03e19ad42c64b292e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/or.out b/tests/expectations/compiler/integers/i128/or.out
index b6bca660ff..9c3dd53e26 100644
--- a/tests/expectations/compiler/integers/i128/or.out
+++ b/tests/expectations/compiler/integers/i128/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b1d602de2a3cbfa6c1612e975738ccefc94f58e6f214a2317e14804038b691ac
-      unrolled_ast: b1d602de2a3cbfa6c1612e975738ccefc94f58e6f214a2317e14804038b691ac
-      ssa_ast: 91af6613fe6d8aceb4da9e4dca4aaa5f19e85f79b969cab00a5382bc0229cbed
-      flattened_ast: d13eb3b4552cbbf5fc2816871c6e9f528ec4a52f6e3e0a9fc95fdc7debe39c0d
-      inlined_ast: d13eb3b4552cbbf5fc2816871c6e9f528ec4a52f6e3e0a9fc95fdc7debe39c0d
-      dce_ast: d13eb3b4552cbbf5fc2816871c6e9f528ec4a52f6e3e0a9fc95fdc7debe39c0d
+  - - initial_ast: 117bd57d58ed676a3b9cfee17de7530c946e72ad740c16eccb8f7a849bb3c1ec
+      unrolled_ast: 117bd57d58ed676a3b9cfee17de7530c946e72ad740c16eccb8f7a849bb3c1ec
+      ssa_ast: 675ec386ee2b135b294f15add3471de8857587bd569edede4219798aed1fd6cc
+      flattened_ast: e842823f051b89c2d5be9f37a18dc544c0a59dd8ffd5921d8199863a3d48309d
+      inlined_ast: e842823f051b89c2d5be9f37a18dc544c0a59dd8ffd5921d8199863a3d48309d
+      dce_ast: e842823f051b89c2d5be9f37a18dc544c0a59dd8ffd5921d8199863a3d48309d
       bytecode: 85fa769a183361184804ca78415e58cd4df150b04f1b50a743771dc28df46b4b
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/pow.out b/tests/expectations/compiler/integers/i128/pow.out
index 822c3a0329..b517de04e0 100644
--- a/tests/expectations/compiler/integers/i128/pow.out
+++ b/tests/expectations/compiler/integers/i128/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e7affea33eff10ee006e1a84d292958196f246719d32d3cde2613fa32605aae1
-      unrolled_ast: e7affea33eff10ee006e1a84d292958196f246719d32d3cde2613fa32605aae1
-      ssa_ast: d20f1118d7b1e83a5596f8416f1cce1919730805f9e22c191b03fc3541c32574
-      flattened_ast: 779fa49c03212a35f6f0f81a32d21e174ce42c75b9963010b937c91dbe39aa0c
-      inlined_ast: 779fa49c03212a35f6f0f81a32d21e174ce42c75b9963010b937c91dbe39aa0c
-      dce_ast: 779fa49c03212a35f6f0f81a32d21e174ce42c75b9963010b937c91dbe39aa0c
+  - - initial_ast: ae01173a3497ea5861e5cbbc39325255442f9e62da2ff891573f3fc69a1ee564
+      unrolled_ast: ae01173a3497ea5861e5cbbc39325255442f9e62da2ff891573f3fc69a1ee564
+      ssa_ast: 5e4e2b17b79c5e8e7225abf8c233d469aaf8473ad5dda2968edf2d0f72c74c6f
+      flattened_ast: c874a7d1532db9fb2d2aad5cacb96ca339209ffe350a05653b22d740f1a03f6c
+      inlined_ast: c874a7d1532db9fb2d2aad5cacb96ca339209ffe350a05653b22d740f1a03f6c
+      dce_ast: c874a7d1532db9fb2d2aad5cacb96ca339209ffe350a05653b22d740f1a03f6c
       bytecode: d190616fb105ce612eb0022279524f88dacfa3a9bef033cc54a70954b0140ef6
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/rem.out b/tests/expectations/compiler/integers/i128/rem.out
index dc11652863..4760824988 100644
--- a/tests/expectations/compiler/integers/i128/rem.out
+++ b/tests/expectations/compiler/integers/i128/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 69238c0769f23d1092c75a1302686a7f521ce987b64f6bb7e24b52f5a0e06c4b
-      unrolled_ast: 69238c0769f23d1092c75a1302686a7f521ce987b64f6bb7e24b52f5a0e06c4b
-      ssa_ast: e8780e7f980f7e8da6c41dadf7d0595e3fd49214f56cc14fd4c73bd5e0ea0e7b
-      flattened_ast: b0dd60811bc1e9b79ef847a6bbc50f377a732196bcf4d02889b3c28ebe7836f2
-      inlined_ast: b0dd60811bc1e9b79ef847a6bbc50f377a732196bcf4d02889b3c28ebe7836f2
-      dce_ast: b0dd60811bc1e9b79ef847a6bbc50f377a732196bcf4d02889b3c28ebe7836f2
+  - - initial_ast: e92b316eec92a1c1fad3b9f13e2da3fd7c8f67708a7d6f346745fcc64f63152d
+      unrolled_ast: e92b316eec92a1c1fad3b9f13e2da3fd7c8f67708a7d6f346745fcc64f63152d
+      ssa_ast: 1f9a8c6be3db68490644f26d1c76f0cc4d90521502573d965d756a1f0d5f6507
+      flattened_ast: 7346b467620c36ffa316cb3af94943e1a03fe7db71fd0e2192c2fd91bf927ab2
+      inlined_ast: 7346b467620c36ffa316cb3af94943e1a03fe7db71fd0e2192c2fd91bf927ab2
+      dce_ast: 7346b467620c36ffa316cb3af94943e1a03fe7db71fd0e2192c2fd91bf927ab2
       bytecode: 5d53e21705893d69b529fbcd09e2200ac612868aa3b553ab83eac9ab33ecdcad
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/shl.out b/tests/expectations/compiler/integers/i128/shl.out
index 6f88618774..fc572a88e9 100644
--- a/tests/expectations/compiler/integers/i128/shl.out
+++ b/tests/expectations/compiler/integers/i128/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fec8476a4e3579b8a10d208c8fa66284e18f7090623e1de945107ad82a9b077b
-      unrolled_ast: fec8476a4e3579b8a10d208c8fa66284e18f7090623e1de945107ad82a9b077b
-      ssa_ast: 5083ef9d979b5d10a89adc61182be10c668426f187df42b8cd5b4eff56225426
-      flattened_ast: f944b23f23eb79b0a298d303361f7581aef0d3bb3e4f8cc38079d5e15bbfaa1d
-      inlined_ast: f944b23f23eb79b0a298d303361f7581aef0d3bb3e4f8cc38079d5e15bbfaa1d
-      dce_ast: f944b23f23eb79b0a298d303361f7581aef0d3bb3e4f8cc38079d5e15bbfaa1d
+  - - initial_ast: 15e51841ad2f9ab067160f2cc651353582bfdf086225c6f0c17fb4898f2decea
+      unrolled_ast: 15e51841ad2f9ab067160f2cc651353582bfdf086225c6f0c17fb4898f2decea
+      ssa_ast: 7a4abe01cba26987e420893839664aa0fd8d86d1dc4da2209c159c79693f4ca0
+      flattened_ast: 2b1079d28da1d57ff81a929b46a1832ade6b8677d1985e1ec4f1284631b17092
+      inlined_ast: 2b1079d28da1d57ff81a929b46a1832ade6b8677d1985e1ec4f1284631b17092
+      dce_ast: 2b1079d28da1d57ff81a929b46a1832ade6b8677d1985e1ec4f1284631b17092
       bytecode: d27718f2372db60651de0720d5d611c3199e4be462f5a122ec9fbf05720f9700
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/shr.out b/tests/expectations/compiler/integers/i128/shr.out
index 8c54784949..ed8ded7893 100644
--- a/tests/expectations/compiler/integers/i128/shr.out
+++ b/tests/expectations/compiler/integers/i128/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 742eadafd95ffda4c7fbdda2062881d38b250988a579478cf0b23ced395691de
-      unrolled_ast: 742eadafd95ffda4c7fbdda2062881d38b250988a579478cf0b23ced395691de
-      ssa_ast: 5e0ce342f83a0661b806dcb55230bbc14a9f717baa99a7a1422ba2731177f64e
-      flattened_ast: f2940296af5c220ad9ae0ffe1eb701236a9d3dde75f84c5cf11aad953d29f7b3
-      inlined_ast: f2940296af5c220ad9ae0ffe1eb701236a9d3dde75f84c5cf11aad953d29f7b3
-      dce_ast: f2940296af5c220ad9ae0ffe1eb701236a9d3dde75f84c5cf11aad953d29f7b3
+  - - initial_ast: 8f15af8a50169f267940056a669b0f390530b8b76af3f69fcb87f0f976963394
+      unrolled_ast: 8f15af8a50169f267940056a669b0f390530b8b76af3f69fcb87f0f976963394
+      ssa_ast: 95a05d8420366447c0fbbdae47674372927bd4e7eea61379ba73e68b440747be
+      flattened_ast: 3afa1fa11cc8fd064409c773ab4b6a77f7c13326f5135bd2bc9b4310bce4881d
+      inlined_ast: 3afa1fa11cc8fd064409c773ab4b6a77f7c13326f5135bd2bc9b4310bce4881d
+      dce_ast: 3afa1fa11cc8fd064409c773ab4b6a77f7c13326f5135bd2bc9b4310bce4881d
       bytecode: 3835c59e778362b72f87e954fe6c9777904bf7d390f68b5ff47fb6c8ef5bb258
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/sub.out b/tests/expectations/compiler/integers/i128/sub.out
index 15102e985f..46bd384568 100644
--- a/tests/expectations/compiler/integers/i128/sub.out
+++ b/tests/expectations/compiler/integers/i128/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4641fdd6f0e763d91308a406e28923b5cb6f242670fc8a7ded94daf4dc819a4c
-      unrolled_ast: 4641fdd6f0e763d91308a406e28923b5cb6f242670fc8a7ded94daf4dc819a4c
-      ssa_ast: dffc128fc14cc30543c7edb3da99b2aa814a49705bf2e3efb98bdbb7416a4e8c
-      flattened_ast: 0720fde66ac23d0010dde303f7c802a4617ed1a9d0ef59d80f8b5ef35dffca5e
-      inlined_ast: 0720fde66ac23d0010dde303f7c802a4617ed1a9d0ef59d80f8b5ef35dffca5e
-      dce_ast: 0720fde66ac23d0010dde303f7c802a4617ed1a9d0ef59d80f8b5ef35dffca5e
+  - - initial_ast: 61031cb0c6c996671079d26930338e68e29bec30531f4ab10a9e92bc1ffb97f7
+      unrolled_ast: 61031cb0c6c996671079d26930338e68e29bec30531f4ab10a9e92bc1ffb97f7
+      ssa_ast: d9e149741efb2813c7cbefeb4e2238095aafa0fb06cf35dda5856322669b208e
+      flattened_ast: 566277077ecd1e5e3c064551fecb504d4785ba0e6797417b705570715962c18e
+      inlined_ast: 566277077ecd1e5e3c064551fecb504d4785ba0e6797417b705570715962c18e
+      dce_ast: 566277077ecd1e5e3c064551fecb504d4785ba0e6797417b705570715962c18e
       bytecode: 1adab47eb5efe9d41dbad9d8b31eb8866871818b40ef6bd54a77c8b016683a5a
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/ternary.out b/tests/expectations/compiler/integers/i128/ternary.out
index 502d91cf5d..42af54d8b1 100644
--- a/tests/expectations/compiler/integers/i128/ternary.out
+++ b/tests/expectations/compiler/integers/i128/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 85be4cb1b779004accdeebfcbe113beb6ffe6af2470ece2a59212ea7a039091e
-      unrolled_ast: 85be4cb1b779004accdeebfcbe113beb6ffe6af2470ece2a59212ea7a039091e
-      ssa_ast: 955248291097aefe3800cdd93cfb1ea2bbc56f8ded81e713f6d67066a693d72d
-      flattened_ast: 4385b66ce47dda4273b5c50c13f0b45bb18159ba7c730713a23a0c2bbcb11109
-      inlined_ast: 4385b66ce47dda4273b5c50c13f0b45bb18159ba7c730713a23a0c2bbcb11109
-      dce_ast: 4385b66ce47dda4273b5c50c13f0b45bb18159ba7c730713a23a0c2bbcb11109
+  - - initial_ast: 540bf8a3288c5b50a16acdf27581a0d96b0eeefbcdb2fe465e1f32b72c80e270
+      unrolled_ast: 540bf8a3288c5b50a16acdf27581a0d96b0eeefbcdb2fe465e1f32b72c80e270
+      ssa_ast: eae19996cfd1216a3f87e608132c13f3c0e4b3cd00d5755806f4f895d00b7d61
+      flattened_ast: 870296b8bd1f0f596a1c00b1b92ee9e3ac9619c402db1510e1c435c986cec9ba
+      inlined_ast: 870296b8bd1f0f596a1c00b1b92ee9e3ac9619c402db1510e1c435c986cec9ba
+      dce_ast: 870296b8bd1f0f596a1c00b1b92ee9e3ac9619c402db1510e1c435c986cec9ba
       bytecode: dfa955d512febab56fa2b549f3f0857663aaddb77a71f0322d48b26af49eb2af
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i128/xor.out b/tests/expectations/compiler/integers/i128/xor.out
index f9d5af2b86..9f40034a65 100644
--- a/tests/expectations/compiler/integers/i128/xor.out
+++ b/tests/expectations/compiler/integers/i128/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 139b12644caff37be3ac74492f504dd0cc400885b50ebb685c353f17d49f2345
-      unrolled_ast: 139b12644caff37be3ac74492f504dd0cc400885b50ebb685c353f17d49f2345
-      ssa_ast: a9e98bcbd51601955915fa8bb70ae0fd6a35297322f56b2043fb2735e26138ac
-      flattened_ast: ecf21cedeb898b33dd122f498eed5453ae0d558bcffcbda92cea5d170655e3c7
-      inlined_ast: ecf21cedeb898b33dd122f498eed5453ae0d558bcffcbda92cea5d170655e3c7
-      dce_ast: ecf21cedeb898b33dd122f498eed5453ae0d558bcffcbda92cea5d170655e3c7
+  - - initial_ast: f283ab0956dfecbd7de5e201dc33e7f41358033e62a724b1777579f1fdf8faac
+      unrolled_ast: f283ab0956dfecbd7de5e201dc33e7f41358033e62a724b1777579f1fdf8faac
+      ssa_ast: bd24eb1743e4a1844fe2ecf9d8dec79b324db50828a0bed9a7819b82a199cd4f
+      flattened_ast: 9e2196bfb3350093e8774e27bc01ddaee14c1137177fbad1688393746331d962
+      inlined_ast: 9e2196bfb3350093e8774e27bc01ddaee14c1137177fbad1688393746331d962
+      dce_ast: 9e2196bfb3350093e8774e27bc01ddaee14c1137177fbad1688393746331d962
       bytecode: a4e52d530daa111c685a34ebf07350f49f886e72fb1af5fd8c789c1ece9813b9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/add.out b/tests/expectations/compiler/integers/i16/add.out
index e28c572b4d..06865ff497 100644
--- a/tests/expectations/compiler/integers/i16/add.out
+++ b/tests/expectations/compiler/integers/i16/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 09cdbda1831b554e7614e21aa9fc6739c8d53a9efdc41f58947672f8c7778c2b
-      unrolled_ast: 09cdbda1831b554e7614e21aa9fc6739c8d53a9efdc41f58947672f8c7778c2b
-      ssa_ast: 556873f019c2e2a064dbfa20527e89fc27363917641f7dc0039bacbc3f175263
-      flattened_ast: 3ee8085fe71c7f1b0e36adc0a139d505c743e52a8f134e7c3e143bd45a2fac0c
-      inlined_ast: 3ee8085fe71c7f1b0e36adc0a139d505c743e52a8f134e7c3e143bd45a2fac0c
-      dce_ast: 3ee8085fe71c7f1b0e36adc0a139d505c743e52a8f134e7c3e143bd45a2fac0c
+  - - initial_ast: ac9c3cd1debbd84593014dde609a58ed6218f736dd6f42bb2b9724533741724b
+      unrolled_ast: ac9c3cd1debbd84593014dde609a58ed6218f736dd6f42bb2b9724533741724b
+      ssa_ast: 82408eca9de096fc086b00c1670ac1cacab37ae3fae2106d73da0cf9a1a7ad74
+      flattened_ast: 2569fc1646f4a81b9fd6c61644cb8498378df9583e28d730b13c7d5b343270cb
+      inlined_ast: 2569fc1646f4a81b9fd6c61644cb8498378df9583e28d730b13c7d5b343270cb
+      dce_ast: 2569fc1646f4a81b9fd6c61644cb8498378df9583e28d730b13c7d5b343270cb
       bytecode: 4d6180dac5a97d9a8f2825b4cae41adec00897380b309e1ffadda4ddd4f607fa
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/and.out b/tests/expectations/compiler/integers/i16/and.out
index 15e66996d9..d9e09d3a87 100644
--- a/tests/expectations/compiler/integers/i16/and.out
+++ b/tests/expectations/compiler/integers/i16/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e73ef2b59ff593a65f6f48ff532584b527effba61c64a18827976228d9d4ccd1
-      unrolled_ast: e73ef2b59ff593a65f6f48ff532584b527effba61c64a18827976228d9d4ccd1
-      ssa_ast: 1e44ec21789b2c7081a2cbaa030c618040f7090e40da38bc81fef8f4760c9589
-      flattened_ast: a94383cf9954525efdb5aaf588f46c3ba56a7386583889adf3ddbfec2869056d
-      inlined_ast: a94383cf9954525efdb5aaf588f46c3ba56a7386583889adf3ddbfec2869056d
-      dce_ast: a94383cf9954525efdb5aaf588f46c3ba56a7386583889adf3ddbfec2869056d
+  - - initial_ast: 5f572874adda1a6d3c99fd6603c5f19beb0f451390ac6fd88c6c0a22f3fbeec1
+      unrolled_ast: 5f572874adda1a6d3c99fd6603c5f19beb0f451390ac6fd88c6c0a22f3fbeec1
+      ssa_ast: 5ea78b63c9477407d30a63d9bacf3f71159bb86aaebce66b847a0de36f518d21
+      flattened_ast: 6f2b92f2708bed879356242008bb3b0308ab8696d52084085b2011bd80975868
+      inlined_ast: 6f2b92f2708bed879356242008bb3b0308ab8696d52084085b2011bd80975868
+      dce_ast: 6f2b92f2708bed879356242008bb3b0308ab8696d52084085b2011bd80975868
       bytecode: a0056ca7a6a670a9bb0bc979e224136219b6a336c43d3ecd624c218cba49ba22
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/console_assert.out b/tests/expectations/compiler/integers/i16/console_assert.out
index 1a190b4d05..a542ce5058 100644
--- a/tests/expectations/compiler/integers/i16/console_assert.out
+++ b/tests/expectations/compiler/integers/i16/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 40fc4797e4270e87654692d37306728ec506379e9a2c01a9cefeaca83b5b2a40
-      unrolled_ast: 40fc4797e4270e87654692d37306728ec506379e9a2c01a9cefeaca83b5b2a40
-      ssa_ast: ee3b4b599a0c72c3f0004f3dd6e49f3f93324a51399cd366c1d814a479a88223
-      flattened_ast: 8f3b364abb1772ac0c113f7c1add23af3a276cd10cccbf83c887621c33d1297b
-      inlined_ast: 8f3b364abb1772ac0c113f7c1add23af3a276cd10cccbf83c887621c33d1297b
-      dce_ast: 8f3b364abb1772ac0c113f7c1add23af3a276cd10cccbf83c887621c33d1297b
+  - - initial_ast: 89ee28d014fb4d9aa94f56c90da8a0ecc88fdf82e2c60349d34dea6d16af08e7
+      unrolled_ast: 89ee28d014fb4d9aa94f56c90da8a0ecc88fdf82e2c60349d34dea6d16af08e7
+      ssa_ast: 1d8376addc84c68b70870c25f2fbb186b40485d8e9258b1011d0a5cf29271643
+      flattened_ast: cff913d5f82b154ed02460fa5aef2110d30b155b2457163b5698a476704491f6
+      inlined_ast: cff913d5f82b154ed02460fa5aef2110d30b155b2457163b5698a476704491f6
+      dce_ast: cff913d5f82b154ed02460fa5aef2110d30b155b2457163b5698a476704491f6
       bytecode: ac2d2f57bf49761437884caa2b7f46c8c33df05175d3cba3ace16cb068374f18
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/div.out b/tests/expectations/compiler/integers/i16/div.out
index 38e69a8c37..2919f189e4 100644
--- a/tests/expectations/compiler/integers/i16/div.out
+++ b/tests/expectations/compiler/integers/i16/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b5dabef191f46248a8310de6f10e404325f1f1a0ce272686fef96f402aba4168
-      unrolled_ast: b5dabef191f46248a8310de6f10e404325f1f1a0ce272686fef96f402aba4168
-      ssa_ast: 2c082bd14eadd01b8217a0662e58392aeacc77fcd9bca0cbc57d57e4f9b17fd4
-      flattened_ast: aed7d91b9dff7037878b2f5f16651dc1bc2611f3841a42d820685fe7aee7168d
-      inlined_ast: aed7d91b9dff7037878b2f5f16651dc1bc2611f3841a42d820685fe7aee7168d
-      dce_ast: aed7d91b9dff7037878b2f5f16651dc1bc2611f3841a42d820685fe7aee7168d
+  - - initial_ast: 0a57f70ffbd4766944b12129cac71d8cfeb1408a3957d06a6d2aa4fd8fc7dc06
+      unrolled_ast: 0a57f70ffbd4766944b12129cac71d8cfeb1408a3957d06a6d2aa4fd8fc7dc06
+      ssa_ast: 8e8d18ee67e30387f8b1175126690614bf01280fff8b64908ca53cf9ffc92abb
+      flattened_ast: 9e18564d49034f7e4fb2a9cb3abe921e932658060990cdd7f2a74af8006c2d37
+      inlined_ast: 9e18564d49034f7e4fb2a9cb3abe921e932658060990cdd7f2a74af8006c2d37
+      dce_ast: 9e18564d49034f7e4fb2a9cb3abe921e932658060990cdd7f2a74af8006c2d37
       bytecode: 0d753f8ac24fd6daf4150b9ab5d1469e61c65d75c6eddcc8a5dd859e8084fb2f
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/eq.out b/tests/expectations/compiler/integers/i16/eq.out
index 1016095c58..9aff0ade63 100644
--- a/tests/expectations/compiler/integers/i16/eq.out
+++ b/tests/expectations/compiler/integers/i16/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 392a37abfd3fd82c1a48d5b6049d9e9e9d4dbbf230f8f6c4f0615ee5dbe7bf67
-      unrolled_ast: 392a37abfd3fd82c1a48d5b6049d9e9e9d4dbbf230f8f6c4f0615ee5dbe7bf67
-      ssa_ast: 55ef0a68d1b56456e016c0c8a352488225a31519312b560bbcb45c6d94695b22
-      flattened_ast: fc7121891eb02d76f4072b046d60b603c3dea468a87efd532a654328ab5fe155
-      inlined_ast: fc7121891eb02d76f4072b046d60b603c3dea468a87efd532a654328ab5fe155
-      dce_ast: fc7121891eb02d76f4072b046d60b603c3dea468a87efd532a654328ab5fe155
+  - - initial_ast: d4be6ca2e7676f3855a3d63cf09f9ff6410db2a2728ddea79e3196ec225d3314
+      unrolled_ast: d4be6ca2e7676f3855a3d63cf09f9ff6410db2a2728ddea79e3196ec225d3314
+      ssa_ast: 64a4e14661aff0959ab3685494712c5b186accfbba0b3147103db0f30b06210f
+      flattened_ast: 204d760c5a05178119ad8c7724aab7e9170b91ef7acee1d41bcf8f033efc2e8d
+      inlined_ast: 204d760c5a05178119ad8c7724aab7e9170b91ef7acee1d41bcf8f033efc2e8d
+      dce_ast: 204d760c5a05178119ad8c7724aab7e9170b91ef7acee1d41bcf8f033efc2e8d
       bytecode: 898a6a5cc452219a2c31f1cc7f0c73c6eea23a72d4d331e013cfb866167467e2
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/ge.out b/tests/expectations/compiler/integers/i16/ge.out
index 83eea61785..22afd6ef36 100644
--- a/tests/expectations/compiler/integers/i16/ge.out
+++ b/tests/expectations/compiler/integers/i16/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 389a6ec4554e6f627b286daa520905157c611bc5991865b752bd63679ff34aca
-      unrolled_ast: 389a6ec4554e6f627b286daa520905157c611bc5991865b752bd63679ff34aca
-      ssa_ast: 6e12fdb1363945830dba4092e6a0dab0ab077d4fcc68d184af72053be64999d1
-      flattened_ast: 584a8c9f22652d9a2c6b15624b92c7258db9f4f36f4a66890b193f52d1a99d36
-      inlined_ast: 584a8c9f22652d9a2c6b15624b92c7258db9f4f36f4a66890b193f52d1a99d36
-      dce_ast: 584a8c9f22652d9a2c6b15624b92c7258db9f4f36f4a66890b193f52d1a99d36
+  - - initial_ast: e5db298a3477079bbd7cd340ff4b76e53e3c3c82c79bca12415c8b80867b4beb
+      unrolled_ast: e5db298a3477079bbd7cd340ff4b76e53e3c3c82c79bca12415c8b80867b4beb
+      ssa_ast: 1d41453d328d27faa64e7c6f551e984b7018ad12adbdac15b98183bc195307a5
+      flattened_ast: 45c53eb8d392f15c87b410dae902947ead0e55ee54c3874400a7466f34bfda0d
+      inlined_ast: 45c53eb8d392f15c87b410dae902947ead0e55ee54c3874400a7466f34bfda0d
+      dce_ast: 45c53eb8d392f15c87b410dae902947ead0e55ee54c3874400a7466f34bfda0d
       bytecode: e35d3733d6b9cdae2cad91fa9100d057efcbdf45f16994f11a75319486a81e64
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/gt.out b/tests/expectations/compiler/integers/i16/gt.out
index 38cfa10799..eb6039e162 100644
--- a/tests/expectations/compiler/integers/i16/gt.out
+++ b/tests/expectations/compiler/integers/i16/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 29ef21b1b92423380c7c4eacc303bf194d7468be67527acc630b88988e876ed3
-      unrolled_ast: 29ef21b1b92423380c7c4eacc303bf194d7468be67527acc630b88988e876ed3
-      ssa_ast: 91211548e55af38be02baac1005dc06a782ed068580ee58250ce46638ccaedc3
-      flattened_ast: 209a248d1458a36edb3ecd283aaa36c83cffd223fa29cb2b98e7876af8e83812
-      inlined_ast: 209a248d1458a36edb3ecd283aaa36c83cffd223fa29cb2b98e7876af8e83812
-      dce_ast: 209a248d1458a36edb3ecd283aaa36c83cffd223fa29cb2b98e7876af8e83812
+  - - initial_ast: cc3c86724b0f366e9e5cf9467f0105ffc3721080cc09c6f66b42e3d2c1682820
+      unrolled_ast: cc3c86724b0f366e9e5cf9467f0105ffc3721080cc09c6f66b42e3d2c1682820
+      ssa_ast: 4e9fed3f5daca74a1dfdff5b5d653fc05814407b244c01b9d4939cd85a3fb281
+      flattened_ast: 31a5773e13d89ac3994e4bd3588591ad431118fecfb60398bf41703c112736fd
+      inlined_ast: 31a5773e13d89ac3994e4bd3588591ad431118fecfb60398bf41703c112736fd
+      dce_ast: 31a5773e13d89ac3994e4bd3588591ad431118fecfb60398bf41703c112736fd
       bytecode: 8195766fd4b565e30f6f4e088c57977e5a558d68847e0a61fe2b8de79bd2590d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/le.out b/tests/expectations/compiler/integers/i16/le.out
index 98f6092da4..b72b940604 100644
--- a/tests/expectations/compiler/integers/i16/le.out
+++ b/tests/expectations/compiler/integers/i16/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a93d22ded38b4e50082ef8a38bf75ea02c8ef1a06be508ded88011abb27ee591
-      unrolled_ast: a93d22ded38b4e50082ef8a38bf75ea02c8ef1a06be508ded88011abb27ee591
-      ssa_ast: 267336dd53336f98542c2699dcf0d965e0e06388f6f691c290676bd496e388bb
-      flattened_ast: 7f94b572449d78d2e60d7e6dae283c40f756e92f8249c35e2ad6b438c28a9bba
-      inlined_ast: 7f94b572449d78d2e60d7e6dae283c40f756e92f8249c35e2ad6b438c28a9bba
-      dce_ast: 7f94b572449d78d2e60d7e6dae283c40f756e92f8249c35e2ad6b438c28a9bba
+  - - initial_ast: 7002248c18ad63212702462ccc6eee1af2394038d44bf2fd054d874b6803d72f
+      unrolled_ast: 7002248c18ad63212702462ccc6eee1af2394038d44bf2fd054d874b6803d72f
+      ssa_ast: 902fd439684b4a6b28bd518f41e3fa5541c227ab2458ab333dd553f8ad03018d
+      flattened_ast: 71008b923dfbc5ef83f150778cda56ff96638c20462154d792b3f476d2dcc919
+      inlined_ast: 71008b923dfbc5ef83f150778cda56ff96638c20462154d792b3f476d2dcc919
+      dce_ast: 71008b923dfbc5ef83f150778cda56ff96638c20462154d792b3f476d2dcc919
       bytecode: 98dc59dd7939556e96fd2a7f222612401d18c45c3d38845f2c68d273b1d848c3
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/lt.out b/tests/expectations/compiler/integers/i16/lt.out
index f16a759de7..817322ac85 100644
--- a/tests/expectations/compiler/integers/i16/lt.out
+++ b/tests/expectations/compiler/integers/i16/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 766fb35b2ba0aef7b1103fc9c81e12c885873ce5e219a71a7591f3282d336631
-      unrolled_ast: 766fb35b2ba0aef7b1103fc9c81e12c885873ce5e219a71a7591f3282d336631
-      ssa_ast: 50fad161c3cd0b53f5b45b05777f404b7c040ec4f97a9b02a7f1f522fac4273e
-      flattened_ast: 271ce739e71ddfc4dd38f4e9d450309ba125e684aa2aaeb61fed466fb3d427e0
-      inlined_ast: 271ce739e71ddfc4dd38f4e9d450309ba125e684aa2aaeb61fed466fb3d427e0
-      dce_ast: 271ce739e71ddfc4dd38f4e9d450309ba125e684aa2aaeb61fed466fb3d427e0
+  - - initial_ast: 37941657da122c1cf3490d961cd10158c595bbd3b0f94b3f8441140b2c1ca268
+      unrolled_ast: 37941657da122c1cf3490d961cd10158c595bbd3b0f94b3f8441140b2c1ca268
+      ssa_ast: 5d7fb912eeb67cc78a6c0de9f781ed14eef18324c4a7d876f929d12557bd64bf
+      flattened_ast: 8c959aab2a8befb329dbcae45a757754a50f6655e3d3c1822a8ccbbb3d5ae134
+      inlined_ast: 8c959aab2a8befb329dbcae45a757754a50f6655e3d3c1822a8ccbbb3d5ae134
+      dce_ast: 8c959aab2a8befb329dbcae45a757754a50f6655e3d3c1822a8ccbbb3d5ae134
       bytecode: 1ce9578b21f22dfd7342da3a2ea28ed86cb30b94475fc02329dab93fe121eaa3
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/max.out b/tests/expectations/compiler/integers/i16/max.out
index cba650d128..f44d6a346e 100644
--- a/tests/expectations/compiler/integers/i16/max.out
+++ b/tests/expectations/compiler/integers/i16/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e2fd154f1d498cac1aaaf44904a8295c4bd82e1e8a0ac4d3c52a48e435effd81
-      unrolled_ast: e2fd154f1d498cac1aaaf44904a8295c4bd82e1e8a0ac4d3c52a48e435effd81
-      ssa_ast: acc9b45db261d0e7173b1da11e7199ecdfb867f19544a06cb99f4d973b593c58
-      flattened_ast: 695fd53b5643c232ac56778b86be226f0cad4ce649b958d6d29609c9b9aaa926
-      inlined_ast: 695fd53b5643c232ac56778b86be226f0cad4ce649b958d6d29609c9b9aaa926
-      dce_ast: 695fd53b5643c232ac56778b86be226f0cad4ce649b958d6d29609c9b9aaa926
+  - - initial_ast: fb788fce49d82b2482542a577d1731dc7a06e74cb71b5b2fcb1fc977a74a5382
+      unrolled_ast: fb788fce49d82b2482542a577d1731dc7a06e74cb71b5b2fcb1fc977a74a5382
+      ssa_ast: 6e27eb17bc03b8d5f68b7ca7ea80d53451df0255bfc224b6423b8a0276f0e446
+      flattened_ast: a65322aaf3e278e604081e96c012eae466c4d1896124ca2fb0778926a096d64f
+      inlined_ast: a65322aaf3e278e604081e96c012eae466c4d1896124ca2fb0778926a096d64f
+      dce_ast: a65322aaf3e278e604081e96c012eae466c4d1896124ca2fb0778926a096d64f
       bytecode: 45295d2179ab802afcc86d7d5b8c0b17afcdab726c8cca491370f77918e64a2b
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/min.out b/tests/expectations/compiler/integers/i16/min.out
index 2f260787f8..7e6744026a 100644
--- a/tests/expectations/compiler/integers/i16/min.out
+++ b/tests/expectations/compiler/integers/i16/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c54397a8775c316b696b6b1651b7af23acb58bb0f583e3838bebf367c10ce13e
-      unrolled_ast: c54397a8775c316b696b6b1651b7af23acb58bb0f583e3838bebf367c10ce13e
-      ssa_ast: 6318f0c65ebeebf6dbd97b62b2f33b60b7ff87bf127339c451d459829c64085b
-      flattened_ast: 4be2d160fae26ecc5f004b22c07e7f21cf061e011d1b63aafb4fb461a618909b
-      inlined_ast: 4be2d160fae26ecc5f004b22c07e7f21cf061e011d1b63aafb4fb461a618909b
-      dce_ast: 4be2d160fae26ecc5f004b22c07e7f21cf061e011d1b63aafb4fb461a618909b
+  - - initial_ast: 588e041e7d349c6df03a8477d7de0cbe798f13c245af807fb36158d6abfddae7
+      unrolled_ast: 588e041e7d349c6df03a8477d7de0cbe798f13c245af807fb36158d6abfddae7
+      ssa_ast: 1195c0f6da9d96c3aed6ddfd75f158948b4595c9435fb12ee5b9be5ade9c267b
+      flattened_ast: 80429f069f2e528754f827868be8476de429c36000c0f6ca38bf21d2fac4b53d
+      inlined_ast: 80429f069f2e528754f827868be8476de429c36000c0f6ca38bf21d2fac4b53d
+      dce_ast: 80429f069f2e528754f827868be8476de429c36000c0f6ca38bf21d2fac4b53d
       bytecode: b4ca9ba0607d70a519a65b1415ffb48639cda59835abf8a7a892710f309b0abc
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/min_fail.out b/tests/expectations/compiler/integers/i16/min_fail.out
index 77bcf94456..baa9d1d9da 100644
--- a/tests/expectations/compiler/integers/i16/min_fail.out
+++ b/tests/expectations/compiler/integers/i16/min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 09d9f7f010474d4976c2b735b648932b9cf612ed84f75909861db651e2708ea5
-      unrolled_ast: 09d9f7f010474d4976c2b735b648932b9cf612ed84f75909861db651e2708ea5
-      ssa_ast: 803cab042d71aedaf4cd6bf6d5cf04b7fb03abbbf1a4d24373da407d49ff984b
-      flattened_ast: f83459e1379d29ba36416653ac541facc0e4f695f0d37445b777afce75c2af43
-      inlined_ast: f83459e1379d29ba36416653ac541facc0e4f695f0d37445b777afce75c2af43
-      dce_ast: f83459e1379d29ba36416653ac541facc0e4f695f0d37445b777afce75c2af43
+  - - initial_ast: ab4eedf21393ae40f155acd2b8917ac668fe2ca0dea9f9186936e928f29d80e2
+      unrolled_ast: ab4eedf21393ae40f155acd2b8917ac668fe2ca0dea9f9186936e928f29d80e2
+      ssa_ast: b24595c2cd607a1188fb6c17087ca63a42d0d902926bb2de65b21c8d79956ea1
+      flattened_ast: 48a56965186be4034a1aaa21c8cb22a2b7b18392a7e268a1451936356432e081
+      inlined_ast: 48a56965186be4034a1aaa21c8cb22a2b7b18392a7e268a1451936356432e081
+      dce_ast: 48a56965186be4034a1aaa21c8cb22a2b7b18392a7e268a1451936356432e081
       bytecode: 5d5bc4c63f62ab0bf4b07e3791e046417ea909f69375729be199bbdba267e742
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/mul.out b/tests/expectations/compiler/integers/i16/mul.out
index 44bbb05188..ae04933a9b 100644
--- a/tests/expectations/compiler/integers/i16/mul.out
+++ b/tests/expectations/compiler/integers/i16/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3eebf844bd177a67aa71ad80897064d084a07ec1d46728fc5bae749d61011458
-      unrolled_ast: 3eebf844bd177a67aa71ad80897064d084a07ec1d46728fc5bae749d61011458
-      ssa_ast: a4ff54892523df074ab3e5b0353ec3e0819bb6ead4be29be1aec7ed2a9ef3012
-      flattened_ast: cf75d6ca032b75bbeab1b22764ef4a7cd2acc89076425ebbad99dda9d1c99aa8
-      inlined_ast: cf75d6ca032b75bbeab1b22764ef4a7cd2acc89076425ebbad99dda9d1c99aa8
-      dce_ast: cf75d6ca032b75bbeab1b22764ef4a7cd2acc89076425ebbad99dda9d1c99aa8
+  - - initial_ast: 00fd086589d74802136ed1601e939c83c930b99a33e692e2425ad02e75a6ea38
+      unrolled_ast: 00fd086589d74802136ed1601e939c83c930b99a33e692e2425ad02e75a6ea38
+      ssa_ast: 793743271ddda45312d4c855c31d3b0d810fa83345be5fc1eaf8f2f3fa833527
+      flattened_ast: bfed6e93f5ac9d3ff662d2bd6196cd6a6c3ae7bebdfb275ac612a1bea038d41c
+      inlined_ast: bfed6e93f5ac9d3ff662d2bd6196cd6a6c3ae7bebdfb275ac612a1bea038d41c
+      dce_ast: bfed6e93f5ac9d3ff662d2bd6196cd6a6c3ae7bebdfb275ac612a1bea038d41c
       bytecode: dfd9acb20823234cdd87513c5b6ee195f0e5b925b52e035009dcb7ff22e6900a
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/ne.out b/tests/expectations/compiler/integers/i16/ne.out
index cd42f93362..97b4e42f00 100644
--- a/tests/expectations/compiler/integers/i16/ne.out
+++ b/tests/expectations/compiler/integers/i16/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fcccfeeaa3101a8c8dc715b47a7ca3ba6bc1e9a7edd6ff0b8e3706cabcd354f8
-      unrolled_ast: fcccfeeaa3101a8c8dc715b47a7ca3ba6bc1e9a7edd6ff0b8e3706cabcd354f8
-      ssa_ast: 19ce57e0ede8332b8ace0dc011330488eb59432b0202ca1824555283a6710909
-      flattened_ast: 14675836b8407ff05be96f34abcec240152d036e656df9a8adfdbd3d37cd6574
-      inlined_ast: 14675836b8407ff05be96f34abcec240152d036e656df9a8adfdbd3d37cd6574
-      dce_ast: 14675836b8407ff05be96f34abcec240152d036e656df9a8adfdbd3d37cd6574
+  - - initial_ast: 3b01f8f267c7195483b92eb55721d63345b6f53874525c9e8f25c29822e50f1e
+      unrolled_ast: 3b01f8f267c7195483b92eb55721d63345b6f53874525c9e8f25c29822e50f1e
+      ssa_ast: 4761eb7cd6230d1ea80e5064ac541a0e4d67e9ac7946809fb0eb45a751f39e4b
+      flattened_ast: 24533a71c642ba52336d4610c0c921a0ed779eafb09065ba74f2014ce5f8a04c
+      inlined_ast: 24533a71c642ba52336d4610c0c921a0ed779eafb09065ba74f2014ce5f8a04c
+      dce_ast: 24533a71c642ba52336d4610c0c921a0ed779eafb09065ba74f2014ce5f8a04c
       bytecode: 955b3e3d4d80a6816de6d59563cc6f31f94dbff43853facba45936dfdc2012ca
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/negate.out b/tests/expectations/compiler/integers/i16/negate.out
index c801c96340..b4d472bdea 100644
--- a/tests/expectations/compiler/integers/i16/negate.out
+++ b/tests/expectations/compiler/integers/i16/negate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 74543d1f6de58c7bddf99a56d7227b8f820ab5d0db3109f898d8cf342bdf5cd3
-      unrolled_ast: 74543d1f6de58c7bddf99a56d7227b8f820ab5d0db3109f898d8cf342bdf5cd3
-      ssa_ast: 29397a9d1e14514103f24706bc7cb56aac07dcdf41600e1ccec185554d51edf8
-      flattened_ast: 91e8d5a7ca88b17c96583b5f416bbf6325e10b4ec220acd8e29b9d76731025d4
-      inlined_ast: 91e8d5a7ca88b17c96583b5f416bbf6325e10b4ec220acd8e29b9d76731025d4
-      dce_ast: 91e8d5a7ca88b17c96583b5f416bbf6325e10b4ec220acd8e29b9d76731025d4
+  - - initial_ast: b00b479bf2aa2c56ffb075a042f3324a4205ae608b213a065a862b58c8bfdb34
+      unrolled_ast: b00b479bf2aa2c56ffb075a042f3324a4205ae608b213a065a862b58c8bfdb34
+      ssa_ast: 4fc5cb67e92ef183495eb6dad0500e7957cbec10c1fa206b2cdbde4dbb420be4
+      flattened_ast: 481bb8307c049ba2c32a8f339868c182d6cea6f01cb997078fb3d412d50dc361
+      inlined_ast: 481bb8307c049ba2c32a8f339868c182d6cea6f01cb997078fb3d412d50dc361
+      dce_ast: 481bb8307c049ba2c32a8f339868c182d6cea6f01cb997078fb3d412d50dc361
       bytecode: 4c2a08bbf8cfdd45438e33b981a9f3d77b1d44225227714b3189e3e641e428e9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/negate_min_fail.out b/tests/expectations/compiler/integers/i16/negate_min_fail.out
index 3763e06e5c..93f4ed2f31 100644
--- a/tests/expectations/compiler/integers/i16/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i16/negate_min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7cd2cb8c46937fc8aaeb9b421d1ac5ae888ce22439f43861856445ecfc86aa5d
-      unrolled_ast: 7cd2cb8c46937fc8aaeb9b421d1ac5ae888ce22439f43861856445ecfc86aa5d
-      ssa_ast: 93d6e9b5638f74440769cfd23ff7a2b22ee1934383a3a5b083adf671fbbbb9c4
-      flattened_ast: 9c5e98ac13640a41ca95453a8dbd19423dde823cf8f629040129ae75724faed1
-      inlined_ast: 9c5e98ac13640a41ca95453a8dbd19423dde823cf8f629040129ae75724faed1
-      dce_ast: 9c5e98ac13640a41ca95453a8dbd19423dde823cf8f629040129ae75724faed1
+  - - initial_ast: 9edbfe099f32651ffe601374cbfe9d7369dd7696f0b13189c20eb3982caa6667
+      unrolled_ast: 9edbfe099f32651ffe601374cbfe9d7369dd7696f0b13189c20eb3982caa6667
+      ssa_ast: c16060431f8910e8823b1b3ce7096d5f6ad0f4ce8d6b17ddcd8758a8490883b6
+      flattened_ast: 61413eece5f481065f68b958feac2c0784ae24a505cc175b0c0823444c732fae
+      inlined_ast: 61413eece5f481065f68b958feac2c0784ae24a505cc175b0c0823444c732fae
+      dce_ast: 61413eece5f481065f68b958feac2c0784ae24a505cc175b0c0823444c732fae
       bytecode: f1c720ffbffc836bb5dcc1bdf2b2e9cb95de97275e7798b6f8e508c9116d757c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/negate_zero.out b/tests/expectations/compiler/integers/i16/negate_zero.out
index 3d56b248f1..9a57a8632b 100644
--- a/tests/expectations/compiler/integers/i16/negate_zero.out
+++ b/tests/expectations/compiler/integers/i16/negate_zero.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 87d320472e8ecbcfb5d8e39f1fd1c7db15804ce784998a5af96776c8bf69959c
-      unrolled_ast: 87d320472e8ecbcfb5d8e39f1fd1c7db15804ce784998a5af96776c8bf69959c
-      ssa_ast: 06dea1ad1e2ef46889a690a5ee0d4721a1c353c53a6041710bf8c0654ae46c57
-      flattened_ast: 80e079322b40ae65927d68806963943f587e7e21e927fa50605f8239785d00ae
-      inlined_ast: 80e079322b40ae65927d68806963943f587e7e21e927fa50605f8239785d00ae
-      dce_ast: 80e079322b40ae65927d68806963943f587e7e21e927fa50605f8239785d00ae
+  - - initial_ast: 3ad17e4fd59b14853b85de6568fcd79d88e34702cd6e0a22af8b6b6e09bd0a59
+      unrolled_ast: 3ad17e4fd59b14853b85de6568fcd79d88e34702cd6e0a22af8b6b6e09bd0a59
+      ssa_ast: f2cc009ec0aec2c381dcd251eed7d3959f82899da9d0428f647bf8a10065b6dc
+      flattened_ast: a7e5d0276c62aaaae6eac8252ecb9a26e40a66f93533c91ce8f08c8f046baedd
+      inlined_ast: a7e5d0276c62aaaae6eac8252ecb9a26e40a66f93533c91ce8f08c8f046baedd
+      dce_ast: a7e5d0276c62aaaae6eac8252ecb9a26e40a66f93533c91ce8f08c8f046baedd
       bytecode: 041ad04237619df46380596339019563fc1d330a7e3792a3d856e4b600e8501e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/operator_methods.out b/tests/expectations/compiler/integers/i16/operator_methods.out
index 0864e0e69d..830425268a 100644
--- a/tests/expectations/compiler/integers/i16/operator_methods.out
+++ b/tests/expectations/compiler/integers/i16/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: af9d1887343d697afdf758fbb59c785a2a8f8bf95e9b02e8e1c10154fdf72d20
-      unrolled_ast: af9d1887343d697afdf758fbb59c785a2a8f8bf95e9b02e8e1c10154fdf72d20
-      ssa_ast: 609ef9fd6d79e85cb7dcac4dfef5fefed9026172f2fd52e6cbd7b5a33a4c0df1
-      flattened_ast: d8d4c0046b74378ac0c712460b638ecb837be4b3aa733864333611cf5972f8ef
-      inlined_ast: d8d4c0046b74378ac0c712460b638ecb837be4b3aa733864333611cf5972f8ef
-      dce_ast: 4152e1989baca8d41f341e95f5a6c8e980c79d37fd30d5a267d7445502e3dd0c
+  - - initial_ast: 4883c1070149fbb3ba2c671f0fc94689d4c1f7efff49649af72d5b487c2f5bb3
+      unrolled_ast: 4883c1070149fbb3ba2c671f0fc94689d4c1f7efff49649af72d5b487c2f5bb3
+      ssa_ast: 98cb1a4d8192bfb2fc1548fdf304afb40fd779610cb4294aa992af3804d1de2b
+      flattened_ast: e98a1c42de742111c15b58a607dcdd842ae415d708057b46a565cf62f211bd43
+      inlined_ast: e98a1c42de742111c15b58a607dcdd842ae415d708057b46a565cf62f211bd43
+      dce_ast: 1a2cc814384e1738130d37d1ad26ca5171736221f4fb6e0bb26f9c53ba3456f7
       bytecode: 2ae0c269722de40ebea82115838ca6bc794e781954d9437afc1684c0f171847f
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/or.out b/tests/expectations/compiler/integers/i16/or.out
index 4de382b313..1cbb6f2c3d 100644
--- a/tests/expectations/compiler/integers/i16/or.out
+++ b/tests/expectations/compiler/integers/i16/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 806def9ba04babf9a35d67959bbf29a8ff8a738c4544babd27f0bf45c08ae9b3
-      unrolled_ast: 806def9ba04babf9a35d67959bbf29a8ff8a738c4544babd27f0bf45c08ae9b3
-      ssa_ast: dad5a98d7f38d56c057dd0faa2c07478c71304b6f705d87f7b6d47c40df003fd
-      flattened_ast: e6cffc917bce49952f6dae423ea527bce2c1b8d7c8826123ef335f7a2fdbcfa5
-      inlined_ast: e6cffc917bce49952f6dae423ea527bce2c1b8d7c8826123ef335f7a2fdbcfa5
-      dce_ast: e6cffc917bce49952f6dae423ea527bce2c1b8d7c8826123ef335f7a2fdbcfa5
+  - - initial_ast: 706a689f19e89f12b3ca7981ad46ff6d1935e00177f1d9c02bc13487f18e6c7d
+      unrolled_ast: 706a689f19e89f12b3ca7981ad46ff6d1935e00177f1d9c02bc13487f18e6c7d
+      ssa_ast: ab6745e60ae52d8d5c86fcbc2959838209083c7a4f9b4f73181c9ec9a3629466
+      flattened_ast: e607059ee995d67702d99d249fc76a7bd261278a9a8d1166722036a30c76cdef
+      inlined_ast: e607059ee995d67702d99d249fc76a7bd261278a9a8d1166722036a30c76cdef
+      dce_ast: e607059ee995d67702d99d249fc76a7bd261278a9a8d1166722036a30c76cdef
       bytecode: ce2896db5a90c1bfd62a00f9b8721cc2285e1ef077a8e225e2748bb33742564b
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/pow.out b/tests/expectations/compiler/integers/i16/pow.out
index 355e0b7a2f..40f73b37d2 100644
--- a/tests/expectations/compiler/integers/i16/pow.out
+++ b/tests/expectations/compiler/integers/i16/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1fb9954aa4fad65f019157eee1ee0fe981e67344df46f64f89d5ff0965a1744b
-      unrolled_ast: 1fb9954aa4fad65f019157eee1ee0fe981e67344df46f64f89d5ff0965a1744b
-      ssa_ast: 412e824eb9aaa2574743ecac101f62e531b87150dcbc338026cd1df53c616b40
-      flattened_ast: fdf3e2bfee6ac626df1b0c24891daf6f1fdc163c8b0f2489d2792053be540963
-      inlined_ast: fdf3e2bfee6ac626df1b0c24891daf6f1fdc163c8b0f2489d2792053be540963
-      dce_ast: fdf3e2bfee6ac626df1b0c24891daf6f1fdc163c8b0f2489d2792053be540963
+  - - initial_ast: ce1c16bd67d42674bb3a432c09eeb6428b9cb5004309f6aa333aa80851260455
+      unrolled_ast: ce1c16bd67d42674bb3a432c09eeb6428b9cb5004309f6aa333aa80851260455
+      ssa_ast: 567de5722b585735825fe933e006d16f10a702f8d573dd17581796e70bd381b4
+      flattened_ast: 9f9385ba18ea96f37716d372bc20e0a60d85a3fbc24c1c9769173562c8568265
+      inlined_ast: 9f9385ba18ea96f37716d372bc20e0a60d85a3fbc24c1c9769173562c8568265
+      dce_ast: 9f9385ba18ea96f37716d372bc20e0a60d85a3fbc24c1c9769173562c8568265
       bytecode: 5566b622f6c5ea37b1b130db8b59ea5d69140dbe2aae45a1ada003d92482f7a9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/rem.out b/tests/expectations/compiler/integers/i16/rem.out
index 3fa7710523..5ba5dd3308 100644
--- a/tests/expectations/compiler/integers/i16/rem.out
+++ b/tests/expectations/compiler/integers/i16/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 24dd42d011200fe22f9ee610cbe50f4f6b8b2fc52e93755322abdf230db0367a
-      unrolled_ast: 24dd42d011200fe22f9ee610cbe50f4f6b8b2fc52e93755322abdf230db0367a
-      ssa_ast: c189947562552352d249f2b91fe3d4a14dcf06e83f1153ad505a0ee5a8be9abe
-      flattened_ast: 07ea242236e3ac58d7dfe8d8f340e3564e409bf0e1c96196e92c90a247822cd6
-      inlined_ast: 07ea242236e3ac58d7dfe8d8f340e3564e409bf0e1c96196e92c90a247822cd6
-      dce_ast: 07ea242236e3ac58d7dfe8d8f340e3564e409bf0e1c96196e92c90a247822cd6
+  - - initial_ast: 22d5cbb75d98df4d5bd90c27a0bc325478d10c99fdd381a38a58da71eefaef40
+      unrolled_ast: 22d5cbb75d98df4d5bd90c27a0bc325478d10c99fdd381a38a58da71eefaef40
+      ssa_ast: d7cb43c56554a9b231afe2f27b811aeef75fbc77001ebfae5819509cd23d37c4
+      flattened_ast: 310b2e218306b51f16efef7adfe256ac7afe5d04eff25e3929b75e28bec41336
+      inlined_ast: 310b2e218306b51f16efef7adfe256ac7afe5d04eff25e3929b75e28bec41336
+      dce_ast: 310b2e218306b51f16efef7adfe256ac7afe5d04eff25e3929b75e28bec41336
       bytecode: 9db0a74c24c209fa63e0d47919e9fa1a10cde21b15179098872b9c99f821cb16
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/shl.out b/tests/expectations/compiler/integers/i16/shl.out
index b4182bcf8c..9407dd6158 100644
--- a/tests/expectations/compiler/integers/i16/shl.out
+++ b/tests/expectations/compiler/integers/i16/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 21d71f440e9ed49506337ad3dbc4cf1239e8de4f2fa46d0c1d747dd4abaeed1a
-      unrolled_ast: 21d71f440e9ed49506337ad3dbc4cf1239e8de4f2fa46d0c1d747dd4abaeed1a
-      ssa_ast: e3443fc971c6cdce8dea3905967796d46a6affe1a3d2fac3a8217b76d90d1e73
-      flattened_ast: e5d322dfb4af5c57b592e351fa0635a397ac026db5cff768e31af72bab72d0f3
-      inlined_ast: e5d322dfb4af5c57b592e351fa0635a397ac026db5cff768e31af72bab72d0f3
-      dce_ast: e5d322dfb4af5c57b592e351fa0635a397ac026db5cff768e31af72bab72d0f3
+  - - initial_ast: a880c2fe49f1578ea6c7f5252ba0d6d8fcc3813278e76acd53490eaa6bf11f89
+      unrolled_ast: a880c2fe49f1578ea6c7f5252ba0d6d8fcc3813278e76acd53490eaa6bf11f89
+      ssa_ast: 2640ab0a82697c6a7bddf51549bdd7337a880951b1b2c5b671a08dbcbea7d739
+      flattened_ast: c80726149c2aaf8e0347427dc6a25438940b84291668fcac16990b37438c8174
+      inlined_ast: c80726149c2aaf8e0347427dc6a25438940b84291668fcac16990b37438c8174
+      dce_ast: c80726149c2aaf8e0347427dc6a25438940b84291668fcac16990b37438c8174
       bytecode: 65af41a661155e3ce64ac1afced0c2ad5098a59a458f1ef3215f34f5a8e4247a
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/shr.out b/tests/expectations/compiler/integers/i16/shr.out
index 2e87b89f37..6ac7508021 100644
--- a/tests/expectations/compiler/integers/i16/shr.out
+++ b/tests/expectations/compiler/integers/i16/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6acc4c7315db9aa2a84c4d05073e5a5bb915bfce3ead0ba7058adceca3c68740
-      unrolled_ast: 6acc4c7315db9aa2a84c4d05073e5a5bb915bfce3ead0ba7058adceca3c68740
-      ssa_ast: e345520f6e9cbbabf6ba64ec9baec1219dc49d774612957381d7efb178939059
-      flattened_ast: 61390f886e94307dbc6c8f2bdb0ffa25dd33527437614c1ee9a9cf0908b3f06e
-      inlined_ast: 61390f886e94307dbc6c8f2bdb0ffa25dd33527437614c1ee9a9cf0908b3f06e
-      dce_ast: 61390f886e94307dbc6c8f2bdb0ffa25dd33527437614c1ee9a9cf0908b3f06e
+  - - initial_ast: a604841979b4fbf2b0a27fbe410a7984bbacf02e55a92090592120ce05ed3d6e
+      unrolled_ast: a604841979b4fbf2b0a27fbe410a7984bbacf02e55a92090592120ce05ed3d6e
+      ssa_ast: bd4b34b41c6244ac22df4de69bcea0b87b53e0be48dc144641f704dd313eefdf
+      flattened_ast: 94a1ae8350c2f74b04ad3a2738f84239377089333bbc98e9b2d9294f57179aac
+      inlined_ast: 94a1ae8350c2f74b04ad3a2738f84239377089333bbc98e9b2d9294f57179aac
+      dce_ast: 94a1ae8350c2f74b04ad3a2738f84239377089333bbc98e9b2d9294f57179aac
       bytecode: 1af055915587aced3dca90d1e065481be3648546d2bc465461d50b03c2974f6a
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/sub.out b/tests/expectations/compiler/integers/i16/sub.out
index 796fe26f20..a51d39aa27 100644
--- a/tests/expectations/compiler/integers/i16/sub.out
+++ b/tests/expectations/compiler/integers/i16/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ba0f0e067bd784fcd2fcf82116c0bdb2781e107670c657e690e97abc6872bb38
-      unrolled_ast: ba0f0e067bd784fcd2fcf82116c0bdb2781e107670c657e690e97abc6872bb38
-      ssa_ast: c8c5c993c7df97a88b2cf5e287a4ed1b4e232409cebfa063a588113256d225c4
-      flattened_ast: 57f558b525842b3ecc87d1798cae5e6ea64b2c68aa63b19ac7a518fa2c5f3871
-      inlined_ast: 57f558b525842b3ecc87d1798cae5e6ea64b2c68aa63b19ac7a518fa2c5f3871
-      dce_ast: 57f558b525842b3ecc87d1798cae5e6ea64b2c68aa63b19ac7a518fa2c5f3871
+  - - initial_ast: a1e85111a069dad6f0dc3093ba5ad4a29a1bda1454600dec257c46c217eb0932
+      unrolled_ast: a1e85111a069dad6f0dc3093ba5ad4a29a1bda1454600dec257c46c217eb0932
+      ssa_ast: d3af5bea1d9ddd712092d2dbfe68c53107671121d49ef6cfb1770a4dc5d4cfbb
+      flattened_ast: 67017f7978bae233a64dac45e0a6402decb2bcfebcca4f2c5116f7d973f70d83
+      inlined_ast: 67017f7978bae233a64dac45e0a6402decb2bcfebcca4f2c5116f7d973f70d83
+      dce_ast: 67017f7978bae233a64dac45e0a6402decb2bcfebcca4f2c5116f7d973f70d83
       bytecode: 17009388ef3907c90aabc4a26d822d5b361f00d4753cca95dda6539866f8d908
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/ternary.out b/tests/expectations/compiler/integers/i16/ternary.out
index 325a8e2df0..c1511879f2 100644
--- a/tests/expectations/compiler/integers/i16/ternary.out
+++ b/tests/expectations/compiler/integers/i16/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a8b345534ea260232675511b0ccca504ac7508b52bd557fb94ede8eeaa9ddbe5
-      unrolled_ast: a8b345534ea260232675511b0ccca504ac7508b52bd557fb94ede8eeaa9ddbe5
-      ssa_ast: bd870dc72c7e5e8d0594a826a0463bf1520ae4e2a914e8801a7f01e42bb17544
-      flattened_ast: 7d78ac3d600d22ccb327465bd533c4a5b4432edfe7269a68b01d1ff35098015c
-      inlined_ast: 7d78ac3d600d22ccb327465bd533c4a5b4432edfe7269a68b01d1ff35098015c
-      dce_ast: 7d78ac3d600d22ccb327465bd533c4a5b4432edfe7269a68b01d1ff35098015c
+  - - initial_ast: b73c586d754638212893f80baf476445e86139a002f779d1dce522d4896bd710
+      unrolled_ast: b73c586d754638212893f80baf476445e86139a002f779d1dce522d4896bd710
+      ssa_ast: e555fd658c9b1c73300cf36a68811eb77293285a14e2c228ecfbfb78d92954d1
+      flattened_ast: 6152fd212d62b36d43f905864f2900c68a72983c7f73437ac97641566dd49ed0
+      inlined_ast: 6152fd212d62b36d43f905864f2900c68a72983c7f73437ac97641566dd49ed0
+      dce_ast: 6152fd212d62b36d43f905864f2900c68a72983c7f73437ac97641566dd49ed0
       bytecode: 36a621308b0c9bc17df0d85b9b4734e73d1d64cbcacdd813603f3d79f74e8996
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i16/xor.out b/tests/expectations/compiler/integers/i16/xor.out
index 725f8290ab..6cf9157f4a 100644
--- a/tests/expectations/compiler/integers/i16/xor.out
+++ b/tests/expectations/compiler/integers/i16/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 40bf8d5c2ed916656ee3bf32c9bf1f7c266d45fe44834a21dc1ac16b8c300e8b
-      unrolled_ast: 40bf8d5c2ed916656ee3bf32c9bf1f7c266d45fe44834a21dc1ac16b8c300e8b
-      ssa_ast: f6f44bc2aebc52546a1c85bd2e8a3dc6105e417267328c51bc5c04a26057bba6
-      flattened_ast: 5165d414dbfb84ab1b4d4982148f42d5980fbd45bb4dd0392ae019442996898f
-      inlined_ast: 5165d414dbfb84ab1b4d4982148f42d5980fbd45bb4dd0392ae019442996898f
-      dce_ast: 5165d414dbfb84ab1b4d4982148f42d5980fbd45bb4dd0392ae019442996898f
+  - - initial_ast: d34124b2bfea9d22544fabdc65bd323524f7debbb562d4bfaff0f3c8e0ca3b6f
+      unrolled_ast: d34124b2bfea9d22544fabdc65bd323524f7debbb562d4bfaff0f3c8e0ca3b6f
+      ssa_ast: 64de5fe3eadd1161ccdb002cf65225dd1ac393755d283ed015d87e39517523bf
+      flattened_ast: 7dfbb8ca63d348da1562d0ce2a916bc86007c0a7de3beced9208e802e102f53b
+      inlined_ast: 7dfbb8ca63d348da1562d0ce2a916bc86007c0a7de3beced9208e802e102f53b
+      dce_ast: 7dfbb8ca63d348da1562d0ce2a916bc86007c0a7de3beced9208e802e102f53b
       bytecode: b3f7fd0a992ed66d1a25b6669e1387d7567d6fad58e97b43c160249c2109f516
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/add.out b/tests/expectations/compiler/integers/i32/add.out
index 51de810201..25c1669817 100644
--- a/tests/expectations/compiler/integers/i32/add.out
+++ b/tests/expectations/compiler/integers/i32/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1b6c1e9e3fc51f73372511a5bdc496cb218e51824ce3fcbaaa3e3d9eb6b047fd
-      unrolled_ast: 1b6c1e9e3fc51f73372511a5bdc496cb218e51824ce3fcbaaa3e3d9eb6b047fd
-      ssa_ast: 4a71ea24712f5f3ca445ef396881b1ba654c6bb45c7b27abbffa538009b0acbe
-      flattened_ast: 614abc97a00dc4b8a87bba617a2fed3de8157c9fe35af21564881e01a2fda898
-      inlined_ast: 614abc97a00dc4b8a87bba617a2fed3de8157c9fe35af21564881e01a2fda898
-      dce_ast: 614abc97a00dc4b8a87bba617a2fed3de8157c9fe35af21564881e01a2fda898
+  - - initial_ast: 59c3d146459ea3e5ad5be4bbe1119c6c6c1a5d1d170195b4fccc8035eccbe749
+      unrolled_ast: 59c3d146459ea3e5ad5be4bbe1119c6c6c1a5d1d170195b4fccc8035eccbe749
+      ssa_ast: f1540bd68778df5bdfabac50062525d4b66a60048c179d9ef48d8388c639008c
+      flattened_ast: 41d974b958c5f64578c841fb05fb7df620e1f306eb2543d7896343f73ceca375
+      inlined_ast: 41d974b958c5f64578c841fb05fb7df620e1f306eb2543d7896343f73ceca375
+      dce_ast: 41d974b958c5f64578c841fb05fb7df620e1f306eb2543d7896343f73ceca375
       bytecode: 2a2cbf02e188b3022afe1de563d58f86c9c18a2277c8dbeb307dd1b5dc66f8d3
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/and.out b/tests/expectations/compiler/integers/i32/and.out
index 5a86f446fd..982953f0c1 100644
--- a/tests/expectations/compiler/integers/i32/and.out
+++ b/tests/expectations/compiler/integers/i32/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6fee1260a3a845d8aadf9e003a44b602dacae966c12de9396cda154e557070a9
-      unrolled_ast: 6fee1260a3a845d8aadf9e003a44b602dacae966c12de9396cda154e557070a9
-      ssa_ast: 849b158dbbc95bf90192958fa02fe4c7f3e275c59c93b12f22c1d22dc20475f2
-      flattened_ast: 020a3835bea629a0e4d167bd1d9859a99a60e0232b8eddf2e42fc641b752c00e
-      inlined_ast: 020a3835bea629a0e4d167bd1d9859a99a60e0232b8eddf2e42fc641b752c00e
-      dce_ast: 020a3835bea629a0e4d167bd1d9859a99a60e0232b8eddf2e42fc641b752c00e
+  - - initial_ast: 331bddd80f7daab5b9d3547ed0bc5172877d9a39f0a8e5100a5a6773596f8a7b
+      unrolled_ast: 331bddd80f7daab5b9d3547ed0bc5172877d9a39f0a8e5100a5a6773596f8a7b
+      ssa_ast: 91b6c1830df7dca2c932d5e6eaaef73155920c65a87e18a8292f8caeb92d41ee
+      flattened_ast: 79a025b9dfe0b81c4a5e0db7b85a24aa891f000ddc9038bb131b4f16e8c4f89e
+      inlined_ast: 79a025b9dfe0b81c4a5e0db7b85a24aa891f000ddc9038bb131b4f16e8c4f89e
+      dce_ast: 79a025b9dfe0b81c4a5e0db7b85a24aa891f000ddc9038bb131b4f16e8c4f89e
       bytecode: eee50040aac3f0f43988dcc4e46afc2f734d30f614a2ae6ee1ce88f39b5f2827
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/console_assert.out b/tests/expectations/compiler/integers/i32/console_assert.out
index 606d72c6dc..d1ea4ca0cd 100644
--- a/tests/expectations/compiler/integers/i32/console_assert.out
+++ b/tests/expectations/compiler/integers/i32/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c26cf9d0557176c72fc5006388dbe10243cd60a89bc2e4ec9faaa972f039356a
-      unrolled_ast: c26cf9d0557176c72fc5006388dbe10243cd60a89bc2e4ec9faaa972f039356a
-      ssa_ast: 838a8fec00ba6caa6633ec45f662caee82dd833645caf346bdd440d239988a5c
-      flattened_ast: 9ee458e3dd1f38359db926ba509baa8fde1b5dd2f7350b57a458e1652bc7a1da
-      inlined_ast: 9ee458e3dd1f38359db926ba509baa8fde1b5dd2f7350b57a458e1652bc7a1da
-      dce_ast: 9ee458e3dd1f38359db926ba509baa8fde1b5dd2f7350b57a458e1652bc7a1da
+  - - initial_ast: 9acbc0888c2187dd93312622249d0d484551806fb5f1963787e666839c9d2236
+      unrolled_ast: 9acbc0888c2187dd93312622249d0d484551806fb5f1963787e666839c9d2236
+      ssa_ast: a7d869ea72aabc32bf2623cbfd46fc326c8d9f8b67fc47141993ea4df25b5e2a
+      flattened_ast: 1b922605572732d44be3985ffbccb92bb4e1c6626a155910699fb8ab8d90c32d
+      inlined_ast: 1b922605572732d44be3985ffbccb92bb4e1c6626a155910699fb8ab8d90c32d
+      dce_ast: 1b922605572732d44be3985ffbccb92bb4e1c6626a155910699fb8ab8d90c32d
       bytecode: e8b3b5f71b01963e4df9f24f4f4f47e9976e5e5b099659e6083cef239d37a2d1
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/div.out b/tests/expectations/compiler/integers/i32/div.out
index 39864674fd..526957f682 100644
--- a/tests/expectations/compiler/integers/i32/div.out
+++ b/tests/expectations/compiler/integers/i32/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cd16f4cc0a938ce695769b71c017ccd4bdc0a90e1de6f1cd0201c6da17b764b1
-      unrolled_ast: cd16f4cc0a938ce695769b71c017ccd4bdc0a90e1de6f1cd0201c6da17b764b1
-      ssa_ast: 0e4416ced58d44c6467ea5114717483b701c6136778ab219120859b76b1eb848
-      flattened_ast: 0de7d8669388cfd4cbc15835e446a2adfe09ccd71ce1c7fdc10c0c05b4e9f892
-      inlined_ast: 0de7d8669388cfd4cbc15835e446a2adfe09ccd71ce1c7fdc10c0c05b4e9f892
-      dce_ast: 0de7d8669388cfd4cbc15835e446a2adfe09ccd71ce1c7fdc10c0c05b4e9f892
+  - - initial_ast: cf6d5c443f797919f692960ea7324b805782cc9a85e3271998a01221d2703ee9
+      unrolled_ast: cf6d5c443f797919f692960ea7324b805782cc9a85e3271998a01221d2703ee9
+      ssa_ast: 6148cc2015694c8727821cd0b732ef5c70e35a4cfb0d5c7bfc1b92da64f35246
+      flattened_ast: 88c7d37ca82258456081ccdbac46445cf5f1f64f0abffadcfcd5ae056748e916
+      inlined_ast: 88c7d37ca82258456081ccdbac46445cf5f1f64f0abffadcfcd5ae056748e916
+      dce_ast: 88c7d37ca82258456081ccdbac46445cf5f1f64f0abffadcfcd5ae056748e916
       bytecode: 22fa0cb05cba0820444e31f02772af70719116ea4f41c50faaed75a4c50cb845
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/eq.out b/tests/expectations/compiler/integers/i32/eq.out
index 4657081ab8..c1f214b415 100644
--- a/tests/expectations/compiler/integers/i32/eq.out
+++ b/tests/expectations/compiler/integers/i32/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 165df0e39b9806c3c1c337326673add8d2803ede013672ebe8791cce1d5d302c
-      unrolled_ast: 165df0e39b9806c3c1c337326673add8d2803ede013672ebe8791cce1d5d302c
-      ssa_ast: 41602255b21fa7ee5656ec2b56fc5a38c69b8f8fa6b87ae7bdae7d9a30870a9f
-      flattened_ast: 3ee50c08d0b487bb11a009b8a1281dacea9e8dd4d146f5cbd7c4ff5e20b4d704
-      inlined_ast: 3ee50c08d0b487bb11a009b8a1281dacea9e8dd4d146f5cbd7c4ff5e20b4d704
-      dce_ast: 3ee50c08d0b487bb11a009b8a1281dacea9e8dd4d146f5cbd7c4ff5e20b4d704
+  - - initial_ast: e923ffff939f0e1cff5ca45e07b889cd0df13ce15669e9fd6aa07f3ed61e4113
+      unrolled_ast: e923ffff939f0e1cff5ca45e07b889cd0df13ce15669e9fd6aa07f3ed61e4113
+      ssa_ast: 6770dde6f01b961e76721688f293e53e11a9084910e0f2c48562636cddf5c3ef
+      flattened_ast: 969678725230ac7fd7f0ac4ab105efb9846147feea4c28188c19c450a278197d
+      inlined_ast: 969678725230ac7fd7f0ac4ab105efb9846147feea4c28188c19c450a278197d
+      dce_ast: 969678725230ac7fd7f0ac4ab105efb9846147feea4c28188c19c450a278197d
       bytecode: db6394a0bd5332bffbca151ba7a0ea7bdb38f83f732c3afef149535db47a71cb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/ge.out b/tests/expectations/compiler/integers/i32/ge.out
index d96d644f0b..7f7fbce7bb 100644
--- a/tests/expectations/compiler/integers/i32/ge.out
+++ b/tests/expectations/compiler/integers/i32/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6832d83316e6b76dc2379b9183fa4997f8996934267a1e0155e3c8e50fb574e0
-      unrolled_ast: 6832d83316e6b76dc2379b9183fa4997f8996934267a1e0155e3c8e50fb574e0
-      ssa_ast: 47216776dc83704c3a7f171e3a9dae40ae1c90cd2feee603718c43a8e37638d0
-      flattened_ast: 97a6d94b62b0cf170c03900c3fc51581d92fe3241c66dd8ca5f98cc18624d185
-      inlined_ast: 97a6d94b62b0cf170c03900c3fc51581d92fe3241c66dd8ca5f98cc18624d185
-      dce_ast: 97a6d94b62b0cf170c03900c3fc51581d92fe3241c66dd8ca5f98cc18624d185
+  - - initial_ast: 02bdbc4912a3430b832c22ffbffc4ed2a44deff52c89cde9b4020144ad47a129
+      unrolled_ast: 02bdbc4912a3430b832c22ffbffc4ed2a44deff52c89cde9b4020144ad47a129
+      ssa_ast: ae51e3d0c6e5335ccb3fa5f084e44b11988203defdb32560436e85bc14629f3f
+      flattened_ast: 9942e4fb07a6ef03c8c5871ffafa49878f4fdebcbdef065b9c7e074889004fc9
+      inlined_ast: 9942e4fb07a6ef03c8c5871ffafa49878f4fdebcbdef065b9c7e074889004fc9
+      dce_ast: 9942e4fb07a6ef03c8c5871ffafa49878f4fdebcbdef065b9c7e074889004fc9
       bytecode: 319b96ef20018acc654ec52780087d599a75f6204095ab426882087218865bcc
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/gt.out b/tests/expectations/compiler/integers/i32/gt.out
index 0e520fda7e..6a9f6d1b2d 100644
--- a/tests/expectations/compiler/integers/i32/gt.out
+++ b/tests/expectations/compiler/integers/i32/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 939909b51ccf839b207e5a9503d19fcd46d5c915b9d3e0ed4a2341f7ff25d1f9
-      unrolled_ast: 939909b51ccf839b207e5a9503d19fcd46d5c915b9d3e0ed4a2341f7ff25d1f9
-      ssa_ast: a3145316bea40d1fbb30750325aee55aa1daa6d2abaca0c73822953097780f7e
-      flattened_ast: 1607b6f4d38c1dd21c38a53e0c86321fda0afaeecc7574ea0cdb09473ceac501
-      inlined_ast: 1607b6f4d38c1dd21c38a53e0c86321fda0afaeecc7574ea0cdb09473ceac501
-      dce_ast: 1607b6f4d38c1dd21c38a53e0c86321fda0afaeecc7574ea0cdb09473ceac501
+  - - initial_ast: 72946170de454c4e38274b29f9f8cdace98e7423d142651a979319427ca529da
+      unrolled_ast: 72946170de454c4e38274b29f9f8cdace98e7423d142651a979319427ca529da
+      ssa_ast: 732e84fe7cb64427d425d79294ad58c4f50d81614b3ab211caf0870d99af07cd
+      flattened_ast: b9c0c3bf4fc0faf4a6078030941b50d08bd6a2b80d1b183545963383b671e615
+      inlined_ast: b9c0c3bf4fc0faf4a6078030941b50d08bd6a2b80d1b183545963383b671e615
+      dce_ast: b9c0c3bf4fc0faf4a6078030941b50d08bd6a2b80d1b183545963383b671e615
       bytecode: 7b0157b83a4db9b46a3c6572aeb5ccae55be420768dc034163508ac4a99308ea
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/le.out b/tests/expectations/compiler/integers/i32/le.out
index f4e3f5b5bb..202af5aca5 100644
--- a/tests/expectations/compiler/integers/i32/le.out
+++ b/tests/expectations/compiler/integers/i32/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a69d4465241a2c6c42e50ef2febc9a913caa3542e4488927e92492b73027d863
-      unrolled_ast: a69d4465241a2c6c42e50ef2febc9a913caa3542e4488927e92492b73027d863
-      ssa_ast: 07eb09d4d05014a8d3243a0d74fcb46106b51078a1cdde50166c7df14ab54d81
-      flattened_ast: eac2b71c723a03968862b694040864c3d0ac12e985df3a47f4c7499bcef769d5
-      inlined_ast: eac2b71c723a03968862b694040864c3d0ac12e985df3a47f4c7499bcef769d5
-      dce_ast: eac2b71c723a03968862b694040864c3d0ac12e985df3a47f4c7499bcef769d5
+  - - initial_ast: bdebe108a731bb780c3bb2510e04ae700c03d773e84756e525530944e7da8879
+      unrolled_ast: bdebe108a731bb780c3bb2510e04ae700c03d773e84756e525530944e7da8879
+      ssa_ast: 751542437059082e9c297d12db392453c55bf73ce2ba8e686079228c27fc9466
+      flattened_ast: 95a8caccb8b5aec2ddaf7d9ccf48a505abc6c6c58bc74a867bd16d3a202483ec
+      inlined_ast: 95a8caccb8b5aec2ddaf7d9ccf48a505abc6c6c58bc74a867bd16d3a202483ec
+      dce_ast: 95a8caccb8b5aec2ddaf7d9ccf48a505abc6c6c58bc74a867bd16d3a202483ec
       bytecode: cc2d953415427376e9e3c26c04b4e66630e4b77f19e04e932b28f04599b7fe77
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/lt.out b/tests/expectations/compiler/integers/i32/lt.out
index 8cc1b992f2..9bc5541240 100644
--- a/tests/expectations/compiler/integers/i32/lt.out
+++ b/tests/expectations/compiler/integers/i32/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b0545ca54625d0b7ccaf4db9bf8e0bb3075e1ee7b85be9444ccda7fcada344ca
-      unrolled_ast: b0545ca54625d0b7ccaf4db9bf8e0bb3075e1ee7b85be9444ccda7fcada344ca
-      ssa_ast: f270f6f8f231ea584558707deb9f67c665d60012fb3665d6035a56c2d1e54bec
-      flattened_ast: 17c2a7e7283b43c2f23fe37af881db5fb5b8bfae202bd73b467cd768f8700338
-      inlined_ast: 17c2a7e7283b43c2f23fe37af881db5fb5b8bfae202bd73b467cd768f8700338
-      dce_ast: 17c2a7e7283b43c2f23fe37af881db5fb5b8bfae202bd73b467cd768f8700338
+  - - initial_ast: d5da7797c554b3875a6a70f862d77c466996de1555d782b1cb6c09d3da89eef0
+      unrolled_ast: d5da7797c554b3875a6a70f862d77c466996de1555d782b1cb6c09d3da89eef0
+      ssa_ast: aaec9ed135346fa8741cd354bcddd37684d2cac332a5a27ee5add65775fb8a8b
+      flattened_ast: d1ec888b6e40b15295a3a40280de5ad04b025d76e7faca205db1f94fea93a80a
+      inlined_ast: d1ec888b6e40b15295a3a40280de5ad04b025d76e7faca205db1f94fea93a80a
+      dce_ast: d1ec888b6e40b15295a3a40280de5ad04b025d76e7faca205db1f94fea93a80a
       bytecode: 815cbaa285c68d1b7707bbe1df33b84fcb00a81bfbae3d4d9cd290902e2ce091
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/max.out b/tests/expectations/compiler/integers/i32/max.out
index 7a2ce621c1..316841dc2d 100644
--- a/tests/expectations/compiler/integers/i32/max.out
+++ b/tests/expectations/compiler/integers/i32/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a0696e840da33b3cfd7b09738d50f6144212b7339f667947532c788100f037cd
-      unrolled_ast: a0696e840da33b3cfd7b09738d50f6144212b7339f667947532c788100f037cd
-      ssa_ast: 13dc5b60cdb031d7b45f40726364403056722608aa5cdb5c2295d9c6eda824e2
-      flattened_ast: 0a978304b479a2b3524518bbf944ddaf8c7f730c0b061808a0834c6fe0c633ab
-      inlined_ast: 0a978304b479a2b3524518bbf944ddaf8c7f730c0b061808a0834c6fe0c633ab
-      dce_ast: 0a978304b479a2b3524518bbf944ddaf8c7f730c0b061808a0834c6fe0c633ab
+  - - initial_ast: 5ec883d46867937de371957dbf49aeacc6a40ece745194f4b6acf59d8a5d45d0
+      unrolled_ast: 5ec883d46867937de371957dbf49aeacc6a40ece745194f4b6acf59d8a5d45d0
+      ssa_ast: d045f0ac15055b56f5c0970d4afd3b57bdeb2d99b14bfb00b74ed380200a5bcd
+      flattened_ast: 05081ff0a933b91af297006466b338cc45fa7cb3b877a651c2a6234e3832d305
+      inlined_ast: 05081ff0a933b91af297006466b338cc45fa7cb3b877a651c2a6234e3832d305
+      dce_ast: 05081ff0a933b91af297006466b338cc45fa7cb3b877a651c2a6234e3832d305
       bytecode: 6821174db234fb38a3ded7835589628bf76443f2faff6cf9aa2f2fc5a5da71cb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/min.out b/tests/expectations/compiler/integers/i32/min.out
index 0006c633db..cef09b8a8b 100644
--- a/tests/expectations/compiler/integers/i32/min.out
+++ b/tests/expectations/compiler/integers/i32/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 82b5f90edf34200af29ddea440d93ab89511d2627e932c1f64d7ff7a07d9baca
-      unrolled_ast: 82b5f90edf34200af29ddea440d93ab89511d2627e932c1f64d7ff7a07d9baca
-      ssa_ast: b4460ec8e03a1f033454792ee09a727d4cde728c050672a280504e03784991c2
-      flattened_ast: 6535f6f34f5de272bd51ba05bb7983f2d1c777c18548f3539cb71c5051a19c68
-      inlined_ast: 6535f6f34f5de272bd51ba05bb7983f2d1c777c18548f3539cb71c5051a19c68
-      dce_ast: 6535f6f34f5de272bd51ba05bb7983f2d1c777c18548f3539cb71c5051a19c68
+  - - initial_ast: a59571728af38aa067f54b1057fdf438d22fe33576521208e0cd83c8565b37e0
+      unrolled_ast: a59571728af38aa067f54b1057fdf438d22fe33576521208e0cd83c8565b37e0
+      ssa_ast: 597ff4f466a24e2425a6e8283ef5fa2fd7f15581c1fc65749f86abaab3bed0c0
+      flattened_ast: 9df7c3388ee24138be0c338e967e1459dec7abe7b86203366f7cbb2fa9b39456
+      inlined_ast: 9df7c3388ee24138be0c338e967e1459dec7abe7b86203366f7cbb2fa9b39456
+      dce_ast: 9df7c3388ee24138be0c338e967e1459dec7abe7b86203366f7cbb2fa9b39456
       bytecode: 71fa0293c129cb150cfbc206d6709f67884cd0864200dd8a6382ae6d30a3dac2
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/min_fail.out b/tests/expectations/compiler/integers/i32/min_fail.out
index 43c0fe069f..1bb9c44770 100644
--- a/tests/expectations/compiler/integers/i32/min_fail.out
+++ b/tests/expectations/compiler/integers/i32/min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b64aefe8c27a9c5b3100e59cb146075e5cc1003cf620030d8ad077688fe83415
-      unrolled_ast: b64aefe8c27a9c5b3100e59cb146075e5cc1003cf620030d8ad077688fe83415
-      ssa_ast: 1b1a8c9a0d14758efdab320b3f2efde046b9564cb621635d669aacbc2e6cdc56
-      flattened_ast: cc3736c47f933d8964a6d603528c53af451711469e10b8ab85a670511ba955c6
-      inlined_ast: cc3736c47f933d8964a6d603528c53af451711469e10b8ab85a670511ba955c6
-      dce_ast: cc3736c47f933d8964a6d603528c53af451711469e10b8ab85a670511ba955c6
+  - - initial_ast: cf400064682c0417b11429bd34e654de07bdcf027dcaa4746bf816646d3df196
+      unrolled_ast: cf400064682c0417b11429bd34e654de07bdcf027dcaa4746bf816646d3df196
+      ssa_ast: c7a066ec5c35442c6fdac92e996d693d0518b90a6e9bb021801c031282480dd8
+      flattened_ast: d7e105f49f43a23b2808aa5fbbcfcefeb07157f4177291c06241a2a2de0029a8
+      inlined_ast: d7e105f49f43a23b2808aa5fbbcfcefeb07157f4177291c06241a2a2de0029a8
+      dce_ast: d7e105f49f43a23b2808aa5fbbcfcefeb07157f4177291c06241a2a2de0029a8
       bytecode: e28a0b12a5006a7f44ebd60e001a3b2bb2142f3e2bc03564b5870415a1bd1e6d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/mul.out b/tests/expectations/compiler/integers/i32/mul.out
index e96daf70e9..801f00717a 100644
--- a/tests/expectations/compiler/integers/i32/mul.out
+++ b/tests/expectations/compiler/integers/i32/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bb60a4d19e564b8f0865e0c61a565820ce2427490f06ce3fe0ee66fd66300728
-      unrolled_ast: bb60a4d19e564b8f0865e0c61a565820ce2427490f06ce3fe0ee66fd66300728
-      ssa_ast: c197df8412d4f6d10def7b2eda96593b6fe5b49555b21784fb865398f08ee8b2
-      flattened_ast: 4264aea623c0cdff3bbb135fb45dac2da1dce884d64f0cd0587c5f8bc45f783a
-      inlined_ast: 4264aea623c0cdff3bbb135fb45dac2da1dce884d64f0cd0587c5f8bc45f783a
-      dce_ast: 4264aea623c0cdff3bbb135fb45dac2da1dce884d64f0cd0587c5f8bc45f783a
+  - - initial_ast: 2ca7745166826e8424f508691373efef2a709424ee75452ca07140b7772a2d86
+      unrolled_ast: 2ca7745166826e8424f508691373efef2a709424ee75452ca07140b7772a2d86
+      ssa_ast: 866217a3d7b6ad964426993b3544c1df5db4156e9d6e10736f431c2e5664808a
+      flattened_ast: 1836ab16713a2910684eb00438f25fe3360001a50f0c8b3babb13584df5f8175
+      inlined_ast: 1836ab16713a2910684eb00438f25fe3360001a50f0c8b3babb13584df5f8175
+      dce_ast: 1836ab16713a2910684eb00438f25fe3360001a50f0c8b3babb13584df5f8175
       bytecode: 6a5893dfd948c5fa425269a9ddab867cbcf55956e015e95b3d4a5be7a861d763
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/ne.out b/tests/expectations/compiler/integers/i32/ne.out
index 84071907cf..45e59c77c1 100644
--- a/tests/expectations/compiler/integers/i32/ne.out
+++ b/tests/expectations/compiler/integers/i32/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a394c217856f4eb4f94705aa4b96c7ca02c6a95ae87e3302402c8d50b2077c62
-      unrolled_ast: a394c217856f4eb4f94705aa4b96c7ca02c6a95ae87e3302402c8d50b2077c62
-      ssa_ast: e3badf6ebcf5955fbd77d5d239b824d55c4aef352ed1e4715ab38f6cd68c5dd1
-      flattened_ast: c5da224e0002bc2efaa14f10dc44407af8924a1a9131806813b0cafc2d6d2f98
-      inlined_ast: c5da224e0002bc2efaa14f10dc44407af8924a1a9131806813b0cafc2d6d2f98
-      dce_ast: c5da224e0002bc2efaa14f10dc44407af8924a1a9131806813b0cafc2d6d2f98
+  - - initial_ast: f0e614bdaf233abefe387f50876aaaceda683f3a247eee28b190cf1de21a2eb0
+      unrolled_ast: f0e614bdaf233abefe387f50876aaaceda683f3a247eee28b190cf1de21a2eb0
+      ssa_ast: bf3ea686acdaaf5b0fcf63df9917b4c3f9841cebafd93413166f185b3f77d4f5
+      flattened_ast: 0f5ebdc9b832b5fd27b34eccb57a82a1c552b6cf07068264f51e3a50b427adfb
+      inlined_ast: 0f5ebdc9b832b5fd27b34eccb57a82a1c552b6cf07068264f51e3a50b427adfb
+      dce_ast: 0f5ebdc9b832b5fd27b34eccb57a82a1c552b6cf07068264f51e3a50b427adfb
       bytecode: 7e3f7a34eaf764f2d9b7119b882a649e4eaceabcd8e54ac5313127b3add0c091
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/negate.out b/tests/expectations/compiler/integers/i32/negate.out
index b667e47416..6a1925a5bc 100644
--- a/tests/expectations/compiler/integers/i32/negate.out
+++ b/tests/expectations/compiler/integers/i32/negate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8b69750a0315e614ed9f0d5c202ca276d093a9a2b1d22d100941eeb42debd342
-      unrolled_ast: 8b69750a0315e614ed9f0d5c202ca276d093a9a2b1d22d100941eeb42debd342
-      ssa_ast: 6eccdeade254ff48b2b7f3ceddd0b9ff5053a2668994eeb1ca6e44d922e6fd3b
-      flattened_ast: 13089ad64c813c087db00e643f8e6e6571151df0bcd0c73d1c29a2938dbd8a44
-      inlined_ast: 13089ad64c813c087db00e643f8e6e6571151df0bcd0c73d1c29a2938dbd8a44
-      dce_ast: 13089ad64c813c087db00e643f8e6e6571151df0bcd0c73d1c29a2938dbd8a44
+  - - initial_ast: dd08e0cf55b8c561092061eb559ba047af75a5631a16c707f459fb5a9a35f591
+      unrolled_ast: dd08e0cf55b8c561092061eb559ba047af75a5631a16c707f459fb5a9a35f591
+      ssa_ast: 7a43c1deeb382a69c9c68299ea71c02d941e67ebf3e8b00c1071fa5b4093f2b8
+      flattened_ast: 8a48a0a18e99ce8da0c565deebe2a6e97a99fda1b2777583bc7d51530258ffcc
+      inlined_ast: 8a48a0a18e99ce8da0c565deebe2a6e97a99fda1b2777583bc7d51530258ffcc
+      dce_ast: 8a48a0a18e99ce8da0c565deebe2a6e97a99fda1b2777583bc7d51530258ffcc
       bytecode: 009e138c1ef58588c8c34fdd4b56c5cd984a2f4664d71a3ce1f5811350d5cc1f
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/negate_min_fail.out b/tests/expectations/compiler/integers/i32/negate_min_fail.out
index 7858732d52..290bd86446 100644
--- a/tests/expectations/compiler/integers/i32/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i32/negate_min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f8aa59960608b016c50478f682aed65c95177ec81f3d8f7a1dc8680b8f1c3846
-      unrolled_ast: f8aa59960608b016c50478f682aed65c95177ec81f3d8f7a1dc8680b8f1c3846
-      ssa_ast: 8cb2f75e23004570762659ee642e24fac7a039a2ea2dfeeb6197b621480ad5d7
-      flattened_ast: bc45e0391c2cd3ce4084ccdc9dfa12125f615a47af3aa44bafcdd8bd6134cd51
-      inlined_ast: bc45e0391c2cd3ce4084ccdc9dfa12125f615a47af3aa44bafcdd8bd6134cd51
-      dce_ast: bc45e0391c2cd3ce4084ccdc9dfa12125f615a47af3aa44bafcdd8bd6134cd51
+  - - initial_ast: 8c93b1187331825d7dab3927c0539f281aca563d5db2cccb275faf1ff5dd5128
+      unrolled_ast: 8c93b1187331825d7dab3927c0539f281aca563d5db2cccb275faf1ff5dd5128
+      ssa_ast: 710f3df70f0f1e866e0085262f2ab8f8b6f842c9aed862051fd60df30f5c21ea
+      flattened_ast: ab72ca89ee90ad4e39c3f7eaba166db9c475a8d8271dbfb6df39ba0a6df7379e
+      inlined_ast: ab72ca89ee90ad4e39c3f7eaba166db9c475a8d8271dbfb6df39ba0a6df7379e
+      dce_ast: ab72ca89ee90ad4e39c3f7eaba166db9c475a8d8271dbfb6df39ba0a6df7379e
       bytecode: 7014d5adeb6ff035c6415dd1001650301e64c7bb14426a4adc0f9b9daa514f69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/negate_zero.out b/tests/expectations/compiler/integers/i32/negate_zero.out
index 9a97bf5f81..192fa98223 100644
--- a/tests/expectations/compiler/integers/i32/negate_zero.out
+++ b/tests/expectations/compiler/integers/i32/negate_zero.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 588027d838505a9c09252cbdcc91374528e1c0f09f2b6dc35749650426f9fd56
-      unrolled_ast: 588027d838505a9c09252cbdcc91374528e1c0f09f2b6dc35749650426f9fd56
-      ssa_ast: 7b0c3229824699eb55bbabb640d96e5310f838297dea6dbb1968325a5e2738cc
-      flattened_ast: bf8fefd11f1af7f89cc6fc8a7ed1e86361587152ebd9369b2a0f04bbaa1d749d
-      inlined_ast: bf8fefd11f1af7f89cc6fc8a7ed1e86361587152ebd9369b2a0f04bbaa1d749d
-      dce_ast: bf8fefd11f1af7f89cc6fc8a7ed1e86361587152ebd9369b2a0f04bbaa1d749d
+  - - initial_ast: 151192000f5c6b32c1e3f4cf58f274660e7f7449385c0260fe96e2983c1459e9
+      unrolled_ast: 151192000f5c6b32c1e3f4cf58f274660e7f7449385c0260fe96e2983c1459e9
+      ssa_ast: 7e2bb2ef594780bb3b23b3b94d220d19cba2a40bf1087b2c6b1ae52f8fad8396
+      flattened_ast: 5b659655abdc752e5f8ed0f42f924c8163620b518fc5f1f1a2035856391b5203
+      inlined_ast: 5b659655abdc752e5f8ed0f42f924c8163620b518fc5f1f1a2035856391b5203
+      dce_ast: 5b659655abdc752e5f8ed0f42f924c8163620b518fc5f1f1a2035856391b5203
       bytecode: 0d7b74771220febbbf1600fe72c373d3398998c0d1200c1fd592d3b3da56b928
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/operator_methods.out b/tests/expectations/compiler/integers/i32/operator_methods.out
index 51c196d80d..9b469fe424 100644
--- a/tests/expectations/compiler/integers/i32/operator_methods.out
+++ b/tests/expectations/compiler/integers/i32/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c1e3f291d2cbe3c3bdfc183b4a2022fa519e4f40845235b9f2266ebb192a3770
-      unrolled_ast: c1e3f291d2cbe3c3bdfc183b4a2022fa519e4f40845235b9f2266ebb192a3770
-      ssa_ast: 265e6ea463894e8ec3f5a42771f22379876c566ed0372290334dfc8e506693bf
-      flattened_ast: 940d7d3c32e86cb4447839059d02cd619d179054931af1ac8acab278ffccaaa4
-      inlined_ast: 940d7d3c32e86cb4447839059d02cd619d179054931af1ac8acab278ffccaaa4
-      dce_ast: cc8f3df25c61a793ade4d6a87021643cb75ba81178e141cb90583b21d3dba1f2
+  - - initial_ast: a3b65dc5a9d28b3f1e843d1e30482e4ec43b21a1fc85de336d925321384d9523
+      unrolled_ast: a3b65dc5a9d28b3f1e843d1e30482e4ec43b21a1fc85de336d925321384d9523
+      ssa_ast: 02c1411fb98c042572acbea535709478fa9716ef8cb4ae7064c9a589164ca45d
+      flattened_ast: 5288c719a3e6cd8ba480d578fad987919b1b6e42f1b8231a98f8a269c238c4f2
+      inlined_ast: 5288c719a3e6cd8ba480d578fad987919b1b6e42f1b8231a98f8a269c238c4f2
+      dce_ast: e16bbe47d8690eb656035c9951b313e42213dd36a95ad201a19119e8aed86594
       bytecode: 40661150b3b39dd341d29dab9771982c77efa03e028104d1965c1e2e2fbf3c28
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/or.out b/tests/expectations/compiler/integers/i32/or.out
index 4ad268d3cd..8a19e1c688 100644
--- a/tests/expectations/compiler/integers/i32/or.out
+++ b/tests/expectations/compiler/integers/i32/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cc02b25ca720a45252b9f0873df4832d56ad50370e012ac093440cc22ff9636a
-      unrolled_ast: cc02b25ca720a45252b9f0873df4832d56ad50370e012ac093440cc22ff9636a
-      ssa_ast: 0ee74596820c4f186e9bbbe0697a817b7bc810d757c7d30b35123793f7a23109
-      flattened_ast: 294a96682f1eedda56aa760844da5837e88bd4e082ad3eb74debe49816cea42f
-      inlined_ast: 294a96682f1eedda56aa760844da5837e88bd4e082ad3eb74debe49816cea42f
-      dce_ast: 294a96682f1eedda56aa760844da5837e88bd4e082ad3eb74debe49816cea42f
+  - - initial_ast: b6d07b4280ead1b4a9b9380fa86572400931b8749d104e8fe4247b3b43a58914
+      unrolled_ast: b6d07b4280ead1b4a9b9380fa86572400931b8749d104e8fe4247b3b43a58914
+      ssa_ast: 4875b503e0b4807bb25425e34a4ca0e2ee5e31b6b2bc8cc87f036c19161af8b9
+      flattened_ast: d0ae6945698342390763ba22dc2b4ab8dcb4d35a0807801462aeb4bf58fe3630
+      inlined_ast: d0ae6945698342390763ba22dc2b4ab8dcb4d35a0807801462aeb4bf58fe3630
+      dce_ast: d0ae6945698342390763ba22dc2b4ab8dcb4d35a0807801462aeb4bf58fe3630
       bytecode: 607f946bff91ee499a6d977e52f6cbc32678d1306e1e6437adc3ed3720d77a02
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/pow.out b/tests/expectations/compiler/integers/i32/pow.out
index f3f70f3d72..1d45623505 100644
--- a/tests/expectations/compiler/integers/i32/pow.out
+++ b/tests/expectations/compiler/integers/i32/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b8f69cc2f49b550393151da2734930a26c1ddc04c9ed2840c3ab9a0ac46a2cb8
-      unrolled_ast: b8f69cc2f49b550393151da2734930a26c1ddc04c9ed2840c3ab9a0ac46a2cb8
-      ssa_ast: 4db46c6f6c73951250f61151894256e370adddeb6d064fe537ef426819fc6856
-      flattened_ast: 5084b170146f0d2cf5fb18beada2941f08b9a378f17dbba5b3539034109b98a1
-      inlined_ast: 5084b170146f0d2cf5fb18beada2941f08b9a378f17dbba5b3539034109b98a1
-      dce_ast: 5084b170146f0d2cf5fb18beada2941f08b9a378f17dbba5b3539034109b98a1
+  - - initial_ast: 14dc6b804ee841d54655cf8a8bcf21e451d6441af58d5a8dc02b5153119155d2
+      unrolled_ast: 14dc6b804ee841d54655cf8a8bcf21e451d6441af58d5a8dc02b5153119155d2
+      ssa_ast: 7f1301654bb707cea257c7a1dbdae1ddcc820b6b187a34f35a1031bfbac550ab
+      flattened_ast: 3db62bef10e87babe663348a41678b79aaaae209ffff44e7648f8969c686c017
+      inlined_ast: 3db62bef10e87babe663348a41678b79aaaae209ffff44e7648f8969c686c017
+      dce_ast: 3db62bef10e87babe663348a41678b79aaaae209ffff44e7648f8969c686c017
       bytecode: 356e8fd9b7a616538d51b58accbf2cb604812f8d4e1d984ed091819b6b1dd7ef
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/rem.out b/tests/expectations/compiler/integers/i32/rem.out
index 5d4f649b94..6a68c9ee93 100644
--- a/tests/expectations/compiler/integers/i32/rem.out
+++ b/tests/expectations/compiler/integers/i32/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d6401df0623e62b0438e6793ea5c4e4861f3d137230aa4027ec0243f69420a53
-      unrolled_ast: d6401df0623e62b0438e6793ea5c4e4861f3d137230aa4027ec0243f69420a53
-      ssa_ast: 6d83b6d9eb57946a48dc4b28cd7f43de29c30e09b8d1124497ba9b533513a794
-      flattened_ast: e543d6b431529cd8e69a9189b77d50fdc3f1588c4731a3d2591afd2b240b3139
-      inlined_ast: e543d6b431529cd8e69a9189b77d50fdc3f1588c4731a3d2591afd2b240b3139
-      dce_ast: e543d6b431529cd8e69a9189b77d50fdc3f1588c4731a3d2591afd2b240b3139
+  - - initial_ast: 4dfad0cebd1ddcc6df31f883c8f11ce11c16a1948563abc29a2ebfe4054f77ec
+      unrolled_ast: 4dfad0cebd1ddcc6df31f883c8f11ce11c16a1948563abc29a2ebfe4054f77ec
+      ssa_ast: 41d840446cc491e5968beafb5a1179088b8cd600b486e44640828bc54214e1a2
+      flattened_ast: 51b82f1b081bbac3e4d1b93f2ec0f3e846928f8c020e22f5358f6321a1d8e963
+      inlined_ast: 51b82f1b081bbac3e4d1b93f2ec0f3e846928f8c020e22f5358f6321a1d8e963
+      dce_ast: 51b82f1b081bbac3e4d1b93f2ec0f3e846928f8c020e22f5358f6321a1d8e963
       bytecode: 58eca9e830625c2f8ae8836c94380e3decec48e4ea0b0b07421a69dffafc9366
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/shl.out b/tests/expectations/compiler/integers/i32/shl.out
index 4854b8bed8..383f755d0c 100644
--- a/tests/expectations/compiler/integers/i32/shl.out
+++ b/tests/expectations/compiler/integers/i32/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bc5a822b0513b552c764ceab9e6b2c8e4f3139dfc038e284d47e4a96058aec23
-      unrolled_ast: bc5a822b0513b552c764ceab9e6b2c8e4f3139dfc038e284d47e4a96058aec23
-      ssa_ast: 8e95510573fed99868dbef07fad439579c51222b4d63b6483abab7c5330cdd8c
-      flattened_ast: 5a730876d6ce65adfd7e5aa914f85d0e1740d45df7cdaeac30f23a9b63094689
-      inlined_ast: 5a730876d6ce65adfd7e5aa914f85d0e1740d45df7cdaeac30f23a9b63094689
-      dce_ast: 5a730876d6ce65adfd7e5aa914f85d0e1740d45df7cdaeac30f23a9b63094689
+  - - initial_ast: 69a396280020539921daae81f8d92de9b834e0c4c684709aff465c51047b2629
+      unrolled_ast: 69a396280020539921daae81f8d92de9b834e0c4c684709aff465c51047b2629
+      ssa_ast: 19cc7c2fc784a4d4fd6840454c1760ac45793780f1a677098b9bade5f6f0e8cf
+      flattened_ast: 3f70a9caabc9aa28979b0a37c35bd55f6e57041129d6f957bb82dac11c6cea27
+      inlined_ast: 3f70a9caabc9aa28979b0a37c35bd55f6e57041129d6f957bb82dac11c6cea27
+      dce_ast: 3f70a9caabc9aa28979b0a37c35bd55f6e57041129d6f957bb82dac11c6cea27
       bytecode: 7b5bbc80ede3dfcc182728241b3f4a889f3c1afc6e5db865947f34cc0eab889c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/shr.out b/tests/expectations/compiler/integers/i32/shr.out
index 1e5deeb606..1a5eba95fb 100644
--- a/tests/expectations/compiler/integers/i32/shr.out
+++ b/tests/expectations/compiler/integers/i32/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 877fb34a1464d3750b1c28bd61577761f5bcbfb4968b5ac8365a1406d2db8bf9
-      unrolled_ast: 877fb34a1464d3750b1c28bd61577761f5bcbfb4968b5ac8365a1406d2db8bf9
-      ssa_ast: b344c368336e7094c41d5c8779d248448a41706b023848a74a5756471102147d
-      flattened_ast: 3b24916811570df81e39b234127b27e4c935896c51032d85b12001ac8d141d7b
-      inlined_ast: 3b24916811570df81e39b234127b27e4c935896c51032d85b12001ac8d141d7b
-      dce_ast: 3b24916811570df81e39b234127b27e4c935896c51032d85b12001ac8d141d7b
+  - - initial_ast: 56f02298f14d28a2f404b4aebd654d9776515e1fa1385b10377a787cc8a37a2b
+      unrolled_ast: 56f02298f14d28a2f404b4aebd654d9776515e1fa1385b10377a787cc8a37a2b
+      ssa_ast: eeb929bf559824ec93889dc741a420809928b9bb3755deddc22425613125cd00
+      flattened_ast: f56222afcf00d0243c94588b3f6750891a670555fba90b55a98ee6be9d1146c9
+      inlined_ast: f56222afcf00d0243c94588b3f6750891a670555fba90b55a98ee6be9d1146c9
+      dce_ast: f56222afcf00d0243c94588b3f6750891a670555fba90b55a98ee6be9d1146c9
       bytecode: 4beebe6f64c29d63c9bafe8a3a58e52b14705368f667c1a44fd85d5d46e80f6c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/sub.out b/tests/expectations/compiler/integers/i32/sub.out
index 60275a8875..2cb5c0ef42 100644
--- a/tests/expectations/compiler/integers/i32/sub.out
+++ b/tests/expectations/compiler/integers/i32/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b6c6497310fa0fc520856f955bc1f056fdbe56eb963e8509189308033ae933f0
-      unrolled_ast: b6c6497310fa0fc520856f955bc1f056fdbe56eb963e8509189308033ae933f0
-      ssa_ast: ef9a4826bd5d37463d60df7b637d7872cdf672df5485cb95b005883c479058f9
-      flattened_ast: 7781b3ded6db7111a626ba9700f6c445b98f4bb7b4d970b2983786967eca2b85
-      inlined_ast: 7781b3ded6db7111a626ba9700f6c445b98f4bb7b4d970b2983786967eca2b85
-      dce_ast: 7781b3ded6db7111a626ba9700f6c445b98f4bb7b4d970b2983786967eca2b85
+  - - initial_ast: 6c3e4cc23188c159180d1f390d73033d439b5270cc868436c2636c7b1e5ba857
+      unrolled_ast: 6c3e4cc23188c159180d1f390d73033d439b5270cc868436c2636c7b1e5ba857
+      ssa_ast: bc1ba6be0f0efdd4ce3595b846f0d2550c3d4654175bf662402d20611024136b
+      flattened_ast: 1989327a22058555599d7ae15fc8ce27fdcb5c0dea0bdd5a26a98dbe8526c689
+      inlined_ast: 1989327a22058555599d7ae15fc8ce27fdcb5c0dea0bdd5a26a98dbe8526c689
+      dce_ast: 1989327a22058555599d7ae15fc8ce27fdcb5c0dea0bdd5a26a98dbe8526c689
       bytecode: 8efbc5343f7c2f0c0978f035231692e7ff00b213495d8713911fe1be40aa91f4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/ternary.out b/tests/expectations/compiler/integers/i32/ternary.out
index ea03711220..640850048f 100644
--- a/tests/expectations/compiler/integers/i32/ternary.out
+++ b/tests/expectations/compiler/integers/i32/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 81695c6cf3c813f08bb1d9c54957645e06279ffb8bceb766320dcf4f4384d0e8
-      unrolled_ast: 81695c6cf3c813f08bb1d9c54957645e06279ffb8bceb766320dcf4f4384d0e8
-      ssa_ast: 25a847e68e0258924a6737056c85bdcbd58180acfa204c38a6d00aa5e93d65a9
-      flattened_ast: 4ef23033fd3568b3454db3cd9bbeac29e850d7790d69551ea389fefae7fba124
-      inlined_ast: 4ef23033fd3568b3454db3cd9bbeac29e850d7790d69551ea389fefae7fba124
-      dce_ast: 4ef23033fd3568b3454db3cd9bbeac29e850d7790d69551ea389fefae7fba124
+  - - initial_ast: cecc903dfee22a687ffd509dd99fb253f12608c71c5ee6bb2c67ef88552a81d0
+      unrolled_ast: cecc903dfee22a687ffd509dd99fb253f12608c71c5ee6bb2c67ef88552a81d0
+      ssa_ast: 174df002115afd7f3df8578371206c771492104435b60681b8922390426ef9db
+      flattened_ast: 3f0b833f5602e4f774a0bc1fce46ba1c11c4f1dc1dd30201ab00081b1ae4b28d
+      inlined_ast: 3f0b833f5602e4f774a0bc1fce46ba1c11c4f1dc1dd30201ab00081b1ae4b28d
+      dce_ast: 3f0b833f5602e4f774a0bc1fce46ba1c11c4f1dc1dd30201ab00081b1ae4b28d
       bytecode: 8255076ed16f7675cce867bf0b6ab1eacad9bdc4735188bb9b1b2dc40cf24ce0
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i32/xor.out b/tests/expectations/compiler/integers/i32/xor.out
index 94c068672a..d1d53ddf28 100644
--- a/tests/expectations/compiler/integers/i32/xor.out
+++ b/tests/expectations/compiler/integers/i32/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b055abf9d92990e1c072748eb7476bf1edb4f191fa42991d1ea472122de3ed25
-      unrolled_ast: b055abf9d92990e1c072748eb7476bf1edb4f191fa42991d1ea472122de3ed25
-      ssa_ast: a5b4515986892a2d3027331491e957edd776756b5f2366a9de2d6c6adaea9fc0
-      flattened_ast: 0cad3bc4c6c98f0d1d8608aebc8eafe8a418c6ac82e97e273828ed87403174a7
-      inlined_ast: 0cad3bc4c6c98f0d1d8608aebc8eafe8a418c6ac82e97e273828ed87403174a7
-      dce_ast: 0cad3bc4c6c98f0d1d8608aebc8eafe8a418c6ac82e97e273828ed87403174a7
+  - - initial_ast: 946aedcba61f6469414b41cb94a144d7720209380e3c5238bb8afc4dc2c12992
+      unrolled_ast: 946aedcba61f6469414b41cb94a144d7720209380e3c5238bb8afc4dc2c12992
+      ssa_ast: df3b90dcae4a4358be5bed67105cfc8de55e2da97fdd2525e8b59ae034494c40
+      flattened_ast: 838338218faaabd0a93b33188ca4e716ed122e5812dcc19a76d1c8e97482a907
+      inlined_ast: 838338218faaabd0a93b33188ca4e716ed122e5812dcc19a76d1c8e97482a907
+      dce_ast: 838338218faaabd0a93b33188ca4e716ed122e5812dcc19a76d1c8e97482a907
       bytecode: 6a7c1505b6d57a26f767b63372873413e4ca3a4b7ff7b42f652a2841d843da64
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/add.out b/tests/expectations/compiler/integers/i64/add.out
index 2e4ab0560b..9c240f18be 100644
--- a/tests/expectations/compiler/integers/i64/add.out
+++ b/tests/expectations/compiler/integers/i64/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9f4ae33bf4fbe92fb6ad2b188dbd55d0a380094f554afc9553f79a27fed8dcd7
-      unrolled_ast: 9f4ae33bf4fbe92fb6ad2b188dbd55d0a380094f554afc9553f79a27fed8dcd7
-      ssa_ast: af2907634de853136e839a1a21b92f727dce318cc2b7763f1183bd4b6fa992f4
-      flattened_ast: ac4528303d79546bc221d55e5d5d9ade1e71d472a8ebd71fa102d0dea7ba5f96
-      inlined_ast: ac4528303d79546bc221d55e5d5d9ade1e71d472a8ebd71fa102d0dea7ba5f96
-      dce_ast: ac4528303d79546bc221d55e5d5d9ade1e71d472a8ebd71fa102d0dea7ba5f96
+  - - initial_ast: e9f29640cccb224a0aa49b9442c73730524afa35b5d6646e152453c664663157
+      unrolled_ast: e9f29640cccb224a0aa49b9442c73730524afa35b5d6646e152453c664663157
+      ssa_ast: c5ef1b3299137c2564e97a8902f9ef7d25da9067246e2eb82ac19d7d267cc1f2
+      flattened_ast: 21ac886a4ac5708446406776fb5ffece162d65299cc52d5d088cc0cefd343d29
+      inlined_ast: 21ac886a4ac5708446406776fb5ffece162d65299cc52d5d088cc0cefd343d29
+      dce_ast: 21ac886a4ac5708446406776fb5ffece162d65299cc52d5d088cc0cefd343d29
       bytecode: cacab9d7bb5db2f55373c7acaab14386b1e68569b39d0ca4837e07d67d31b78e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/and.out b/tests/expectations/compiler/integers/i64/and.out
index e8ee2d3379..7331bd8c31 100644
--- a/tests/expectations/compiler/integers/i64/and.out
+++ b/tests/expectations/compiler/integers/i64/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bb75d8524af507dce8ac5ef322685a1d223d2f63c5bcc3d903fc166e40855822
-      unrolled_ast: bb75d8524af507dce8ac5ef322685a1d223d2f63c5bcc3d903fc166e40855822
-      ssa_ast: 8c0ff9052c570041c7ef94a757322d8e28229e2313477d124cf7585080181aed
-      flattened_ast: 16d60e086b18351df027e379ba354e82034c1d43ce81bd23d4c47a76e73d1857
-      inlined_ast: 16d60e086b18351df027e379ba354e82034c1d43ce81bd23d4c47a76e73d1857
-      dce_ast: 16d60e086b18351df027e379ba354e82034c1d43ce81bd23d4c47a76e73d1857
+  - - initial_ast: 3edb6a27cd8733d3aa05b965a8bba18ed131407f6114b41e6039e5979c75c63a
+      unrolled_ast: 3edb6a27cd8733d3aa05b965a8bba18ed131407f6114b41e6039e5979c75c63a
+      ssa_ast: 058ad5cbc812e50bec8b6fad08c3154a920c5771d02fdea2fb270c1f4be7051d
+      flattened_ast: 43d86d5213e491cf4e3bb7ca671f27494d9327eb190cf87b3c8e6a303b342768
+      inlined_ast: 43d86d5213e491cf4e3bb7ca671f27494d9327eb190cf87b3c8e6a303b342768
+      dce_ast: 43d86d5213e491cf4e3bb7ca671f27494d9327eb190cf87b3c8e6a303b342768
       bytecode: 8867cc02772ac290447a78df347c850a4f5a2cf3077d76fa71c1c3ee43ba6e55
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/console_assert.out b/tests/expectations/compiler/integers/i64/console_assert.out
index e7c54a9599..200ca7f55f 100644
--- a/tests/expectations/compiler/integers/i64/console_assert.out
+++ b/tests/expectations/compiler/integers/i64/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c9753553618a60b0812e4e61736c4170c02e9fa9adac79b8a17a0e55c9346681
-      unrolled_ast: c9753553618a60b0812e4e61736c4170c02e9fa9adac79b8a17a0e55c9346681
-      ssa_ast: 52870e69a35373d55cf97defc09bcc349c0dc7fce7db4981c0917c5f5c500e97
-      flattened_ast: d1b846af0efc198ca0772d601504f606b95c150f906a8ee76b20e96645feb0e3
-      inlined_ast: d1b846af0efc198ca0772d601504f606b95c150f906a8ee76b20e96645feb0e3
-      dce_ast: d1b846af0efc198ca0772d601504f606b95c150f906a8ee76b20e96645feb0e3
+  - - initial_ast: db8362d00c1a00f5b519319e06d6949c7b28b1daf1e9d002606e3ee020d29ce9
+      unrolled_ast: db8362d00c1a00f5b519319e06d6949c7b28b1daf1e9d002606e3ee020d29ce9
+      ssa_ast: d73a81906588005b7ef3d8a6fd9eacbe910c81c545012cd9a1f16cb3ad0181cc
+      flattened_ast: 021dddbcb4e724e41ab3a8781aad2575fbeac01d7ae9b2ed34f40713eec0d2d0
+      inlined_ast: 021dddbcb4e724e41ab3a8781aad2575fbeac01d7ae9b2ed34f40713eec0d2d0
+      dce_ast: 021dddbcb4e724e41ab3a8781aad2575fbeac01d7ae9b2ed34f40713eec0d2d0
       bytecode: 84d9ec69408c0662a22522e0fde8c535c8f73af3da10f98f7b228a9c9ac2742e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/div.out b/tests/expectations/compiler/integers/i64/div.out
index f00cfd1e58..80e8e6d096 100644
--- a/tests/expectations/compiler/integers/i64/div.out
+++ b/tests/expectations/compiler/integers/i64/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6df1567d08f1730126dc07fc5911e653cf10dba6291d59d7d00322f71a20ae93
-      unrolled_ast: 6df1567d08f1730126dc07fc5911e653cf10dba6291d59d7d00322f71a20ae93
-      ssa_ast: 157f6016ac1c146f4fe356477eccb9c93bc78ee905a0dacc2e84269690e2e6e8
-      flattened_ast: 57d4b9ad31484b60c380f32f99cfd061e61273d500fe906e66a39c8c74f1f935
-      inlined_ast: 57d4b9ad31484b60c380f32f99cfd061e61273d500fe906e66a39c8c74f1f935
-      dce_ast: 57d4b9ad31484b60c380f32f99cfd061e61273d500fe906e66a39c8c74f1f935
+  - - initial_ast: 5bc83043fe2ddd4135f31d7ccae7f5621a12b4321689edceebf13cc584d1946e
+      unrolled_ast: 5bc83043fe2ddd4135f31d7ccae7f5621a12b4321689edceebf13cc584d1946e
+      ssa_ast: 2be18da59b4d93aea349ce0d21f703765a57411a99eeec4951674893ac1854f0
+      flattened_ast: 338fb3818e0f29ed3dd7f369970135b5db1a883a37090b65d4b55a16c09cc627
+      inlined_ast: 338fb3818e0f29ed3dd7f369970135b5db1a883a37090b65d4b55a16c09cc627
+      dce_ast: 338fb3818e0f29ed3dd7f369970135b5db1a883a37090b65d4b55a16c09cc627
       bytecode: 1d370b22d4ae239f0bcb12a771b471bfbbf8c43ad4b3f15b8223b6f122f29457
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/eq.out b/tests/expectations/compiler/integers/i64/eq.out
index 13a566418b..ae1b248425 100644
--- a/tests/expectations/compiler/integers/i64/eq.out
+++ b/tests/expectations/compiler/integers/i64/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f2e11eef89a2f076a83d37bd5fd24f955197c9c8d9770db1da9a27b42a469b0a
-      unrolled_ast: f2e11eef89a2f076a83d37bd5fd24f955197c9c8d9770db1da9a27b42a469b0a
-      ssa_ast: 62691d56b95e742176c654384e9d423391e6a98d7551a4d0f3e23f0f306c699a
-      flattened_ast: faf2dfe47dffa6eb5dc1d6aaa26a3dc9cc3cb77efec275ded8713a32b347bd2a
-      inlined_ast: faf2dfe47dffa6eb5dc1d6aaa26a3dc9cc3cb77efec275ded8713a32b347bd2a
-      dce_ast: faf2dfe47dffa6eb5dc1d6aaa26a3dc9cc3cb77efec275ded8713a32b347bd2a
+  - - initial_ast: b0d0604f18823e1caa0e3fdb60e442fb2a54d1823574538db18ea4de86044e2b
+      unrolled_ast: b0d0604f18823e1caa0e3fdb60e442fb2a54d1823574538db18ea4de86044e2b
+      ssa_ast: 4e120578203a96a80d24d644bef03b003b744c122231d668f77032d760ae44b6
+      flattened_ast: 18fbda7eaffca2a0351520316a4e6e5f6223f0f4853fddaf9206e07809d2430b
+      inlined_ast: 18fbda7eaffca2a0351520316a4e6e5f6223f0f4853fddaf9206e07809d2430b
+      dce_ast: 18fbda7eaffca2a0351520316a4e6e5f6223f0f4853fddaf9206e07809d2430b
       bytecode: 3b16a9ffcba2d86d0099abfc040442550dad3a04f8ba2bbdec05f93ec3c1b6ec
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/ge.out b/tests/expectations/compiler/integers/i64/ge.out
index b054a538fe..7f1910d727 100644
--- a/tests/expectations/compiler/integers/i64/ge.out
+++ b/tests/expectations/compiler/integers/i64/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b4a5d9ffaff3d5abb5e3a92469b99ec93413dd6543b4d705f04614a2b8efec27
-      unrolled_ast: b4a5d9ffaff3d5abb5e3a92469b99ec93413dd6543b4d705f04614a2b8efec27
-      ssa_ast: 8cfdfe4ef6c76d0046768f6b5936010cd562a833e8e52376c6f384cba59a0614
-      flattened_ast: 85b113278ed6f2e096f886493891e9f6b94b0f7c06805fea82f4030d8bdaf2d3
-      inlined_ast: 85b113278ed6f2e096f886493891e9f6b94b0f7c06805fea82f4030d8bdaf2d3
-      dce_ast: 85b113278ed6f2e096f886493891e9f6b94b0f7c06805fea82f4030d8bdaf2d3
+  - - initial_ast: 414b7ef6175fd3fb332b4a89153a7f40ae6912dd4491894a08729de2d85d8a1b
+      unrolled_ast: 414b7ef6175fd3fb332b4a89153a7f40ae6912dd4491894a08729de2d85d8a1b
+      ssa_ast: ca40017e1f5d268fdd64b6e09f4ee0b071d4042807fa153a2efc9c630d406dff
+      flattened_ast: 4130928a28da49141acdf37d1ebd31da39db823e76c4099c4d1a61ab2c746e19
+      inlined_ast: 4130928a28da49141acdf37d1ebd31da39db823e76c4099c4d1a61ab2c746e19
+      dce_ast: 4130928a28da49141acdf37d1ebd31da39db823e76c4099c4d1a61ab2c746e19
       bytecode: ed40a103f79cba4bb4b6ca00730fb673def3a223840271519eecbc1ee845f325
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/gt.out b/tests/expectations/compiler/integers/i64/gt.out
index 71639d0952..ea77c19ccd 100644
--- a/tests/expectations/compiler/integers/i64/gt.out
+++ b/tests/expectations/compiler/integers/i64/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 47d698eb2b36711b5fb05b86b3f4f16afc1aaffcc975781d648545c2e3716ec9
-      unrolled_ast: 47d698eb2b36711b5fb05b86b3f4f16afc1aaffcc975781d648545c2e3716ec9
-      ssa_ast: 33393f18b195c820c816e2fd473ca3275dcb772b9d411fdab3f23513271ab66e
-      flattened_ast: 124d28b62b5daa750a410f379dfeaba20f803a1a4a283cc27d75c415b54f2364
-      inlined_ast: 124d28b62b5daa750a410f379dfeaba20f803a1a4a283cc27d75c415b54f2364
-      dce_ast: 124d28b62b5daa750a410f379dfeaba20f803a1a4a283cc27d75c415b54f2364
+  - - initial_ast: 88bca5a668cf073c740cacb4b9cfa8d4c326c1f936a5b57a86d6aab7ad43db68
+      unrolled_ast: 88bca5a668cf073c740cacb4b9cfa8d4c326c1f936a5b57a86d6aab7ad43db68
+      ssa_ast: d32c127cd8b9b26dfa0e447228cf81289442702c69c5c8320ba590ac451eef01
+      flattened_ast: 65c5c2ca3a7ffe5b165207a5c45d4bb7db7b5b65824e78b6267f481875c18960
+      inlined_ast: 65c5c2ca3a7ffe5b165207a5c45d4bb7db7b5b65824e78b6267f481875c18960
+      dce_ast: 65c5c2ca3a7ffe5b165207a5c45d4bb7db7b5b65824e78b6267f481875c18960
       bytecode: 9e8596394abe6381f7e39ef612e78acc5b9fd4e2cd036a0b3f1296686182a3e5
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/le.out b/tests/expectations/compiler/integers/i64/le.out
index 75c4947b23..125ffa2a06 100644
--- a/tests/expectations/compiler/integers/i64/le.out
+++ b/tests/expectations/compiler/integers/i64/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e4e7f9f56117ae43c016b7f6472e7347ba15c5434aef44d9493850a75bcd47dc
-      unrolled_ast: e4e7f9f56117ae43c016b7f6472e7347ba15c5434aef44d9493850a75bcd47dc
-      ssa_ast: ec4c8d75f5cdcc0e22d9b5b3c222e80bcf10566f303083780f90ab85c89df4a1
-      flattened_ast: 2d2e56e24c6bd4149f1d6639fc53a83249dff90bb2c26db22e63d6a27c7c36b5
-      inlined_ast: 2d2e56e24c6bd4149f1d6639fc53a83249dff90bb2c26db22e63d6a27c7c36b5
-      dce_ast: 2d2e56e24c6bd4149f1d6639fc53a83249dff90bb2c26db22e63d6a27c7c36b5
+  - - initial_ast: fc347cd05d5cb69bb832680eca0086503859d0b736291a552445511883913113
+      unrolled_ast: fc347cd05d5cb69bb832680eca0086503859d0b736291a552445511883913113
+      ssa_ast: 55e3ca7ef80ef2fd4af9938c235d04906e311196b0f839b8c85ea944a38ef4bb
+      flattened_ast: edd5ef9cd2d367160a3d28f22f05b136f3b80786730d8a9c08c0eb921bbcc2f1
+      inlined_ast: edd5ef9cd2d367160a3d28f22f05b136f3b80786730d8a9c08c0eb921bbcc2f1
+      dce_ast: edd5ef9cd2d367160a3d28f22f05b136f3b80786730d8a9c08c0eb921bbcc2f1
       bytecode: b1f586e188d06fec69970d2cbf367157f2046040b6b848b8b0bc3dd6b02aa095
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/lt.out b/tests/expectations/compiler/integers/i64/lt.out
index 907e0985b7..ff05b38fc1 100644
--- a/tests/expectations/compiler/integers/i64/lt.out
+++ b/tests/expectations/compiler/integers/i64/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3c2838a0ad28c576898cc6d0dfec5d92dc2399a0ec77660b1b3cb0c49bed6a6f
-      unrolled_ast: 3c2838a0ad28c576898cc6d0dfec5d92dc2399a0ec77660b1b3cb0c49bed6a6f
-      ssa_ast: ee53a8616ef045497f9867665a7cbaf56092e17cd4489360c8d2eb6cd29429bb
-      flattened_ast: 711fee8261fee8b65b3fb350b231d7606ee7b92222fe593fee1acf9aa016e4c9
-      inlined_ast: 711fee8261fee8b65b3fb350b231d7606ee7b92222fe593fee1acf9aa016e4c9
-      dce_ast: 711fee8261fee8b65b3fb350b231d7606ee7b92222fe593fee1acf9aa016e4c9
+  - - initial_ast: 6e40d280f39972d22015546d881ffcbcf46f7940c39c091954e1d5d291c35ccc
+      unrolled_ast: 6e40d280f39972d22015546d881ffcbcf46f7940c39c091954e1d5d291c35ccc
+      ssa_ast: 313978798434fa814fb0a3d38ee92aefcf1c8bef020e7d9443a09d0b9d9f012a
+      flattened_ast: 6ce5445873d30cbd399b372a45a84bda6cd0ee4955e3ffa010790e9984145347
+      inlined_ast: 6ce5445873d30cbd399b372a45a84bda6cd0ee4955e3ffa010790e9984145347
+      dce_ast: 6ce5445873d30cbd399b372a45a84bda6cd0ee4955e3ffa010790e9984145347
       bytecode: 146646862a181a2d9c802993b30c04190405d0ec9cf00847c755162af14ab765
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/max.out b/tests/expectations/compiler/integers/i64/max.out
index 43b124ea99..fc778a1f5c 100644
--- a/tests/expectations/compiler/integers/i64/max.out
+++ b/tests/expectations/compiler/integers/i64/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 841b19ba649d7cb737df4e44e0f517857297e776c82730a5d3eb148b8b94ce5a
-      unrolled_ast: 841b19ba649d7cb737df4e44e0f517857297e776c82730a5d3eb148b8b94ce5a
-      ssa_ast: d13ca83d53127e75cab9162dff05c6e65e257acfc684d2b5e7807cb24a7bb255
-      flattened_ast: 4aa58340f41a553b0f720853ce08f01dd03fad3738f2f37c7099a04039beef39
-      inlined_ast: 4aa58340f41a553b0f720853ce08f01dd03fad3738f2f37c7099a04039beef39
-      dce_ast: 4aa58340f41a553b0f720853ce08f01dd03fad3738f2f37c7099a04039beef39
+  - - initial_ast: 5df58ced6b86af33462ac530900dd16b6d30b7feba31d43b6cadb9bf2f9fe7c0
+      unrolled_ast: 5df58ced6b86af33462ac530900dd16b6d30b7feba31d43b6cadb9bf2f9fe7c0
+      ssa_ast: 0d1bf06c4be1470d06f7810cd616e467ca6916cfd8849d9b1994b39238499799
+      flattened_ast: 63fb82df2ed0a5cff92a75a018534ccdb7e6af7b0a7572613300d24a05d5301d
+      inlined_ast: 63fb82df2ed0a5cff92a75a018534ccdb7e6af7b0a7572613300d24a05d5301d
+      dce_ast: 63fb82df2ed0a5cff92a75a018534ccdb7e6af7b0a7572613300d24a05d5301d
       bytecode: c8d4abba332861ba511e2f210502137e5aeeef23c159740de5649958515e3910
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/min.out b/tests/expectations/compiler/integers/i64/min.out
index 30741f3356..b303409e1e 100644
--- a/tests/expectations/compiler/integers/i64/min.out
+++ b/tests/expectations/compiler/integers/i64/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c4ac06f304f37c6b49fc04f12eb6efb23f1980b807a1c16a304d3fb81726af52
-      unrolled_ast: c4ac06f304f37c6b49fc04f12eb6efb23f1980b807a1c16a304d3fb81726af52
-      ssa_ast: 8c4c2f7cd0144cf03449cbf0a9073ea880d7d4b2fa9abc7bcc71b9de0b4fbbd3
-      flattened_ast: 954f2e2d7388a5356801f258946d6f171e7ffcfa40e33a15c1141fe464925dce
-      inlined_ast: 954f2e2d7388a5356801f258946d6f171e7ffcfa40e33a15c1141fe464925dce
-      dce_ast: 954f2e2d7388a5356801f258946d6f171e7ffcfa40e33a15c1141fe464925dce
+  - - initial_ast: d7258e31261e440605e1488722d5010c82674b4307e60f2f3e4e2eeea31acdb5
+      unrolled_ast: d7258e31261e440605e1488722d5010c82674b4307e60f2f3e4e2eeea31acdb5
+      ssa_ast: d919c36aa4c2bc7cf3c6286f46ce65dce443737ab8d0b74170c352cf0334eb33
+      flattened_ast: 081a00d816c82be97e5d50c21c8ab9555c0f7cbb8ce02fe605b7a3461e1264b1
+      inlined_ast: 081a00d816c82be97e5d50c21c8ab9555c0f7cbb8ce02fe605b7a3461e1264b1
+      dce_ast: 081a00d816c82be97e5d50c21c8ab9555c0f7cbb8ce02fe605b7a3461e1264b1
       bytecode: ba879d9c018e4334cff11992ba1b8a0bcb0901d6efdb29a6daac15ce9bb32e2c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/min_fail.out b/tests/expectations/compiler/integers/i64/min_fail.out
index 320854a564..4fdd667a09 100644
--- a/tests/expectations/compiler/integers/i64/min_fail.out
+++ b/tests/expectations/compiler/integers/i64/min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e95557225c938540338e9a5aadc96d133ce151a10cfe0aab4dedfec7629a8fb3
-      unrolled_ast: e95557225c938540338e9a5aadc96d133ce151a10cfe0aab4dedfec7629a8fb3
-      ssa_ast: 0060b9af73b226fc2e459004ff3b061299b9759308070d7077d2ef330d7efcd9
-      flattened_ast: f50f88e63cc22a65ab6ba93be71da255e134bfad901734116ae81f42ce8fe8af
-      inlined_ast: f50f88e63cc22a65ab6ba93be71da255e134bfad901734116ae81f42ce8fe8af
-      dce_ast: f50f88e63cc22a65ab6ba93be71da255e134bfad901734116ae81f42ce8fe8af
+  - - initial_ast: b97354ffa197585273137d61a87f47a0a33ba9ef36ea44f07a57f014245735d1
+      unrolled_ast: b97354ffa197585273137d61a87f47a0a33ba9ef36ea44f07a57f014245735d1
+      ssa_ast: 447c107d9482e4d3f8c1dc377b13866b61dc691b22252c7302cb465663e02704
+      flattened_ast: a3eeb7529b8e203c99b82a8b8fe9d6c78347304168e60575f02b05dd213e0d2e
+      inlined_ast: a3eeb7529b8e203c99b82a8b8fe9d6c78347304168e60575f02b05dd213e0d2e
+      dce_ast: a3eeb7529b8e203c99b82a8b8fe9d6c78347304168e60575f02b05dd213e0d2e
       bytecode: 8060d7771b9a815e84dd576354e32cd26c7bf342fb513fe3b589de4c094701b4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/mul.out b/tests/expectations/compiler/integers/i64/mul.out
index 09ccacd38b..f5b322f0b5 100644
--- a/tests/expectations/compiler/integers/i64/mul.out
+++ b/tests/expectations/compiler/integers/i64/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2663666ec938b8a2f0df813437044ac1c4e49781d742cea9275f56b18886d20a
-      unrolled_ast: 2663666ec938b8a2f0df813437044ac1c4e49781d742cea9275f56b18886d20a
-      ssa_ast: 30305d1d3f7ade394e4473dfb0045fb41dcea67f59664e24d27dc581db59e1b4
-      flattened_ast: 021eedf096dc8d0389acb7c854c14943585fe0db5a8d518cc047f5a65b980542
-      inlined_ast: 021eedf096dc8d0389acb7c854c14943585fe0db5a8d518cc047f5a65b980542
-      dce_ast: 021eedf096dc8d0389acb7c854c14943585fe0db5a8d518cc047f5a65b980542
+  - - initial_ast: ce948fbed55d4bc26eafee4ccba5890fdcfa1b7d59f6640adb05c4d360f36577
+      unrolled_ast: ce948fbed55d4bc26eafee4ccba5890fdcfa1b7d59f6640adb05c4d360f36577
+      ssa_ast: b9581c9704e48e98400bf70e3d7789b3ad63d214e1c43da8d1e7ab38225bdef9
+      flattened_ast: 94e4b2b38905f621355f9b8d969540ba22fa7b9fae1d9facb757c3463ff36bdc
+      inlined_ast: 94e4b2b38905f621355f9b8d969540ba22fa7b9fae1d9facb757c3463ff36bdc
+      dce_ast: 94e4b2b38905f621355f9b8d969540ba22fa7b9fae1d9facb757c3463ff36bdc
       bytecode: f4641ddee6184f6fc437aa0f4422f2ea01a26648f9c7bf5559a2471505ed8096
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/ne.out b/tests/expectations/compiler/integers/i64/ne.out
index 97737e5788..a9f6482070 100644
--- a/tests/expectations/compiler/integers/i64/ne.out
+++ b/tests/expectations/compiler/integers/i64/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 12784eacf7849bbd89df037d588662e28a0674ddbdb776fc68a1afc5c2c98041
-      unrolled_ast: 12784eacf7849bbd89df037d588662e28a0674ddbdb776fc68a1afc5c2c98041
-      ssa_ast: cb9f38d425c12e4d907d5ce76ce8a67afdfd870b222e7d681c65fd152845ef10
-      flattened_ast: 028965ed30e474a545f3931c850a161edda3728c1854eef2d4df0ca3ebe7b349
-      inlined_ast: 028965ed30e474a545f3931c850a161edda3728c1854eef2d4df0ca3ebe7b349
-      dce_ast: 028965ed30e474a545f3931c850a161edda3728c1854eef2d4df0ca3ebe7b349
+  - - initial_ast: 10777379063934654dc6caf6601492cfab028d5025b80132acfb1f4c1b317d1a
+      unrolled_ast: 10777379063934654dc6caf6601492cfab028d5025b80132acfb1f4c1b317d1a
+      ssa_ast: 5ffd0d1b5187701b3f1208a0774a2bc743745f45a52d16222ec4fedac8ea1b1d
+      flattened_ast: e264f925b8b526827462c6f960155d3f25e1ff566fac46342b45c2db573a8f5a
+      inlined_ast: e264f925b8b526827462c6f960155d3f25e1ff566fac46342b45c2db573a8f5a
+      dce_ast: e264f925b8b526827462c6f960155d3f25e1ff566fac46342b45c2db573a8f5a
       bytecode: 56e6953042e8cf528010b3706c59f9240a38c0e4537f2bcedb790d17e0595327
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/negate.out b/tests/expectations/compiler/integers/i64/negate.out
index 20d935d488..8f297d0c33 100644
--- a/tests/expectations/compiler/integers/i64/negate.out
+++ b/tests/expectations/compiler/integers/i64/negate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 54eeae833822272ff287c28928a4c1c42910fac36d7a045763260cdf952c704f
-      unrolled_ast: 54eeae833822272ff287c28928a4c1c42910fac36d7a045763260cdf952c704f
-      ssa_ast: 7b99004d1d3de1b1744e5d196cb39e3441390dcbb58d34a3c645e79bfd2eb018
-      flattened_ast: 99a588ac169c2cebb83710cfd2540ad536c915f658bd80987c0526f37209c491
-      inlined_ast: 99a588ac169c2cebb83710cfd2540ad536c915f658bd80987c0526f37209c491
-      dce_ast: 99a588ac169c2cebb83710cfd2540ad536c915f658bd80987c0526f37209c491
+  - - initial_ast: cc01b2309f3bd7eb941d5b045cdef55c0819aee7c013e91e3c2fde9cb2c7342a
+      unrolled_ast: cc01b2309f3bd7eb941d5b045cdef55c0819aee7c013e91e3c2fde9cb2c7342a
+      ssa_ast: cd6214669dd59af0750723b45d7561b753b48d27e0998487ddcda4ccda313418
+      flattened_ast: 8c70ad98d74d4650cb232cc5622a334c3f50209a151beb9bdede66c0bd34299b
+      inlined_ast: 8c70ad98d74d4650cb232cc5622a334c3f50209a151beb9bdede66c0bd34299b
+      dce_ast: 8c70ad98d74d4650cb232cc5622a334c3f50209a151beb9bdede66c0bd34299b
       bytecode: 4a3cad0d173991e84e84d40f5868e63fccab04b6561f1de4afef8976a90dbf17
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/negate_min_fail.out b/tests/expectations/compiler/integers/i64/negate_min_fail.out
index 5c48ae8e6a..1d42dffa09 100644
--- a/tests/expectations/compiler/integers/i64/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i64/negate_min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e847e26050ab0263c68947db7580b94ec33ed8f95c54c92f713f43db4052f69c
-      unrolled_ast: e847e26050ab0263c68947db7580b94ec33ed8f95c54c92f713f43db4052f69c
-      ssa_ast: 8259d092dac5f40afb5dfc6c4e24715cacbeb168582d536a5b47a40927fc66d9
-      flattened_ast: fe66ba6c8ffd9d92b226efbd549c2a4e732ca73707b39564c2fa83bf879c887d
-      inlined_ast: fe66ba6c8ffd9d92b226efbd549c2a4e732ca73707b39564c2fa83bf879c887d
-      dce_ast: fe66ba6c8ffd9d92b226efbd549c2a4e732ca73707b39564c2fa83bf879c887d
+  - - initial_ast: d968ec8fe39174fa6ea9b1e1e81efbbd80213d2bb6040c4fdc3f3c4bc537fd87
+      unrolled_ast: d968ec8fe39174fa6ea9b1e1e81efbbd80213d2bb6040c4fdc3f3c4bc537fd87
+      ssa_ast: 1caf15d816376bc8f579d5b4e88855d237c19f7700b43cb48db3694200203b18
+      flattened_ast: 0cf0168d3f855ba18422f1d859f1d8ea28597b49f08185fec8164d1885abd28a
+      inlined_ast: 0cf0168d3f855ba18422f1d859f1d8ea28597b49f08185fec8164d1885abd28a
+      dce_ast: 0cf0168d3f855ba18422f1d859f1d8ea28597b49f08185fec8164d1885abd28a
       bytecode: eb8fb8c25730005f5c6c14d190313c0bee2ae389d6295686dd1867663fc93f67
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/negate_zero.out b/tests/expectations/compiler/integers/i64/negate_zero.out
index 630bd70b3b..6590798723 100644
--- a/tests/expectations/compiler/integers/i64/negate_zero.out
+++ b/tests/expectations/compiler/integers/i64/negate_zero.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 331b424f152c7fcf6fe8bffe9124c175a536dc343135752093f4a1e74eb25095
-      unrolled_ast: 331b424f152c7fcf6fe8bffe9124c175a536dc343135752093f4a1e74eb25095
-      ssa_ast: 97b23cd77e54b903807f64245492e6fbf819456b7e683dc4db6abd8aeae1667a
-      flattened_ast: f69ef2ab1aae84857576b89b9f1f509e059c411ffaf0d04c0b23c0d1fef005fd
-      inlined_ast: f69ef2ab1aae84857576b89b9f1f509e059c411ffaf0d04c0b23c0d1fef005fd
-      dce_ast: f69ef2ab1aae84857576b89b9f1f509e059c411ffaf0d04c0b23c0d1fef005fd
+  - - initial_ast: 33c975d0f041f888f5b69162b8bfff20dc54ab1286472da399c3d529c34a37e6
+      unrolled_ast: 33c975d0f041f888f5b69162b8bfff20dc54ab1286472da399c3d529c34a37e6
+      ssa_ast: 581d0f762aa9b9b52682354d0702d3651cecbe95db04d9d56ceadfcaeeab1a46
+      flattened_ast: 8abe31024f2a9d81c4fe415a561517e344b535d6a2c40d458a78454964c792e0
+      inlined_ast: 8abe31024f2a9d81c4fe415a561517e344b535d6a2c40d458a78454964c792e0
+      dce_ast: 8abe31024f2a9d81c4fe415a561517e344b535d6a2c40d458a78454964c792e0
       bytecode: dbe5b65eae7786eb721e8e7bf810718e8482635802c2e5d5da2996d8c0c3f7f4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/operator_methods.out b/tests/expectations/compiler/integers/i64/operator_methods.out
index 29f997959c..8e190e847f 100644
--- a/tests/expectations/compiler/integers/i64/operator_methods.out
+++ b/tests/expectations/compiler/integers/i64/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9544ea5075f9db89f714f3aa9a4862c95e39af7a104108fe4eca090b9c8fcd63
-      unrolled_ast: 9544ea5075f9db89f714f3aa9a4862c95e39af7a104108fe4eca090b9c8fcd63
-      ssa_ast: 01ece95fe7c21559808add6909bd32a086dd86c7ed5f56b57e6f861dc550db46
-      flattened_ast: 20afaa9da95a52ada5182a53965ea39a49a13168d492b3ffa0e2cdd87e4be88c
-      inlined_ast: 20afaa9da95a52ada5182a53965ea39a49a13168d492b3ffa0e2cdd87e4be88c
-      dce_ast: 70970e234913ede4be58a853f06ad08ce7825ff17156c0b73fd64b80ace021e2
+  - - initial_ast: 71fe5a15aa2dca1751ecc8020ef2e09b408e0265110080f85a7d114484f721bd
+      unrolled_ast: 71fe5a15aa2dca1751ecc8020ef2e09b408e0265110080f85a7d114484f721bd
+      ssa_ast: e149c7132d15f9519f38cf8ebc9f8a57e64ce0afad6a43bab7c17d2ac8fd1d60
+      flattened_ast: 9acbca9c6accf96f6f22bc344ebc25ba1fda8036379b2fd3ecef09783dbae11c
+      inlined_ast: 9acbca9c6accf96f6f22bc344ebc25ba1fda8036379b2fd3ecef09783dbae11c
+      dce_ast: 4496266d10b7a9518cdcf4f38b844ca863c1b097d9ed80dd70290951c52ebe64
       bytecode: 94719443d1e9713563afa7861751ae6fac8380851db816055ed46c207a613efc
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/or.out b/tests/expectations/compiler/integers/i64/or.out
index e1b2d2e6ee..095f5a56c0 100644
--- a/tests/expectations/compiler/integers/i64/or.out
+++ b/tests/expectations/compiler/integers/i64/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4c554cbd3717a9eccf70230d3edafaad63bfd0f5b17ef1d1cb412e90d17e15ad
-      unrolled_ast: 4c554cbd3717a9eccf70230d3edafaad63bfd0f5b17ef1d1cb412e90d17e15ad
-      ssa_ast: cd80089f2a992478783fdb79e2e0afd84ca3a71b6d8e9a0862b82fc29e8ac1f3
-      flattened_ast: eb0bc8a303e9f86c8e9fdc67807f6e0a59b9d42dfd43f4c1fd82bb35b7830da5
-      inlined_ast: eb0bc8a303e9f86c8e9fdc67807f6e0a59b9d42dfd43f4c1fd82bb35b7830da5
-      dce_ast: eb0bc8a303e9f86c8e9fdc67807f6e0a59b9d42dfd43f4c1fd82bb35b7830da5
+  - - initial_ast: 3ba23b2571b5f813d4b5bb2da6fb6183311ae648019626c8aae9720250e8e619
+      unrolled_ast: 3ba23b2571b5f813d4b5bb2da6fb6183311ae648019626c8aae9720250e8e619
+      ssa_ast: f67fefab93ac24017327d075e4cff0b75f9cc83bbf7e86d5629f79f476301637
+      flattened_ast: c8406a8b3fc7167233e27a006e174d20f4f7324dcb936a427fdfa1ebd29ebfc5
+      inlined_ast: c8406a8b3fc7167233e27a006e174d20f4f7324dcb936a427fdfa1ebd29ebfc5
+      dce_ast: c8406a8b3fc7167233e27a006e174d20f4f7324dcb936a427fdfa1ebd29ebfc5
       bytecode: 4bdb71dbcb23bcb6519ef3ddab06e79a70b155f8be87cc5d2b9d95221affd686
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/pow.out b/tests/expectations/compiler/integers/i64/pow.out
index c9eaa9aa92..a5ddb3df4a 100644
--- a/tests/expectations/compiler/integers/i64/pow.out
+++ b/tests/expectations/compiler/integers/i64/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 63ae38d69ce6bdc1f9a5ab2f8b2eaf0b7598d66d5256dbc6fb0a01cfa862bf42
-      unrolled_ast: 63ae38d69ce6bdc1f9a5ab2f8b2eaf0b7598d66d5256dbc6fb0a01cfa862bf42
-      ssa_ast: 99ceaf895aa45d2a4c38799139dcdba25f28ffc6e5f4c3be1d931ed9e6cd9576
-      flattened_ast: c323872da2f911ca7f096e114308d47d2420e0c2885449e6ef40e470e3c3fa1e
-      inlined_ast: c323872da2f911ca7f096e114308d47d2420e0c2885449e6ef40e470e3c3fa1e
-      dce_ast: c323872da2f911ca7f096e114308d47d2420e0c2885449e6ef40e470e3c3fa1e
+  - - initial_ast: 1fc006eadee1fa142a56482a766e113f6dd097e29d23acf593e7e9838fd42d4f
+      unrolled_ast: 1fc006eadee1fa142a56482a766e113f6dd097e29d23acf593e7e9838fd42d4f
+      ssa_ast: 11791e1443f842dc5374552c840c1ab1063ec41c9596ae3d9e38d56a24cae429
+      flattened_ast: 3fcfbd35213e62ae797d3fe6d7ddb11c13dea3eb4762eeed497546913483e908
+      inlined_ast: 3fcfbd35213e62ae797d3fe6d7ddb11c13dea3eb4762eeed497546913483e908
+      dce_ast: 3fcfbd35213e62ae797d3fe6d7ddb11c13dea3eb4762eeed497546913483e908
       bytecode: ff1ba1259f2f4a90553920fc5a9391125c9d5fbc583e2a648b80dc409b62d5fc
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/rem.out b/tests/expectations/compiler/integers/i64/rem.out
index 053fc62d23..f157a1c68c 100644
--- a/tests/expectations/compiler/integers/i64/rem.out
+++ b/tests/expectations/compiler/integers/i64/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3fa12ad7731563a99efbeadc16124a3f862f8978684ff8d90feca7c53187f525
-      unrolled_ast: 3fa12ad7731563a99efbeadc16124a3f862f8978684ff8d90feca7c53187f525
-      ssa_ast: 79e69bf9ae6a6f9df85643c84f183222eb9b0061ce037e5d629b63e3222b17d9
-      flattened_ast: 0ab661221e63a29398655a0e05c68c17040c56bdc7eaa3c78d9ff295962d6670
-      inlined_ast: 0ab661221e63a29398655a0e05c68c17040c56bdc7eaa3c78d9ff295962d6670
-      dce_ast: 0ab661221e63a29398655a0e05c68c17040c56bdc7eaa3c78d9ff295962d6670
+  - - initial_ast: e477a7399e28f608b9034e7ac5445a22dc7f87fbe19e2c53c0f614a183a59130
+      unrolled_ast: e477a7399e28f608b9034e7ac5445a22dc7f87fbe19e2c53c0f614a183a59130
+      ssa_ast: 80e08a479bad3f31b7e6b5ad36c28f46333bbd97ed14e372ed048fc349f647ea
+      flattened_ast: bd00f72b0266e148a1f4fb57b17253deb6e3eec71e754cbfbddb42c716f3a27e
+      inlined_ast: bd00f72b0266e148a1f4fb57b17253deb6e3eec71e754cbfbddb42c716f3a27e
+      dce_ast: bd00f72b0266e148a1f4fb57b17253deb6e3eec71e754cbfbddb42c716f3a27e
       bytecode: 89effef213f290d8097c5e2289a9010d4379e63954959a7eeca9a25e4e5f50b8
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/shl.out b/tests/expectations/compiler/integers/i64/shl.out
index 170e991dc1..84dfe49164 100644
--- a/tests/expectations/compiler/integers/i64/shl.out
+++ b/tests/expectations/compiler/integers/i64/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4d1e994017252227e6a1958f192d81d100b896915edfb37a2e2bdf23a717f0a1
-      unrolled_ast: 4d1e994017252227e6a1958f192d81d100b896915edfb37a2e2bdf23a717f0a1
-      ssa_ast: 84bc3d8869e22df3800f20893cd377b516e81408e25ec228ddf232242375e5a9
-      flattened_ast: e6b1bff00ffde39190cb2eafbcf6ff9877c17727c18f13bdde83505fe0da8d27
-      inlined_ast: e6b1bff00ffde39190cb2eafbcf6ff9877c17727c18f13bdde83505fe0da8d27
-      dce_ast: e6b1bff00ffde39190cb2eafbcf6ff9877c17727c18f13bdde83505fe0da8d27
+  - - initial_ast: f6419ba44f9bcab379f1a411aa0f0f36026922faf0bc052a4147fdd6af914d45
+      unrolled_ast: f6419ba44f9bcab379f1a411aa0f0f36026922faf0bc052a4147fdd6af914d45
+      ssa_ast: 4b15bf1b77bf26986dd5a83c3f79c18dbe900e044a3ef3c8eb95011efac6065f
+      flattened_ast: ad91f9e44e524c888a59bc8f784a05879cd3ec3171af6ba1f185d766808aafe4
+      inlined_ast: ad91f9e44e524c888a59bc8f784a05879cd3ec3171af6ba1f185d766808aafe4
+      dce_ast: ad91f9e44e524c888a59bc8f784a05879cd3ec3171af6ba1f185d766808aafe4
       bytecode: 44b4f1e4aff3e8f3343854e8efc5146404333da549cc6e04bca927e7e1484487
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/shr.out b/tests/expectations/compiler/integers/i64/shr.out
index 01211aea8f..97edacf85a 100644
--- a/tests/expectations/compiler/integers/i64/shr.out
+++ b/tests/expectations/compiler/integers/i64/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9d2ff080ac63aa8a6a2cd4d5ce56568b669af7abf239e27c8426fc03d276336d
-      unrolled_ast: 9d2ff080ac63aa8a6a2cd4d5ce56568b669af7abf239e27c8426fc03d276336d
-      ssa_ast: b3323d7f8ede2c0fea6d2dd5f8198bc404caa5d9a33fd40ff787f897ccae03fc
-      flattened_ast: 88044bb8fb1d0563ea4c1805f82eec98816b2d275aabe3ef8a1978610cdadf77
-      inlined_ast: 88044bb8fb1d0563ea4c1805f82eec98816b2d275aabe3ef8a1978610cdadf77
-      dce_ast: 88044bb8fb1d0563ea4c1805f82eec98816b2d275aabe3ef8a1978610cdadf77
+  - - initial_ast: 45cbc002d655f07440615566a47cbeb174a150fd62284d47f931388d59327fc5
+      unrolled_ast: 45cbc002d655f07440615566a47cbeb174a150fd62284d47f931388d59327fc5
+      ssa_ast: 407331e3a9c95e9967c07d40e44fd6d9cf9609dc009440c98f38a45bb9a0835a
+      flattened_ast: 5fbd68abf904a3a724d0e31df8b6b6051c846940abc29fd65c77d647acb4f48f
+      inlined_ast: 5fbd68abf904a3a724d0e31df8b6b6051c846940abc29fd65c77d647acb4f48f
+      dce_ast: 5fbd68abf904a3a724d0e31df8b6b6051c846940abc29fd65c77d647acb4f48f
       bytecode: 2768046fc5a9e4812b3b19a67908baca08c0e3d5141323dabb57cff84e659d62
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/sub.out b/tests/expectations/compiler/integers/i64/sub.out
index 38a54cd3b4..310e1c7867 100644
--- a/tests/expectations/compiler/integers/i64/sub.out
+++ b/tests/expectations/compiler/integers/i64/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2e49f4832b9970f991c0c7ca0ed8fde9199d19025f83a184fc60ebf92739eedc
-      unrolled_ast: 2e49f4832b9970f991c0c7ca0ed8fde9199d19025f83a184fc60ebf92739eedc
-      ssa_ast: b0831e23d47ebc00685a140d09776fbcc91f20850329c706a560cabc65522d78
-      flattened_ast: f4376e0bab5f1418f2e5ac03f7cdfea61be92be50386ebb9b57d6254c37a0103
-      inlined_ast: f4376e0bab5f1418f2e5ac03f7cdfea61be92be50386ebb9b57d6254c37a0103
-      dce_ast: f4376e0bab5f1418f2e5ac03f7cdfea61be92be50386ebb9b57d6254c37a0103
+  - - initial_ast: c6d6b064dbdb75e70019bb2b5be33ff653057327566bee5ad4ba54c4528b16fc
+      unrolled_ast: c6d6b064dbdb75e70019bb2b5be33ff653057327566bee5ad4ba54c4528b16fc
+      ssa_ast: 6f5d3e2d5a7c904782b634831bc07299694e306eb805ea5047bf4213d08f8bf2
+      flattened_ast: 7e4af28b141320d0e83ff275274873e5058911c1fdf951b6cd28882ae4dd2e4a
+      inlined_ast: 7e4af28b141320d0e83ff275274873e5058911c1fdf951b6cd28882ae4dd2e4a
+      dce_ast: 7e4af28b141320d0e83ff275274873e5058911c1fdf951b6cd28882ae4dd2e4a
       bytecode: 3394c4bead78f2ab177206a71d03d27cc9e584d5eb7aa587e7a9101911c1e76d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/ternary.out b/tests/expectations/compiler/integers/i64/ternary.out
index d0352226bb..df0116f379 100644
--- a/tests/expectations/compiler/integers/i64/ternary.out
+++ b/tests/expectations/compiler/integers/i64/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 49490de93239051816f8c94fb363a70045baf2569a93556e158163281a56f792
-      unrolled_ast: 49490de93239051816f8c94fb363a70045baf2569a93556e158163281a56f792
-      ssa_ast: ab7ecd2622003fa08d4663e3496935a10388cab2244d1275ef1ebcff423feb92
-      flattened_ast: 9d09c7dfb002f17b30fcf87bbaeda96cd53bb8b5a2c18df9965fcd88aae7bb39
-      inlined_ast: 9d09c7dfb002f17b30fcf87bbaeda96cd53bb8b5a2c18df9965fcd88aae7bb39
-      dce_ast: 9d09c7dfb002f17b30fcf87bbaeda96cd53bb8b5a2c18df9965fcd88aae7bb39
+  - - initial_ast: 117b274791a21a40be02bc96d76eca891e80a3081c8d8862b4da78a5a7a69a6b
+      unrolled_ast: 117b274791a21a40be02bc96d76eca891e80a3081c8d8862b4da78a5a7a69a6b
+      ssa_ast: 7d6bb99402e99ea706cfe37ddcc6704f4884419da71f73ef53bfc64e64998f34
+      flattened_ast: d125d583fc5942a7968306858eda6aae8838eef30ca8db3cc9140bbc649acf5e
+      inlined_ast: d125d583fc5942a7968306858eda6aae8838eef30ca8db3cc9140bbc649acf5e
+      dce_ast: d125d583fc5942a7968306858eda6aae8838eef30ca8db3cc9140bbc649acf5e
       bytecode: 4a10ca6f583fa9516bfbdad6094fdaadefd4d6069c0f87f13cc0e3fc1d36029e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i64/xor.out b/tests/expectations/compiler/integers/i64/xor.out
index 4ad47b3547..103870b630 100644
--- a/tests/expectations/compiler/integers/i64/xor.out
+++ b/tests/expectations/compiler/integers/i64/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ab803352ca88f0da0f99109c350726e0fac0009dd77754318923284ade8ab844
-      unrolled_ast: ab803352ca88f0da0f99109c350726e0fac0009dd77754318923284ade8ab844
-      ssa_ast: 3d236089c32f030898265b1bb1afdf9d8b98ad18a06ee2c9f09e3c8b9f91a4fe
-      flattened_ast: ae9da6edd6b2b46bba0ecbe5c6f9cb7bcf95a681a40ab0e2f3cf8e24d1b5974c
-      inlined_ast: ae9da6edd6b2b46bba0ecbe5c6f9cb7bcf95a681a40ab0e2f3cf8e24d1b5974c
-      dce_ast: ae9da6edd6b2b46bba0ecbe5c6f9cb7bcf95a681a40ab0e2f3cf8e24d1b5974c
+  - - initial_ast: 007a066f2242dc422516c98b2ce1cdd723d87729a278daae10b57dc7c879a45c
+      unrolled_ast: 007a066f2242dc422516c98b2ce1cdd723d87729a278daae10b57dc7c879a45c
+      ssa_ast: a6049559960070eb78d1bc63f41817eb7c85e6b68b4755c3736bfa0bbd23076b
+      flattened_ast: 26a058181c8ffe3ec58a9e2de385e61c7c2d7c019023ceefa5d19739126334e3
+      inlined_ast: 26a058181c8ffe3ec58a9e2de385e61c7c2d7c019023ceefa5d19739126334e3
+      dce_ast: 26a058181c8ffe3ec58a9e2de385e61c7c2d7c019023ceefa5d19739126334e3
       bytecode: 202aa93c8b415346f4cc8b49533c89cf2004fb273e78581f033c75ea57dad512
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/add.out b/tests/expectations/compiler/integers/i8/add.out
index d93ea9e275..5ff1f415ab 100644
--- a/tests/expectations/compiler/integers/i8/add.out
+++ b/tests/expectations/compiler/integers/i8/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ef14f9112efb5093c7d24befade4602c7716a155139a7f91949837b054d54de3
-      unrolled_ast: ef14f9112efb5093c7d24befade4602c7716a155139a7f91949837b054d54de3
-      ssa_ast: 75810d456d07440f4598a5ed6628a4e313a8a5008e022778365d8acedac1a677
-      flattened_ast: feaf44aac0b3ce05af1983a18c3aea66a48c9fc7fce46afbd70171249552f995
-      inlined_ast: feaf44aac0b3ce05af1983a18c3aea66a48c9fc7fce46afbd70171249552f995
-      dce_ast: feaf44aac0b3ce05af1983a18c3aea66a48c9fc7fce46afbd70171249552f995
+  - - initial_ast: 07d84ab17fb71320a01c243bc220b7273b27cd2f4c572b11852afd5128563bb7
+      unrolled_ast: 07d84ab17fb71320a01c243bc220b7273b27cd2f4c572b11852afd5128563bb7
+      ssa_ast: e089fb6b899d91adc9df149257039d771880ff6d31cbcc1c3fcf3223d61e4fcc
+      flattened_ast: a7a814b61f9d3d520375e192824edaf10f378cd65f30746bfcb1e81d4b524940
+      inlined_ast: a7a814b61f9d3d520375e192824edaf10f378cd65f30746bfcb1e81d4b524940
+      dce_ast: a7a814b61f9d3d520375e192824edaf10f378cd65f30746bfcb1e81d4b524940
       bytecode: 7e5db24495ea3dcca85545d83273ce3c02faae5a2bcaef3a9448920ac68daeda
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/and.out b/tests/expectations/compiler/integers/i8/and.out
index 35367f5b1c..0ea22ccc4c 100644
--- a/tests/expectations/compiler/integers/i8/and.out
+++ b/tests/expectations/compiler/integers/i8/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 913afb329d1588bc08bf08d42eece411042cd4a94ed148a678b1f6cab51ee22a
-      unrolled_ast: 913afb329d1588bc08bf08d42eece411042cd4a94ed148a678b1f6cab51ee22a
-      ssa_ast: 22daad00ab2051b4a09f5035b241d99ff2bc7fe3cbe6aa3de0671d2e51b0df63
-      flattened_ast: a923f711e7515b65d8ca9bbb112469c55c6b05bf711d238a1534542a2e971bd3
-      inlined_ast: a923f711e7515b65d8ca9bbb112469c55c6b05bf711d238a1534542a2e971bd3
-      dce_ast: a923f711e7515b65d8ca9bbb112469c55c6b05bf711d238a1534542a2e971bd3
+  - - initial_ast: a063e325deddad785dd14f788353e4d94c2355f1355abd2a50671c90e5559d3b
+      unrolled_ast: a063e325deddad785dd14f788353e4d94c2355f1355abd2a50671c90e5559d3b
+      ssa_ast: a5e67a59aa3c79c8652aab9c8f0c14fc7351b0331785147c17af92a83775c943
+      flattened_ast: aba78de1076526cc130deb0e01cdfe6f5c1c0b5a2b977d9c0b877258d6c07f00
+      inlined_ast: aba78de1076526cc130deb0e01cdfe6f5c1c0b5a2b977d9c0b877258d6c07f00
+      dce_ast: aba78de1076526cc130deb0e01cdfe6f5c1c0b5a2b977d9c0b877258d6c07f00
       bytecode: 6696abc2bfb9eeab6ab4255dad93e1c66316b93bf19136e37fdefb22a09b50c9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/console_assert.out b/tests/expectations/compiler/integers/i8/console_assert.out
index a53e44dac6..7c2e12480e 100644
--- a/tests/expectations/compiler/integers/i8/console_assert.out
+++ b/tests/expectations/compiler/integers/i8/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4986739da36415ebbe7cd73761da74c7d659572629f7ed4d9b581bb0233df5e7
-      unrolled_ast: 4986739da36415ebbe7cd73761da74c7d659572629f7ed4d9b581bb0233df5e7
-      ssa_ast: 1ff18b8eee4bbd750c6e06da3f0f751af932073f8eac21f0f2e8f6f85bb58536
-      flattened_ast: c56444c3614a7a1533d26e48780caad5e2abf15b7b09845017db90417af693f0
-      inlined_ast: c56444c3614a7a1533d26e48780caad5e2abf15b7b09845017db90417af693f0
-      dce_ast: c56444c3614a7a1533d26e48780caad5e2abf15b7b09845017db90417af693f0
+  - - initial_ast: 3fe23b4329af3136db2925b2e5da16d725e537e34283754f6747a2f7a393b58c
+      unrolled_ast: 3fe23b4329af3136db2925b2e5da16d725e537e34283754f6747a2f7a393b58c
+      ssa_ast: e2c18ef96396775f32c54816bc878d8b574c51c3cc8b95d71318c58e4ed35c1e
+      flattened_ast: ae688a373daa53b54951b04e7cb6247bf6466ebe8723dfbfd92dd5a8a4663af2
+      inlined_ast: ae688a373daa53b54951b04e7cb6247bf6466ebe8723dfbfd92dd5a8a4663af2
+      dce_ast: ae688a373daa53b54951b04e7cb6247bf6466ebe8723dfbfd92dd5a8a4663af2
       bytecode: abe50f2f70110c2d0e6728636967d2e3ef06c1bdad64c39cf82f7402a924f769
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/div.out b/tests/expectations/compiler/integers/i8/div.out
index d429ef08b3..a580e55230 100644
--- a/tests/expectations/compiler/integers/i8/div.out
+++ b/tests/expectations/compiler/integers/i8/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 657d719755909a451ae84af9f0ece00262d7cc224e149224306dcc51570fcd11
-      unrolled_ast: 657d719755909a451ae84af9f0ece00262d7cc224e149224306dcc51570fcd11
-      ssa_ast: 94caa741f5bc9e33de0e15aeb88fec31870b6980168fae66aa0e611c817bfbb2
-      flattened_ast: a9ad247ed48cf9aef62d1585cd2024077e30ef58b17f4a875a20f2589f0cf5c8
-      inlined_ast: a9ad247ed48cf9aef62d1585cd2024077e30ef58b17f4a875a20f2589f0cf5c8
-      dce_ast: a9ad247ed48cf9aef62d1585cd2024077e30ef58b17f4a875a20f2589f0cf5c8
+  - - initial_ast: a99d49f82ba307357ed2beec620332c7d583ae1cafdf559988d3d1ef763f8bec
+      unrolled_ast: a99d49f82ba307357ed2beec620332c7d583ae1cafdf559988d3d1ef763f8bec
+      ssa_ast: 851edf5277ca7215cc3ac57f7cad5eb1436f8cd9a774026e791377c4c39d6f8a
+      flattened_ast: 8608dca0650e150a75aed81964c8a21c496b5387a60fba5ff08f8ae1dbcf6360
+      inlined_ast: 8608dca0650e150a75aed81964c8a21c496b5387a60fba5ff08f8ae1dbcf6360
+      dce_ast: 8608dca0650e150a75aed81964c8a21c496b5387a60fba5ff08f8ae1dbcf6360
       bytecode: a748bd3dea41e7274e04929fa60b4e6e1a93c07f229afe99bf12c5fc29162f68
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/eq.out b/tests/expectations/compiler/integers/i8/eq.out
index 4bcb2321fa..1a57291470 100644
--- a/tests/expectations/compiler/integers/i8/eq.out
+++ b/tests/expectations/compiler/integers/i8/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6efc43a41c3755f1085d13dbee5451ba287be4f474fce0dbc8ce2af6a776d0a3
-      unrolled_ast: 6efc43a41c3755f1085d13dbee5451ba287be4f474fce0dbc8ce2af6a776d0a3
-      ssa_ast: b1409bee08a88f1fba0e1e87b39a2555e31ccbfc076ee4951cf5e5f60f2475a1
-      flattened_ast: cabc76b0f17dc3fedb839318db3c3d47e0630c8cd9ac06400bde72c413c5c5e7
-      inlined_ast: cabc76b0f17dc3fedb839318db3c3d47e0630c8cd9ac06400bde72c413c5c5e7
-      dce_ast: cabc76b0f17dc3fedb839318db3c3d47e0630c8cd9ac06400bde72c413c5c5e7
+  - - initial_ast: c99261521e939edca25d61a2be4c03a37c10db1277282a00ef63e052693f55da
+      unrolled_ast: c99261521e939edca25d61a2be4c03a37c10db1277282a00ef63e052693f55da
+      ssa_ast: 66e35e5e8a265870c553d32b13b5fc4361c5cde060cb4d13ef346dbe9cfef69f
+      flattened_ast: 656eb83a14fca0734218bc899c9e03a5cd8489c7662c159a3d4829b0d50ba5f0
+      inlined_ast: 656eb83a14fca0734218bc899c9e03a5cd8489c7662c159a3d4829b0d50ba5f0
+      dce_ast: 656eb83a14fca0734218bc899c9e03a5cd8489c7662c159a3d4829b0d50ba5f0
       bytecode: a78d778b5d4c7ab76e80a1c944c5060214f0e474a0892dca998044ec07f736f9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/ge.out b/tests/expectations/compiler/integers/i8/ge.out
index 47b5f0cfa0..02a492e99a 100644
--- a/tests/expectations/compiler/integers/i8/ge.out
+++ b/tests/expectations/compiler/integers/i8/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c82ee73c4036f2ebbb0b65bf038b6a481768575950d9f1e9e1436bf3ba44392d
-      unrolled_ast: c82ee73c4036f2ebbb0b65bf038b6a481768575950d9f1e9e1436bf3ba44392d
-      ssa_ast: f9baf8ea2ecda76d8033151e91461d68c2b13ff563c3192bd65b069c42355ce1
-      flattened_ast: f42e539b79e4f85316802da3dcf7d2b66455424a72f05b9b61e0aa9f874572a9
-      inlined_ast: f42e539b79e4f85316802da3dcf7d2b66455424a72f05b9b61e0aa9f874572a9
-      dce_ast: f42e539b79e4f85316802da3dcf7d2b66455424a72f05b9b61e0aa9f874572a9
+  - - initial_ast: 0e87a61ac1a37ccd51f13d8ffbea7d2bf7501b3dc3ed31de16a7f29582abcf30
+      unrolled_ast: 0e87a61ac1a37ccd51f13d8ffbea7d2bf7501b3dc3ed31de16a7f29582abcf30
+      ssa_ast: d301aceca5f0ee7b56b819428ffd7764ddcc420ffa7d2b47b4d4e5893cf21225
+      flattened_ast: 30804919c6d90ec09bacae351374b101c742ef65c74ab5107108fec864c09831
+      inlined_ast: 30804919c6d90ec09bacae351374b101c742ef65c74ab5107108fec864c09831
+      dce_ast: 30804919c6d90ec09bacae351374b101c742ef65c74ab5107108fec864c09831
       bytecode: 94572b27b48d4abfd620aa9e9b2826915ffa548e81e7163562a598777c174b9d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/gt.out b/tests/expectations/compiler/integers/i8/gt.out
index 04825c2464..0f030760da 100644
--- a/tests/expectations/compiler/integers/i8/gt.out
+++ b/tests/expectations/compiler/integers/i8/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1987fc81bb0bdb3d68027bf0c39571a03e15e50c7725fc8dbf8a1f5aa91dc694
-      unrolled_ast: 1987fc81bb0bdb3d68027bf0c39571a03e15e50c7725fc8dbf8a1f5aa91dc694
-      ssa_ast: 3a385a9bb19436c947157d0a6ff1c8ec7697b482972e9d778dbeeb0130bdce98
-      flattened_ast: f866887ce79c072fd137f5daf9c460d4e5ddb1befd6102047e7312157f151c6e
-      inlined_ast: f866887ce79c072fd137f5daf9c460d4e5ddb1befd6102047e7312157f151c6e
-      dce_ast: f866887ce79c072fd137f5daf9c460d4e5ddb1befd6102047e7312157f151c6e
+  - - initial_ast: 12fe069325c13a59f33cd1a5df84feb508f47bb485af47e166748dcfa5f5904b
+      unrolled_ast: 12fe069325c13a59f33cd1a5df84feb508f47bb485af47e166748dcfa5f5904b
+      ssa_ast: 731d8d2f5e2717ddf7a37e999320f2bd7e651c7a7fb1f5cd7fbff5657138d828
+      flattened_ast: 13077811c24b79f614e6f070287120552766c2dd2c2be25f412ac0abf19531d4
+      inlined_ast: 13077811c24b79f614e6f070287120552766c2dd2c2be25f412ac0abf19531d4
+      dce_ast: 13077811c24b79f614e6f070287120552766c2dd2c2be25f412ac0abf19531d4
       bytecode: 12088489a333361c2ba46423958eb72cf877d9db1e0acc0520b13b02a6d0467e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/le.out b/tests/expectations/compiler/integers/i8/le.out
index 2dcaee249a..f7021bbe88 100644
--- a/tests/expectations/compiler/integers/i8/le.out
+++ b/tests/expectations/compiler/integers/i8/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8c0aa370af384981611d9f29f87fe0e58d75e373b21b981e0091045998b2679b
-      unrolled_ast: 8c0aa370af384981611d9f29f87fe0e58d75e373b21b981e0091045998b2679b
-      ssa_ast: cdffeb780527785248a1caed6f008d92c10a07b49b3a2ae82969c4b9215f88f0
-      flattened_ast: d1ed5acf4d6872fb2b658e780ba09fb1e5ad20489ec3e96c96047a38b0f2b95b
-      inlined_ast: d1ed5acf4d6872fb2b658e780ba09fb1e5ad20489ec3e96c96047a38b0f2b95b
-      dce_ast: d1ed5acf4d6872fb2b658e780ba09fb1e5ad20489ec3e96c96047a38b0f2b95b
+  - - initial_ast: ecf5cceb87c168fcb46116113c94286486f9c19b049833fab089c7a4fb9cd329
+      unrolled_ast: ecf5cceb87c168fcb46116113c94286486f9c19b049833fab089c7a4fb9cd329
+      ssa_ast: 4a013c250c0d917af5d1a90c1bd74350149535d8d0b5ea70561f046bc9387fff
+      flattened_ast: e3e8254e04b2b773a424101644f35e8ccdc38caffbcf8451208fbebf4db10a5e
+      inlined_ast: e3e8254e04b2b773a424101644f35e8ccdc38caffbcf8451208fbebf4db10a5e
+      dce_ast: e3e8254e04b2b773a424101644f35e8ccdc38caffbcf8451208fbebf4db10a5e
       bytecode: 13ee1135be90a2ac630bba0dddd170b24bdf375295c4d3e21ddb511d388f9c31
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/lt.out b/tests/expectations/compiler/integers/i8/lt.out
index 71f10f66b8..ff6eefd2c1 100644
--- a/tests/expectations/compiler/integers/i8/lt.out
+++ b/tests/expectations/compiler/integers/i8/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bf00097294a52aa8f3b779efe8119a3c9e6a1afdd4daf55c791cfd6e7eb11dec
-      unrolled_ast: bf00097294a52aa8f3b779efe8119a3c9e6a1afdd4daf55c791cfd6e7eb11dec
-      ssa_ast: c82633162f038dc9bd340bf0ffd6a98201de99f5bd668e96545ab4d3b31061a5
-      flattened_ast: 5686bbe097bddb0f67e0de349931dc8a2e101a4ed578e643e43c9aefc08bd0c8
-      inlined_ast: 5686bbe097bddb0f67e0de349931dc8a2e101a4ed578e643e43c9aefc08bd0c8
-      dce_ast: 5686bbe097bddb0f67e0de349931dc8a2e101a4ed578e643e43c9aefc08bd0c8
+  - - initial_ast: b11223256ecabf60f7c6c5f707bbf28ab5f5dfa344be92f00316982a6f36fce3
+      unrolled_ast: b11223256ecabf60f7c6c5f707bbf28ab5f5dfa344be92f00316982a6f36fce3
+      ssa_ast: 47a412872df3b04fd51368f2f6eea426a79f7240848296348cf41aa87642b4b2
+      flattened_ast: 8ba52a3c1f84f2a31932f53609d3f6389e0c770ab38f041322074417cd49b582
+      inlined_ast: 8ba52a3c1f84f2a31932f53609d3f6389e0c770ab38f041322074417cd49b582
+      dce_ast: 8ba52a3c1f84f2a31932f53609d3f6389e0c770ab38f041322074417cd49b582
       bytecode: 603e5cdb76df60951144b9bf25a52c5707dd4286906cae46fccc43f3b87292e2
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/max.out b/tests/expectations/compiler/integers/i8/max.out
index c6c6697109..34650c71ac 100644
--- a/tests/expectations/compiler/integers/i8/max.out
+++ b/tests/expectations/compiler/integers/i8/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a9760c5c385e16dbdbae50ab23efe6769ef46024ec22f58ee7aa2b26315a5843
-      unrolled_ast: a9760c5c385e16dbdbae50ab23efe6769ef46024ec22f58ee7aa2b26315a5843
-      ssa_ast: bd7ab26f06aa023441eb0dd92b4b4331ff9de6ca7031c90a851576d2e536d9a6
-      flattened_ast: 5b0202285c7f08974ce02358a9d13c527cd79971a67496dfb5859a996ee1a704
-      inlined_ast: 5b0202285c7f08974ce02358a9d13c527cd79971a67496dfb5859a996ee1a704
-      dce_ast: 5b0202285c7f08974ce02358a9d13c527cd79971a67496dfb5859a996ee1a704
+  - - initial_ast: 31c67dd82e1c1be8325c34169a958cf1e994109d6c6921707bc0650ad79aa076
+      unrolled_ast: 31c67dd82e1c1be8325c34169a958cf1e994109d6c6921707bc0650ad79aa076
+      ssa_ast: 763a3d4e1143cb07fa5ae18bc98d9570953c44da3b887e1692c06495a9ac1d11
+      flattened_ast: a2ec62800223b1c2dd134c654038ac0ecd19020fc7677c8099ecb210d08607ff
+      inlined_ast: a2ec62800223b1c2dd134c654038ac0ecd19020fc7677c8099ecb210d08607ff
+      dce_ast: a2ec62800223b1c2dd134c654038ac0ecd19020fc7677c8099ecb210d08607ff
       bytecode: 3c067ad506fc41e4e9e7db063d5364cb4b48df235e552f3cae7d5de2cbb781e0
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/min.out b/tests/expectations/compiler/integers/i8/min.out
index 70db33f6fa..f62cc8ffa0 100644
--- a/tests/expectations/compiler/integers/i8/min.out
+++ b/tests/expectations/compiler/integers/i8/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4f29d6bf9a74f838985b31d2b8f7915043e579572b63b285087d59577af59468
-      unrolled_ast: 4f29d6bf9a74f838985b31d2b8f7915043e579572b63b285087d59577af59468
-      ssa_ast: aaf401bc8d8d2ad16d9263e1a6acc80a553d149c116829130e15d70ae232f1b9
-      flattened_ast: ea621488bc952534d6d148f9b0af029aa4b6538954eadfa87dc125f5b67611da
-      inlined_ast: ea621488bc952534d6d148f9b0af029aa4b6538954eadfa87dc125f5b67611da
-      dce_ast: ea621488bc952534d6d148f9b0af029aa4b6538954eadfa87dc125f5b67611da
+  - - initial_ast: eac786134b15cb742549dbe6c80518bf48cef907c1c330371a256a70733b4779
+      unrolled_ast: eac786134b15cb742549dbe6c80518bf48cef907c1c330371a256a70733b4779
+      ssa_ast: 743b69bcb3009629fbf32cd402e6e51e418a9a0703822588db037da92a9a7d50
+      flattened_ast: 70de166347c787fc3f64dc971b7d226438ba08c7beb777e88c7c0e7c3314604a
+      inlined_ast: 70de166347c787fc3f64dc971b7d226438ba08c7beb777e88c7c0e7c3314604a
+      dce_ast: 70de166347c787fc3f64dc971b7d226438ba08c7beb777e88c7c0e7c3314604a
       bytecode: 55a111c89ca19d386df2b23007d709d5c8787909e9e1160c29499b3f7a01dcf5
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/min_fail.out b/tests/expectations/compiler/integers/i8/min_fail.out
index 38e9a9da9b..150e6cf9c5 100644
--- a/tests/expectations/compiler/integers/i8/min_fail.out
+++ b/tests/expectations/compiler/integers/i8/min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6d452302a8e41999aaa2bb432a2d6961bd4799363f30c0263281b704e48d3887
-      unrolled_ast: 6d452302a8e41999aaa2bb432a2d6961bd4799363f30c0263281b704e48d3887
-      ssa_ast: 75f7eacbe122ee099967cabd494663542f1e0d9f6ad94207da7ce5d64f0dcae8
-      flattened_ast: 822fa045a889617ec97af4694895f36913688880e59afaf551e5ac0a78708fd9
-      inlined_ast: 822fa045a889617ec97af4694895f36913688880e59afaf551e5ac0a78708fd9
-      dce_ast: 822fa045a889617ec97af4694895f36913688880e59afaf551e5ac0a78708fd9
+  - - initial_ast: 90c8eabf61f7407c987b630d2b4ca030dd98075396934bd948e2a59ca4b63d97
+      unrolled_ast: 90c8eabf61f7407c987b630d2b4ca030dd98075396934bd948e2a59ca4b63d97
+      ssa_ast: c49b51c7ff792df950e3b87d2463347087f4ef3be103292d9832f82e834d6fbf
+      flattened_ast: c1e27fad8ba906a8af6c220a71d138c6bc5f42588dd674d373971b11ec357783
+      inlined_ast: c1e27fad8ba906a8af6c220a71d138c6bc5f42588dd674d373971b11ec357783
+      dce_ast: c1e27fad8ba906a8af6c220a71d138c6bc5f42588dd674d373971b11ec357783
       bytecode: 2181efe703d35367134a1f8a3601cc57254af6fff5313d65f4b442e1bb24ca38
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/mul.out b/tests/expectations/compiler/integers/i8/mul.out
index 3d377a8cf3..b652dec57c 100644
--- a/tests/expectations/compiler/integers/i8/mul.out
+++ b/tests/expectations/compiler/integers/i8/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3484caa0f47f9e44732f5bf53fbaa44dcd9b02c855406340e582781bd866460c
-      unrolled_ast: 3484caa0f47f9e44732f5bf53fbaa44dcd9b02c855406340e582781bd866460c
-      ssa_ast: 2beb044ef535511e47ae74fbd65c1e6197133d93074ba05c06160146d09c9545
-      flattened_ast: fcf867f4cbc282b573769d15544c56ee6cd508faa8d38c1b6697f48c81078d6a
-      inlined_ast: fcf867f4cbc282b573769d15544c56ee6cd508faa8d38c1b6697f48c81078d6a
-      dce_ast: fcf867f4cbc282b573769d15544c56ee6cd508faa8d38c1b6697f48c81078d6a
+  - - initial_ast: a87a12bb8fc280bf8c58febad946592c3696ed253c87098057d3204eaaa9046f
+      unrolled_ast: a87a12bb8fc280bf8c58febad946592c3696ed253c87098057d3204eaaa9046f
+      ssa_ast: d59da907c9764666b96ba13d6f20c2152aa26a43a46ff9302ec015e3b89c5379
+      flattened_ast: 99da246fedfb5f2ca3706d4ace4f318b069e0a649177b485b9c71bd4f2443164
+      inlined_ast: 99da246fedfb5f2ca3706d4ace4f318b069e0a649177b485b9c71bd4f2443164
+      dce_ast: 99da246fedfb5f2ca3706d4ace4f318b069e0a649177b485b9c71bd4f2443164
       bytecode: 4d7f4174af8a36e85cdb61b3aea8ff9d5d2fff98c50e002f82e4e37cec9beab8
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/ne.out b/tests/expectations/compiler/integers/i8/ne.out
index e06707afab..0bc73bf1f2 100644
--- a/tests/expectations/compiler/integers/i8/ne.out
+++ b/tests/expectations/compiler/integers/i8/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e29ce7c2bd58f126a1c108882f3bdb45d757623c9cf709c1eadfd99ff186e16f
-      unrolled_ast: e29ce7c2bd58f126a1c108882f3bdb45d757623c9cf709c1eadfd99ff186e16f
-      ssa_ast: 18ddd2acb797b4fa1ab2c85b2195afd42b467320593e44359feb6d49a83febc9
-      flattened_ast: 988d2b91a76685706a2ba5e615e79e28a4f16a57f9748afb58c7c338df5f0373
-      inlined_ast: 988d2b91a76685706a2ba5e615e79e28a4f16a57f9748afb58c7c338df5f0373
-      dce_ast: 988d2b91a76685706a2ba5e615e79e28a4f16a57f9748afb58c7c338df5f0373
+  - - initial_ast: 7005f72c03792c518a05aeddb9b8c3650e7c32a06e39d4576843de1e3b24543c
+      unrolled_ast: 7005f72c03792c518a05aeddb9b8c3650e7c32a06e39d4576843de1e3b24543c
+      ssa_ast: 23c10d1598a47c83aa11f2e0bfe975e7551a9fedd7d03f9dcffd46024b5bfa48
+      flattened_ast: 56f47768e5e9fd7c26049f3d9d296cb9701985f195240f169858ab53fcd1800a
+      inlined_ast: 56f47768e5e9fd7c26049f3d9d296cb9701985f195240f169858ab53fcd1800a
+      dce_ast: 56f47768e5e9fd7c26049f3d9d296cb9701985f195240f169858ab53fcd1800a
       bytecode: d7dd8a73bf281baa5edbf7c488b9752d703a092ec1840c0e35d830a7c6f9c007
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/negate.out b/tests/expectations/compiler/integers/i8/negate.out
index 5bb946b9f3..0ddaa35c74 100644
--- a/tests/expectations/compiler/integers/i8/negate.out
+++ b/tests/expectations/compiler/integers/i8/negate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 33e1939757f86007f579899c465eda408a0c11bf3749ab963703fd242b25aea2
-      unrolled_ast: 33e1939757f86007f579899c465eda408a0c11bf3749ab963703fd242b25aea2
-      ssa_ast: bd64f54bfea9b341ed73b8e282109a4424fb1e483525900c62ac8b222d1d5dc2
-      flattened_ast: bb30e90bf2271bb690d500975b6aba2e2397779b749006b8f599fe3c97f11454
-      inlined_ast: bb30e90bf2271bb690d500975b6aba2e2397779b749006b8f599fe3c97f11454
-      dce_ast: bb30e90bf2271bb690d500975b6aba2e2397779b749006b8f599fe3c97f11454
+  - - initial_ast: 040816f67e524380de3cd27a3cb56052e7c1fe655ce9d398748bb33eaf4729f4
+      unrolled_ast: 040816f67e524380de3cd27a3cb56052e7c1fe655ce9d398748bb33eaf4729f4
+      ssa_ast: 7807af8ce2a4a00abfa0831290f1c91d20a742899746b5f82f5e2ebd9b1d1925
+      flattened_ast: b7f1cb5a94a8d46a781e30c682f8a7bca29722c5232b32216a4d2de9171043ae
+      inlined_ast: b7f1cb5a94a8d46a781e30c682f8a7bca29722c5232b32216a4d2de9171043ae
+      dce_ast: b7f1cb5a94a8d46a781e30c682f8a7bca29722c5232b32216a4d2de9171043ae
       bytecode: 68da5691d330a6bcaa3f223f7a2140e1c01993fe61750a646efe6241bccb88c9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/negate_min_fail.out b/tests/expectations/compiler/integers/i8/negate_min_fail.out
index 836a285e54..d686617d66 100644
--- a/tests/expectations/compiler/integers/i8/negate_min_fail.out
+++ b/tests/expectations/compiler/integers/i8/negate_min_fail.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 17e989f72becd05e3c9aaefe0a3fdeae061fe3b682d3e67699a96aa5450f1999
-      unrolled_ast: 17e989f72becd05e3c9aaefe0a3fdeae061fe3b682d3e67699a96aa5450f1999
-      ssa_ast: 55227fcb22d4facfc1391a5e0f762c6f6a0d4d77f327d90caa080cff3de76f81
-      flattened_ast: da664b732f84d41f1b60f8b6ea43cf84433b25aa6f2c25517bc5c979c3729cb1
-      inlined_ast: da664b732f84d41f1b60f8b6ea43cf84433b25aa6f2c25517bc5c979c3729cb1
-      dce_ast: da664b732f84d41f1b60f8b6ea43cf84433b25aa6f2c25517bc5c979c3729cb1
+  - - initial_ast: 194e51fe9878292960394da39386a1dbcc1e977ee8416726c8fbd383b5bfbe5b
+      unrolled_ast: 194e51fe9878292960394da39386a1dbcc1e977ee8416726c8fbd383b5bfbe5b
+      ssa_ast: 0656d2da826be1737cb3c7c62c05188a29c65fec6d279c90884584a1d6fdc679
+      flattened_ast: 4031c6449a5c86fb0ce0dab472a134a05d56ff332d69cd8591ff3667a426fa30
+      inlined_ast: 4031c6449a5c86fb0ce0dab472a134a05d56ff332d69cd8591ff3667a426fa30
+      dce_ast: 4031c6449a5c86fb0ce0dab472a134a05d56ff332d69cd8591ff3667a426fa30
       bytecode: a4ebf23c558ad51c1a52d068bb7ac0b76d19edf6545cb32d068ab3206f87bef4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/negate_zero.out b/tests/expectations/compiler/integers/i8/negate_zero.out
index 43ebbcb250..8ace5256a3 100644
--- a/tests/expectations/compiler/integers/i8/negate_zero.out
+++ b/tests/expectations/compiler/integers/i8/negate_zero.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 68ce2b4dc8763f6623643f7833f8c49bebd688b6244738003986845ae1872605
-      unrolled_ast: 68ce2b4dc8763f6623643f7833f8c49bebd688b6244738003986845ae1872605
-      ssa_ast: e7f2820b1252bbb0de42ab35aad732c6bc4c5544c00a1dd07cf7a1581f5c6f39
-      flattened_ast: 34e399ca3a944babd90c3072fd082c97f3d039925701572e2ca36710c1af2781
-      inlined_ast: 34e399ca3a944babd90c3072fd082c97f3d039925701572e2ca36710c1af2781
-      dce_ast: 34e399ca3a944babd90c3072fd082c97f3d039925701572e2ca36710c1af2781
+  - - initial_ast: 91a818f3d71a2063e76aca390de35001265b6c477bd6a70a14f87ef9d484f400
+      unrolled_ast: 91a818f3d71a2063e76aca390de35001265b6c477bd6a70a14f87ef9d484f400
+      ssa_ast: 47b11751be1053b075c3ca03c9c335c9f2944189b83c9d9cd41d2fdeb1a67cf5
+      flattened_ast: ff0582578669d4d6ab3aa46c57b3ecde5151954169d83e3361529b12bb18ccbe
+      inlined_ast: ff0582578669d4d6ab3aa46c57b3ecde5151954169d83e3361529b12bb18ccbe
+      dce_ast: ff0582578669d4d6ab3aa46c57b3ecde5151954169d83e3361529b12bb18ccbe
       bytecode: d93c33f2a15e75c32e9a604904fecc39f063d4a2a3463240b68a401105a55053
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/operator_methods.out b/tests/expectations/compiler/integers/i8/operator_methods.out
index 4121817d61..7dc2686311 100644
--- a/tests/expectations/compiler/integers/i8/operator_methods.out
+++ b/tests/expectations/compiler/integers/i8/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c8b5f38cb3f15b6a0a36afdec33ddc9056a273559df74aa8aaf2a1ee89e851ef
-      unrolled_ast: c8b5f38cb3f15b6a0a36afdec33ddc9056a273559df74aa8aaf2a1ee89e851ef
-      ssa_ast: 28306194a8dcba77645240feab07d5bbcba791cfe7e619b41501e440a4c39eb4
-      flattened_ast: e38c60a0419909fc1c55e5fd27dd3a7d4607efc2a42d1a86169b4314eae2cb2f
-      inlined_ast: e38c60a0419909fc1c55e5fd27dd3a7d4607efc2a42d1a86169b4314eae2cb2f
-      dce_ast: c72763647bbb151691182bc3e7947f780cfda8e67f59e9fec48510e592e6adfe
+  - - initial_ast: dd7502bef653796f3b4d9656ef0a357606fca03f3f6010d219b7826fef9051cd
+      unrolled_ast: dd7502bef653796f3b4d9656ef0a357606fca03f3f6010d219b7826fef9051cd
+      ssa_ast: 373aa383a999fd4be546853244905e214f7e129c950f862dd8493e7e52328c93
+      flattened_ast: c6b39b142ca26000a889d632bbeb07e35ae6bb09fc5ad80ba7e48ef6f8c88eea
+      inlined_ast: c6b39b142ca26000a889d632bbeb07e35ae6bb09fc5ad80ba7e48ef6f8c88eea
+      dce_ast: 5f1ef69b9c7f65c3ed2d9b39c2b84c429526e8e0c4713d113b0b1e46900cae79
       bytecode: faddd6204de19b830842ea34e1f218276b8e8914ecd7fdbfd4143b0f08d305c1
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/or.out b/tests/expectations/compiler/integers/i8/or.out
index 74652c1b98..7c220a1c1b 100644
--- a/tests/expectations/compiler/integers/i8/or.out
+++ b/tests/expectations/compiler/integers/i8/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 795adf59a558f9a82ce8f23f665a85c07541cf8553e9b74bc7e2c7bf1e2dfb13
-      unrolled_ast: 795adf59a558f9a82ce8f23f665a85c07541cf8553e9b74bc7e2c7bf1e2dfb13
-      ssa_ast: 3b71c914c78543f9f316c822d0b711ea4dfa343d770331c01ba5fcec708fcc79
-      flattened_ast: e2f9753789312dc1b37f267c329446efd41a5c2a2d977868a2455a31dc66042a
-      inlined_ast: e2f9753789312dc1b37f267c329446efd41a5c2a2d977868a2455a31dc66042a
-      dce_ast: e2f9753789312dc1b37f267c329446efd41a5c2a2d977868a2455a31dc66042a
+  - - initial_ast: b69f37a395828629e6bfabf802ac501f778a9c0e7df55f80e06da50b55dc6025
+      unrolled_ast: b69f37a395828629e6bfabf802ac501f778a9c0e7df55f80e06da50b55dc6025
+      ssa_ast: 0346b6db0a2d40e9e57a6762c0be5ddfcd638c3cc93983276749c8cdc14bb8a0
+      flattened_ast: 5b0c9a5ab6c57707d1c461859f7264d9bca91c90be4262ce9b52a8ed93ebd5fe
+      inlined_ast: 5b0c9a5ab6c57707d1c461859f7264d9bca91c90be4262ce9b52a8ed93ebd5fe
+      dce_ast: 5b0c9a5ab6c57707d1c461859f7264d9bca91c90be4262ce9b52a8ed93ebd5fe
       bytecode: 4ea2659376ff2503f5dbf9e6bda9c9f13fb84dec3182bb626646806f874e00eb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/pow.out b/tests/expectations/compiler/integers/i8/pow.out
index 03fac3e949..911ba838d6 100644
--- a/tests/expectations/compiler/integers/i8/pow.out
+++ b/tests/expectations/compiler/integers/i8/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4ae6654eb3d0de876cf398fd983cd8211c7143f905c5ed6f5b70593271b22acf
-      unrolled_ast: 4ae6654eb3d0de876cf398fd983cd8211c7143f905c5ed6f5b70593271b22acf
-      ssa_ast: 1590a53bf4f920e6082cc802c3b3db58c9aa2445be661690fa57af0773b66203
-      flattened_ast: 798e2742fbac376f7a3786b008da78cf8128dc73e311479732b11a6b42edf745
-      inlined_ast: 798e2742fbac376f7a3786b008da78cf8128dc73e311479732b11a6b42edf745
-      dce_ast: 798e2742fbac376f7a3786b008da78cf8128dc73e311479732b11a6b42edf745
+  - - initial_ast: 093ce4ebb14cdcf0d1c08145dbb531bae9c202b18c94ee9d44ec96916f4f9d43
+      unrolled_ast: 093ce4ebb14cdcf0d1c08145dbb531bae9c202b18c94ee9d44ec96916f4f9d43
+      ssa_ast: 3ddf4fea39e76fc452cb9385cd9bdc53042fda424034ca10d530956ff13a511f
+      flattened_ast: 18345adc230fee4157150d4ff37ccb7078a346a9be14c8adc564e7c5e41d7b87
+      inlined_ast: 18345adc230fee4157150d4ff37ccb7078a346a9be14c8adc564e7c5e41d7b87
+      dce_ast: 18345adc230fee4157150d4ff37ccb7078a346a9be14c8adc564e7c5e41d7b87
       bytecode: edd5ec13303284be804f592351207aa0ac4c7c6e0c0b7f9a6377f8b75e0d377e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/rem.out b/tests/expectations/compiler/integers/i8/rem.out
index 62e5db6527..29d9daa0d0 100644
--- a/tests/expectations/compiler/integers/i8/rem.out
+++ b/tests/expectations/compiler/integers/i8/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 65f1aa7de58cf3c0ffb52de86a17d5c9218306fc9318e12c2e920c4737f41ff4
-      unrolled_ast: 65f1aa7de58cf3c0ffb52de86a17d5c9218306fc9318e12c2e920c4737f41ff4
-      ssa_ast: 69bf9e080e23b5d9b738491e3fdc5d006d924d61129deda7c4a510275df0fa0f
-      flattened_ast: 001278dbebd3994494e74600d7b0fc6c038008190ef88312709d274971a67e1c
-      inlined_ast: 001278dbebd3994494e74600d7b0fc6c038008190ef88312709d274971a67e1c
-      dce_ast: 001278dbebd3994494e74600d7b0fc6c038008190ef88312709d274971a67e1c
+  - - initial_ast: 16f6dc0498a02799052ae0834e16ad8c3c21fb5d11a2c76b97cac08f7e5e8b3d
+      unrolled_ast: 16f6dc0498a02799052ae0834e16ad8c3c21fb5d11a2c76b97cac08f7e5e8b3d
+      ssa_ast: b1ad53cac80d29b3803acf8988162e3209712d07e8c9b56392708df6ce2de602
+      flattened_ast: 072b62665ccde81685e91b82577eba049fd5442fc7a43f5ce2dc280be939bbf0
+      inlined_ast: 072b62665ccde81685e91b82577eba049fd5442fc7a43f5ce2dc280be939bbf0
+      dce_ast: 072b62665ccde81685e91b82577eba049fd5442fc7a43f5ce2dc280be939bbf0
       bytecode: 34eda0edb2d4048d2b3e2ea19e929f063903b4ca94d90f8a0e1525a0bb2d0134
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/shl.out b/tests/expectations/compiler/integers/i8/shl.out
index d5eff8904b..56b7d302c9 100644
--- a/tests/expectations/compiler/integers/i8/shl.out
+++ b/tests/expectations/compiler/integers/i8/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 11c7bea2286ee4c6fc496d534f39bfe48f92815c8e36aee9ec37dd26caef6b14
-      unrolled_ast: 11c7bea2286ee4c6fc496d534f39bfe48f92815c8e36aee9ec37dd26caef6b14
-      ssa_ast: 2dbc6ff6ace53e30b5fdd515c8ff2559e99b7d0acfa4844af2e9575c88d13a12
-      flattened_ast: ceb90339fd5d1bf2b049b36b9673a213be8f7bb47d31ba3755fb80005c6fd29f
-      inlined_ast: ceb90339fd5d1bf2b049b36b9673a213be8f7bb47d31ba3755fb80005c6fd29f
-      dce_ast: ceb90339fd5d1bf2b049b36b9673a213be8f7bb47d31ba3755fb80005c6fd29f
+  - - initial_ast: 183bc04f1d21690c6cea4938d8172b01a8718a1104298e475538353cc233c1b2
+      unrolled_ast: 183bc04f1d21690c6cea4938d8172b01a8718a1104298e475538353cc233c1b2
+      ssa_ast: 3cc8079c0ba523325306cdd973a3c75776ed6a778aa1a37cdcc08bcd6da8b2e2
+      flattened_ast: 70b35bb9803dd5a9fe0560e75bd185d2baa1b79620059cf4db0365944a1a68d0
+      inlined_ast: 70b35bb9803dd5a9fe0560e75bd185d2baa1b79620059cf4db0365944a1a68d0
+      dce_ast: 70b35bb9803dd5a9fe0560e75bd185d2baa1b79620059cf4db0365944a1a68d0
       bytecode: 307c17323af8fd5de808a828e634ce97419a0ba67815102016fab6c883b7e052
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/shr.out b/tests/expectations/compiler/integers/i8/shr.out
index 78af489794..f9ee3cd18a 100644
--- a/tests/expectations/compiler/integers/i8/shr.out
+++ b/tests/expectations/compiler/integers/i8/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8315c15617f1f4c3dbd657810e054d3e720a0f76af33d9cc475b0dae54295735
-      unrolled_ast: 8315c15617f1f4c3dbd657810e054d3e720a0f76af33d9cc475b0dae54295735
-      ssa_ast: 365099670c2dbd5753c7c9476e46afd1f48e7382754f2b725d13dd8dc1bde3eb
-      flattened_ast: 04b63dca056ab5f9bada97bc093dde943bdcb2543f35043cc13400d0a642cd4a
-      inlined_ast: 04b63dca056ab5f9bada97bc093dde943bdcb2543f35043cc13400d0a642cd4a
-      dce_ast: 04b63dca056ab5f9bada97bc093dde943bdcb2543f35043cc13400d0a642cd4a
+  - - initial_ast: b86b5e7d2628ba759cbcfb812424b2641e5c3dcad11e2467999dfa08016aa8a6
+      unrolled_ast: b86b5e7d2628ba759cbcfb812424b2641e5c3dcad11e2467999dfa08016aa8a6
+      ssa_ast: fcc241f39cf2e87a993c85db347d51957bd546f81f16531f6392ba031fb9ad37
+      flattened_ast: 08c0e00e444a95360b8541d584adec68f2d9bacaf5887c4909803b647a231b0f
+      inlined_ast: 08c0e00e444a95360b8541d584adec68f2d9bacaf5887c4909803b647a231b0f
+      dce_ast: 08c0e00e444a95360b8541d584adec68f2d9bacaf5887c4909803b647a231b0f
       bytecode: e0110365aec2e78cbf8f7accb85b8c7e36d2c606cdd6a4cafd02a2b4dc7dfe38
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/sub.out b/tests/expectations/compiler/integers/i8/sub.out
index ad8f70d968..a6846ca323 100644
--- a/tests/expectations/compiler/integers/i8/sub.out
+++ b/tests/expectations/compiler/integers/i8/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fd66b54917cc441ef49eca9f6fa13dd535f2df492cdbaac71649b36cfb356758
-      unrolled_ast: fd66b54917cc441ef49eca9f6fa13dd535f2df492cdbaac71649b36cfb356758
-      ssa_ast: da89c4341b9458763e2173e90e30a752a5fee7915aa9a80c25d98c173ed5fd66
-      flattened_ast: ce73901cef2507b9c698f41142c3884c85ffc06a17fe3e97b87f56e32ce40158
-      inlined_ast: ce73901cef2507b9c698f41142c3884c85ffc06a17fe3e97b87f56e32ce40158
-      dce_ast: ce73901cef2507b9c698f41142c3884c85ffc06a17fe3e97b87f56e32ce40158
+  - - initial_ast: b0626431db72632c7ef8d457337bfca536c6a4130d10120f5c5a27c72e2851a1
+      unrolled_ast: b0626431db72632c7ef8d457337bfca536c6a4130d10120f5c5a27c72e2851a1
+      ssa_ast: b2216167eaa4893cfecafc80c86e7465147e87113a081736a9e16739a5320595
+      flattened_ast: 1f7cac21b145040dbcedb62a66986c461d37981c2a2f79ab99edf51cf274e7df
+      inlined_ast: 1f7cac21b145040dbcedb62a66986c461d37981c2a2f79ab99edf51cf274e7df
+      dce_ast: 1f7cac21b145040dbcedb62a66986c461d37981c2a2f79ab99edf51cf274e7df
       bytecode: 6638d0f711e011432b8371bf648e0903f22612d062139a650ebe4d75783a8393
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/ternary.out b/tests/expectations/compiler/integers/i8/ternary.out
index 8d8e9c4d74..7406198e8d 100644
--- a/tests/expectations/compiler/integers/i8/ternary.out
+++ b/tests/expectations/compiler/integers/i8/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9e6fdee915db349b94d34e2f43d7af9a7824c28afa3a277fc717a9cc2bc68023
-      unrolled_ast: 9e6fdee915db349b94d34e2f43d7af9a7824c28afa3a277fc717a9cc2bc68023
-      ssa_ast: f02a4cfadfbcbe21941d8ce5a4a66bf93c098e91980631e9e0a0d2f408f7df10
-      flattened_ast: 79ecd77af9960a151beab0c81ce1be6abbd5837322c5b1550c9d8b8079bcf7ea
-      inlined_ast: 79ecd77af9960a151beab0c81ce1be6abbd5837322c5b1550c9d8b8079bcf7ea
-      dce_ast: 79ecd77af9960a151beab0c81ce1be6abbd5837322c5b1550c9d8b8079bcf7ea
+  - - initial_ast: 70fd1d8c1011cb78f97ac5409a225615a9b44fed3310a64b5e130f13bcb97516
+      unrolled_ast: 70fd1d8c1011cb78f97ac5409a225615a9b44fed3310a64b5e130f13bcb97516
+      ssa_ast: d05adbb4f4fbde79076ec41b0c51284f339160755eb3a4cc626fd35ca7ba7e59
+      flattened_ast: 20479528b9629b239825a58ea330247ec78c4323550646a7380f934d47de0548
+      inlined_ast: 20479528b9629b239825a58ea330247ec78c4323550646a7380f934d47de0548
+      dce_ast: 20479528b9629b239825a58ea330247ec78c4323550646a7380f934d47de0548
       bytecode: 61eac30d1e0b3a4fa0357855b11e228b012203b9cd2f814c0faa660a2be5996d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/i8/xor.out b/tests/expectations/compiler/integers/i8/xor.out
index caed9b79ee..bd9960a2e5 100644
--- a/tests/expectations/compiler/integers/i8/xor.out
+++ b/tests/expectations/compiler/integers/i8/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 81bc75821111b33a00169c6d27dd2af0fe7d5310c9d71cd1b398a0ba06193903
-      unrolled_ast: 81bc75821111b33a00169c6d27dd2af0fe7d5310c9d71cd1b398a0ba06193903
-      ssa_ast: 8d507af2ef133c847aaaccce5e1f87f18d33f108a33ea85b0293d4d933b08a15
-      flattened_ast: 48ec214d72c468ec1af1447739e354cd5c4ffaa186365e9dcf4cbf12d8cfe47e
-      inlined_ast: 48ec214d72c468ec1af1447739e354cd5c4ffaa186365e9dcf4cbf12d8cfe47e
-      dce_ast: 48ec214d72c468ec1af1447739e354cd5c4ffaa186365e9dcf4cbf12d8cfe47e
+  - - initial_ast: 5d7d8dd4538f728348d600099e24171ffae208b3d08f965a468e8672e1435cb1
+      unrolled_ast: 5d7d8dd4538f728348d600099e24171ffae208b3d08f965a468e8672e1435cb1
+      ssa_ast: 173a56c74307076727f79c0a8349c0a1d1f139c0c8b37f91ba1bd105c38ba824
+      flattened_ast: 50c5dc3dff7a1d333b1c8a13be1a5446b0e8c57928b19bae68531d3134f3d6da
+      inlined_ast: 50c5dc3dff7a1d333b1c8a13be1a5446b0e8c57928b19bae68531d3134f3d6da
+      dce_ast: 50c5dc3dff7a1d333b1c8a13be1a5446b0e8c57928b19bae68531d3134f3d6da
       bytecode: 219e0ef5cb7c0ac1ecb9541920637d11e5f48c5e52adab2060e6ed389647eee4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/add.out b/tests/expectations/compiler/integers/u128/add.out
index 27f6294bf0..60f316ce03 100644
--- a/tests/expectations/compiler/integers/u128/add.out
+++ b/tests/expectations/compiler/integers/u128/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 08101cd97183e6dee8892feaced8a53474df5294d2696dab6edae85638c62e55
-      unrolled_ast: 08101cd97183e6dee8892feaced8a53474df5294d2696dab6edae85638c62e55
-      ssa_ast: 238362ba03774889257aae062c7ce81ad2f1015cd8b1e9102abeedd2576b5dc9
-      flattened_ast: 3e6e016c36fc6bc54f8e5c509fcfa2c70a63097c3002863160b72463a081fc42
-      inlined_ast: 3e6e016c36fc6bc54f8e5c509fcfa2c70a63097c3002863160b72463a081fc42
-      dce_ast: 3e6e016c36fc6bc54f8e5c509fcfa2c70a63097c3002863160b72463a081fc42
+  - - initial_ast: 8b6766c9bd596a30226ae74d9608242a9b5fe27938ef09fa8cce819a79aa49d6
+      unrolled_ast: 8b6766c9bd596a30226ae74d9608242a9b5fe27938ef09fa8cce819a79aa49d6
+      ssa_ast: f343f59b5d52d8d66d140a9b83b1ca11518d25d0f22cdb933cc02cc341a7dec3
+      flattened_ast: 5c6226b3fbba9906b986beebbedc6605c35c53dfd6e48683851612530384b5d0
+      inlined_ast: 5c6226b3fbba9906b986beebbedc6605c35c53dfd6e48683851612530384b5d0
+      dce_ast: 5c6226b3fbba9906b986beebbedc6605c35c53dfd6e48683851612530384b5d0
       bytecode: 2d327c3f6b7f23cc5f8e292ef00cf94df2fa9afad2bc8fe26ca28dc6f338d2cc
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/and.out b/tests/expectations/compiler/integers/u128/and.out
index 1e04209e57..30042b0387 100644
--- a/tests/expectations/compiler/integers/u128/and.out
+++ b/tests/expectations/compiler/integers/u128/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8131d22ee501b24e6597fd66cd48adc967e1e8f6d21c783ca63ad5b0af29dd56
-      unrolled_ast: 8131d22ee501b24e6597fd66cd48adc967e1e8f6d21c783ca63ad5b0af29dd56
-      ssa_ast: 48752b130fa243ddc60dcf002ceea105c04b70af7274b0e09014b6b8a8db3763
-      flattened_ast: aea1c8054f2d42624a4ea6fa52468549dc6907b034f2e721900f1e4f2cd25cb2
-      inlined_ast: aea1c8054f2d42624a4ea6fa52468549dc6907b034f2e721900f1e4f2cd25cb2
-      dce_ast: aea1c8054f2d42624a4ea6fa52468549dc6907b034f2e721900f1e4f2cd25cb2
+  - - initial_ast: 41683b1ee4abd74e7c6501ec5c0ce122f8bf98fc5e4f388791dfc240bd11a027
+      unrolled_ast: 41683b1ee4abd74e7c6501ec5c0ce122f8bf98fc5e4f388791dfc240bd11a027
+      ssa_ast: e2b0dd9fcdd8b4a5117b87e3879e83a05377e219bf691625312d853a632fd6fb
+      flattened_ast: 6f686b14ac0e3524ada5fbc0ff3718b5899c800c0fe9b50fa14846439fc830d4
+      inlined_ast: 6f686b14ac0e3524ada5fbc0ff3718b5899c800c0fe9b50fa14846439fc830d4
+      dce_ast: 6f686b14ac0e3524ada5fbc0ff3718b5899c800c0fe9b50fa14846439fc830d4
       bytecode: 5400590002c3acc5121a18ff585e8ca17b695e7486ea09a61cb2520dfd09f413
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/console_assert.out b/tests/expectations/compiler/integers/u128/console_assert.out
index d7296a657b..d1b19e2719 100644
--- a/tests/expectations/compiler/integers/u128/console_assert.out
+++ b/tests/expectations/compiler/integers/u128/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 17891ba94f703111a24d1bc1737c01da700dba9cebfca4986964edebe27948bf
-      unrolled_ast: 17891ba94f703111a24d1bc1737c01da700dba9cebfca4986964edebe27948bf
-      ssa_ast: ced728a21903608fb2e9e0ce6fbc576e7aa21d0f08929989320f4946dda62577
-      flattened_ast: 1d5a3dd33bccafae400be0bbeb6610c3e1e1cd5c8904bf3947bc9069056fa0da
-      inlined_ast: 1d5a3dd33bccafae400be0bbeb6610c3e1e1cd5c8904bf3947bc9069056fa0da
-      dce_ast: 1d5a3dd33bccafae400be0bbeb6610c3e1e1cd5c8904bf3947bc9069056fa0da
+  - - initial_ast: f1c1858a9944b3c30d0cf143577798de2c6072b0e2c050658c40d3d9d5675648
+      unrolled_ast: f1c1858a9944b3c30d0cf143577798de2c6072b0e2c050658c40d3d9d5675648
+      ssa_ast: 05509b5ecb539ce40927f991d758abb5d782799cc61fd6012436acd1a78dd0c7
+      flattened_ast: dab38b9c328709f96771fa3f36f1bcb783902b5d85e41f9add60ab936aaa984e
+      inlined_ast: dab38b9c328709f96771fa3f36f1bcb783902b5d85e41f9add60ab936aaa984e
+      dce_ast: dab38b9c328709f96771fa3f36f1bcb783902b5d85e41f9add60ab936aaa984e
       bytecode: 0d83f401cd41e95e3c0df3dc876c4f162207f2073c8e550beca92e21ef07a3b9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/div.out b/tests/expectations/compiler/integers/u128/div.out
index 9c2c21e28a..31ea7bae58 100644
--- a/tests/expectations/compiler/integers/u128/div.out
+++ b/tests/expectations/compiler/integers/u128/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0c031401acedf30a8f5828453235aea935bb245f268438038925efda5498802c
-      unrolled_ast: 0c031401acedf30a8f5828453235aea935bb245f268438038925efda5498802c
-      ssa_ast: d9c09ea4711b2cb6311825fe63c0f219b11a9f11cb4a19de91fc550cbf67b7bc
-      flattened_ast: cdfa3a232d6f6f73f2e4ab2cb76e56ff073eeecd5f1bd3a38cadd8f806985b98
-      inlined_ast: cdfa3a232d6f6f73f2e4ab2cb76e56ff073eeecd5f1bd3a38cadd8f806985b98
-      dce_ast: cdfa3a232d6f6f73f2e4ab2cb76e56ff073eeecd5f1bd3a38cadd8f806985b98
+  - - initial_ast: 296bb708b5f9eedb44c36fe60853a2613ed3f646f573708bf362b6ea7a9a7601
+      unrolled_ast: 296bb708b5f9eedb44c36fe60853a2613ed3f646f573708bf362b6ea7a9a7601
+      ssa_ast: a1d0458af97622d48e0b637b684bc18033b303111af389061a0d606ef5816823
+      flattened_ast: e7bd13716f8371ac3ed6e8714155abd2c2213f11971f66499a1acb90be470913
+      inlined_ast: e7bd13716f8371ac3ed6e8714155abd2c2213f11971f66499a1acb90be470913
+      dce_ast: e7bd13716f8371ac3ed6e8714155abd2c2213f11971f66499a1acb90be470913
       bytecode: 1ca018f3c002538884233e7f1e7dee0584a346f54675e78fb69af2c90d7d32e8
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/eq.out b/tests/expectations/compiler/integers/u128/eq.out
index 2f94943f1e..5311e3d9a2 100644
--- a/tests/expectations/compiler/integers/u128/eq.out
+++ b/tests/expectations/compiler/integers/u128/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e2ec13411416a7d78f9470f45ebed5016b8b914edc27fe1175ccc046bc7503fd
-      unrolled_ast: e2ec13411416a7d78f9470f45ebed5016b8b914edc27fe1175ccc046bc7503fd
-      ssa_ast: 880651626368402501752011aaf1f4ff340ce9696368a2e4177baf9184694479
-      flattened_ast: 415d2592a7de040c6587aebb2d1f17e8a19d278fc3ef30fbc6fb8800f3816e9a
-      inlined_ast: 415d2592a7de040c6587aebb2d1f17e8a19d278fc3ef30fbc6fb8800f3816e9a
-      dce_ast: 415d2592a7de040c6587aebb2d1f17e8a19d278fc3ef30fbc6fb8800f3816e9a
+  - - initial_ast: 3dec0d948f502adcd945456d89a5fbdd3583cb0852650f0bd2b1320bbbd684fa
+      unrolled_ast: 3dec0d948f502adcd945456d89a5fbdd3583cb0852650f0bd2b1320bbbd684fa
+      ssa_ast: ddb3881d6113a3d0ce29201430e5e2da4fcc64b780bb36a8c87845d73d22e686
+      flattened_ast: 03a918c0dfa676ac433fbde6adf689f60c7a369c8c2e3a82faeda78d159df311
+      inlined_ast: 03a918c0dfa676ac433fbde6adf689f60c7a369c8c2e3a82faeda78d159df311
+      dce_ast: 03a918c0dfa676ac433fbde6adf689f60c7a369c8c2e3a82faeda78d159df311
       bytecode: 38011d05593d9cf5baa1fca933e8155d3154ad934a4b0ae9d67111b324875f86
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/ge.out b/tests/expectations/compiler/integers/u128/ge.out
index 26e1df630e..5a8f0c5a9b 100644
--- a/tests/expectations/compiler/integers/u128/ge.out
+++ b/tests/expectations/compiler/integers/u128/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f6a4ee0f2f0e6f6d4a35e89bb654727edc8ad7b5ffe867d4711a29ca35920579
-      unrolled_ast: f6a4ee0f2f0e6f6d4a35e89bb654727edc8ad7b5ffe867d4711a29ca35920579
-      ssa_ast: 004c98f8f6d7f0040eb87a3e815367d0d991c620934571ffc92c886c80bc9dea
-      flattened_ast: 3acc906d5020c345515121ea306ecbe2d2493a83c059bfcffb97ce72dc28f6ec
-      inlined_ast: 3acc906d5020c345515121ea306ecbe2d2493a83c059bfcffb97ce72dc28f6ec
-      dce_ast: 3acc906d5020c345515121ea306ecbe2d2493a83c059bfcffb97ce72dc28f6ec
+  - - initial_ast: b9a24233cd7596aa1cac9eb7938e758e5c205c61ddddf293dd0a8468445d346e
+      unrolled_ast: b9a24233cd7596aa1cac9eb7938e758e5c205c61ddddf293dd0a8468445d346e
+      ssa_ast: ec7384873d81ba876e2bb5997206c5e87accfea648abf395f317098974438568
+      flattened_ast: 63a5ef02f1f10f29240ae3d5b7beb4c65c235d5be7dec6cc93b8a2689337a8b6
+      inlined_ast: 63a5ef02f1f10f29240ae3d5b7beb4c65c235d5be7dec6cc93b8a2689337a8b6
+      dce_ast: 63a5ef02f1f10f29240ae3d5b7beb4c65c235d5be7dec6cc93b8a2689337a8b6
       bytecode: 92057edeaefa3fca292e9539868a1d2004a4ff6161d837428e1acff9ae8e0298
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/gt.out b/tests/expectations/compiler/integers/u128/gt.out
index edd0700eb9..a7d51c8b05 100644
--- a/tests/expectations/compiler/integers/u128/gt.out
+++ b/tests/expectations/compiler/integers/u128/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3b1138715c7227a546d0b4e8e3730e95ea9177638e3266105f9780963eab6f93
-      unrolled_ast: 3b1138715c7227a546d0b4e8e3730e95ea9177638e3266105f9780963eab6f93
-      ssa_ast: 098a2d3ab780a46084a1a707225ed2f12a7ed1409422602bb837ff63f71ed18b
-      flattened_ast: 74f3227e50fc387f83462f29625ecd3ac5722e15ee7b1d18a64ca144044732cc
-      inlined_ast: 74f3227e50fc387f83462f29625ecd3ac5722e15ee7b1d18a64ca144044732cc
-      dce_ast: 74f3227e50fc387f83462f29625ecd3ac5722e15ee7b1d18a64ca144044732cc
+  - - initial_ast: 5be6262a56e0c13a77d3e090c98a217fd7fe74534697333c5fbe1c3ef83837d0
+      unrolled_ast: 5be6262a56e0c13a77d3e090c98a217fd7fe74534697333c5fbe1c3ef83837d0
+      ssa_ast: b34e38b80e5adae841753e4c40091b47b026377f6adfcc958a539fa04ca9c09f
+      flattened_ast: 219671beb4581d84715d2bb71a203448c9c1e033c836285cc7e205099e1d979f
+      inlined_ast: 219671beb4581d84715d2bb71a203448c9c1e033c836285cc7e205099e1d979f
+      dce_ast: 219671beb4581d84715d2bb71a203448c9c1e033c836285cc7e205099e1d979f
       bytecode: 14a4cbf43177cac769cf5e4befa2689f01a6755871f5fd288664ffff22e498c5
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/le.out b/tests/expectations/compiler/integers/u128/le.out
index ae424d1816..8ac80a5df0 100644
--- a/tests/expectations/compiler/integers/u128/le.out
+++ b/tests/expectations/compiler/integers/u128/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 55f82e5c16b9548a2c3762977935721d5cf01933bddb55f80a4212350a8c1c9b
-      unrolled_ast: 55f82e5c16b9548a2c3762977935721d5cf01933bddb55f80a4212350a8c1c9b
-      ssa_ast: 58d4f99469f5951b2e64cd1cff2dc6a41125d62334aca50f5e1ce4131a8735d2
-      flattened_ast: 3b6a7a652b091029f90c206f181d75ebc5ec28aa0c2c8d0f07849173c72dccdc
-      inlined_ast: 3b6a7a652b091029f90c206f181d75ebc5ec28aa0c2c8d0f07849173c72dccdc
-      dce_ast: 3b6a7a652b091029f90c206f181d75ebc5ec28aa0c2c8d0f07849173c72dccdc
+  - - initial_ast: ff91cadca88e5d9ff6c7265e1bf2e0e077ec587ad5d5fbca8eb77ca2263e5a26
+      unrolled_ast: ff91cadca88e5d9ff6c7265e1bf2e0e077ec587ad5d5fbca8eb77ca2263e5a26
+      ssa_ast: 001cad050af8bdeb688de6e05ae303935ddd14fece9190268bceeecdbcb3d53a
+      flattened_ast: e9b603673c4a7d4515078f3fa37044dc3d92287bc251e3317655853932f9903d
+      inlined_ast: e9b603673c4a7d4515078f3fa37044dc3d92287bc251e3317655853932f9903d
+      dce_ast: e9b603673c4a7d4515078f3fa37044dc3d92287bc251e3317655853932f9903d
       bytecode: 6a2f064cee58782422db7fc88c4395f7e18281c9bf22e8b7546a054712482d8e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/lt.out b/tests/expectations/compiler/integers/u128/lt.out
index 3b5b844723..ec233c45b4 100644
--- a/tests/expectations/compiler/integers/u128/lt.out
+++ b/tests/expectations/compiler/integers/u128/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5bb77db6b81afced6894592224fe61cc24ac85cb3b840de1a6dc68f4374c721f
-      unrolled_ast: 5bb77db6b81afced6894592224fe61cc24ac85cb3b840de1a6dc68f4374c721f
-      ssa_ast: 30914c1ea61fe4f47ee4949a971d114afea4dba209a0631a76449d35d601de2f
-      flattened_ast: 18dae006f467026c37ab3b73744967fb93d12ad789734ef100b2cd3033df2561
-      inlined_ast: 18dae006f467026c37ab3b73744967fb93d12ad789734ef100b2cd3033df2561
-      dce_ast: 18dae006f467026c37ab3b73744967fb93d12ad789734ef100b2cd3033df2561
+  - - initial_ast: 3534ab04f556a8b466b3dae6f6338a3a3b7d43c6bfb050f24dc8ae032a399818
+      unrolled_ast: 3534ab04f556a8b466b3dae6f6338a3a3b7d43c6bfb050f24dc8ae032a399818
+      ssa_ast: 6fbf5d7ba49b4f4dceaea901f6e12e57e34006cca70075de99f7ca16a1c43439
+      flattened_ast: fc63ce36036856e75cb7fc6d235b18062f2d1edd79d640185334fe6c95061fa0
+      inlined_ast: fc63ce36036856e75cb7fc6d235b18062f2d1edd79d640185334fe6c95061fa0
+      dce_ast: fc63ce36036856e75cb7fc6d235b18062f2d1edd79d640185334fe6c95061fa0
       bytecode: 459e412ddd219e315cc1ef6bf05f9b2490bae8dc003dcefc25f5976b8ff053f4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/max.out b/tests/expectations/compiler/integers/u128/max.out
index 27e652dcff..8be97d8116 100644
--- a/tests/expectations/compiler/integers/u128/max.out
+++ b/tests/expectations/compiler/integers/u128/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 79c897fbcf7c18abea98b7c3c258f955e01fe6960132a656a3b5b36ae1dc6d2f
-      unrolled_ast: 79c897fbcf7c18abea98b7c3c258f955e01fe6960132a656a3b5b36ae1dc6d2f
-      ssa_ast: a6212907b686b6a2f7accd64781f98f260b3d257ed62f32cf5629993c9eb81cc
-      flattened_ast: 768de7cec18f52cf575f5c5937a829d7ffbcdfa37a555a61eee54b05c2a8efd6
-      inlined_ast: 768de7cec18f52cf575f5c5937a829d7ffbcdfa37a555a61eee54b05c2a8efd6
-      dce_ast: 1c35be315bebfa2c6d81bb23e85f24ad912a56e6ad76db45fcfa9a5cd8c9990e
+  - - initial_ast: dfd0e71d05dea45152396daa70f8aa5d1c4336353bb7d7b98c74c4022eb964ef
+      unrolled_ast: dfd0e71d05dea45152396daa70f8aa5d1c4336353bb7d7b98c74c4022eb964ef
+      ssa_ast: 8c7560223c184d697ed6a5d5e009ddbddd26d3d7fb83fb6ed4915e42ec6d49cc
+      flattened_ast: 9cc20fdc43806fd6b90a4fb49676101a4c004bf0d0a57698580abc97a05212a1
+      inlined_ast: 9cc20fdc43806fd6b90a4fb49676101a4c004bf0d0a57698580abc97a05212a1
+      dce_ast: c84af0bc3da1ab2a18b439be658555a7284af8d9f1a99fdb9f8050f064438d53
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/min.out b/tests/expectations/compiler/integers/u128/min.out
index 1fb56c6906..2e14a9dae0 100644
--- a/tests/expectations/compiler/integers/u128/min.out
+++ b/tests/expectations/compiler/integers/u128/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c43981549e0bfb981d89598c806e81c9227a829a00752cea0b76cd6cf9cfa149
-      unrolled_ast: c43981549e0bfb981d89598c806e81c9227a829a00752cea0b76cd6cf9cfa149
-      ssa_ast: 081573a01bc6344adf23f4ef351acf460b4e4fb2e5176f6609bdf93944b274b7
-      flattened_ast: 3ae3722b4ba125030d051d1415b8e66e66f61c9454e1ba1f0b9384688fc52a5b
-      inlined_ast: 3ae3722b4ba125030d051d1415b8e66e66f61c9454e1ba1f0b9384688fc52a5b
-      dce_ast: 318848fe721599dd8959ef4f6c0f5f4a50afb2e4ec23178b2ea459b93fa172ab
+  - - initial_ast: 0db996a10c54470f9295f198b5343ea9c70506e26694671e48c1f7510cbdbbfa
+      unrolled_ast: 0db996a10c54470f9295f198b5343ea9c70506e26694671e48c1f7510cbdbbfa
+      ssa_ast: c91834651ed7167637e3d6cbd6ee00676a813a86d4aa7951e6991011a11ae572
+      flattened_ast: f1bff0e85549d2ccda455a2b5dd4e6c438d2041f0df11424177937c970e41dd0
+      inlined_ast: f1bff0e85549d2ccda455a2b5dd4e6c438d2041f0df11424177937c970e41dd0
+      dce_ast: e1e93392a1c9f7b954220cf007e5cd7c1bc87eb7cb1f514396330ab825aaca80
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/mul.out b/tests/expectations/compiler/integers/u128/mul.out
index d662e4abcc..3a94715963 100644
--- a/tests/expectations/compiler/integers/u128/mul.out
+++ b/tests/expectations/compiler/integers/u128/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e79404e69b8dda63c8fc900342750c70cc8bdea274a6c1ff629e240efdaf723f
-      unrolled_ast: e79404e69b8dda63c8fc900342750c70cc8bdea274a6c1ff629e240efdaf723f
-      ssa_ast: 8d8ac46f38ca27253dbe61f122b6838d713494b52577e1976613ca32c4070b06
-      flattened_ast: 4f6871bd9c14fcac9de457a403f633860504bf2d3065c065dbacc48a18a72bdf
-      inlined_ast: 4f6871bd9c14fcac9de457a403f633860504bf2d3065c065dbacc48a18a72bdf
-      dce_ast: 4f6871bd9c14fcac9de457a403f633860504bf2d3065c065dbacc48a18a72bdf
+  - - initial_ast: c7c3110dd09e2b44530f6556c8a99d2eeb14a48054d9e1a29003b833693dcca8
+      unrolled_ast: c7c3110dd09e2b44530f6556c8a99d2eeb14a48054d9e1a29003b833693dcca8
+      ssa_ast: b6422ad03100bbe95aacbbeffcdd6371684a82858e617b6ac3512013dd0bfdde
+      flattened_ast: 885b9c6d34e608e44055d3ff436e7ce3908f6590d6b5266d764fd749b2e1249a
+      inlined_ast: 885b9c6d34e608e44055d3ff436e7ce3908f6590d6b5266d764fd749b2e1249a
+      dce_ast: 885b9c6d34e608e44055d3ff436e7ce3908f6590d6b5266d764fd749b2e1249a
       bytecode: 67857a350a412ed022768ab4aaa6387e63e548b7dc0b552dcb061b719abc90bb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/ne.out b/tests/expectations/compiler/integers/u128/ne.out
index 6a59b23cd2..03fc5bb88b 100644
--- a/tests/expectations/compiler/integers/u128/ne.out
+++ b/tests/expectations/compiler/integers/u128/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d8de38ac73be31f2483c3bd9c31f48ec0539960710347258fe6cab2943eef1d3
-      unrolled_ast: d8de38ac73be31f2483c3bd9c31f48ec0539960710347258fe6cab2943eef1d3
-      ssa_ast: 859d0dd45e99383198bb1bf627c08f110bfd10018948d18f5b4183f48b1f0a32
-      flattened_ast: 86e6f89615d38bc0948271dcd69162553ac7035090f99d6a871bbe7344bff518
-      inlined_ast: 86e6f89615d38bc0948271dcd69162553ac7035090f99d6a871bbe7344bff518
-      dce_ast: 86e6f89615d38bc0948271dcd69162553ac7035090f99d6a871bbe7344bff518
+  - - initial_ast: 75ef12e2b1a4de03a936fd441f91bbd3c9887c2fe0380d2fa88892c601b4d940
+      unrolled_ast: 75ef12e2b1a4de03a936fd441f91bbd3c9887c2fe0380d2fa88892c601b4d940
+      ssa_ast: 84aebd9f6f432b8ec6e2b8666ab5b2d98e11d7459399c7d2981557e33c77c8b2
+      flattened_ast: 628700511ec4203d2d0dc1b472d03c4a577dfb424e502fced48f7ddd5902cf29
+      inlined_ast: 628700511ec4203d2d0dc1b472d03c4a577dfb424e502fced48f7ddd5902cf29
+      dce_ast: 628700511ec4203d2d0dc1b472d03c4a577dfb424e502fced48f7ddd5902cf29
       bytecode: 63457f4ddad404af243d9707a6e9e6f6f878cb639895a110bca73b804395bd14
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/operator_methods.out b/tests/expectations/compiler/integers/u128/operator_methods.out
index 43f1a953a5..45ed7a0291 100644
--- a/tests/expectations/compiler/integers/u128/operator_methods.out
+++ b/tests/expectations/compiler/integers/u128/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cf8ede4548ded98c65a9cd93ad60d9a20d3782af71df2c0947262af711331e03
-      unrolled_ast: cf8ede4548ded98c65a9cd93ad60d9a20d3782af71df2c0947262af711331e03
-      ssa_ast: 40c60108bad83666a9219038ad49a395cc59f6d9c81557a7c91c3500fe82d394
-      flattened_ast: 967f36289c31ff3cee453f5fb2f3e257d683daee776a7d11476a3d6c174009f6
-      inlined_ast: 967f36289c31ff3cee453f5fb2f3e257d683daee776a7d11476a3d6c174009f6
-      dce_ast: 37bacad711cb0db16ca624e9a91b3916c62fb20b033a718441f57f83309bbbfb
+  - - initial_ast: 8e83f52129a707628bdfe3d41eae68fe104f41c05da4a315b5c6843611a14cfb
+      unrolled_ast: 8e83f52129a707628bdfe3d41eae68fe104f41c05da4a315b5c6843611a14cfb
+      ssa_ast: a5be33174d9c0d057ba74a6b44796c3d52ea071e62905dcf6a40ab792168fe4c
+      flattened_ast: 9697db1b8f5e3985346e0454ee5546a285c4ed4c5710e659d377ad7835c30077
+      inlined_ast: 9697db1b8f5e3985346e0454ee5546a285c4ed4c5710e659d377ad7835c30077
+      dce_ast: b954fe56d17ae4fd4d45db0e4b6d46538f7cc482b28ec0fb389b7fe4c9737225
       bytecode: a669206687d494820bada50c8468f052183b69cd778ff0ce870a370ac8ea7bf4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/or.out b/tests/expectations/compiler/integers/u128/or.out
index 11963d25d2..d7936fa565 100644
--- a/tests/expectations/compiler/integers/u128/or.out
+++ b/tests/expectations/compiler/integers/u128/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f86c3cfa097574a9303bcb351cc32307664081fc7f3b60cd1d9d496a87ab8600
-      unrolled_ast: f86c3cfa097574a9303bcb351cc32307664081fc7f3b60cd1d9d496a87ab8600
-      ssa_ast: 2c86fc2ade2d1e2292485b8381f532d13870e9067d4a0b112c690f6003b61371
-      flattened_ast: 821e0f51dd136c8296e20ff16372bcf821526f10b6c317e9d2a452884a34d8b7
-      inlined_ast: 821e0f51dd136c8296e20ff16372bcf821526f10b6c317e9d2a452884a34d8b7
-      dce_ast: 821e0f51dd136c8296e20ff16372bcf821526f10b6c317e9d2a452884a34d8b7
+  - - initial_ast: ba6d8df931e4718120e3d618a372262a53c4080c6975bee5bbecce4008a10718
+      unrolled_ast: ba6d8df931e4718120e3d618a372262a53c4080c6975bee5bbecce4008a10718
+      ssa_ast: fb5641692aa6c75a6d069080741df49f5492e21a843871b4d45c719e63d19684
+      flattened_ast: 557da4b61c880cbbbea9bccb7c797c8ebbfff1d0995710117641b49966bd9562
+      inlined_ast: 557da4b61c880cbbbea9bccb7c797c8ebbfff1d0995710117641b49966bd9562
+      dce_ast: 557da4b61c880cbbbea9bccb7c797c8ebbfff1d0995710117641b49966bd9562
       bytecode: 004cb45ea888f207ca8e42a4f7acf3687aa3294a975462c89541c2d0f53dcdf3
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/pow.out b/tests/expectations/compiler/integers/u128/pow.out
index 0e85beeb90..f7c52f5d14 100644
--- a/tests/expectations/compiler/integers/u128/pow.out
+++ b/tests/expectations/compiler/integers/u128/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: df232a6caceb7fc33d1178f782a2cfe5a8005f83eb115a2c53e7d5a62f33a5c2
-      unrolled_ast: df232a6caceb7fc33d1178f782a2cfe5a8005f83eb115a2c53e7d5a62f33a5c2
-      ssa_ast: 27825b0aa060782aa965b941ece46eb1da5a2dd7b574e7f1777f8cdb0308b39a
-      flattened_ast: c0abb4bfbd354dd032683109f4e6dcc9f60b013f9e7dbf6526949f16564b8143
-      inlined_ast: c0abb4bfbd354dd032683109f4e6dcc9f60b013f9e7dbf6526949f16564b8143
-      dce_ast: c0abb4bfbd354dd032683109f4e6dcc9f60b013f9e7dbf6526949f16564b8143
+  - - initial_ast: 6bafd8d44b50e01e8e7461430fe68f29ac20820ac1101938c7eec781eb77606f
+      unrolled_ast: 6bafd8d44b50e01e8e7461430fe68f29ac20820ac1101938c7eec781eb77606f
+      ssa_ast: 2084a2bbc3f60452dbe07b234fb8db51f1d443405fe8084e5fae527a86d48ffc
+      flattened_ast: d551da916c37f7d8b862fc8bc552591e9b67577b6564ff0ab38a69da4e046b2e
+      inlined_ast: d551da916c37f7d8b862fc8bc552591e9b67577b6564ff0ab38a69da4e046b2e
+      dce_ast: d551da916c37f7d8b862fc8bc552591e9b67577b6564ff0ab38a69da4e046b2e
       bytecode: f88e8b16ebc2a407989f9f316ad6a9edfec6f134c7a0d9b25cea571df8161900
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/rem.out b/tests/expectations/compiler/integers/u128/rem.out
index f2aa825c1b..db618741e1 100644
--- a/tests/expectations/compiler/integers/u128/rem.out
+++ b/tests/expectations/compiler/integers/u128/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: d115ce03291214a2dd12416d9bd409b286b40d65bab26469a2f8c41e71c59e6b
-      unrolled_ast: d115ce03291214a2dd12416d9bd409b286b40d65bab26469a2f8c41e71c59e6b
-      ssa_ast: a7f96002ebf3ce942954c4a5a99f68317190faf6a657cb6b724f170bb04ae8cb
-      flattened_ast: d5325fc10e56f1b444c2e0814e81469b427c3c6815a46fc9635abeca312f1384
-      inlined_ast: d5325fc10e56f1b444c2e0814e81469b427c3c6815a46fc9635abeca312f1384
-      dce_ast: d5325fc10e56f1b444c2e0814e81469b427c3c6815a46fc9635abeca312f1384
+  - - initial_ast: 3064661c2161013519c60cadc69dc7b8a81d06847510c68f175290d03b8ea769
+      unrolled_ast: 3064661c2161013519c60cadc69dc7b8a81d06847510c68f175290d03b8ea769
+      ssa_ast: d9b36b90c8380ccf911ebf83ea209b2f3120935407990089a875eec55479b58f
+      flattened_ast: 8d75b677a89cdddb1e838986289612c7cfd8e61ded4fae5d3760454045b1620d
+      inlined_ast: 8d75b677a89cdddb1e838986289612c7cfd8e61ded4fae5d3760454045b1620d
+      dce_ast: 8d75b677a89cdddb1e838986289612c7cfd8e61ded4fae5d3760454045b1620d
       bytecode: 77cd05d1f311504fae6e47a74e98a964f1dd411e6fd447b33b57a2d475bb5aed
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/shl.out b/tests/expectations/compiler/integers/u128/shl.out
index 081838c545..ab7655ae2c 100644
--- a/tests/expectations/compiler/integers/u128/shl.out
+++ b/tests/expectations/compiler/integers/u128/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a2709489a232e7885b232a5be1d7165a0fd2ba0571aa9f5bbcc3c6a410660af0
-      unrolled_ast: a2709489a232e7885b232a5be1d7165a0fd2ba0571aa9f5bbcc3c6a410660af0
-      ssa_ast: 8ee46acfebe374823053fa9c2a6bd093644a7d60612e7dc1779c62471aa3992a
-      flattened_ast: b33d9f7778aaaebc682b954ce9c38ed8df5108d203b7329fea8fc58e525d4d19
-      inlined_ast: b33d9f7778aaaebc682b954ce9c38ed8df5108d203b7329fea8fc58e525d4d19
-      dce_ast: b33d9f7778aaaebc682b954ce9c38ed8df5108d203b7329fea8fc58e525d4d19
+  - - initial_ast: a4ca5f3b2ccebdae485c769763da40948685cc5a3f368ad89adc431c7fb955e5
+      unrolled_ast: a4ca5f3b2ccebdae485c769763da40948685cc5a3f368ad89adc431c7fb955e5
+      ssa_ast: 70375e9e626519829edd176d5949ebe2b25fb9dd26a25a8dd79b424ab0e53001
+      flattened_ast: 8f8afdaad68bee3fc1d8a4a12435fb2d5ba869d96dd4db9cce955e58c4e8f14e
+      inlined_ast: 8f8afdaad68bee3fc1d8a4a12435fb2d5ba869d96dd4db9cce955e58c4e8f14e
+      dce_ast: 8f8afdaad68bee3fc1d8a4a12435fb2d5ba869d96dd4db9cce955e58c4e8f14e
       bytecode: f9f90b58b9fc961c6ee4909ef338c77962403add4feee851959038263971eba9
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/shr.out b/tests/expectations/compiler/integers/u128/shr.out
index f6643c5aca..59a4a1cee8 100644
--- a/tests/expectations/compiler/integers/u128/shr.out
+++ b/tests/expectations/compiler/integers/u128/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4dc123d5cf1b4dab70448fdecf2129aec73508fe668d5d1f9501b5c0fcf449f0
-      unrolled_ast: 4dc123d5cf1b4dab70448fdecf2129aec73508fe668d5d1f9501b5c0fcf449f0
-      ssa_ast: ac816eb4530c2a2afb55eace7b7e54d7b61cd9b516c0509bf88cdfad0ec509d9
-      flattened_ast: 394a32eb6aa4b2214127d3871a3d4971247e4f23fd8888b31ab42b0c2438cdbc
-      inlined_ast: 394a32eb6aa4b2214127d3871a3d4971247e4f23fd8888b31ab42b0c2438cdbc
-      dce_ast: 394a32eb6aa4b2214127d3871a3d4971247e4f23fd8888b31ab42b0c2438cdbc
+  - - initial_ast: 58901ea0b990f9e8d61d32bc83e5f8f63aae8268138c74eb2bec7219f9e8d6ca
+      unrolled_ast: 58901ea0b990f9e8d61d32bc83e5f8f63aae8268138c74eb2bec7219f9e8d6ca
+      ssa_ast: 5df9316ffac5d699850a3c70fc8d45c82b94034080934cb37cae126812aded90
+      flattened_ast: ec5626ba04a9085404909f8de36eac96ad2918e2ad8c38541e6ef0b4444121a1
+      inlined_ast: ec5626ba04a9085404909f8de36eac96ad2918e2ad8c38541e6ef0b4444121a1
+      dce_ast: ec5626ba04a9085404909f8de36eac96ad2918e2ad8c38541e6ef0b4444121a1
       bytecode: c3f89cd7a94e013dfafa5e7deaa5bf758e78a9bee96b9324d8b2314d67ea6a27
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/sub.out b/tests/expectations/compiler/integers/u128/sub.out
index 7f46753974..7c22e1fc0a 100644
--- a/tests/expectations/compiler/integers/u128/sub.out
+++ b/tests/expectations/compiler/integers/u128/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 2b6c3fdca3b464926624a37b843a5adf8a7b75eba5bcd3777520a2db7beebc9c
-      unrolled_ast: 2b6c3fdca3b464926624a37b843a5adf8a7b75eba5bcd3777520a2db7beebc9c
-      ssa_ast: 571d8c196375dac23c731558d8ca9c52cbe4817f5641a331a1db507801232ed0
-      flattened_ast: a6360f66aaa59d7c33894857ac84139025f39678360ef4dbb02bacf9db267559
-      inlined_ast: a6360f66aaa59d7c33894857ac84139025f39678360ef4dbb02bacf9db267559
-      dce_ast: a6360f66aaa59d7c33894857ac84139025f39678360ef4dbb02bacf9db267559
+  - - initial_ast: b0812bc73a7d2b64d2b79562454b14acaa2c5e9a513894e2bcf25d9b665f5ca6
+      unrolled_ast: b0812bc73a7d2b64d2b79562454b14acaa2c5e9a513894e2bcf25d9b665f5ca6
+      ssa_ast: 1684590ec5a164419310536b1da52c9529d9e97fba01d11d46d333406d14c066
+      flattened_ast: 03600a06fb56b4b9542b02d705c9ac9dc225519d6d7a8a4b441e74b1cd65d4bf
+      inlined_ast: 03600a06fb56b4b9542b02d705c9ac9dc225519d6d7a8a4b441e74b1cd65d4bf
+      dce_ast: 03600a06fb56b4b9542b02d705c9ac9dc225519d6d7a8a4b441e74b1cd65d4bf
       bytecode: 92ed5e41e02f9f2ee5862aad62d54a2a0f2e1a2fc2edde87f1c6ee1fa84de67c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/ternary.out b/tests/expectations/compiler/integers/u128/ternary.out
index 4ac5a0623c..db0d25635d 100644
--- a/tests/expectations/compiler/integers/u128/ternary.out
+++ b/tests/expectations/compiler/integers/u128/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 702e695f7d4af5e64089c652f9f112f3f76a558374c2a93deb7a252725cd3387
-      unrolled_ast: 702e695f7d4af5e64089c652f9f112f3f76a558374c2a93deb7a252725cd3387
-      ssa_ast: d1a7627c71c451504679181790a276dd91fc4dda2648b09931746ccbcd70b681
-      flattened_ast: ead603d867cbbf8494afa0f71824cb2ae2a67f138f89fac8f2af200bad37e6e9
-      inlined_ast: ead603d867cbbf8494afa0f71824cb2ae2a67f138f89fac8f2af200bad37e6e9
-      dce_ast: ead603d867cbbf8494afa0f71824cb2ae2a67f138f89fac8f2af200bad37e6e9
+  - - initial_ast: 99f1345b8252c599c8585e45e9685099f96db19e939a537463e33d6c56daaf28
+      unrolled_ast: 99f1345b8252c599c8585e45e9685099f96db19e939a537463e33d6c56daaf28
+      ssa_ast: 2fe3b8a66e4f98d30874de9e281c2240c4fa16aec5915d7072623e701d76e8a0
+      flattened_ast: d28c157e82922f248294d2402018f84107df82ccdcdcd3f17076182c1d210511
+      inlined_ast: d28c157e82922f248294d2402018f84107df82ccdcdcd3f17076182c1d210511
+      dce_ast: d28c157e82922f248294d2402018f84107df82ccdcdcd3f17076182c1d210511
       bytecode: d360bfc2331d64cee6cebe783b9ac261efe5c6e8aaa334be38a9c56ab40261b2
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u128/xor.out b/tests/expectations/compiler/integers/u128/xor.out
index 3d0c9a6c17..1abdabb34f 100644
--- a/tests/expectations/compiler/integers/u128/xor.out
+++ b/tests/expectations/compiler/integers/u128/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c07450d6c39cee515723b5d2549014f82d9f069b6ffdaa171a3fd425d60c5d05
-      unrolled_ast: c07450d6c39cee515723b5d2549014f82d9f069b6ffdaa171a3fd425d60c5d05
-      ssa_ast: c48142deb0b215d476a4e352fac26e893504a55d0e8cc0ceb434da7890fd785a
-      flattened_ast: 1c275ee7389702be85497bc0af2a4fc0f5e7a9a306da0c3c74bdab2c3856e7ad
-      inlined_ast: 1c275ee7389702be85497bc0af2a4fc0f5e7a9a306da0c3c74bdab2c3856e7ad
-      dce_ast: 1c275ee7389702be85497bc0af2a4fc0f5e7a9a306da0c3c74bdab2c3856e7ad
+  - - initial_ast: b4d295c34f3e3322add7258e2e131f796aa05d3384c3565c3b40d3af456625f9
+      unrolled_ast: b4d295c34f3e3322add7258e2e131f796aa05d3384c3565c3b40d3af456625f9
+      ssa_ast: b4d294feea2420cbc029a8762292e52ab3bfb6187d19dd6bf28b03f63ad69cb0
+      flattened_ast: 27e277dbf8bd249900fb5f5f515673c352a766f08315c293655e9155a167e335
+      inlined_ast: 27e277dbf8bd249900fb5f5f515673c352a766f08315c293655e9155a167e335
+      dce_ast: 27e277dbf8bd249900fb5f5f515673c352a766f08315c293655e9155a167e335
       bytecode: 63a04f95623ff9dfbe22b389e7b7b6127999e1340aa1ed3e2eb59228d92d9aab
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/add.out b/tests/expectations/compiler/integers/u16/add.out
index 256150f025..b2feecdcc7 100644
--- a/tests/expectations/compiler/integers/u16/add.out
+++ b/tests/expectations/compiler/integers/u16/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fc7daed8ae413b4caeb661461cc0c5e4aab6d12fce265a61dab669453a631850
-      unrolled_ast: fc7daed8ae413b4caeb661461cc0c5e4aab6d12fce265a61dab669453a631850
-      ssa_ast: 3ec8b9916924954534d0aa90b253eb40864f0dd4897fe05baf9a9c47704be5fb
-      flattened_ast: d34f22df0e98e045fffc911e93bd9b62531877f3017f03f9d4a0ec67eed26e7b
-      inlined_ast: d34f22df0e98e045fffc911e93bd9b62531877f3017f03f9d4a0ec67eed26e7b
-      dce_ast: d34f22df0e98e045fffc911e93bd9b62531877f3017f03f9d4a0ec67eed26e7b
+  - - initial_ast: bac381e90ec6a9de5a761cd2cab28495698c67bbe7cb799e34c716d4bf790b73
+      unrolled_ast: bac381e90ec6a9de5a761cd2cab28495698c67bbe7cb799e34c716d4bf790b73
+      ssa_ast: 72a99d0347372ef2407c982eb894287ce8103bcfee7b9fc769d092afb953fb66
+      flattened_ast: da8a93ec1d0e515ee69d62b6415afb7622d6361487cdcf16de472995b9abb0c8
+      inlined_ast: da8a93ec1d0e515ee69d62b6415afb7622d6361487cdcf16de472995b9abb0c8
+      dce_ast: da8a93ec1d0e515ee69d62b6415afb7622d6361487cdcf16de472995b9abb0c8
       bytecode: 2252ca765c9f4d167815c556dedf80fd261ecb82c22da486f1c019b62ca9b59c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/and.out b/tests/expectations/compiler/integers/u16/and.out
index 520abe3421..a10004fe66 100644
--- a/tests/expectations/compiler/integers/u16/and.out
+++ b/tests/expectations/compiler/integers/u16/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4ec0b33043e3d58d78f2e61b74f6c6b84f053afd9932fa9d4d8351df4251c8e4
-      unrolled_ast: 4ec0b33043e3d58d78f2e61b74f6c6b84f053afd9932fa9d4d8351df4251c8e4
-      ssa_ast: 958cf98bcd2a48843f45ac5027876b544cd95a2ef8fc7dd3f323b2f74cdbe165
-      flattened_ast: 708f8725a926d316f861aec94b157fa8ad232d63de00aca70be934ea7a1ca245
-      inlined_ast: 708f8725a926d316f861aec94b157fa8ad232d63de00aca70be934ea7a1ca245
-      dce_ast: 708f8725a926d316f861aec94b157fa8ad232d63de00aca70be934ea7a1ca245
+  - - initial_ast: 0f3e7fcfda0437e586459de9b3f564cbdb147f7d7bbdb2342646db02ca548add
+      unrolled_ast: 0f3e7fcfda0437e586459de9b3f564cbdb147f7d7bbdb2342646db02ca548add
+      ssa_ast: 42155307e88107ace87d43f92b5a5b03481c9a0f92d8f09931afb17fbd088c60
+      flattened_ast: 02ed315422158ac74a0d5227de98864894f6f332d735b92aee7072ea50b9f97c
+      inlined_ast: 02ed315422158ac74a0d5227de98864894f6f332d735b92aee7072ea50b9f97c
+      dce_ast: 02ed315422158ac74a0d5227de98864894f6f332d735b92aee7072ea50b9f97c
       bytecode: 6160eab9fab5c6648122e91366d143924e69bdc272bc606f68be14f22f88cd1a
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/console_assert.out b/tests/expectations/compiler/integers/u16/console_assert.out
index 64e1f015a4..b52ed86a35 100644
--- a/tests/expectations/compiler/integers/u16/console_assert.out
+++ b/tests/expectations/compiler/integers/u16/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f23230df6de351125048e2d840387ce68d066fa5b6a05dd208a933eb2b1482ad
-      unrolled_ast: f23230df6de351125048e2d840387ce68d066fa5b6a05dd208a933eb2b1482ad
-      ssa_ast: 4272eca7d9c750ec02e7bb1bcac7c5d8cbb7dba1222b73815aeaed2c6c114432
-      flattened_ast: d28e3dba5f151bf09904c9bcd6e3ef58499e7d8b15a501219042d6dad2891993
-      inlined_ast: d28e3dba5f151bf09904c9bcd6e3ef58499e7d8b15a501219042d6dad2891993
-      dce_ast: d28e3dba5f151bf09904c9bcd6e3ef58499e7d8b15a501219042d6dad2891993
+  - - initial_ast: 5019238252ffa046af39d11164599a7f8ff33e76764c0c3cfd077f8b4c3d30b2
+      unrolled_ast: 5019238252ffa046af39d11164599a7f8ff33e76764c0c3cfd077f8b4c3d30b2
+      ssa_ast: c84c1c8844a9d70e17acdcc01523c38ef86a37cd8dbc5a9e9673c5b038e3a792
+      flattened_ast: e3ee0f04c7f20c8193ef9844fc3e13436e084e921e7d69f734568e9ed8aa3db3
+      inlined_ast: e3ee0f04c7f20c8193ef9844fc3e13436e084e921e7d69f734568e9ed8aa3db3
+      dce_ast: e3ee0f04c7f20c8193ef9844fc3e13436e084e921e7d69f734568e9ed8aa3db3
       bytecode: 986d6843806fcd3a479d777dcc4373b94817a5d3b9fb4cc1a6c3da752a69c925
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/div.out b/tests/expectations/compiler/integers/u16/div.out
index d99b09df23..3c1371ad36 100644
--- a/tests/expectations/compiler/integers/u16/div.out
+++ b/tests/expectations/compiler/integers/u16/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1db2a06d60bdbc9d98d348cf97d0267c3a50af5061cdab0c8ce02df5b0e07a3f
-      unrolled_ast: 1db2a06d60bdbc9d98d348cf97d0267c3a50af5061cdab0c8ce02df5b0e07a3f
-      ssa_ast: cf0ab8c4b8b35478b4abb304168891b33ddfb3a6f7d9454af5e91163affd93ac
-      flattened_ast: ea765263c80c62012fd6edb792cc0dbecc48fb0582f6de03b54fcfa474aa1e35
-      inlined_ast: ea765263c80c62012fd6edb792cc0dbecc48fb0582f6de03b54fcfa474aa1e35
-      dce_ast: ea765263c80c62012fd6edb792cc0dbecc48fb0582f6de03b54fcfa474aa1e35
+  - - initial_ast: 6d37c3c496e3e550a5e31c2ddd23d1af87a7f56c9d9c777987fe889add2223bf
+      unrolled_ast: 6d37c3c496e3e550a5e31c2ddd23d1af87a7f56c9d9c777987fe889add2223bf
+      ssa_ast: 2ed5a93f7d49b1d40becb253b86bec8d4ea61535f91b35f29bec610a2188fe56
+      flattened_ast: b45f64bd03129888e4283932ab0b7eb842e0c7b5a17cf44c937e49fbbdc4745a
+      inlined_ast: b45f64bd03129888e4283932ab0b7eb842e0c7b5a17cf44c937e49fbbdc4745a
+      dce_ast: b45f64bd03129888e4283932ab0b7eb842e0c7b5a17cf44c937e49fbbdc4745a
       bytecode: 99ba89ed030480c15697c6ba3b9dce82fa489d24dbba6d2edbc4934fc8baeb6c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/eq.out b/tests/expectations/compiler/integers/u16/eq.out
index e67c4e52eb..82d7a76b6e 100644
--- a/tests/expectations/compiler/integers/u16/eq.out
+++ b/tests/expectations/compiler/integers/u16/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c7a8674d1bde2f8c99ea1d678f0659cb457e6c4119d92b246a533ea1abf187cb
-      unrolled_ast: c7a8674d1bde2f8c99ea1d678f0659cb457e6c4119d92b246a533ea1abf187cb
-      ssa_ast: 8b85648385ba17f938169892f54661c55c821f204f23f5becc5b794d3c615216
-      flattened_ast: bd36eeb1ae051fc43a8036906b19cacfdd7cf8180356e77200b6fe28e21b2dc1
-      inlined_ast: bd36eeb1ae051fc43a8036906b19cacfdd7cf8180356e77200b6fe28e21b2dc1
-      dce_ast: bd36eeb1ae051fc43a8036906b19cacfdd7cf8180356e77200b6fe28e21b2dc1
+  - - initial_ast: bd9ce91df0691d59a096f06f9f5c343175bef767902ccb9e942247400aeb1c54
+      unrolled_ast: bd9ce91df0691d59a096f06f9f5c343175bef767902ccb9e942247400aeb1c54
+      ssa_ast: 2872af25262452e4d7f6280f832a7ce95d8d7635c92adcf8e8313a5073beb40d
+      flattened_ast: 1640c3335ea504e2d768897fa30a79aa091e6f34a183be5338a6a7201ca6d2a2
+      inlined_ast: 1640c3335ea504e2d768897fa30a79aa091e6f34a183be5338a6a7201ca6d2a2
+      dce_ast: 1640c3335ea504e2d768897fa30a79aa091e6f34a183be5338a6a7201ca6d2a2
       bytecode: f125a6c62a71bd66b09211e1febbdfaa6491b9255270bbe3ac27ef505f4c46e0
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/ge.out b/tests/expectations/compiler/integers/u16/ge.out
index f9e043180f..4e47743e95 100644
--- a/tests/expectations/compiler/integers/u16/ge.out
+++ b/tests/expectations/compiler/integers/u16/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4bd594e3ce2d22cad7272f1a873c68140c56fcfdc026ddd1c1ee7f75fe4e8337
-      unrolled_ast: 4bd594e3ce2d22cad7272f1a873c68140c56fcfdc026ddd1c1ee7f75fe4e8337
-      ssa_ast: 94991461b4b385cd3c70694ba598a83b2e2538b1d029d8e99c14201634e400ae
-      flattened_ast: f0c352f15a9d5d8aa80a32c369e134e4aa6c180fb11da4cb134c523e2ecc3221
-      inlined_ast: f0c352f15a9d5d8aa80a32c369e134e4aa6c180fb11da4cb134c523e2ecc3221
-      dce_ast: f0c352f15a9d5d8aa80a32c369e134e4aa6c180fb11da4cb134c523e2ecc3221
+  - - initial_ast: 9e842ad41584de91280d5bdf9881c82f3c069e511fe2bb6d11726311a6759e72
+      unrolled_ast: 9e842ad41584de91280d5bdf9881c82f3c069e511fe2bb6d11726311a6759e72
+      ssa_ast: 09a0299c19554c7fb152e98f91a9c965d3b4b9661b6824e2ccf430e87b398588
+      flattened_ast: bdecb0359014a66564abb4db0385d94e571351deff650866f8a23b6b6e5ab736
+      inlined_ast: bdecb0359014a66564abb4db0385d94e571351deff650866f8a23b6b6e5ab736
+      dce_ast: bdecb0359014a66564abb4db0385d94e571351deff650866f8a23b6b6e5ab736
       bytecode: ee2f4384477fac864957953a97c53275060e4c4ba793a180d6007af25b50b8df
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/gt.out b/tests/expectations/compiler/integers/u16/gt.out
index a1e6e82554..a750f9d8ae 100644
--- a/tests/expectations/compiler/integers/u16/gt.out
+++ b/tests/expectations/compiler/integers/u16/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5e2f36ec561400f47c0deacb787c1367b8528dddb290fc7cc6bfc92bae3da39f
-      unrolled_ast: 5e2f36ec561400f47c0deacb787c1367b8528dddb290fc7cc6bfc92bae3da39f
-      ssa_ast: eb92f395de3cfaf77cffbe953378c7645c48d3628d4ec6b940ce5e87746f4b2f
-      flattened_ast: 40743c28939d487f57683b7745dd427d1aacfb1168393453aeca03844b88487e
-      inlined_ast: 40743c28939d487f57683b7745dd427d1aacfb1168393453aeca03844b88487e
-      dce_ast: 40743c28939d487f57683b7745dd427d1aacfb1168393453aeca03844b88487e
+  - - initial_ast: 68e74c67cab83b1ddd996a9a12dda81c01a7ac269ed80f3f6e728172ea63d974
+      unrolled_ast: 68e74c67cab83b1ddd996a9a12dda81c01a7ac269ed80f3f6e728172ea63d974
+      ssa_ast: 39dfc8b355cee2461970fbaa3e06188abdce3478b4ab5501dba267596ac73210
+      flattened_ast: 73ccda1fc34d79910fec57a263e342b2d2a2c7696567db641668c5f87ab87196
+      inlined_ast: 73ccda1fc34d79910fec57a263e342b2d2a2c7696567db641668c5f87ab87196
+      dce_ast: 73ccda1fc34d79910fec57a263e342b2d2a2c7696567db641668c5f87ab87196
       bytecode: f7ff09e980c11a6a98c8178e5cecbe8cbf83e40f25f5feec526358c95262fe96
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/le.out b/tests/expectations/compiler/integers/u16/le.out
index acbcd8acd2..3d0568e323 100644
--- a/tests/expectations/compiler/integers/u16/le.out
+++ b/tests/expectations/compiler/integers/u16/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6619a957b6f06c45ef3e3c7a91f8845c7c8afac6ca224a2fefbcbb251d85e706
-      unrolled_ast: 6619a957b6f06c45ef3e3c7a91f8845c7c8afac6ca224a2fefbcbb251d85e706
-      ssa_ast: eced2f141fa525bef55aa7bdfc409c788a8ae59004031c2207cff31f65b19886
-      flattened_ast: e7598669f921befc9b8e4905d148b854ddefd5b15db15e18ac0d17a7a4465421
-      inlined_ast: e7598669f921befc9b8e4905d148b854ddefd5b15db15e18ac0d17a7a4465421
-      dce_ast: e7598669f921befc9b8e4905d148b854ddefd5b15db15e18ac0d17a7a4465421
+  - - initial_ast: 9e70c35fcdc94e66c5916da9cf57d0e61a59cbb95e1f06d721b79add1039d84d
+      unrolled_ast: 9e70c35fcdc94e66c5916da9cf57d0e61a59cbb95e1f06d721b79add1039d84d
+      ssa_ast: 839c6f7f99f1f503c9aee705c15ce1174e027cee3c301b937e98d6d861b35c52
+      flattened_ast: 9b2252fcbc75e5511d729a45037c23e74fb0b815a3aa44a17343df605e33c708
+      inlined_ast: 9b2252fcbc75e5511d729a45037c23e74fb0b815a3aa44a17343df605e33c708
+      dce_ast: 9b2252fcbc75e5511d729a45037c23e74fb0b815a3aa44a17343df605e33c708
       bytecode: 1a4dc861ca94e33a883b8326dcf9a21345fdd65b1d00dcaab408cbe8bf2e7c23
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/lt.out b/tests/expectations/compiler/integers/u16/lt.out
index 564ae42a38..b236c03628 100644
--- a/tests/expectations/compiler/integers/u16/lt.out
+++ b/tests/expectations/compiler/integers/u16/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4ff6738ccd96227ea46d4e55cb615775f98f224e87846ee09442eeb74abeb479
-      unrolled_ast: 4ff6738ccd96227ea46d4e55cb615775f98f224e87846ee09442eeb74abeb479
-      ssa_ast: a35b18b5d4bc408d1c845c95aea4dacc62cd31a18f2992f9a15076564f584492
-      flattened_ast: 8ac1be0f72dfdbe80ea2babb3af40a5d0eb1259991aec407a7a6f0571730c639
-      inlined_ast: 8ac1be0f72dfdbe80ea2babb3af40a5d0eb1259991aec407a7a6f0571730c639
-      dce_ast: 8ac1be0f72dfdbe80ea2babb3af40a5d0eb1259991aec407a7a6f0571730c639
+  - - initial_ast: ba6a7b014ad3705313b4a3eaf65a4d4b17eae8065815d6cae8ece2a8c3c9c814
+      unrolled_ast: ba6a7b014ad3705313b4a3eaf65a4d4b17eae8065815d6cae8ece2a8c3c9c814
+      ssa_ast: 1ad170d712551b27d0071462e053d93744bda9d9c6122d8b196459b705b7f904
+      flattened_ast: c7eae0c4bfd009d7c3e67fafd96d91979997ce8ba43702ff8869d3ef5a88c3cd
+      inlined_ast: c7eae0c4bfd009d7c3e67fafd96d91979997ce8ba43702ff8869d3ef5a88c3cd
+      dce_ast: c7eae0c4bfd009d7c3e67fafd96d91979997ce8ba43702ff8869d3ef5a88c3cd
       bytecode: 3b2dd5b9dfa587ed0f67449bbc6a9a0b90edb7c9ffbee5e36f1c40512e09bb1d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/max.out b/tests/expectations/compiler/integers/u16/max.out
index d0b0566706..d526cb0b21 100644
--- a/tests/expectations/compiler/integers/u16/max.out
+++ b/tests/expectations/compiler/integers/u16/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a56c665e9ad6ed784ff9393532818b19d9f86f3c3f8b62580d155a0fd7221ae6
-      unrolled_ast: a56c665e9ad6ed784ff9393532818b19d9f86f3c3f8b62580d155a0fd7221ae6
-      ssa_ast: 49875f37dc6284802eabf16e2178fd2a9a9b3580c9e03a16fd07973844480222
-      flattened_ast: 3a4980025714ba35f4d409b2a6e8c57fb0c638fbfc696d34ea2530d423d10670
-      inlined_ast: 3a4980025714ba35f4d409b2a6e8c57fb0c638fbfc696d34ea2530d423d10670
-      dce_ast: 6eb24028e1d062bc61a5ff9c4b8390f96db0be1ccc12047cbf5ba3ea038030b8
+  - - initial_ast: b8167d3cae4546d3fbb3dbf15870d7adcb18000aa06f9f7c6189e24f3496c5b9
+      unrolled_ast: b8167d3cae4546d3fbb3dbf15870d7adcb18000aa06f9f7c6189e24f3496c5b9
+      ssa_ast: 8270e77864941d3f2a95ccb463d16c429a9468444d9313bcf1e523b027155635
+      flattened_ast: 5c5b6c065de4a45e28d4c98650922ae960e2123b670358676d14c092f82d9f9b
+      inlined_ast: 5c5b6c065de4a45e28d4c98650922ae960e2123b670358676d14c092f82d9f9b
+      dce_ast: 36b64d3196635a31962ed9355a8fb8cfd89e8ccf1375326727a7cad70b9b16bc
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/min.out b/tests/expectations/compiler/integers/u16/min.out
index 0c81eec390..a1418f947c 100644
--- a/tests/expectations/compiler/integers/u16/min.out
+++ b/tests/expectations/compiler/integers/u16/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1db9437de7703f7f839a7eabc803c81c77a2eee1b6dbb4a4ff6825c66b91f11c
-      unrolled_ast: 1db9437de7703f7f839a7eabc803c81c77a2eee1b6dbb4a4ff6825c66b91f11c
-      ssa_ast: a730052ece8d8430feaabac53764c744134c3e3f557bb53a66c1767fd3d6cf8c
-      flattened_ast: db53033c8f2bb0995d1c011565204922c80d7b89c20697cbf1367af25f09d7b4
-      inlined_ast: db53033c8f2bb0995d1c011565204922c80d7b89c20697cbf1367af25f09d7b4
-      dce_ast: 6e57ba358030a370d68a4f419c99171ec588523b863ee0a1bb6cedd843c7c04a
+  - - initial_ast: 7eeec5f75eb9c5a8cbd13c3e9706ffae1af80a4ca5653041102b32b7177b1081
+      unrolled_ast: 7eeec5f75eb9c5a8cbd13c3e9706ffae1af80a4ca5653041102b32b7177b1081
+      ssa_ast: 6264a5d77806e0f95536e96390edb6c8e66a815191557b96ad9c046bd479a992
+      flattened_ast: 8028fe3cbdcc9f7f6a61bd7eef8ad2194a8d90317d222701fb654bb1adb7bc5e
+      inlined_ast: 8028fe3cbdcc9f7f6a61bd7eef8ad2194a8d90317d222701fb654bb1adb7bc5e
+      dce_ast: bd3b38c0fd9de216854db7c9f1d6dfde9c887e9433a9cb3ba8c2c13ac37a2849
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/mul.out b/tests/expectations/compiler/integers/u16/mul.out
index f98f660497..a12807cd19 100644
--- a/tests/expectations/compiler/integers/u16/mul.out
+++ b/tests/expectations/compiler/integers/u16/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0b076b76c9d33d0a4983017b41485779041584058b26873949d469f5e96380f3
-      unrolled_ast: 0b076b76c9d33d0a4983017b41485779041584058b26873949d469f5e96380f3
-      ssa_ast: 657e967db4b01337ffa0b9add15cfb0636a3edd58c6ee606f67da92985bf73b4
-      flattened_ast: 09553d120d4ccf83d02ab253fd0d06a5e02b620ac3bc673d2191f483078b0165
-      inlined_ast: 09553d120d4ccf83d02ab253fd0d06a5e02b620ac3bc673d2191f483078b0165
-      dce_ast: 09553d120d4ccf83d02ab253fd0d06a5e02b620ac3bc673d2191f483078b0165
+  - - initial_ast: ed3bd3b169f59936a4659150a07db007d430df2e2eaf49037008d7a18e5774d3
+      unrolled_ast: ed3bd3b169f59936a4659150a07db007d430df2e2eaf49037008d7a18e5774d3
+      ssa_ast: 8260f67c804bb031042a87c3c92ff8a4c92b3ad880d0cc6e15a7bcfeb189434e
+      flattened_ast: da23ac693fd0a5082e6bacc0cff1dabf3292ec090c142dbf2388dd1301837f6c
+      inlined_ast: da23ac693fd0a5082e6bacc0cff1dabf3292ec090c142dbf2388dd1301837f6c
+      dce_ast: da23ac693fd0a5082e6bacc0cff1dabf3292ec090c142dbf2388dd1301837f6c
       bytecode: 5495593b6e8c8b396503f1f61e5f3b620d1ccc173721316cfb1f30b268486ed5
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/ne.out b/tests/expectations/compiler/integers/u16/ne.out
index 671445c36b..6972acf7a5 100644
--- a/tests/expectations/compiler/integers/u16/ne.out
+++ b/tests/expectations/compiler/integers/u16/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 45c3006c2e81f8177a7dbd277eb52ab13af6f1547ff8e756ff72dfbe09f316bb
-      unrolled_ast: 45c3006c2e81f8177a7dbd277eb52ab13af6f1547ff8e756ff72dfbe09f316bb
-      ssa_ast: 29b9b42fea21fab7086022415a82af7040976882a3b524fe7798d7b4896f17b6
-      flattened_ast: 90e44ee3c375de89c63b1b9311db95ce611c405d4cf718b4879cb773e58caff1
-      inlined_ast: 90e44ee3c375de89c63b1b9311db95ce611c405d4cf718b4879cb773e58caff1
-      dce_ast: 90e44ee3c375de89c63b1b9311db95ce611c405d4cf718b4879cb773e58caff1
+  - - initial_ast: 97c9755d17e5c9a5abab1a0d5cb9284677f207c556f943eea63490e80b46ca8d
+      unrolled_ast: 97c9755d17e5c9a5abab1a0d5cb9284677f207c556f943eea63490e80b46ca8d
+      ssa_ast: 92bb99e8e68a742a802cdb66da23985ab207d04e51c382d1229b70bfd0f4abf7
+      flattened_ast: ef9f13c3c360aebe593328fa6f5af97a75e0e903c5b9b715fb2e0c26df05441d
+      inlined_ast: ef9f13c3c360aebe593328fa6f5af97a75e0e903c5b9b715fb2e0c26df05441d
+      dce_ast: ef9f13c3c360aebe593328fa6f5af97a75e0e903c5b9b715fb2e0c26df05441d
       bytecode: 02468182490bfd77f1aae9ed8c5a4b1cd2a3373c2bdc998f6567f5c900fefe33
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/operator_methods.out b/tests/expectations/compiler/integers/u16/operator_methods.out
index 609ec11694..aa2b12d553 100644
--- a/tests/expectations/compiler/integers/u16/operator_methods.out
+++ b/tests/expectations/compiler/integers/u16/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3d10e4465190697ce58ae1f85c0ee0f9c1c5dfbf92dc6c5fb8c69ab41f4bf391
-      unrolled_ast: 3d10e4465190697ce58ae1f85c0ee0f9c1c5dfbf92dc6c5fb8c69ab41f4bf391
-      ssa_ast: a188fb279d1be51104b8fae30e66ccdfd0910ed10800e058da7d82f00bd74575
-      flattened_ast: 438df832c9f5d1825277809bd4fff45c6639190d5ae9287c13d7edc300b83d82
-      inlined_ast: 438df832c9f5d1825277809bd4fff45c6639190d5ae9287c13d7edc300b83d82
-      dce_ast: 65266edd8b348a54201086dd76bb8307d6529295d768ce0a5c2dadb2eb7b816c
+  - - initial_ast: c3f64abb52075c7dacb51240b1670b0fbcbb271401bf4086c068003c7b0a5117
+      unrolled_ast: c3f64abb52075c7dacb51240b1670b0fbcbb271401bf4086c068003c7b0a5117
+      ssa_ast: f3ce1ccb5c18c6867457f4146bc2bf2dea8a3ffb2c3f4fb9fac9806ed8c02737
+      flattened_ast: eb9954851d5ae163997f935c1e815160b3b2db497e97d83c4148f80230f41ba4
+      inlined_ast: eb9954851d5ae163997f935c1e815160b3b2db497e97d83c4148f80230f41ba4
+      dce_ast: c19a676a5f4f91e3a7deb1943edf53cdfc1505ac0eaf53c7d768d8ab8565fa74
       bytecode: 842bf9cb4647adc6c67cecc1c36ec85f5a659d9245571869e10e93bb303ff343
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/or.out b/tests/expectations/compiler/integers/u16/or.out
index 26093bcec3..d11eb8f387 100644
--- a/tests/expectations/compiler/integers/u16/or.out
+++ b/tests/expectations/compiler/integers/u16/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6179bd524f6d0e0e4598a6a61428031f96bb3d76ac9fac49656e55476de98ab7
-      unrolled_ast: 6179bd524f6d0e0e4598a6a61428031f96bb3d76ac9fac49656e55476de98ab7
-      ssa_ast: 453283048c7341a4987544ec6c894fe0fa94d6d3d2417a0dc048e2013c295253
-      flattened_ast: 44b02800b7bd777429aa9afe1cb1c4a0a471ca1ac0b8734b981bbd57993d0884
-      inlined_ast: 44b02800b7bd777429aa9afe1cb1c4a0a471ca1ac0b8734b981bbd57993d0884
-      dce_ast: 44b02800b7bd777429aa9afe1cb1c4a0a471ca1ac0b8734b981bbd57993d0884
+  - - initial_ast: 07b173c2dc4601b5e0c0b1c7b7337c85bfc0eac36603b862dd1eecb152494ff4
+      unrolled_ast: 07b173c2dc4601b5e0c0b1c7b7337c85bfc0eac36603b862dd1eecb152494ff4
+      ssa_ast: 468eb035bd78c0c1ade7412bd01bca990a26fee6ea0b8a4d00bbd0ca8a8153f8
+      flattened_ast: dc1c2389bf46ba9bd11e20d41523f74360795e370e046674ea32b7ee512258c8
+      inlined_ast: dc1c2389bf46ba9bd11e20d41523f74360795e370e046674ea32b7ee512258c8
+      dce_ast: dc1c2389bf46ba9bd11e20d41523f74360795e370e046674ea32b7ee512258c8
       bytecode: 50061292bb5678c2bbb3062570d3f8d5233316e274c6504aa6b012816e2f511e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/pow.out b/tests/expectations/compiler/integers/u16/pow.out
index b63b32fb9b..e49a00b85f 100644
--- a/tests/expectations/compiler/integers/u16/pow.out
+++ b/tests/expectations/compiler/integers/u16/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f1e07994bcdcf845b345bcf2dc29bc26c841d5a4d1cbe90f5eb12d5b7b6096dc
-      unrolled_ast: f1e07994bcdcf845b345bcf2dc29bc26c841d5a4d1cbe90f5eb12d5b7b6096dc
-      ssa_ast: 466e554f3b8659bfab27089c522deadd3603fc245ecac9057bf00178204660ff
-      flattened_ast: c013a3ced8e6566ad30d29cde7a2d96801612394fc2858cd1033cf62fbe5b3fd
-      inlined_ast: c013a3ced8e6566ad30d29cde7a2d96801612394fc2858cd1033cf62fbe5b3fd
-      dce_ast: c013a3ced8e6566ad30d29cde7a2d96801612394fc2858cd1033cf62fbe5b3fd
+  - - initial_ast: 56ed4611024a6d4cd6cf505f48fd253753680b45fb56f2f583e28b3c044be24d
+      unrolled_ast: 56ed4611024a6d4cd6cf505f48fd253753680b45fb56f2f583e28b3c044be24d
+      ssa_ast: 1bf9f92594b306cca2b54981bfe5474852746253bb28d4904f52e3b070bc9566
+      flattened_ast: c77781ccc9114b84a6cf0fa6e90622354641cee68093ecb43e7a0fd9a56fff6e
+      inlined_ast: c77781ccc9114b84a6cf0fa6e90622354641cee68093ecb43e7a0fd9a56fff6e
+      dce_ast: c77781ccc9114b84a6cf0fa6e90622354641cee68093ecb43e7a0fd9a56fff6e
       bytecode: 57544c7875d33d64e359c3e64ab2115a3d431c3ecba318223e0237fbbbdfcde0
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/rem.out b/tests/expectations/compiler/integers/u16/rem.out
index 5e0e2acb86..b82083930a 100644
--- a/tests/expectations/compiler/integers/u16/rem.out
+++ b/tests/expectations/compiler/integers/u16/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0a73dd75f7be865aafee9b9a549f66e53abdf72ec40d458a16f07cb578c68ad7
-      unrolled_ast: 0a73dd75f7be865aafee9b9a549f66e53abdf72ec40d458a16f07cb578c68ad7
-      ssa_ast: 523fff818c52128a69b0924e6d61cf969ce3c5e471d1623bba00c5aeef15ccde
-      flattened_ast: 36c70732c4cb6bf0724369014084ae6106cb6f8c31738f9585036627595d0b40
-      inlined_ast: 36c70732c4cb6bf0724369014084ae6106cb6f8c31738f9585036627595d0b40
-      dce_ast: 36c70732c4cb6bf0724369014084ae6106cb6f8c31738f9585036627595d0b40
+  - - initial_ast: 588f8b604580f6ee40db9b74b74fd10d51d9ce43316982399cb5ddfdd7e84eb9
+      unrolled_ast: 588f8b604580f6ee40db9b74b74fd10d51d9ce43316982399cb5ddfdd7e84eb9
+      ssa_ast: f7f4046334d03b12df3009d0593e2ff8306f8bdeb85c07612fd43d9da04ef45d
+      flattened_ast: 0cce09c850c79c60143dff1d0c9111fd44a316ab69ec15c29c71056575b33459
+      inlined_ast: 0cce09c850c79c60143dff1d0c9111fd44a316ab69ec15c29c71056575b33459
+      dce_ast: 0cce09c850c79c60143dff1d0c9111fd44a316ab69ec15c29c71056575b33459
       bytecode: 312a00be59034a01944b77f36b32275e4d54b11d5b098a7e19c7bb4906e6ca6f
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/shl.out b/tests/expectations/compiler/integers/u16/shl.out
index 58b686e8c4..e7ade2ca45 100644
--- a/tests/expectations/compiler/integers/u16/shl.out
+++ b/tests/expectations/compiler/integers/u16/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c91b476512fc66f3edd3018e57a14cd08350624bdede3e9161bba43a18982b61
-      unrolled_ast: c91b476512fc66f3edd3018e57a14cd08350624bdede3e9161bba43a18982b61
-      ssa_ast: c1ae96bad47d5754b21adf59992bbe35cdbe28d8ffe7e3bf5830006ebc6b7983
-      flattened_ast: 91b650751d07c972b8b645e2e7ec0387599fce12b45a1a691b6fd88894cc3804
-      inlined_ast: 91b650751d07c972b8b645e2e7ec0387599fce12b45a1a691b6fd88894cc3804
-      dce_ast: 91b650751d07c972b8b645e2e7ec0387599fce12b45a1a691b6fd88894cc3804
+  - - initial_ast: 9866bc9c2035ee16cafd38e4c5f82f25211d405bbf9eb2668a539910a1bf9600
+      unrolled_ast: 9866bc9c2035ee16cafd38e4c5f82f25211d405bbf9eb2668a539910a1bf9600
+      ssa_ast: ef3b99f7e2fec2eb46a345714aa9840c8aa6493d2db230b9023cef653b24e473
+      flattened_ast: 30688527f18af59edab0ca7d7fe8778836b15e2d76b80a1eb98a6787a120d60f
+      inlined_ast: 30688527f18af59edab0ca7d7fe8778836b15e2d76b80a1eb98a6787a120d60f
+      dce_ast: 30688527f18af59edab0ca7d7fe8778836b15e2d76b80a1eb98a6787a120d60f
       bytecode: 5ebe5527cde826ed570752b1e9ffd16a4805c5071c3adbd4099ebad9174d5f11
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/shr.out b/tests/expectations/compiler/integers/u16/shr.out
index 6043334737..0563deb864 100644
--- a/tests/expectations/compiler/integers/u16/shr.out
+++ b/tests/expectations/compiler/integers/u16/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 56189753f447d3ed8b2512c2fe63c91a206f5ef50bf22198733a3f4ec634f884
-      unrolled_ast: 56189753f447d3ed8b2512c2fe63c91a206f5ef50bf22198733a3f4ec634f884
-      ssa_ast: aa063f5751f21cc0e7bf04a39a631d2dd2639e0eec90c2f5182716b0c013cc9a
-      flattened_ast: c81bdd856a892e9acc3f5217f080b158f7c9c1797756d411c679887b268e7d1d
-      inlined_ast: c81bdd856a892e9acc3f5217f080b158f7c9c1797756d411c679887b268e7d1d
-      dce_ast: c81bdd856a892e9acc3f5217f080b158f7c9c1797756d411c679887b268e7d1d
+  - - initial_ast: fe985e0a947398979e5ac314bf390e62cf40b59d155499acb9fc5e4f6de8a8b1
+      unrolled_ast: fe985e0a947398979e5ac314bf390e62cf40b59d155499acb9fc5e4f6de8a8b1
+      ssa_ast: af4c33db341492580a69b618e56d7cf4652bd6e2099c11e7da00b7ca80cb27f9
+      flattened_ast: 0b84f74b82db6f8a0a993bf3922a7fa80471cc119808c93845382ae6367f6fd9
+      inlined_ast: 0b84f74b82db6f8a0a993bf3922a7fa80471cc119808c93845382ae6367f6fd9
+      dce_ast: 0b84f74b82db6f8a0a993bf3922a7fa80471cc119808c93845382ae6367f6fd9
       bytecode: 27908eccc0ae25f792ff3b23f7b243cec3dc74e4167e62f5db0d2ac9c8d91d2c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/sub.out b/tests/expectations/compiler/integers/u16/sub.out
index f12ac0f314..7e00d8f197 100644
--- a/tests/expectations/compiler/integers/u16/sub.out
+++ b/tests/expectations/compiler/integers/u16/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ed2798c6f3be09694310dabf22619691d426135cd0e8b24766f25a70b16b5824
-      unrolled_ast: ed2798c6f3be09694310dabf22619691d426135cd0e8b24766f25a70b16b5824
-      ssa_ast: 530e1d99ec60daa0dabc7ed9aba6bc81a2561d9183ff03940c86431d58dc0228
-      flattened_ast: 555d267f1d1d412cd9e2ce1e6bc525adb1ccfbb4bd0b4d4470ba82f789f2f4df
-      inlined_ast: 555d267f1d1d412cd9e2ce1e6bc525adb1ccfbb4bd0b4d4470ba82f789f2f4df
-      dce_ast: 555d267f1d1d412cd9e2ce1e6bc525adb1ccfbb4bd0b4d4470ba82f789f2f4df
+  - - initial_ast: 857812af1045dabebf4e6eb68b16893a3d317598f7851f7a4d1c291a52ef1323
+      unrolled_ast: 857812af1045dabebf4e6eb68b16893a3d317598f7851f7a4d1c291a52ef1323
+      ssa_ast: d7a3c1dc8eb07d6add84a71f12849bfab37e1df3b362ddbcf2ff329bdcde854c
+      flattened_ast: 9b65f7e899badd6fa2c216fe359638e2d88266a6aa29f34f4f3cfeee3cec3bee
+      inlined_ast: 9b65f7e899badd6fa2c216fe359638e2d88266a6aa29f34f4f3cfeee3cec3bee
+      dce_ast: 9b65f7e899badd6fa2c216fe359638e2d88266a6aa29f34f4f3cfeee3cec3bee
       bytecode: d6c71656a8b803092075816e82fbc5c044f3700139c5ca079a1a8f2be846d573
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/ternary.out b/tests/expectations/compiler/integers/u16/ternary.out
index 4ccd7b859c..d6d489ef25 100644
--- a/tests/expectations/compiler/integers/u16/ternary.out
+++ b/tests/expectations/compiler/integers/u16/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f16833a105cc1cde21df4aa476bf3b425983456c39678f6d293f4eee8f26010c
-      unrolled_ast: f16833a105cc1cde21df4aa476bf3b425983456c39678f6d293f4eee8f26010c
-      ssa_ast: 89ca1055575925d5a869b32f71ecced26c12a21db924d47c2603d0bfc53306f0
-      flattened_ast: dcd6b89c12be28708fc662a9056c914c9aa361470e49971ba9e076ddc916f93e
-      inlined_ast: dcd6b89c12be28708fc662a9056c914c9aa361470e49971ba9e076ddc916f93e
-      dce_ast: dcd6b89c12be28708fc662a9056c914c9aa361470e49971ba9e076ddc916f93e
+  - - initial_ast: de596aaabd8d5d2f5f06ef6148de0cee48f699562679a8adbdfcc1fa3708ab50
+      unrolled_ast: de596aaabd8d5d2f5f06ef6148de0cee48f699562679a8adbdfcc1fa3708ab50
+      ssa_ast: 7398f219d2f50c64c9b1d4a6ba557b3bcbca4a502f405957bddd9d8985cba3f7
+      flattened_ast: 51114d6b614042f55b72ec93eee6ef67235d839b037cb81ab5d85b666e777f85
+      inlined_ast: 51114d6b614042f55b72ec93eee6ef67235d839b037cb81ab5d85b666e777f85
+      dce_ast: 51114d6b614042f55b72ec93eee6ef67235d839b037cb81ab5d85b666e777f85
       bytecode: 113603fb207a83e65ee275be10ad122173cea7a90327c07028eab9fffe449016
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u16/xor.out b/tests/expectations/compiler/integers/u16/xor.out
index 8e89f6aef5..f5b6cbf24c 100644
--- a/tests/expectations/compiler/integers/u16/xor.out
+++ b/tests/expectations/compiler/integers/u16/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8a3b91da5d3afbd797cf484556f6630bd1d1bda2916c00a907f144804b75affa
-      unrolled_ast: 8a3b91da5d3afbd797cf484556f6630bd1d1bda2916c00a907f144804b75affa
-      ssa_ast: 350589a90e1fceaf80899a5d25ceb4765a95c4ef9353d3dee8657726e0d1b91b
-      flattened_ast: 890e38ffe027c8487f20cceed78ff5e93d7a8d0e0c6b023bbc60b9e404c0344c
-      inlined_ast: 890e38ffe027c8487f20cceed78ff5e93d7a8d0e0c6b023bbc60b9e404c0344c
-      dce_ast: 890e38ffe027c8487f20cceed78ff5e93d7a8d0e0c6b023bbc60b9e404c0344c
+  - - initial_ast: 14fa4a89756b0a3ac1564a911d398b58d7cdd6b0bd132d5575a869a2493fe463
+      unrolled_ast: 14fa4a89756b0a3ac1564a911d398b58d7cdd6b0bd132d5575a869a2493fe463
+      ssa_ast: bd49d4128f9304b8edd9c86d06d11f9721445d29653f40372ad66fc917ea74e2
+      flattened_ast: 5d8c0544cc7b99e72b5191991ccb09309af7f203ee3c16557798d4a433cb4035
+      inlined_ast: 5d8c0544cc7b99e72b5191991ccb09309af7f203ee3c16557798d4a433cb4035
+      dce_ast: 5d8c0544cc7b99e72b5191991ccb09309af7f203ee3c16557798d4a433cb4035
       bytecode: eb928c87aa9dab9c5fd3d063c6f3bd9400ca1fb12eea712baf4406852dc1f439
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/add.out b/tests/expectations/compiler/integers/u32/add.out
index ea4a2a20a3..0f5aea5be4 100644
--- a/tests/expectations/compiler/integers/u32/add.out
+++ b/tests/expectations/compiler/integers/u32/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 76b9945c57a58eeda5688b09b7983302310946661a33b71f613cbfdad5815801
-      unrolled_ast: 76b9945c57a58eeda5688b09b7983302310946661a33b71f613cbfdad5815801
-      ssa_ast: c4e8aee26fdd52af15e9d8279c7c974e74132786b7bcdd1586f9a455c37a59c3
-      flattened_ast: 05d6caa260bcaa98011ee35fdbac9999b7fe41e32029171c8cd6e3e704ffc6be
-      inlined_ast: 05d6caa260bcaa98011ee35fdbac9999b7fe41e32029171c8cd6e3e704ffc6be
-      dce_ast: 05d6caa260bcaa98011ee35fdbac9999b7fe41e32029171c8cd6e3e704ffc6be
+  - - initial_ast: 6a8f61512d2075181aaa35c22bd913b856d10e3ab3f4fb63733d90b59ad2d21e
+      unrolled_ast: 6a8f61512d2075181aaa35c22bd913b856d10e3ab3f4fb63733d90b59ad2d21e
+      ssa_ast: dac86bab60139a9ae4f7c8ef082dab5bd9552a20b7fb8ac1169c5b8759a0f533
+      flattened_ast: 283a5228acebef96b7687ff4ab5b71f925d013ddf995cec07e49c00af9113e02
+      inlined_ast: 283a5228acebef96b7687ff4ab5b71f925d013ddf995cec07e49c00af9113e02
+      dce_ast: 283a5228acebef96b7687ff4ab5b71f925d013ddf995cec07e49c00af9113e02
       bytecode: 6a79f884436b0bdadcee0ff3dd76a5e3fb16cd5d733f2091cbb17cc680c8b185
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/and.out b/tests/expectations/compiler/integers/u32/and.out
index 646403da7c..57ae0fdae8 100644
--- a/tests/expectations/compiler/integers/u32/and.out
+++ b/tests/expectations/compiler/integers/u32/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0bdcabe136d02616b80d0dc001e763b4fb0bea2686771d147633ead19526e255
-      unrolled_ast: 0bdcabe136d02616b80d0dc001e763b4fb0bea2686771d147633ead19526e255
-      ssa_ast: 5843eabaed0ae08dce4ddc5886c760cad4b17a547fbfc83fd7dbe8b876b38d86
-      flattened_ast: ad943410ebe6fe21f41a28b420d7509f3e3179e2536eb2accb2e9e3597149eb6
-      inlined_ast: ad943410ebe6fe21f41a28b420d7509f3e3179e2536eb2accb2e9e3597149eb6
-      dce_ast: ad943410ebe6fe21f41a28b420d7509f3e3179e2536eb2accb2e9e3597149eb6
+  - - initial_ast: b739e6cd24bc2088696f210f4a832f923118297aca754bf0fcbf4e351288e927
+      unrolled_ast: b739e6cd24bc2088696f210f4a832f923118297aca754bf0fcbf4e351288e927
+      ssa_ast: 6a373a303969a263e221f4bcdf082d00cb4ddce82721d7000354ceb476b0159a
+      flattened_ast: de2118bbae40176900b7fef636f4a18f788f484694a95b9749c18869a04688d4
+      inlined_ast: de2118bbae40176900b7fef636f4a18f788f484694a95b9749c18869a04688d4
+      dce_ast: de2118bbae40176900b7fef636f4a18f788f484694a95b9749c18869a04688d4
       bytecode: 8cf2c9baf4dd960c2135a86ac62576bcb4d04c2ba826ff413bdce7f05d230516
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/console_assert.out b/tests/expectations/compiler/integers/u32/console_assert.out
index e57eff0531..1485b11b90 100644
--- a/tests/expectations/compiler/integers/u32/console_assert.out
+++ b/tests/expectations/compiler/integers/u32/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c26c5ba13d6fc12cf13de005b9553d7de70223edd9d64e834acc6033bc42c890
-      unrolled_ast: c26c5ba13d6fc12cf13de005b9553d7de70223edd9d64e834acc6033bc42c890
-      ssa_ast: f2208dde162a5f8256781fa5f4b8109ad9c1d7c3cf113b73d057966f6c8ddfa8
-      flattened_ast: 1fd4bcd2b00bd9f6b8cf69b5fd7f201a87b29fadc89be8abe65c2399343f812e
-      inlined_ast: 1fd4bcd2b00bd9f6b8cf69b5fd7f201a87b29fadc89be8abe65c2399343f812e
-      dce_ast: 1fd4bcd2b00bd9f6b8cf69b5fd7f201a87b29fadc89be8abe65c2399343f812e
+  - - initial_ast: 944097e39ef0159e7f5723f7fcbf213d78f90f7811e9825935d57d73a01f030b
+      unrolled_ast: 944097e39ef0159e7f5723f7fcbf213d78f90f7811e9825935d57d73a01f030b
+      ssa_ast: 2d338fb9042afc72bb6ed5611811fe5d6432094b130cce23b54e7bd675a33055
+      flattened_ast: 1a137838f07b20ddeee2c0b22f4594619eff609bd97bf0e877ef7be4b9bc9afd
+      inlined_ast: 1a137838f07b20ddeee2c0b22f4594619eff609bd97bf0e877ef7be4b9bc9afd
+      dce_ast: 1a137838f07b20ddeee2c0b22f4594619eff609bd97bf0e877ef7be4b9bc9afd
       bytecode: c05a2b573d0bcf072a9b4cda004f6e3c44b73fba4238919546eb3703cb05c258
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/div.out b/tests/expectations/compiler/integers/u32/div.out
index 69e42a436e..ae0ef4a1c7 100644
--- a/tests/expectations/compiler/integers/u32/div.out
+++ b/tests/expectations/compiler/integers/u32/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fc19ed28a2b3542743290a53a65045f189683ab164423ff8fc802eb05f7600a2
-      unrolled_ast: fc19ed28a2b3542743290a53a65045f189683ab164423ff8fc802eb05f7600a2
-      ssa_ast: 9e28e66aad8c20dcc73ad84dc6617a97ea934f07caf66471b26917295ded39f5
-      flattened_ast: 1f43d534a333821f77b8c60e332e96238996dd84c64384cf758b72be81b56c9b
-      inlined_ast: 1f43d534a333821f77b8c60e332e96238996dd84c64384cf758b72be81b56c9b
-      dce_ast: 1f43d534a333821f77b8c60e332e96238996dd84c64384cf758b72be81b56c9b
+  - - initial_ast: fddba8f6ee155c1b38deaf8673bc948530899f9c9bb24d5595cc0da75896bc70
+      unrolled_ast: fddba8f6ee155c1b38deaf8673bc948530899f9c9bb24d5595cc0da75896bc70
+      ssa_ast: 439a445a1721806f786b541ce159ac77a5241224054415383e1f498098d55664
+      flattened_ast: 766a26d32f85ce0a32aaafd48e1899107f9e4d3f0eb9818a256dda9ec3524c5a
+      inlined_ast: 766a26d32f85ce0a32aaafd48e1899107f9e4d3f0eb9818a256dda9ec3524c5a
+      dce_ast: 766a26d32f85ce0a32aaafd48e1899107f9e4d3f0eb9818a256dda9ec3524c5a
       bytecode: 544b47ba167ef02d93729c64e3bb7f76cd94229385874a8c68b48cdf9f7cf767
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/eq.out b/tests/expectations/compiler/integers/u32/eq.out
index 5c06a1fdbf..2c27226cfe 100644
--- a/tests/expectations/compiler/integers/u32/eq.out
+++ b/tests/expectations/compiler/integers/u32/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a4b12fc6faae6504e7ea7514a594013eda37a253e18513c838c24b73251aa493
-      unrolled_ast: a4b12fc6faae6504e7ea7514a594013eda37a253e18513c838c24b73251aa493
-      ssa_ast: df9a99dc116d9b058414aad05ec025e0e13536c702a968bb8349240c463e347a
-      flattened_ast: af6db2e843edc1b6929d931a172f521676a33825d75a118f212d1cacaa740d13
-      inlined_ast: af6db2e843edc1b6929d931a172f521676a33825d75a118f212d1cacaa740d13
-      dce_ast: af6db2e843edc1b6929d931a172f521676a33825d75a118f212d1cacaa740d13
+  - - initial_ast: 61edba10f38554b59e10548ea5ec921ddea0362b26310d852ed51928d7c6a446
+      unrolled_ast: 61edba10f38554b59e10548ea5ec921ddea0362b26310d852ed51928d7c6a446
+      ssa_ast: 939e319548013937f9fd2af75a37d469060de3f0e3472ef641c023004224a04b
+      flattened_ast: 4bb2f3f9732d3732fc28e78d7abde06c78b429c432ae00cf004be9a45242f373
+      inlined_ast: 4bb2f3f9732d3732fc28e78d7abde06c78b429c432ae00cf004be9a45242f373
+      dce_ast: 4bb2f3f9732d3732fc28e78d7abde06c78b429c432ae00cf004be9a45242f373
       bytecode: eb74a56b4c761a3050ee4ca8c5ac6f4085675f0ba71514b9c10cc49044251472
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/ge.out b/tests/expectations/compiler/integers/u32/ge.out
index be081a6b67..89ef401e46 100644
--- a/tests/expectations/compiler/integers/u32/ge.out
+++ b/tests/expectations/compiler/integers/u32/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 19cddc2359614ef0bebf8bee2b9b80d270da274b30741e144e11fe1d043d0d5d
-      unrolled_ast: 19cddc2359614ef0bebf8bee2b9b80d270da274b30741e144e11fe1d043d0d5d
-      ssa_ast: db8c9b556d8a7a91326984f472d51ab8550aaead9f5dfb56fdcbe4c9c72aaa14
-      flattened_ast: 27df1128c1805548762e45d728d800a61c4c711e27b9f6743acf6ea04690b1e5
-      inlined_ast: 27df1128c1805548762e45d728d800a61c4c711e27b9f6743acf6ea04690b1e5
-      dce_ast: 27df1128c1805548762e45d728d800a61c4c711e27b9f6743acf6ea04690b1e5
+  - - initial_ast: 08b01cbfa96891e83c39f6dc3c2dd3c56abab93ab4a8055eaa92cbe8e16b68a8
+      unrolled_ast: 08b01cbfa96891e83c39f6dc3c2dd3c56abab93ab4a8055eaa92cbe8e16b68a8
+      ssa_ast: f11712643cd9b56dbb76c056b70cd667f649acdc5e65f9007873ce354a444b80
+      flattened_ast: 548e04cc2696f74e0487ee61d943e7909ce3417d477004dee1c6031b64fa8ef5
+      inlined_ast: 548e04cc2696f74e0487ee61d943e7909ce3417d477004dee1c6031b64fa8ef5
+      dce_ast: 548e04cc2696f74e0487ee61d943e7909ce3417d477004dee1c6031b64fa8ef5
       bytecode: d5c6740e9f4b930180fb52ddc268e35b87ed215c56fe529e98ee015dbfa08b3e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/gt.out b/tests/expectations/compiler/integers/u32/gt.out
index 960815142d..d5cfbdc0bf 100644
--- a/tests/expectations/compiler/integers/u32/gt.out
+++ b/tests/expectations/compiler/integers/u32/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 413fba516be1db92aef583659c9cc66f2bd1cca25e9539c129697c7ef74e4e75
-      unrolled_ast: 413fba516be1db92aef583659c9cc66f2bd1cca25e9539c129697c7ef74e4e75
-      ssa_ast: d9f42663d5d87ea355ea6d15370c2c8f014bb4ddc2318d01023f219a435eaa88
-      flattened_ast: ca677c96fe912c79afcad74554e5edcc21cd3dedee66b825f620407e8b50081d
-      inlined_ast: ca677c96fe912c79afcad74554e5edcc21cd3dedee66b825f620407e8b50081d
-      dce_ast: ca677c96fe912c79afcad74554e5edcc21cd3dedee66b825f620407e8b50081d
+  - - initial_ast: 66dc30548213d8c0accfc85ee880a167eb769f08ce68121dacaa339294825d6c
+      unrolled_ast: 66dc30548213d8c0accfc85ee880a167eb769f08ce68121dacaa339294825d6c
+      ssa_ast: 0822ecd1d676ccb0f2c2e6b38869770482c9b446af6895db80431480ee29518e
+      flattened_ast: 96240d85e2524b785baa0b04c81e970634092cb0e8de6087f6be802937f22f8b
+      inlined_ast: 96240d85e2524b785baa0b04c81e970634092cb0e8de6087f6be802937f22f8b
+      dce_ast: 96240d85e2524b785baa0b04c81e970634092cb0e8de6087f6be802937f22f8b
       bytecode: 5b1536cb2d2f274904ed23cabc28dad63d0e22a9bd4d1a5615b88b2c3ea6d7eb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/le.out b/tests/expectations/compiler/integers/u32/le.out
index c875bb5a34..8e1cd26e08 100644
--- a/tests/expectations/compiler/integers/u32/le.out
+++ b/tests/expectations/compiler/integers/u32/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b08689c569b21d0bae9988483424abd97d73a6c91f4f9193b67c416bf2f37fef
-      unrolled_ast: b08689c569b21d0bae9988483424abd97d73a6c91f4f9193b67c416bf2f37fef
-      ssa_ast: ffeafd8f204f23232305f7e6d48715b19528872080ed866044350788c357fc72
-      flattened_ast: 564c9f57f69ba6b4ee83843a0bc6b2724ac4d091e27bd12c30d162b3286eb38c
-      inlined_ast: 564c9f57f69ba6b4ee83843a0bc6b2724ac4d091e27bd12c30d162b3286eb38c
-      dce_ast: 564c9f57f69ba6b4ee83843a0bc6b2724ac4d091e27bd12c30d162b3286eb38c
+  - - initial_ast: 72b7c82e70cd3a0e57df985fc86fd81f98ca1cbd1f7f86c20d203f43a9265632
+      unrolled_ast: 72b7c82e70cd3a0e57df985fc86fd81f98ca1cbd1f7f86c20d203f43a9265632
+      ssa_ast: 7741795fb1e192a6496cb73f13b9a5102896ad23d434af26445b8c7f44fee3f0
+      flattened_ast: f24c9bdccd2f68af9c5dbd767f7f4e0c4e1812472e76733d92c368e1ead4688b
+      inlined_ast: f24c9bdccd2f68af9c5dbd767f7f4e0c4e1812472e76733d92c368e1ead4688b
+      dce_ast: f24c9bdccd2f68af9c5dbd767f7f4e0c4e1812472e76733d92c368e1ead4688b
       bytecode: 76d3ed305f669697432c49a48165440a287bc91eb95c2110f936235259d824ed
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/lt.out b/tests/expectations/compiler/integers/u32/lt.out
index 2a2340ad99..b845504025 100644
--- a/tests/expectations/compiler/integers/u32/lt.out
+++ b/tests/expectations/compiler/integers/u32/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9ca2bfa61689e644aad7fb3ec8f5b45c2f89c6997c94e8900f2a8a6430f7ca17
-      unrolled_ast: 9ca2bfa61689e644aad7fb3ec8f5b45c2f89c6997c94e8900f2a8a6430f7ca17
-      ssa_ast: 651f74b8072a1aee26651b5c8962bc4232135e827f60b956f32535bba5913ef9
-      flattened_ast: d4ad5c48f645c93357c2df6c464db998ac9052e555eec004677ef326724862bb
-      inlined_ast: d4ad5c48f645c93357c2df6c464db998ac9052e555eec004677ef326724862bb
-      dce_ast: d4ad5c48f645c93357c2df6c464db998ac9052e555eec004677ef326724862bb
+  - - initial_ast: d568e7c937586e197e2418f50875736fc9d44f767980f18ae2ce958fcec22a1a
+      unrolled_ast: d568e7c937586e197e2418f50875736fc9d44f767980f18ae2ce958fcec22a1a
+      ssa_ast: 345edec8278423dd0fd6078b70e8d3929486ff142b5fb8ee7f933ec4721d089b
+      flattened_ast: 31e4a7d4b9f0d5a71a991cdbd9d63c5e4c44e3711139712c2449ea7a7f0517e6
+      inlined_ast: 31e4a7d4b9f0d5a71a991cdbd9d63c5e4c44e3711139712c2449ea7a7f0517e6
+      dce_ast: 31e4a7d4b9f0d5a71a991cdbd9d63c5e4c44e3711139712c2449ea7a7f0517e6
       bytecode: 4aac77fed46b036a9aaced7512320c824d26a5a025292fdb91c422b4ef3fadfd
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/max.out b/tests/expectations/compiler/integers/u32/max.out
index faa1abeaaa..64a10afcf0 100644
--- a/tests/expectations/compiler/integers/u32/max.out
+++ b/tests/expectations/compiler/integers/u32/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9f490e8ec84e1d9b2cadeb4ae80e677204813a232ef25c757824c136d9817bd0
-      unrolled_ast: 9f490e8ec84e1d9b2cadeb4ae80e677204813a232ef25c757824c136d9817bd0
-      ssa_ast: a8e6fecc439110927d153639a3eb89cc8a6947ae1a8495ed9c6c859251b24eff
-      flattened_ast: 7301eb08e4ab571770baa72d1a2911da3865492b10447f4fb3d566a7ac6b32cb
-      inlined_ast: 7301eb08e4ab571770baa72d1a2911da3865492b10447f4fb3d566a7ac6b32cb
-      dce_ast: eb7579fd0b1d4a3d53d91c1eea89271e61785ae1fc6e7aaed43b4124c7c9dfa7
+  - - initial_ast: 52adf774de073c65ac49781346b144ac3a0a263efaadc64dc4d90656a638a366
+      unrolled_ast: 52adf774de073c65ac49781346b144ac3a0a263efaadc64dc4d90656a638a366
+      ssa_ast: 3eb9c90945dc8499f79f1d3d5ae139501653015bac26acba9afbd2a7573dea74
+      flattened_ast: 3d0a1ff95a7cc8367d0006ca19b86073479c84d7fd9e344def7a5294577c3f1b
+      inlined_ast: 3d0a1ff95a7cc8367d0006ca19b86073479c84d7fd9e344def7a5294577c3f1b
+      dce_ast: 4bad27f949830e05271fcabb9f1a0828011bc77374e6856804c65893694901db
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/min.out b/tests/expectations/compiler/integers/u32/min.out
index 2729c62ed5..e20abf1d84 100644
--- a/tests/expectations/compiler/integers/u32/min.out
+++ b/tests/expectations/compiler/integers/u32/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e074325c47a660b4f450652a49dbe79d081aa6a876e6a1cd855b97f0f8cb2807
-      unrolled_ast: e074325c47a660b4f450652a49dbe79d081aa6a876e6a1cd855b97f0f8cb2807
-      ssa_ast: 8fac208a87c63c815c74d3bd8df668616b1430861186aa75f062e1e9097da993
-      flattened_ast: d55ef7e952d6906c152602c401557bb85e6d7c382b89c767d33ef2dc9c8797c8
-      inlined_ast: d55ef7e952d6906c152602c401557bb85e6d7c382b89c767d33ef2dc9c8797c8
-      dce_ast: 6e57ba358030a370d68a4f419c99171ec588523b863ee0a1bb6cedd843c7c04a
+  - - initial_ast: b3e650f9bf4939ddcb3db7cb2ae263cf2a2d0b1e4a5a9bd4575c2e1fe246bb6f
+      unrolled_ast: b3e650f9bf4939ddcb3db7cb2ae263cf2a2d0b1e4a5a9bd4575c2e1fe246bb6f
+      ssa_ast: 067d6e742261f4367419f56d935eb415827ed90d9522a252d231e6ff9d4922e2
+      flattened_ast: bb2676e49a195a59a8b058e27cfa1d4c3543854f1de3df012cf15346a4bf48ad
+      inlined_ast: bb2676e49a195a59a8b058e27cfa1d4c3543854f1de3df012cf15346a4bf48ad
+      dce_ast: bd3b38c0fd9de216854db7c9f1d6dfde9c887e9433a9cb3ba8c2c13ac37a2849
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/mul.out b/tests/expectations/compiler/integers/u32/mul.out
index 60fd4367e2..7e68a02c37 100644
--- a/tests/expectations/compiler/integers/u32/mul.out
+++ b/tests/expectations/compiler/integers/u32/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6809c9ac0fa0b274c516789c0656d603f7078c0ea18171911722dd0fe22523d1
-      unrolled_ast: 6809c9ac0fa0b274c516789c0656d603f7078c0ea18171911722dd0fe22523d1
-      ssa_ast: 1c52ffde77b8d81d98081fe88014faae3bacedc354cb7240c41ada5831945edb
-      flattened_ast: 53f9bc432683b581936563fa3a5086c91d054136e1bdaee68c9abf5558ecb2ac
-      inlined_ast: 53f9bc432683b581936563fa3a5086c91d054136e1bdaee68c9abf5558ecb2ac
-      dce_ast: 53f9bc432683b581936563fa3a5086c91d054136e1bdaee68c9abf5558ecb2ac
+  - - initial_ast: d0735c93d0cbdfe390a6dda8035096f9623d2ecca4146ce80232f4555484d5f8
+      unrolled_ast: d0735c93d0cbdfe390a6dda8035096f9623d2ecca4146ce80232f4555484d5f8
+      ssa_ast: 4a195c6fdacde0a6bd39139fe8b33ad70f209646d99684ec706c72a567f2b5fc
+      flattened_ast: 48331573f28ec0c46487380e58530ce92f4e28253e7b4f3a0b85d27ec0593744
+      inlined_ast: 48331573f28ec0c46487380e58530ce92f4e28253e7b4f3a0b85d27ec0593744
+      dce_ast: 48331573f28ec0c46487380e58530ce92f4e28253e7b4f3a0b85d27ec0593744
       bytecode: 1dfb6b0bc60a60fdf5e7049346815ffb6fc80d045cb8282510fa518f3337e089
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/ne.out b/tests/expectations/compiler/integers/u32/ne.out
index 190874dd40..6063162d29 100644
--- a/tests/expectations/compiler/integers/u32/ne.out
+++ b/tests/expectations/compiler/integers/u32/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 80f26976341ab004e431ca5b5613f05e27d4f59fe7f5fa75239c83bdbfdca6a5
-      unrolled_ast: 80f26976341ab004e431ca5b5613f05e27d4f59fe7f5fa75239c83bdbfdca6a5
-      ssa_ast: 43852068198951274bb3b166b472ece5c44955d133c2b2a432209f467f812281
-      flattened_ast: 0fcf598ea52b026bd6da5a948d1da501371998a9950310921caba3ac3b365d8a
-      inlined_ast: 0fcf598ea52b026bd6da5a948d1da501371998a9950310921caba3ac3b365d8a
-      dce_ast: 0fcf598ea52b026bd6da5a948d1da501371998a9950310921caba3ac3b365d8a
+  - - initial_ast: f0647b1e80b21a470c2663de369e28e5a6cab168482ce7dc72ec7581433d7681
+      unrolled_ast: f0647b1e80b21a470c2663de369e28e5a6cab168482ce7dc72ec7581433d7681
+      ssa_ast: 875ac6c36407a3438dbacb7d17d7a71660c366155303494d1e7d85ba756e3d8d
+      flattened_ast: 5e21d8ba832b4b75fe0a7773788cedd4de614346092fe50ae67bb33bace15f6d
+      inlined_ast: 5e21d8ba832b4b75fe0a7773788cedd4de614346092fe50ae67bb33bace15f6d
+      dce_ast: 5e21d8ba832b4b75fe0a7773788cedd4de614346092fe50ae67bb33bace15f6d
       bytecode: 0fe1011e038cf47ffdbb7e95c4ac2326b985aeeffca177329c145c144fc46639
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/operator_methods.out b/tests/expectations/compiler/integers/u32/operator_methods.out
index ef5a003945..14d05356fe 100644
--- a/tests/expectations/compiler/integers/u32/operator_methods.out
+++ b/tests/expectations/compiler/integers/u32/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 55b0b25d5f461e359763785a415af1c663fea32e6661cf3adb62b041bcb6c5df
-      unrolled_ast: 55b0b25d5f461e359763785a415af1c663fea32e6661cf3adb62b041bcb6c5df
-      ssa_ast: 8f18178dc8405d89ca217582266de69e4c58c7590c7b675067db910eecaadf5e
-      flattened_ast: 9ef684100e5967771db32d76c09b7c5477a79f973e05880f1e43d4f8bf1c1c04
-      inlined_ast: 9ef684100e5967771db32d76c09b7c5477a79f973e05880f1e43d4f8bf1c1c04
-      dce_ast: c5f74741f54ccbf79d65eb2aecf5ac445575eb1574cef538a96e5509402c138b
+  - - initial_ast: 9bb8ebcd75607ea75046b71bf111004eaaa65f8b75fc6e29841288c666368ef0
+      unrolled_ast: 9bb8ebcd75607ea75046b71bf111004eaaa65f8b75fc6e29841288c666368ef0
+      ssa_ast: 967a389b1d75d78804848c39c6d545382da9cdecbaeb86b3b131e53c6fbf52a1
+      flattened_ast: 1e2e0609b399c59ec2be25bbbfd4be8781612f401b9d5b6959d232a8f4169b80
+      inlined_ast: 1e2e0609b399c59ec2be25bbbfd4be8781612f401b9d5b6959d232a8f4169b80
+      dce_ast: 8cd0a7161b4ddce564c45ec4ddea8c4afe4840f64cb2b8767e4d5dd46913f94d
       bytecode: aec6ee0fcfa292c5e3a4b9165408e9627b7c73b520302dc986293cc36fea4383
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/or.out b/tests/expectations/compiler/integers/u32/or.out
index eb37ecb43d..01e589143f 100644
--- a/tests/expectations/compiler/integers/u32/or.out
+++ b/tests/expectations/compiler/integers/u32/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cb87dafadca3019b80847f8ae4321e73475fa6b4b255d85185c38cfc49899256
-      unrolled_ast: cb87dafadca3019b80847f8ae4321e73475fa6b4b255d85185c38cfc49899256
-      ssa_ast: 8580fbe7e9690aaf4f3f544f98bca27d0ec24e5916d78f60bda3d9288218d486
-      flattened_ast: 03da227a58891d9db8e77cf7c8c952d9164ee8ab83cb7f7ae5875edb7259e5a5
-      inlined_ast: 03da227a58891d9db8e77cf7c8c952d9164ee8ab83cb7f7ae5875edb7259e5a5
-      dce_ast: 03da227a58891d9db8e77cf7c8c952d9164ee8ab83cb7f7ae5875edb7259e5a5
+  - - initial_ast: 82990a327119cc4d3793ffea1c616874c682639436c4eeaf914cacaa55821deb
+      unrolled_ast: 82990a327119cc4d3793ffea1c616874c682639436c4eeaf914cacaa55821deb
+      ssa_ast: e1dccc896737a80736f718fc059ced54fe3bcf2464221957054cf4f613bb3d26
+      flattened_ast: 91462f94702bc2455f5408f30e1c9e74f50cbb37c132a0abeff4184e2a2d60d3
+      inlined_ast: 91462f94702bc2455f5408f30e1c9e74f50cbb37c132a0abeff4184e2a2d60d3
+      dce_ast: 91462f94702bc2455f5408f30e1c9e74f50cbb37c132a0abeff4184e2a2d60d3
       bytecode: 53c22439941468b3986c9021bd4d3436c1e3ce8aa1ac79e04de9a0d08b16b3eb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/pow.out b/tests/expectations/compiler/integers/u32/pow.out
index 4db78f30b4..56a9961e1b 100644
--- a/tests/expectations/compiler/integers/u32/pow.out
+++ b/tests/expectations/compiler/integers/u32/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f3e66dd4ce70e25a380731570d4162e1d0efdac8dd3825f4e254b638a3afe601
-      unrolled_ast: f3e66dd4ce70e25a380731570d4162e1d0efdac8dd3825f4e254b638a3afe601
-      ssa_ast: 26615b6433714286920cb1652bcbdbc398f3b147e393b70a113d104850c61b7c
-      flattened_ast: eb9d6b36525957e7a419e51e91494b4825361e514bc9bf89c1bae668c2831310
-      inlined_ast: eb9d6b36525957e7a419e51e91494b4825361e514bc9bf89c1bae668c2831310
-      dce_ast: eb9d6b36525957e7a419e51e91494b4825361e514bc9bf89c1bae668c2831310
+  - - initial_ast: 6ba01089f9af29a80862f1fdd56772c8f009efda21382fa317a6df9e32023109
+      unrolled_ast: 6ba01089f9af29a80862f1fdd56772c8f009efda21382fa317a6df9e32023109
+      ssa_ast: 5fb4436280c3ba78227416021ef1d5620b0ddb024e234210132b60bd68982473
+      flattened_ast: ce66d858cc53107be29f24ce14c186e86bd3ec9520a0966df880ac12a38b25fc
+      inlined_ast: ce66d858cc53107be29f24ce14c186e86bd3ec9520a0966df880ac12a38b25fc
+      dce_ast: ce66d858cc53107be29f24ce14c186e86bd3ec9520a0966df880ac12a38b25fc
       bytecode: ea3230d133de200302ce0c5577ef8daca458af44512b67f567dfdeaeb60ef62d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/rem.out b/tests/expectations/compiler/integers/u32/rem.out
index 73ff7d35e2..a9dccaec6f 100644
--- a/tests/expectations/compiler/integers/u32/rem.out
+++ b/tests/expectations/compiler/integers/u32/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 09e46e36315313edec079e9bbb9c156401086fd0d173d6250006648b701d4cac
-      unrolled_ast: 09e46e36315313edec079e9bbb9c156401086fd0d173d6250006648b701d4cac
-      ssa_ast: 975b5221a1eeef391ea3cd65e34cae670004d734bc8763eb4ca25efed4728151
-      flattened_ast: 94af18339bda3c4b168155b3f985175b9ac5ea2179484e606d24a103e8e457ad
-      inlined_ast: 94af18339bda3c4b168155b3f985175b9ac5ea2179484e606d24a103e8e457ad
-      dce_ast: 94af18339bda3c4b168155b3f985175b9ac5ea2179484e606d24a103e8e457ad
+  - - initial_ast: 0ebb012af2b12178d050c3ada962ff92bae317fe0398f52b264d3ada9e405328
+      unrolled_ast: 0ebb012af2b12178d050c3ada962ff92bae317fe0398f52b264d3ada9e405328
+      ssa_ast: 8344e9a542257e3066f7c356426118c65215aae22fdf356f48ddc113ce77e92e
+      flattened_ast: 6bda8ada795b956e7e09ced0a10e82b1c6ff297c00c92c6c6833c292f41625b0
+      inlined_ast: 6bda8ada795b956e7e09ced0a10e82b1c6ff297c00c92c6c6833c292f41625b0
+      dce_ast: 6bda8ada795b956e7e09ced0a10e82b1c6ff297c00c92c6c6833c292f41625b0
       bytecode: 654c6c9d87b686ee8ac83d2561ae0db42eaed0e933d018514d99d2eee2dc350c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/shl.out b/tests/expectations/compiler/integers/u32/shl.out
index 45c220c6a2..dee8550880 100644
--- a/tests/expectations/compiler/integers/u32/shl.out
+++ b/tests/expectations/compiler/integers/u32/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4c3e1a6617abc766aeb06682ede4f6e11c46b53617149e38921154239ed78cba
-      unrolled_ast: 4c3e1a6617abc766aeb06682ede4f6e11c46b53617149e38921154239ed78cba
-      ssa_ast: cf7cdac2f5b69981b3a1aa7b476b655d35920f7796b6b0d5a3d2808f69cc45bb
-      flattened_ast: 88bfc5d9b1c80175241bea35c9b0d7cb09c37cd53f3acf5330d0d48329ffb93d
-      inlined_ast: 88bfc5d9b1c80175241bea35c9b0d7cb09c37cd53f3acf5330d0d48329ffb93d
-      dce_ast: 88bfc5d9b1c80175241bea35c9b0d7cb09c37cd53f3acf5330d0d48329ffb93d
+  - - initial_ast: fe7f6fd5941ca89561bbea03c4509d21d966144a6ccbfe65d814fb9c644732fa
+      unrolled_ast: fe7f6fd5941ca89561bbea03c4509d21d966144a6ccbfe65d814fb9c644732fa
+      ssa_ast: 52e140a570316f269f1b34b4f8ff8c442438ed17f885f4f3484ee9fc8bec006e
+      flattened_ast: 3caface231db8653434935b90666310ba2112cffae4b0a510609139fcf195653
+      inlined_ast: 3caface231db8653434935b90666310ba2112cffae4b0a510609139fcf195653
+      dce_ast: 3caface231db8653434935b90666310ba2112cffae4b0a510609139fcf195653
       bytecode: d00fc78598c5002f3dd2576928bd1fb6121f078f9fc5b2b7394ff8338192172d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/shr.out b/tests/expectations/compiler/integers/u32/shr.out
index d1c3a63adb..db006b1887 100644
--- a/tests/expectations/compiler/integers/u32/shr.out
+++ b/tests/expectations/compiler/integers/u32/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 5d6b4d7f1a0010bcab2a54ce234fbd3c30f7b2531eab68784339460674f6443e
-      unrolled_ast: 5d6b4d7f1a0010bcab2a54ce234fbd3c30f7b2531eab68784339460674f6443e
-      ssa_ast: f35701985c543af0e0c608f8e659de3d32aa1d5354985f241cb7dc7e4bbfa501
-      flattened_ast: 78c3c1be518ef1a2e3f22340fa5bd6eba9a3051a6cfbc2de3e158dd6715b3e0a
-      inlined_ast: 78c3c1be518ef1a2e3f22340fa5bd6eba9a3051a6cfbc2de3e158dd6715b3e0a
-      dce_ast: 78c3c1be518ef1a2e3f22340fa5bd6eba9a3051a6cfbc2de3e158dd6715b3e0a
+  - - initial_ast: de401e73f51f4181867b830d70ce5dff7e6796b4cf7eb5b913ae5952280ba6d7
+      unrolled_ast: de401e73f51f4181867b830d70ce5dff7e6796b4cf7eb5b913ae5952280ba6d7
+      ssa_ast: cb3d1713479aef4d380f312699cfecc93bd90e69adfd1a085eb31010bb82d610
+      flattened_ast: d27143ea7c81c674ac69de0fc85306a3421c1c64d90b37d6be086a14a38dc3d1
+      inlined_ast: d27143ea7c81c674ac69de0fc85306a3421c1c64d90b37d6be086a14a38dc3d1
+      dce_ast: d27143ea7c81c674ac69de0fc85306a3421c1c64d90b37d6be086a14a38dc3d1
       bytecode: 80a1a42b727652cf9808ca4800943f424edc0f0b8e43781b9a6686e3ef7801e1
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/sub.out b/tests/expectations/compiler/integers/u32/sub.out
index 63279bf6d9..fbc5e891ef 100644
--- a/tests/expectations/compiler/integers/u32/sub.out
+++ b/tests/expectations/compiler/integers/u32/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b28f336827bb2b14347acc756d74ced71d8cc86077cd19b6a0523478a5821b57
-      unrolled_ast: b28f336827bb2b14347acc756d74ced71d8cc86077cd19b6a0523478a5821b57
-      ssa_ast: e8b6e42cb69b044ae2167a8e882b4592cabacbeb43824f3cbe139f9f10deebf8
-      flattened_ast: 0581d223fc65c9b3d61ad4a7797e1abed0bf605c849275cc30cf100569dad24a
-      inlined_ast: 0581d223fc65c9b3d61ad4a7797e1abed0bf605c849275cc30cf100569dad24a
-      dce_ast: 0581d223fc65c9b3d61ad4a7797e1abed0bf605c849275cc30cf100569dad24a
+  - - initial_ast: 7625c4ad094167f4fa9a7d065bab4aef8e30c1dbc2cf85a4f012b55306cd6f51
+      unrolled_ast: 7625c4ad094167f4fa9a7d065bab4aef8e30c1dbc2cf85a4f012b55306cd6f51
+      ssa_ast: 40ae9962eb170f7179942e74af726f500a29b4331ea8052fe82af17807f91574
+      flattened_ast: 9805505aa96da9da76cdafeec86468cb04dd24e0e50366d2a258ab755aab80f4
+      inlined_ast: 9805505aa96da9da76cdafeec86468cb04dd24e0e50366d2a258ab755aab80f4
+      dce_ast: 9805505aa96da9da76cdafeec86468cb04dd24e0e50366d2a258ab755aab80f4
       bytecode: 979ef93cea21ee04681e95a25458674a5c7bbc15e717b104e6dc1b16d5a7111b
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/ternary.out b/tests/expectations/compiler/integers/u32/ternary.out
index 83d9b239f0..58f95a4d8a 100644
--- a/tests/expectations/compiler/integers/u32/ternary.out
+++ b/tests/expectations/compiler/integers/u32/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 69146776f199f8f1b4a7586d27f0c21bd04196dbe46fbe4237b7256897c2004f
-      unrolled_ast: 69146776f199f8f1b4a7586d27f0c21bd04196dbe46fbe4237b7256897c2004f
-      ssa_ast: e1d1e180a814f69dc0355fe2ccf67a279b835741f50d1c2d0f71f770260ccd47
-      flattened_ast: c136492f50dcb7289806a5527c7d19d98f1f588c732291c2735f2546d7009926
-      inlined_ast: c136492f50dcb7289806a5527c7d19d98f1f588c732291c2735f2546d7009926
-      dce_ast: c136492f50dcb7289806a5527c7d19d98f1f588c732291c2735f2546d7009926
+  - - initial_ast: 900a5c1839d51cdce6d7178019a14af6a7361a6abfb6bb5acba1b0ab52e10c93
+      unrolled_ast: 900a5c1839d51cdce6d7178019a14af6a7361a6abfb6bb5acba1b0ab52e10c93
+      ssa_ast: 92f54c8703a9949ef853c30d4bcc48b15a63fd8f618f406c221cf054f8263b22
+      flattened_ast: d4c13132cb186066a3564c91c0f867b19dfe69190d4ffd4d749a4994f7f702c6
+      inlined_ast: d4c13132cb186066a3564c91c0f867b19dfe69190d4ffd4d749a4994f7f702c6
+      dce_ast: d4c13132cb186066a3564c91c0f867b19dfe69190d4ffd4d749a4994f7f702c6
       bytecode: 0ecd93e68a7f1e72535d2f014714c6b6dbf91f2b0a18df56913798be12ec1515
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u32/xor.out b/tests/expectations/compiler/integers/u32/xor.out
index 67a9121d21..ccb96bd2e2 100644
--- a/tests/expectations/compiler/integers/u32/xor.out
+++ b/tests/expectations/compiler/integers/u32/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: c50b14977746b299a39a2d0e70d788f570c1d87cc4767662923764b0153ac78f
-      unrolled_ast: c50b14977746b299a39a2d0e70d788f570c1d87cc4767662923764b0153ac78f
-      ssa_ast: 164c08856c81db1e425d9a142f3f83a81f991f4bd4c1a21170e035be2313b88d
-      flattened_ast: 5ec722a2f1e5da4fa8e1198acb5385b9fc306a99b3cf65a32a6baf7f0225e33e
-      inlined_ast: 5ec722a2f1e5da4fa8e1198acb5385b9fc306a99b3cf65a32a6baf7f0225e33e
-      dce_ast: 5ec722a2f1e5da4fa8e1198acb5385b9fc306a99b3cf65a32a6baf7f0225e33e
+  - - initial_ast: d9b77568e64296d2a13ab580b6f31aef13de832c98508ba61221722c93663cbb
+      unrolled_ast: d9b77568e64296d2a13ab580b6f31aef13de832c98508ba61221722c93663cbb
+      ssa_ast: 2d69f6bd3c2f80731fbb69f56fd899991ed527d6277ec2ba49dbe0289ee76266
+      flattened_ast: 9b7893c156da413a93a8a68605d5bafb81e0042223fc0596ca304d6cdf416e46
+      inlined_ast: 9b7893c156da413a93a8a68605d5bafb81e0042223fc0596ca304d6cdf416e46
+      dce_ast: 9b7893c156da413a93a8a68605d5bafb81e0042223fc0596ca304d6cdf416e46
       bytecode: f870b2c0a3ffc0935a53b790fbd562a4e160982136e597762e14d3a11f7572c7
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/add.out b/tests/expectations/compiler/integers/u64/add.out
index d89fbc371f..77327a2434 100644
--- a/tests/expectations/compiler/integers/u64/add.out
+++ b/tests/expectations/compiler/integers/u64/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 68c8bd6d534c58194d7fcb0fa2ccfd90ccf4ea5340198ce42ea85204c8a35ef2
-      unrolled_ast: 68c8bd6d534c58194d7fcb0fa2ccfd90ccf4ea5340198ce42ea85204c8a35ef2
-      ssa_ast: e34456a3a141bc4b19823914f15ad4c349e4a24147ae6d3ffba2165320f81b06
-      flattened_ast: e4d91a44533daed1e1410f9ece3b7863328eb268f6dd5aed025942de8a635fca
-      inlined_ast: e4d91a44533daed1e1410f9ece3b7863328eb268f6dd5aed025942de8a635fca
-      dce_ast: e4d91a44533daed1e1410f9ece3b7863328eb268f6dd5aed025942de8a635fca
+  - - initial_ast: 32d382518b3571b40285c1eff9217cbcb4b4193d4d08740c4cf857119b5d2987
+      unrolled_ast: 32d382518b3571b40285c1eff9217cbcb4b4193d4d08740c4cf857119b5d2987
+      ssa_ast: 7b15360bb787743f689948e834267548caabcc5b1f0eaa17b3a2d24154c0409b
+      flattened_ast: 18de3625bc6c31e3157e3a2d931b68c1c825e070921058ecefec9fe073e9cf12
+      inlined_ast: 18de3625bc6c31e3157e3a2d931b68c1c825e070921058ecefec9fe073e9cf12
+      dce_ast: 18de3625bc6c31e3157e3a2d931b68c1c825e070921058ecefec9fe073e9cf12
       bytecode: 3be0f7452f3ef5033f9f4c29362b7f16ca7d059569909b356d23fe3dbd898486
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/and.out b/tests/expectations/compiler/integers/u64/and.out
index 3269153a40..4bec593bea 100644
--- a/tests/expectations/compiler/integers/u64/and.out
+++ b/tests/expectations/compiler/integers/u64/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f73472a51957d60678f98dd91a4ad64a6248ca9a37dfb3f1d9f7023d7cf6ab53
-      unrolled_ast: f73472a51957d60678f98dd91a4ad64a6248ca9a37dfb3f1d9f7023d7cf6ab53
-      ssa_ast: 4dd85485322f23e6230423225775bf45cda6ab2a73b4244f611eee3b1c218b5d
-      flattened_ast: cda35e55fa526576ad51f1897675c18fdcab14df00665f6712ea74b718f19f71
-      inlined_ast: cda35e55fa526576ad51f1897675c18fdcab14df00665f6712ea74b718f19f71
-      dce_ast: cda35e55fa526576ad51f1897675c18fdcab14df00665f6712ea74b718f19f71
+  - - initial_ast: 77ba14a1fd0b40af0b63bc1cab050f95786ef9ebd8e744285e59e6914d1578bf
+      unrolled_ast: 77ba14a1fd0b40af0b63bc1cab050f95786ef9ebd8e744285e59e6914d1578bf
+      ssa_ast: 5ce17e30ec555ab25028fdb9c9b51c706d1224a6f014e9e0dffb2ffc9789f264
+      flattened_ast: de8bde56e9055cd64c2bc6e3e037a179be253421af1c4f0ab09709a45abf015e
+      inlined_ast: de8bde56e9055cd64c2bc6e3e037a179be253421af1c4f0ab09709a45abf015e
+      dce_ast: de8bde56e9055cd64c2bc6e3e037a179be253421af1c4f0ab09709a45abf015e
       bytecode: af4239d923d8c22f7bbdfdf8643c85648b25ba62b82819217a6c50924208d529
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/console_assert.out b/tests/expectations/compiler/integers/u64/console_assert.out
index f8d4e14495..14a733a40e 100644
--- a/tests/expectations/compiler/integers/u64/console_assert.out
+++ b/tests/expectations/compiler/integers/u64/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 77865b8a26f10e2d229ff6d54769212ba2a9420ad806d3c5b21c6a7cc8cc095e
-      unrolled_ast: 77865b8a26f10e2d229ff6d54769212ba2a9420ad806d3c5b21c6a7cc8cc095e
-      ssa_ast: a87187aee3704ea523cd7cc0be86cf0822f8aab29b6e3d36c52f6551e8f8f65f
-      flattened_ast: 7e11809f0fc08f563d49dd938555e2a8f3bdf1828838ff326c59ebbdd8cec570
-      inlined_ast: 7e11809f0fc08f563d49dd938555e2a8f3bdf1828838ff326c59ebbdd8cec570
-      dce_ast: 7e11809f0fc08f563d49dd938555e2a8f3bdf1828838ff326c59ebbdd8cec570
+  - - initial_ast: 67203f3297358e50d171e39b2410c6dbf0ac6cd8ab80bc468c64a7504b794eb8
+      unrolled_ast: 67203f3297358e50d171e39b2410c6dbf0ac6cd8ab80bc468c64a7504b794eb8
+      ssa_ast: ea76dbbbedd2a70c5ffe760f72d98881141253d702184249af82763d61f380e0
+      flattened_ast: d9060989fc27b379fa8bb9b07b5778f604fa4627c5b582ea0eaeb7ffafcf534f
+      inlined_ast: d9060989fc27b379fa8bb9b07b5778f604fa4627c5b582ea0eaeb7ffafcf534f
+      dce_ast: d9060989fc27b379fa8bb9b07b5778f604fa4627c5b582ea0eaeb7ffafcf534f
       bytecode: 0ee1282c31147bd35917b56ca5e0b6ed9ae7178f4a8e0681cb788bfe2803d2e5
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/div.out b/tests/expectations/compiler/integers/u64/div.out
index ed7c80347d..80262657c4 100644
--- a/tests/expectations/compiler/integers/u64/div.out
+++ b/tests/expectations/compiler/integers/u64/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b778c94806c3938c197ad412b7ff159ba5d3bd23a2121ec2308a8ab51b0a5bf9
-      unrolled_ast: b778c94806c3938c197ad412b7ff159ba5d3bd23a2121ec2308a8ab51b0a5bf9
-      ssa_ast: 1cf5e523983e68b3bf4e1e03965c1a3101b1b23047cac276d31b085414db2394
-      flattened_ast: 66412e559a6c0a5ccbeceafe18cf6ec958308ebb22701e53963817e6f30b237c
-      inlined_ast: 66412e559a6c0a5ccbeceafe18cf6ec958308ebb22701e53963817e6f30b237c
-      dce_ast: 66412e559a6c0a5ccbeceafe18cf6ec958308ebb22701e53963817e6f30b237c
+  - - initial_ast: f67e3a92a0051e3f842cf5a18af15f59cbc74f1baeb346be577dbcf3975fdce4
+      unrolled_ast: f67e3a92a0051e3f842cf5a18af15f59cbc74f1baeb346be577dbcf3975fdce4
+      ssa_ast: 1cd7a773694d3a6bed00c535dd9bffeade137f455bf803fe44e5170de55d2a7b
+      flattened_ast: ec6a28c0f33e3935679c808008573998f22c653f9bacf33faf827d0cf13195bc
+      inlined_ast: ec6a28c0f33e3935679c808008573998f22c653f9bacf33faf827d0cf13195bc
+      dce_ast: ec6a28c0f33e3935679c808008573998f22c653f9bacf33faf827d0cf13195bc
       bytecode: 2a4e7edc50312cff13755a1480eadc016a474629e3655a4d8b878a85001b75c3
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/eq.out b/tests/expectations/compiler/integers/u64/eq.out
index b4f34bdcea..e11b7e4233 100644
--- a/tests/expectations/compiler/integers/u64/eq.out
+++ b/tests/expectations/compiler/integers/u64/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4fd0b23cfdb176b7a6b495f01b8438559c6cff712752e98ab0a3de7f36de7afc
-      unrolled_ast: 4fd0b23cfdb176b7a6b495f01b8438559c6cff712752e98ab0a3de7f36de7afc
-      ssa_ast: f4fb84948974589c69de3f819a30bdee4ccbe4134d352d5d3725133ba455dfd5
-      flattened_ast: 5f87e991d4e21bd05664abb60fce101bc98266b8d1d40f3db727719a2e30fa63
-      inlined_ast: 5f87e991d4e21bd05664abb60fce101bc98266b8d1d40f3db727719a2e30fa63
-      dce_ast: 5f87e991d4e21bd05664abb60fce101bc98266b8d1d40f3db727719a2e30fa63
+  - - initial_ast: dccc8677a7599f867a34b55723f9b2c26d7cec9fffabdd1e7d182baa8d6b28b1
+      unrolled_ast: dccc8677a7599f867a34b55723f9b2c26d7cec9fffabdd1e7d182baa8d6b28b1
+      ssa_ast: 831818d40ab2368b65db1ba3ed698e7e9e8bd581a5df1547f2d7cd5736c1e15b
+      flattened_ast: 9a6321a652695750fb68a2417128bf0c207eefba38b69ac7c47652a4f9325dd1
+      inlined_ast: 9a6321a652695750fb68a2417128bf0c207eefba38b69ac7c47652a4f9325dd1
+      dce_ast: 9a6321a652695750fb68a2417128bf0c207eefba38b69ac7c47652a4f9325dd1
       bytecode: c3b043c14b4d869eddba1a5c38b463704b8fdc7a7b6dbfb8b54dbc4ba66e706f
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/ge.out b/tests/expectations/compiler/integers/u64/ge.out
index 0314780a64..a23393658b 100644
--- a/tests/expectations/compiler/integers/u64/ge.out
+++ b/tests/expectations/compiler/integers/u64/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 199b845891747c5469f32d9c9bd80d96d7fa388a042fa95fcf32ec73cab60fc0
-      unrolled_ast: 199b845891747c5469f32d9c9bd80d96d7fa388a042fa95fcf32ec73cab60fc0
-      ssa_ast: afadeac04ace9a0a30937a470e29e68393339f2ab19601aa555df03d78147328
-      flattened_ast: 4876c406305fc53e57daa1cab1e1a8be5c989971b49a5c42e1c0cde3fa7ec1c5
-      inlined_ast: 4876c406305fc53e57daa1cab1e1a8be5c989971b49a5c42e1c0cde3fa7ec1c5
-      dce_ast: 4876c406305fc53e57daa1cab1e1a8be5c989971b49a5c42e1c0cde3fa7ec1c5
+  - - initial_ast: 92b4d39078b7703ccc73e956a724ee20b97ae6c49e492fc0bbfcf9fc2bbc222d
+      unrolled_ast: 92b4d39078b7703ccc73e956a724ee20b97ae6c49e492fc0bbfcf9fc2bbc222d
+      ssa_ast: c71b378c2a5cb105879686597ef782242b6f31dbe08f54359bb74d00e6a653da
+      flattened_ast: 9931baf41a7b83c8c2abc0d3953c8cf898c31c8a41938052ed7a1426251e75f1
+      inlined_ast: 9931baf41a7b83c8c2abc0d3953c8cf898c31c8a41938052ed7a1426251e75f1
+      dce_ast: 9931baf41a7b83c8c2abc0d3953c8cf898c31c8a41938052ed7a1426251e75f1
       bytecode: b2e3005d49e16c6431a7731d180ba407dbf3c26564e1015a3e803681959a6e7c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/gt.out b/tests/expectations/compiler/integers/u64/gt.out
index f2c1e7b1ff..1baaf75e68 100644
--- a/tests/expectations/compiler/integers/u64/gt.out
+++ b/tests/expectations/compiler/integers/u64/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9fd6d547ccf4be972d8f44df74d7809c2c3ed200d9f266dbf5d72330fa2e8131
-      unrolled_ast: 9fd6d547ccf4be972d8f44df74d7809c2c3ed200d9f266dbf5d72330fa2e8131
-      ssa_ast: 86c72668d67fcedbb78946ba387bb8b65ad1295b414db90c5ca0931079954c80
-      flattened_ast: bc0181e8905a7fb98dd2f67c32048159e0f7d8c8c9d25ff662f091dde7df382a
-      inlined_ast: bc0181e8905a7fb98dd2f67c32048159e0f7d8c8c9d25ff662f091dde7df382a
-      dce_ast: bc0181e8905a7fb98dd2f67c32048159e0f7d8c8c9d25ff662f091dde7df382a
+  - - initial_ast: b3d307cd992c082a876c371dd981f1afbbd1913fcdd5d5bb05334c0d45af2dfd
+      unrolled_ast: b3d307cd992c082a876c371dd981f1afbbd1913fcdd5d5bb05334c0d45af2dfd
+      ssa_ast: 795f85029fb0ab85b01f4c1ead05a85239bd7827125af24603958bee1a548834
+      flattened_ast: 0735c3c519d2afeb7aab7441daac99600ba094b8b0f8f7c904771c4c5eef3e7a
+      inlined_ast: 0735c3c519d2afeb7aab7441daac99600ba094b8b0f8f7c904771c4c5eef3e7a
+      dce_ast: 0735c3c519d2afeb7aab7441daac99600ba094b8b0f8f7c904771c4c5eef3e7a
       bytecode: 1e385f77b2a0d6c95fc6747906e33664cce2d0a97477de15da923d515c2747b7
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/le.out b/tests/expectations/compiler/integers/u64/le.out
index f440d96cc3..f9454e9275 100644
--- a/tests/expectations/compiler/integers/u64/le.out
+++ b/tests/expectations/compiler/integers/u64/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9de7a7029929d9111c66c7807395b9b327adfc8ffbd4840a40a9a3aa4dd08271
-      unrolled_ast: 9de7a7029929d9111c66c7807395b9b327adfc8ffbd4840a40a9a3aa4dd08271
-      ssa_ast: 24d0141f85690037eb8eb91b77f205b9fcf8cbd569c8de190bb8143d50e31737
-      flattened_ast: 84e777b33d76f8c1c4520df44f97d5a211824aec36bb99b4bab0abf184d50498
-      inlined_ast: 84e777b33d76f8c1c4520df44f97d5a211824aec36bb99b4bab0abf184d50498
-      dce_ast: 84e777b33d76f8c1c4520df44f97d5a211824aec36bb99b4bab0abf184d50498
+  - - initial_ast: 30f466b966e700483542dddab2c20a461c49f817317b2c2d39746d9717aa7ab8
+      unrolled_ast: 30f466b966e700483542dddab2c20a461c49f817317b2c2d39746d9717aa7ab8
+      ssa_ast: 867fe9539ed4045bf3beed11e790542b4182b4ade74a2b608bff8311a9fb3c33
+      flattened_ast: d8eab0fbb87c1aa03b2da7e45d3e2fc49ffd8dc4283dcaf2b180d1f28458344e
+      inlined_ast: d8eab0fbb87c1aa03b2da7e45d3e2fc49ffd8dc4283dcaf2b180d1f28458344e
+      dce_ast: d8eab0fbb87c1aa03b2da7e45d3e2fc49ffd8dc4283dcaf2b180d1f28458344e
       bytecode: 8236ef7329613c24727637bdb29f45feb3ad59e82ed99249b8f5098b82922859
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/lt.out b/tests/expectations/compiler/integers/u64/lt.out
index 2dd58e81a4..c1bcc9e701 100644
--- a/tests/expectations/compiler/integers/u64/lt.out
+++ b/tests/expectations/compiler/integers/u64/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: eeb99c3d15d19b01df13001011738b5ffbfe85b932b8ff0fdf208528a0aeb9e2
-      unrolled_ast: eeb99c3d15d19b01df13001011738b5ffbfe85b932b8ff0fdf208528a0aeb9e2
-      ssa_ast: beb41e237ac6ee554436794b098ceac69c59b65627a99ad6ec19bcc8dc040ad3
-      flattened_ast: 328ff81bb584eac9a4426396b391a09e31d471fea941cfbe52b8bbeabcd78644
-      inlined_ast: 328ff81bb584eac9a4426396b391a09e31d471fea941cfbe52b8bbeabcd78644
-      dce_ast: 328ff81bb584eac9a4426396b391a09e31d471fea941cfbe52b8bbeabcd78644
+  - - initial_ast: 728d0dc2a3ee66ab5c25073bf3a13958943825151fb87dd7cb38a2b0f305ec02
+      unrolled_ast: 728d0dc2a3ee66ab5c25073bf3a13958943825151fb87dd7cb38a2b0f305ec02
+      ssa_ast: 1f1c9ab354564eb64a7f8e4e4f96c173f0fdf872b8f251503640c898422df5da
+      flattened_ast: 5df5d3bfa627f944073a0ef595c0aea67078aa227a48b56f99df1efe4a3af0f2
+      inlined_ast: 5df5d3bfa627f944073a0ef595c0aea67078aa227a48b56f99df1efe4a3af0f2
+      dce_ast: 5df5d3bfa627f944073a0ef595c0aea67078aa227a48b56f99df1efe4a3af0f2
       bytecode: b436a196b7beab8b7a51791cc458801a2cd9498aeced74c07b81a7f1cc77e183
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/max.out b/tests/expectations/compiler/integers/u64/max.out
index b7eb52b4b3..1d01c353b0 100644
--- a/tests/expectations/compiler/integers/u64/max.out
+++ b/tests/expectations/compiler/integers/u64/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b32aeb034782969957e542ba30a204eb1624d2b4d554ee68061f57d6296f9e8f
-      unrolled_ast: b32aeb034782969957e542ba30a204eb1624d2b4d554ee68061f57d6296f9e8f
-      ssa_ast: 460aab3424ee600d208d1c088736945830f73c4b909ca0ebe66efa6302ab291c
-      flattened_ast: c43be94c22440a538dd68a9d314c193eb8c268593345da194f37a5cd61596d3b
-      inlined_ast: c43be94c22440a538dd68a9d314c193eb8c268593345da194f37a5cd61596d3b
-      dce_ast: f62552fab65b365886c214a7d55f18b779156f4c2a58fb436ca31daf209f3fe9
+  - - initial_ast: d1638b96147e25dc736e0250a4325984defe59bd1450e9934b98a3fb1ac15d53
+      unrolled_ast: d1638b96147e25dc736e0250a4325984defe59bd1450e9934b98a3fb1ac15d53
+      ssa_ast: 2287462940f3d457a8b317973ec73684a0363c100ae455c98e15ace7dcb22c88
+      flattened_ast: 5d207a75b8b1b214d0e9cb162ca96a7d344c9f2201f17449a186ec3834e649b0
+      inlined_ast: 5d207a75b8b1b214d0e9cb162ca96a7d344c9f2201f17449a186ec3834e649b0
+      dce_ast: 39f5bd77dfb9736c5f562ec75c0d0a87e16b878552faf44045c99655b4f4a00e
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/min.out b/tests/expectations/compiler/integers/u64/min.out
index b80be7b119..cc573bf679 100644
--- a/tests/expectations/compiler/integers/u64/min.out
+++ b/tests/expectations/compiler/integers/u64/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ee499038d83209329f0ea94f6d0ee7efaa6730d4a795e6be57b04e5437defe49
-      unrolled_ast: ee499038d83209329f0ea94f6d0ee7efaa6730d4a795e6be57b04e5437defe49
-      ssa_ast: d75bc111f8d869d1bcbe6b240a4c2db00eb8e3f42a4d7671d2648717599a7c78
-      flattened_ast: 6fec5c541011527c422b716439aab05b2e5f7ce25ea3577db7b043687b00cd8b
-      inlined_ast: 6fec5c541011527c422b716439aab05b2e5f7ce25ea3577db7b043687b00cd8b
-      dce_ast: 6e57ba358030a370d68a4f419c99171ec588523b863ee0a1bb6cedd843c7c04a
+  - - initial_ast: 26b2cd4830ae59cd1e4a3e54a45df6b646e46c512da53497937993f121a05388
+      unrolled_ast: 26b2cd4830ae59cd1e4a3e54a45df6b646e46c512da53497937993f121a05388
+      ssa_ast: e46d6b32db8e851327e89226c95e2974f724e93547333a9db2d97d9a0662ccd6
+      flattened_ast: a6a38899cd558cadd46cda05ef766665f767bcaa5129b5cc1bd6fe65a788f300
+      inlined_ast: a6a38899cd558cadd46cda05ef766665f767bcaa5129b5cc1bd6fe65a788f300
+      dce_ast: bd3b38c0fd9de216854db7c9f1d6dfde9c887e9433a9cb3ba8c2c13ac37a2849
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/mul.out b/tests/expectations/compiler/integers/u64/mul.out
index 051b8111d3..406dc072a0 100644
--- a/tests/expectations/compiler/integers/u64/mul.out
+++ b/tests/expectations/compiler/integers/u64/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 16c960d42ca5794d073c0aaaadca76e4d435c359a6f2f787d9e2192170096532
-      unrolled_ast: 16c960d42ca5794d073c0aaaadca76e4d435c359a6f2f787d9e2192170096532
-      ssa_ast: 8d30b3f3d6a215050bcab7e6add4fe2355f2077cc8471d11d6e469748153dbdb
-      flattened_ast: 3c61abc58200830d5d5b3120ad5367d1aafda925fa872f4b7e05bd40994772c1
-      inlined_ast: 3c61abc58200830d5d5b3120ad5367d1aafda925fa872f4b7e05bd40994772c1
-      dce_ast: 3c61abc58200830d5d5b3120ad5367d1aafda925fa872f4b7e05bd40994772c1
+  - - initial_ast: df06653959983078a0a163fd830f55ef54257608d9975f6ca6081b779465a73c
+      unrolled_ast: df06653959983078a0a163fd830f55ef54257608d9975f6ca6081b779465a73c
+      ssa_ast: be420cbfc3feb85b74962bb0e3448847c291d69bf09b03bf18960e075f5f6606
+      flattened_ast: c01648ae1dbeccc37e45a3fc4d8a47e118dffbe992f2dce9a432c99a40cc4db5
+      inlined_ast: c01648ae1dbeccc37e45a3fc4d8a47e118dffbe992f2dce9a432c99a40cc4db5
+      dce_ast: c01648ae1dbeccc37e45a3fc4d8a47e118dffbe992f2dce9a432c99a40cc4db5
       bytecode: 78f1462dd03f403c4a6d09ee9fe96c4a38f860069190d718a34416b68b9b5643
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/ne.out b/tests/expectations/compiler/integers/u64/ne.out
index 8198fde99d..6f95d88699 100644
--- a/tests/expectations/compiler/integers/u64/ne.out
+++ b/tests/expectations/compiler/integers/u64/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cb95bc442ddfc32ae487f8190b82d4e56b5991966c1967d59feae0463e6d3c3a
-      unrolled_ast: cb95bc442ddfc32ae487f8190b82d4e56b5991966c1967d59feae0463e6d3c3a
-      ssa_ast: c59e1adf7dd6eaa46da818bf9b07aa873d5201aa62e7891def0a137477fb1637
-      flattened_ast: 43e51c577bcb2bc75ebb7bf5c89003aa36f523d0cb22e381f8bf0a91de85b006
-      inlined_ast: 43e51c577bcb2bc75ebb7bf5c89003aa36f523d0cb22e381f8bf0a91de85b006
-      dce_ast: 43e51c577bcb2bc75ebb7bf5c89003aa36f523d0cb22e381f8bf0a91de85b006
+  - - initial_ast: 5ce991305dc9fee31c7972be1cff0ba395af8923b2d53ee69c5b46e08c965198
+      unrolled_ast: 5ce991305dc9fee31c7972be1cff0ba395af8923b2d53ee69c5b46e08c965198
+      ssa_ast: 6f62ac5a1e6bb741ff7957755321d6d7696c4b25401e9af509f469430636a043
+      flattened_ast: 0744b31d9be0aa506da797a1c09f7c0a16f511f9da017ae2fe03c1d61b5bad39
+      inlined_ast: 0744b31d9be0aa506da797a1c09f7c0a16f511f9da017ae2fe03c1d61b5bad39
+      dce_ast: 0744b31d9be0aa506da797a1c09f7c0a16f511f9da017ae2fe03c1d61b5bad39
       bytecode: a7b99df5f7c17bca61aa58a32b7dd8b1b4281302d545b2a88b8c162d1c52dbaa
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/operator_methods.out b/tests/expectations/compiler/integers/u64/operator_methods.out
index abcefedecd..631697034b 100644
--- a/tests/expectations/compiler/integers/u64/operator_methods.out
+++ b/tests/expectations/compiler/integers/u64/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 52b1af4a042700b6b093053af761963b082a511c7090bdbdf249c4134d95dc3f
-      unrolled_ast: 52b1af4a042700b6b093053af761963b082a511c7090bdbdf249c4134d95dc3f
-      ssa_ast: 9229bd989f8936f45b830bb5cdb6a8c47a41ba885fb8dc418fd615b9ceef61ee
-      flattened_ast: 1e07b7ba8a5bc3d09b51ddbdf464170955a22ef26abef45c262d65b4c0bf760d
-      inlined_ast: 1e07b7ba8a5bc3d09b51ddbdf464170955a22ef26abef45c262d65b4c0bf760d
-      dce_ast: c3a58444cfc84abe895bc3f43470c15d2ba06131353d10f82fbcbad53c150090
+  - - initial_ast: bf18d724ad7b08433e8e060e7fa299db52c68eff7e67c482bc3c96ba2f2c5863
+      unrolled_ast: bf18d724ad7b08433e8e060e7fa299db52c68eff7e67c482bc3c96ba2f2c5863
+      ssa_ast: a31794d04bfe16d51a1c36ee7978899e30553e5f40632747e89b27062aebd121
+      flattened_ast: 4dd21ece245f362acea761527bd78b1c186124d2d11305e1a58167b3381933ae
+      inlined_ast: 4dd21ece245f362acea761527bd78b1c186124d2d11305e1a58167b3381933ae
+      dce_ast: e5b747e2898897a15d7ed65c1c32363544950c68229109a4053dd8ba14b986f2
       bytecode: e5ef9b94c6b2173341804d3fd3d6ca89bcdebc38ed22f7444bb4e140d86f5f00
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/or.out b/tests/expectations/compiler/integers/u64/or.out
index 1e06cad7c7..a8c840033e 100644
--- a/tests/expectations/compiler/integers/u64/or.out
+++ b/tests/expectations/compiler/integers/u64/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bf6c446ae7f170a0272b4b75193afe0a405fd4b76caea5423a90f320d96524a2
-      unrolled_ast: bf6c446ae7f170a0272b4b75193afe0a405fd4b76caea5423a90f320d96524a2
-      ssa_ast: d7bb118b0244e2b45062d06040437567df5dbab3cff7eecba47aa137b41a978e
-      flattened_ast: 34c2263e3f646599978072bbd831f0fe10a186a715cafbf44a7dbb668a3fce87
-      inlined_ast: 34c2263e3f646599978072bbd831f0fe10a186a715cafbf44a7dbb668a3fce87
-      dce_ast: 34c2263e3f646599978072bbd831f0fe10a186a715cafbf44a7dbb668a3fce87
+  - - initial_ast: d0185ab6b322267a82d319993c1f22a33fc20f05fe440203d5b77548994e9105
+      unrolled_ast: d0185ab6b322267a82d319993c1f22a33fc20f05fe440203d5b77548994e9105
+      ssa_ast: 91ad2a73293427907c6a1ca31f8f8aab6f4e2c63314a25590e563603c6319946
+      flattened_ast: 6d27dd9c232e21bc087aef71bcbb60ba6312ac9429933a5d411f752337ee1eaf
+      inlined_ast: 6d27dd9c232e21bc087aef71bcbb60ba6312ac9429933a5d411f752337ee1eaf
+      dce_ast: 6d27dd9c232e21bc087aef71bcbb60ba6312ac9429933a5d411f752337ee1eaf
       bytecode: 13cd83b19f077edfeb58e50adbd76dac67742cef9747f50f4bc4bdb3ec3dc38e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/pow.out b/tests/expectations/compiler/integers/u64/pow.out
index d2c10b021d..b85e94b62a 100644
--- a/tests/expectations/compiler/integers/u64/pow.out
+++ b/tests/expectations/compiler/integers/u64/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4513398c2e2e4f23ec648fae18070d9042629dcbb85a5be223ba226df6520712
-      unrolled_ast: 4513398c2e2e4f23ec648fae18070d9042629dcbb85a5be223ba226df6520712
-      ssa_ast: b74c557d3d58062c38233ef3f6d0196a1078775cc1ff4b594264db5f5541e6f7
-      flattened_ast: be12c9ed67503008eb29ce4ddf8978351e78ac15a1beb007a7a8fef83a8dd62a
-      inlined_ast: be12c9ed67503008eb29ce4ddf8978351e78ac15a1beb007a7a8fef83a8dd62a
-      dce_ast: be12c9ed67503008eb29ce4ddf8978351e78ac15a1beb007a7a8fef83a8dd62a
+  - - initial_ast: b1f91b7691e18f6221f18655d05d2d9516ae8168189da7b3a521d0ea3cfe335a
+      unrolled_ast: b1f91b7691e18f6221f18655d05d2d9516ae8168189da7b3a521d0ea3cfe335a
+      ssa_ast: 6d956832d070d6b0a502b853e0a950a7c676f23a3907a8a05e5e77c0499aaa0d
+      flattened_ast: 6adaec7083ef124a414cfbe342f730e845f82f21a8a395d56814b1fbe2109ee3
+      inlined_ast: 6adaec7083ef124a414cfbe342f730e845f82f21a8a395d56814b1fbe2109ee3
+      dce_ast: 6adaec7083ef124a414cfbe342f730e845f82f21a8a395d56814b1fbe2109ee3
       bytecode: d1aaa5f10bdbc9f2ea3144d83472c27d7f6d6ae31fa26196f320db6d7a9b0403
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/rem.out b/tests/expectations/compiler/integers/u64/rem.out
index 8dc788db2b..dcecd8aa12 100644
--- a/tests/expectations/compiler/integers/u64/rem.out
+++ b/tests/expectations/compiler/integers/u64/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fb6946830546ef03b70c966e433fc00f46a9557e5d87a1e4fe17f136b03c6b39
-      unrolled_ast: fb6946830546ef03b70c966e433fc00f46a9557e5d87a1e4fe17f136b03c6b39
-      ssa_ast: 0b3e13b36ad5073873d5e1cd6457df6561e671660690cd1e02fb70da8559a1a0
-      flattened_ast: 22db9a4b57114fd70741c750ddf504ea85077ccb0243e1dac3075c83867cb485
-      inlined_ast: 22db9a4b57114fd70741c750ddf504ea85077ccb0243e1dac3075c83867cb485
-      dce_ast: 22db9a4b57114fd70741c750ddf504ea85077ccb0243e1dac3075c83867cb485
+  - - initial_ast: bba9b5ad5fdd42eb8cdfd2b58c809660b5acd3343e73dec0d4b9090c597d5a03
+      unrolled_ast: bba9b5ad5fdd42eb8cdfd2b58c809660b5acd3343e73dec0d4b9090c597d5a03
+      ssa_ast: 36d0f6eac69826e798ff32fdd18d8ecb85f2e8b59494fbd58b87f4a07db5eb75
+      flattened_ast: 88da25f4100cbdf37037ade93b4fe797447bd8614037a0a5005ae09c502ba93a
+      inlined_ast: 88da25f4100cbdf37037ade93b4fe797447bd8614037a0a5005ae09c502ba93a
+      dce_ast: 88da25f4100cbdf37037ade93b4fe797447bd8614037a0a5005ae09c502ba93a
       bytecode: a9ad512e3741c4b6ee79435b76680783f4e9de0ae6720f3945fe03a8a4fd4d0d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/shl.out b/tests/expectations/compiler/integers/u64/shl.out
index 1188f35cde..9933cdcbba 100644
--- a/tests/expectations/compiler/integers/u64/shl.out
+++ b/tests/expectations/compiler/integers/u64/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b6e3225ab1d4face18cf7320d672b3af910f04cdc1bfba12770174f11f9868e3
-      unrolled_ast: b6e3225ab1d4face18cf7320d672b3af910f04cdc1bfba12770174f11f9868e3
-      ssa_ast: 0dee9c54c8f1859d2de37c17e272ff208beddd52c0c97261531d145a08c0d5b3
-      flattened_ast: bf381b9ae1879e1314ab2e01259224a2b84830028fc97abd8008bf8304820a20
-      inlined_ast: bf381b9ae1879e1314ab2e01259224a2b84830028fc97abd8008bf8304820a20
-      dce_ast: bf381b9ae1879e1314ab2e01259224a2b84830028fc97abd8008bf8304820a20
+  - - initial_ast: f84303c9619d843c87af7b49be8db7d19490a02619f0e56df4bdbf934894d7ca
+      unrolled_ast: f84303c9619d843c87af7b49be8db7d19490a02619f0e56df4bdbf934894d7ca
+      ssa_ast: f823f12bb658c9a33fd30c096e67c736d5ad9a8c4a693fd92f5d3bb81e835709
+      flattened_ast: e075aeaed3837be552b506c7f65a17de0c070fbd4ce25481c61ae50a80dfec57
+      inlined_ast: e075aeaed3837be552b506c7f65a17de0c070fbd4ce25481c61ae50a80dfec57
+      dce_ast: e075aeaed3837be552b506c7f65a17de0c070fbd4ce25481c61ae50a80dfec57
       bytecode: d36e49eaf108a44b1c40155c909914f866e5ce509034c1ae630d22a37c702cba
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/shr.out b/tests/expectations/compiler/integers/u64/shr.out
index 2b6f5030bc..86b2874052 100644
--- a/tests/expectations/compiler/integers/u64/shr.out
+++ b/tests/expectations/compiler/integers/u64/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cebeed67ae66d1f639d5a5da555407309860432d4c2c381fb06177e5961b43b4
-      unrolled_ast: cebeed67ae66d1f639d5a5da555407309860432d4c2c381fb06177e5961b43b4
-      ssa_ast: 9b86399847e94c861959570453522b01a83cc0ee596d2a7c01175c0ec11ba5cd
-      flattened_ast: a676d0c48ab56497cf43542295b31153e5287e9b5aac4e50c1cbd104e71e9514
-      inlined_ast: a676d0c48ab56497cf43542295b31153e5287e9b5aac4e50c1cbd104e71e9514
-      dce_ast: a676d0c48ab56497cf43542295b31153e5287e9b5aac4e50c1cbd104e71e9514
+  - - initial_ast: 7776eca44e0e03f1a625baa7b6374e1ee7f12c55f4600cbbdc5d32064472e1a7
+      unrolled_ast: 7776eca44e0e03f1a625baa7b6374e1ee7f12c55f4600cbbdc5d32064472e1a7
+      ssa_ast: 8ee1eb1498d686cd28c084b7b51af3f3335e40ec7cc42673cda39e4637b368dc
+      flattened_ast: 207eb40fbe7fbe86ba1e2798ef499d2d538b583fe23c9edc092f804aaba8724c
+      inlined_ast: 207eb40fbe7fbe86ba1e2798ef499d2d538b583fe23c9edc092f804aaba8724c
+      dce_ast: 207eb40fbe7fbe86ba1e2798ef499d2d538b583fe23c9edc092f804aaba8724c
       bytecode: 58d1ec6467fbeb13930300da8864ec299ab548393dd572f1ccd4878a599873e2
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/sub.out b/tests/expectations/compiler/integers/u64/sub.out
index b2ddb6d9a3..4a2fc10f9a 100644
--- a/tests/expectations/compiler/integers/u64/sub.out
+++ b/tests/expectations/compiler/integers/u64/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9e3fb7362f01c82c3ed67df1d0a755b7e02bd8c1d6b4b1b249182121942e836c
-      unrolled_ast: 9e3fb7362f01c82c3ed67df1d0a755b7e02bd8c1d6b4b1b249182121942e836c
-      ssa_ast: 411cd3f67653aa3483e8e7eb80967af81495faab9444d9c4a948b1ef34833b52
-      flattened_ast: 391db29cfb3bfd9a225d024af600d6af3f514a6d53b1e93354ab8162666829a4
-      inlined_ast: 391db29cfb3bfd9a225d024af600d6af3f514a6d53b1e93354ab8162666829a4
-      dce_ast: 391db29cfb3bfd9a225d024af600d6af3f514a6d53b1e93354ab8162666829a4
+  - - initial_ast: f1773cb8c46741890634f8c01fc331af2beb9afe9cda9df049323c0e81cdd349
+      unrolled_ast: f1773cb8c46741890634f8c01fc331af2beb9afe9cda9df049323c0e81cdd349
+      ssa_ast: 2571339226686b8e92c783e4748900fb6923be0500a8eda0b1319028e2e6614d
+      flattened_ast: e471c617e69f3d300213360e856065899617d3eddbccf2ddcdbc90ff4fcbeee5
+      inlined_ast: e471c617e69f3d300213360e856065899617d3eddbccf2ddcdbc90ff4fcbeee5
+      dce_ast: e471c617e69f3d300213360e856065899617d3eddbccf2ddcdbc90ff4fcbeee5
       bytecode: fe0eb66afc2af38ebf4fd30fa4eb0af15eda6be5302fb2a7470485b4536d06e4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/ternary.out b/tests/expectations/compiler/integers/u64/ternary.out
index dc1cea75de..c2f8f2253f 100644
--- a/tests/expectations/compiler/integers/u64/ternary.out
+++ b/tests/expectations/compiler/integers/u64/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ceb1fdd1f9c1585d4c9de1400b1b64258b1c01843773739a3e0004a81195b720
-      unrolled_ast: ceb1fdd1f9c1585d4c9de1400b1b64258b1c01843773739a3e0004a81195b720
-      ssa_ast: 7a7bc736e8476f24192652c60348b91f929ef4452f66ccb8773b5ad1c84645cf
-      flattened_ast: 85a4286b98750e76b5e81295fb06d7ffa4d73b1175083750e40c8f7de1904a8e
-      inlined_ast: 85a4286b98750e76b5e81295fb06d7ffa4d73b1175083750e40c8f7de1904a8e
-      dce_ast: 85a4286b98750e76b5e81295fb06d7ffa4d73b1175083750e40c8f7de1904a8e
+  - - initial_ast: 941a306dcc57eeee5d31031f7ee913ee65d95d97a07c78bb6e8fec07546e206f
+      unrolled_ast: 941a306dcc57eeee5d31031f7ee913ee65d95d97a07c78bb6e8fec07546e206f
+      ssa_ast: e82bd0e2dd32704e1d623c350dc03fadd0ab9b5ecdd8c5a7ea0e7c9033d47b34
+      flattened_ast: ecd0562ae3730134ddd41555350fb9116e9b1a5a038f809d7653fea4ccdd2329
+      inlined_ast: ecd0562ae3730134ddd41555350fb9116e9b1a5a038f809d7653fea4ccdd2329
+      dce_ast: ecd0562ae3730134ddd41555350fb9116e9b1a5a038f809d7653fea4ccdd2329
       bytecode: 4e191316243b5f6fff5d47a3177f3ec59d72ce76b7f3d6d3aa0da615f67a4087
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u64/xor.out b/tests/expectations/compiler/integers/u64/xor.out
index 2160472f95..483b27edfb 100644
--- a/tests/expectations/compiler/integers/u64/xor.out
+++ b/tests/expectations/compiler/integers/u64/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3493bb09dac934b749ff66e16d565da69c3061c74498df041dd2797626c6eb57
-      unrolled_ast: 3493bb09dac934b749ff66e16d565da69c3061c74498df041dd2797626c6eb57
-      ssa_ast: 3c0cb837b7d3f9efe8b490954ec008c07afc0f2d97b1ff3e3586ac2b4f9a8204
-      flattened_ast: 63778066ca8f4ffa7906a0580f3955ee7af48d580b4db4e249fa83d8aff296ce
-      inlined_ast: 63778066ca8f4ffa7906a0580f3955ee7af48d580b4db4e249fa83d8aff296ce
-      dce_ast: 63778066ca8f4ffa7906a0580f3955ee7af48d580b4db4e249fa83d8aff296ce
+  - - initial_ast: eb020d2bead3ed4402db6cea864f9a41ab211930a627c07778efd3ff0ada7929
+      unrolled_ast: eb020d2bead3ed4402db6cea864f9a41ab211930a627c07778efd3ff0ada7929
+      ssa_ast: 2fd795ce4b6ba36fe8f8825cf51cea6ca58a91a065f5c55dc0d2fb3363aa139c
+      flattened_ast: 135a723545390f58d7f237e7f3142a07c0331d1101289af969de07f09b4e3942
+      inlined_ast: 135a723545390f58d7f237e7f3142a07c0331d1101289af969de07f09b4e3942
+      dce_ast: 135a723545390f58d7f237e7f3142a07c0331d1101289af969de07f09b4e3942
       bytecode: cf0a59e484f688e214a001360e2b18445ca6764fbd6c05f133ff317504b3fb3c
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/add.out b/tests/expectations/compiler/integers/u8/add.out
index 452ebaa2df..d7d2693d68 100644
--- a/tests/expectations/compiler/integers/u8/add.out
+++ b/tests/expectations/compiler/integers/u8/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: df9bd5e5c180ad680fd6eb896b0bfe7b94f519b4cd868567361f7337cc11bdbb
-      unrolled_ast: df9bd5e5c180ad680fd6eb896b0bfe7b94f519b4cd868567361f7337cc11bdbb
-      ssa_ast: a1997e78ff1533bf682cd09c01dd5d6534bdad581d106fd537b452200d77ef0b
-      flattened_ast: 69637913d50218f367c70beb39e9a4c46dfadb29089770bbec455b5a73cf5d05
-      inlined_ast: 69637913d50218f367c70beb39e9a4c46dfadb29089770bbec455b5a73cf5d05
-      dce_ast: 69637913d50218f367c70beb39e9a4c46dfadb29089770bbec455b5a73cf5d05
+  - - initial_ast: e34d2b8233279a68a52417a6839a5c4cf1760873500819db4c631a9b481014da
+      unrolled_ast: e34d2b8233279a68a52417a6839a5c4cf1760873500819db4c631a9b481014da
+      ssa_ast: bfa6e14a758ed32bbcc76157039f8533dd2619d8b32bb87aef48bd80f2fcbf82
+      flattened_ast: 670e5296e5e8661f84130aea863e325369892f13463ac43832ecafc3628abb2b
+      inlined_ast: 670e5296e5e8661f84130aea863e325369892f13463ac43832ecafc3628abb2b
+      dce_ast: 670e5296e5e8661f84130aea863e325369892f13463ac43832ecafc3628abb2b
       bytecode: 6761db493c28a4d597f857d8d63da1678bb9f4408795168fe82a841acf77f89e
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/and.out b/tests/expectations/compiler/integers/u8/and.out
index 597f28f078..037fef634a 100644
--- a/tests/expectations/compiler/integers/u8/and.out
+++ b/tests/expectations/compiler/integers/u8/and.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 539c472e6e995e411fa802351640088cd6b8430007ea84446ef3c0e4a0140cec
-      unrolled_ast: 539c472e6e995e411fa802351640088cd6b8430007ea84446ef3c0e4a0140cec
-      ssa_ast: a5cbae526bad533c1db03a338025a7a6a124c897fdd6e0b367c32ce850b06272
-      flattened_ast: 09410c17b4cda4610433c1a879e4c203f15d224f3c5209c592eec1e12a02cf06
-      inlined_ast: 09410c17b4cda4610433c1a879e4c203f15d224f3c5209c592eec1e12a02cf06
-      dce_ast: 09410c17b4cda4610433c1a879e4c203f15d224f3c5209c592eec1e12a02cf06
+  - - initial_ast: cf5fa4b3cfbf83afea2e5f8a8e5fd4a2d4b80d46e91b5bf1918e6d2447c8a01a
+      unrolled_ast: cf5fa4b3cfbf83afea2e5f8a8e5fd4a2d4b80d46e91b5bf1918e6d2447c8a01a
+      ssa_ast: e834a2445cdfccc8716cb9604fe4cb8086a27a7fff42fd4686af42bc54e1c419
+      flattened_ast: ceb7170ba10e685d4d043fc60af16c8db2cdff381130377e55b84e4608ca6afd
+      inlined_ast: ceb7170ba10e685d4d043fc60af16c8db2cdff381130377e55b84e4608ca6afd
+      dce_ast: ceb7170ba10e685d4d043fc60af16c8db2cdff381130377e55b84e4608ca6afd
       bytecode: 31f37fed73b997c95b00e68369546c32ee9baeac9bc4c08113248156f68f7365
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/console_assert.out b/tests/expectations/compiler/integers/u8/console_assert.out
index 53f7ad4184..4305ebe225 100644
--- a/tests/expectations/compiler/integers/u8/console_assert.out
+++ b/tests/expectations/compiler/integers/u8/console_assert.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 354c56213cf341826a527f2e53a24c8d1e753d5b8a3d9321ebbb5524ae45fe9b
-      unrolled_ast: 354c56213cf341826a527f2e53a24c8d1e753d5b8a3d9321ebbb5524ae45fe9b
-      ssa_ast: 88bdf118a52695829b251c2b737dbda178bdd06437b5f28b309f59eaf83ef56a
-      flattened_ast: 7e10d1d6262067a9c47e172dbd226165b4e71cdae7201e167dc8f86980eb8e44
-      inlined_ast: 7e10d1d6262067a9c47e172dbd226165b4e71cdae7201e167dc8f86980eb8e44
-      dce_ast: 7e10d1d6262067a9c47e172dbd226165b4e71cdae7201e167dc8f86980eb8e44
+  - - initial_ast: e932db4456723f9d8cd94d4a05420e464f1bd9b7e5b2356a7c5025aad4655194
+      unrolled_ast: e932db4456723f9d8cd94d4a05420e464f1bd9b7e5b2356a7c5025aad4655194
+      ssa_ast: 2ef089358045c7db64303b81e684698886d9f691b71973722f2b130581d7b9c8
+      flattened_ast: 5ad0f7482fd6c47e36f0104e4345e0292d5f27b85942e3e616ec6c8ea2b480ef
+      inlined_ast: 5ad0f7482fd6c47e36f0104e4345e0292d5f27b85942e3e616ec6c8ea2b480ef
+      dce_ast: 5ad0f7482fd6c47e36f0104e4345e0292d5f27b85942e3e616ec6c8ea2b480ef
       bytecode: 4c7bc1ae9e77f79475afa9f5201eefc0fe85291af17b3d746bd69336e42101a1
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/div.out b/tests/expectations/compiler/integers/u8/div.out
index 5598f4867f..67add33e74 100644
--- a/tests/expectations/compiler/integers/u8/div.out
+++ b/tests/expectations/compiler/integers/u8/div.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7341b10182088d69bccf13ab2012bf3487e68fddc60fd54674e3b97c3db86ca4
-      unrolled_ast: 7341b10182088d69bccf13ab2012bf3487e68fddc60fd54674e3b97c3db86ca4
-      ssa_ast: 8fbb27078dea8c1625d9d44887c996d53c850b194015c153fc4815d43800332a
-      flattened_ast: 0511da2ff44816d54f25df6e43bef88416c923b6adc827c11e4f715263f4c775
-      inlined_ast: 0511da2ff44816d54f25df6e43bef88416c923b6adc827c11e4f715263f4c775
-      dce_ast: 0511da2ff44816d54f25df6e43bef88416c923b6adc827c11e4f715263f4c775
+  - - initial_ast: 53670265a047cc05cd1e0ef0283e88ca258b7fb9caa392e0eae3a5d61a8fd644
+      unrolled_ast: 53670265a047cc05cd1e0ef0283e88ca258b7fb9caa392e0eae3a5d61a8fd644
+      ssa_ast: b68069a72bdbceebc187991e429386e2c2370e28937e746661509e24b5c23def
+      flattened_ast: d3c9122dc9d4cff89bb4a2a158526c8e76fe3b41cf3eb52913666e5954c73d3b
+      inlined_ast: d3c9122dc9d4cff89bb4a2a158526c8e76fe3b41cf3eb52913666e5954c73d3b
+      dce_ast: d3c9122dc9d4cff89bb4a2a158526c8e76fe3b41cf3eb52913666e5954c73d3b
       bytecode: 632b53e1874bb592e38caef626784ecc81f0b250a76ed6ece1d92b0e3e07f0f3
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/eq.out b/tests/expectations/compiler/integers/u8/eq.out
index 43a67a0f15..a2859d6a81 100644
--- a/tests/expectations/compiler/integers/u8/eq.out
+++ b/tests/expectations/compiler/integers/u8/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8ecfb0d97a7354025431bea5163910d5cc7a1d90dcd8fffd5d5d30b825a02481
-      unrolled_ast: 8ecfb0d97a7354025431bea5163910d5cc7a1d90dcd8fffd5d5d30b825a02481
-      ssa_ast: c7c388a8927e1a7b6060951a5f6fdf5b60db63a2034266f2c136b3c0e26d2c62
-      flattened_ast: c19c846db7638be5342662b85c4cd532e8dfba0bb058c9a6c4c468791cdb55a6
-      inlined_ast: c19c846db7638be5342662b85c4cd532e8dfba0bb058c9a6c4c468791cdb55a6
-      dce_ast: c19c846db7638be5342662b85c4cd532e8dfba0bb058c9a6c4c468791cdb55a6
+  - - initial_ast: 81e6aabc9ec7d16bca2f28d1760c0bab0aec846d4252551876011d5080eefe9c
+      unrolled_ast: 81e6aabc9ec7d16bca2f28d1760c0bab0aec846d4252551876011d5080eefe9c
+      ssa_ast: 4c5e0309e8eb602fb9a24c7375060a8842eaa5877713616bd5a0e08a9475155b
+      flattened_ast: f08c40d974bd177c7961575215645442bd47b8697bf9cfc170f6ed7596f225bd
+      inlined_ast: f08c40d974bd177c7961575215645442bd47b8697bf9cfc170f6ed7596f225bd
+      dce_ast: f08c40d974bd177c7961575215645442bd47b8697bf9cfc170f6ed7596f225bd
       bytecode: a8fabd0b697054bb6de3971dbb93d8a9fb228135f08372b2ae641bb32d670d62
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/ge.out b/tests/expectations/compiler/integers/u8/ge.out
index 0640ef01ea..9b0aa8dd69 100644
--- a/tests/expectations/compiler/integers/u8/ge.out
+++ b/tests/expectations/compiler/integers/u8/ge.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e1434e63e90a99b155314cfe136eb2615f335cbc141e341f7afebe86f654ccda
-      unrolled_ast: e1434e63e90a99b155314cfe136eb2615f335cbc141e341f7afebe86f654ccda
-      ssa_ast: 2a6ebf3d42914295d8e08d03d6d13966d148ff4e2dc62a5287cfa2a52b6eaa23
-      flattened_ast: 2f8a1d201299581c9f41e5376a322eb33d606b672705035f9625b353ced33f77
-      inlined_ast: 2f8a1d201299581c9f41e5376a322eb33d606b672705035f9625b353ced33f77
-      dce_ast: 2f8a1d201299581c9f41e5376a322eb33d606b672705035f9625b353ced33f77
+  - - initial_ast: 8ec7760fc3e0473f58387ed62ad07ff23cdc3799fbd69fa984fc6019697518f3
+      unrolled_ast: 8ec7760fc3e0473f58387ed62ad07ff23cdc3799fbd69fa984fc6019697518f3
+      ssa_ast: c9687cb9ed334a76fdb6b037fdbcef5012d00e16e1c14b66183d8da45a11b2ca
+      flattened_ast: 0af74be7180eeab21ea756a93dd632fff769b9a930ddb35df99c6e5d8e0d5d41
+      inlined_ast: 0af74be7180eeab21ea756a93dd632fff769b9a930ddb35df99c6e5d8e0d5d41
+      dce_ast: 0af74be7180eeab21ea756a93dd632fff769b9a930ddb35df99c6e5d8e0d5d41
       bytecode: f6c47583029e6e00d1d236422c0365a273e4da8dad6dabfb1fe6d1081dc03311
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/gt.out b/tests/expectations/compiler/integers/u8/gt.out
index 6de32c40b8..921aa661c4 100644
--- a/tests/expectations/compiler/integers/u8/gt.out
+++ b/tests/expectations/compiler/integers/u8/gt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 83f8792165dfed51100eae5c22972aa82946cd7a603432371aca84e9531372fe
-      unrolled_ast: 83f8792165dfed51100eae5c22972aa82946cd7a603432371aca84e9531372fe
-      ssa_ast: 8320927a6f0445c0cf50be4ebed0867bdf83bf9d91ce3ca1b9af9ca5c2f6a4f7
-      flattened_ast: 419cea63c337a025df8f406b2f1867882e8be2b93b242526445871f56828fe98
-      inlined_ast: 419cea63c337a025df8f406b2f1867882e8be2b93b242526445871f56828fe98
-      dce_ast: 419cea63c337a025df8f406b2f1867882e8be2b93b242526445871f56828fe98
+  - - initial_ast: a5ef209001dabe5fe6ab9e4d01da23eb4f37d07816a848b25498a028c795b8b4
+      unrolled_ast: a5ef209001dabe5fe6ab9e4d01da23eb4f37d07816a848b25498a028c795b8b4
+      ssa_ast: 804e70801d033c016037766ce0283f0a3378abdcdd305e4fe5d57da5b0f32a25
+      flattened_ast: ac33124ac0694e577c4310339ca721d0eb48fed177d30e1d8411adf276f6e103
+      inlined_ast: ac33124ac0694e577c4310339ca721d0eb48fed177d30e1d8411adf276f6e103
+      dce_ast: ac33124ac0694e577c4310339ca721d0eb48fed177d30e1d8411adf276f6e103
       bytecode: 33459897e4a71fffb71fcfaead0d591ef888473dd61c5c1b83465aa7f99c7f69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/le.out b/tests/expectations/compiler/integers/u8/le.out
index 4310b54a50..371727e42c 100644
--- a/tests/expectations/compiler/integers/u8/le.out
+++ b/tests/expectations/compiler/integers/u8/le.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 53158d99560a205f3c3c0631fb3563532751beb7e0501291b36edb9d6b9e4e08
-      unrolled_ast: 53158d99560a205f3c3c0631fb3563532751beb7e0501291b36edb9d6b9e4e08
-      ssa_ast: 36261f956b10dc0163b09409d50eca614810c0671a95cfdfe8dd0636ff5d3e3a
-      flattened_ast: 034ab84377c34cb27e3032e908480fe6f0975e9878744592d0e18991286022bf
-      inlined_ast: 034ab84377c34cb27e3032e908480fe6f0975e9878744592d0e18991286022bf
-      dce_ast: 034ab84377c34cb27e3032e908480fe6f0975e9878744592d0e18991286022bf
+  - - initial_ast: f940eb4a4501221d09f280d9a7956de73f1da25b177b01044f73bbd36e523501
+      unrolled_ast: f940eb4a4501221d09f280d9a7956de73f1da25b177b01044f73bbd36e523501
+      ssa_ast: aeef1436483c7b71b8e59f0693b4c945997a8653bb259d310b4a54cf89a7c849
+      flattened_ast: 34ab707d72275077258de5106e65fbbd0546d0b7ae2712955305ca771165d493
+      inlined_ast: 34ab707d72275077258de5106e65fbbd0546d0b7ae2712955305ca771165d493
+      dce_ast: 34ab707d72275077258de5106e65fbbd0546d0b7ae2712955305ca771165d493
       bytecode: 4e59b997e48f430720d435483ba0e45c45df4be732f87661f59f7f6b87331c30
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/lt.out b/tests/expectations/compiler/integers/u8/lt.out
index 418dd5938d..fd28340e7f 100644
--- a/tests/expectations/compiler/integers/u8/lt.out
+++ b/tests/expectations/compiler/integers/u8/lt.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 928a5dfa3c2779cefece2d143615f2483fd5a6939b27d3cef085c8e924be681a
-      unrolled_ast: 928a5dfa3c2779cefece2d143615f2483fd5a6939b27d3cef085c8e924be681a
-      ssa_ast: 21182ae43c7119041b6f7b83149bbceb633f64b4ef35ccce4f4fed05e64de286
-      flattened_ast: bfcdb3345f9d21e977a838fb8cbb6f06b839ca62524d8a5ac6a6eb76610ef152
-      inlined_ast: bfcdb3345f9d21e977a838fb8cbb6f06b839ca62524d8a5ac6a6eb76610ef152
-      dce_ast: bfcdb3345f9d21e977a838fb8cbb6f06b839ca62524d8a5ac6a6eb76610ef152
+  - - initial_ast: 3b6f810ded45e099a0d155b7bbfc57fc148a82c249af1c918736fd9ae7c3178e
+      unrolled_ast: 3b6f810ded45e099a0d155b7bbfc57fc148a82c249af1c918736fd9ae7c3178e
+      ssa_ast: 3a6c8fbb6077a1b652253e1ce89dbadd5cb66c4be90208bf09b07dac46ecdd0a
+      flattened_ast: f10e94db3756758beb2eed49ca3dbd5755205c0f6e4c7f7c7e6940f8fc9741a7
+      inlined_ast: f10e94db3756758beb2eed49ca3dbd5755205c0f6e4c7f7c7e6940f8fc9741a7
+      dce_ast: f10e94db3756758beb2eed49ca3dbd5755205c0f6e4c7f7c7e6940f8fc9741a7
       bytecode: a785c0d8cfd6988cde7a87a968cf8aa87ac982a4c4aef53474348c4e0525d714
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/max.out b/tests/expectations/compiler/integers/u8/max.out
index 107d934e7b..1662af7333 100644
--- a/tests/expectations/compiler/integers/u8/max.out
+++ b/tests/expectations/compiler/integers/u8/max.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8e7f513c88dad1e5ef13f8af7c7bf7920e58b8df1d30371fbb3a9711e8e669a0
-      unrolled_ast: 8e7f513c88dad1e5ef13f8af7c7bf7920e58b8df1d30371fbb3a9711e8e669a0
-      ssa_ast: 0b01b955d57b7942e64a7833a511c7cd15991a54411c0b5ac56cba1b01dd26e2
-      flattened_ast: 170e6806b49a3a4beccb8065239f6608b8e0de8c59d3d7525e7421d21a53cddc
-      inlined_ast: 170e6806b49a3a4beccb8065239f6608b8e0de8c59d3d7525e7421d21a53cddc
-      dce_ast: 6e57ba358030a370d68a4f419c99171ec588523b863ee0a1bb6cedd843c7c04a
+  - - initial_ast: 3aa5b57bcafe7fef06df7d29502b0899e351f3fa137bf97b354c343b27fa7f2d
+      unrolled_ast: 3aa5b57bcafe7fef06df7d29502b0899e351f3fa137bf97b354c343b27fa7f2d
+      ssa_ast: cb1bc9038cc24facea78ade12f2799343ec625656fbce45babdb25491354aa7d
+      flattened_ast: 5cb45313fb519880dd0e39419bf2a806388942ef05000ed8e36365b96a88a9ca
+      inlined_ast: 5cb45313fb519880dd0e39419bf2a806388942ef05000ed8e36365b96a88a9ca
+      dce_ast: bd3b38c0fd9de216854db7c9f1d6dfde9c887e9433a9cb3ba8c2c13ac37a2849
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/min.out b/tests/expectations/compiler/integers/u8/min.out
index 3a419eeab7..bba007832c 100644
--- a/tests/expectations/compiler/integers/u8/min.out
+++ b/tests/expectations/compiler/integers/u8/min.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 311564afeb6ec99df3ea010c0872e4d52724b8f7ddf2869a55244be59a8318ff
-      unrolled_ast: 311564afeb6ec99df3ea010c0872e4d52724b8f7ddf2869a55244be59a8318ff
-      ssa_ast: 0ea6e6dd53e99519295db68c83a77486cf0e509ebd9740f189d84e75b7a56f75
-      flattened_ast: 2cf7f2b6724c18f5deeb21ed14c2b0af010c92196f804b150b15f298f5a66827
-      inlined_ast: 2cf7f2b6724c18f5deeb21ed14c2b0af010c92196f804b150b15f298f5a66827
-      dce_ast: fe2545de2d4033cb517373a2c67976ba7c101afbaf5ae40b2ab488fc5b8ea6da
+  - - initial_ast: 1a20927f777b1bc2596fffdf1de71564975eaff2bd1c24f3978eaae38b3926cd
+      unrolled_ast: 1a20927f777b1bc2596fffdf1de71564975eaff2bd1c24f3978eaae38b3926cd
+      ssa_ast: d142d1775a3a4bb35d25d7ea882936e5ac22f7e7da02ecca5f68b77f44d70e2a
+      flattened_ast: eedc82194272698d8ed51deffbde40af575abbd0d81dba176eebecd45c14b505
+      inlined_ast: eedc82194272698d8ed51deffbde40af575abbd0d81dba176eebecd45c14b505
+      dce_ast: 867b7eddeb1728c9a089d43e31938e20795f25b48098b2f72b085cc46c4856a8
       bytecode: 651a250bda995df00cf3b4659d1ea35912ed94da32b5d487677dead9126b5d69
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/mul.out b/tests/expectations/compiler/integers/u8/mul.out
index f9a2810a88..97ba1981a1 100644
--- a/tests/expectations/compiler/integers/u8/mul.out
+++ b/tests/expectations/compiler/integers/u8/mul.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 932eda59a134b3a50e6fb2b24458d32e20eeed58ce5550261ff030c53d5baf9d
-      unrolled_ast: 932eda59a134b3a50e6fb2b24458d32e20eeed58ce5550261ff030c53d5baf9d
-      ssa_ast: 3c3f5fb49b9fef9b94c54cdc88473ad06993d35b5b9a60bd28fd45ba8b2d97b5
-      flattened_ast: ff9ad8948b7cdbb20e735e18f27e0cfb5791a4516a0e064160ddc68695e8e0bf
-      inlined_ast: ff9ad8948b7cdbb20e735e18f27e0cfb5791a4516a0e064160ddc68695e8e0bf
-      dce_ast: ff9ad8948b7cdbb20e735e18f27e0cfb5791a4516a0e064160ddc68695e8e0bf
+  - - initial_ast: 9a231a693dfffd0ce11440c39e9302eed2e8b1ffa77e48ae4242e43a101abae2
+      unrolled_ast: 9a231a693dfffd0ce11440c39e9302eed2e8b1ffa77e48ae4242e43a101abae2
+      ssa_ast: 9c301863a4a3ce7d1a75825a9c86846dc28b638e716cc231725dbda95e780ba8
+      flattened_ast: cdb3da8111b00f0b983f148e193777843007720c0407caa2f3d865fd0d233112
+      inlined_ast: cdb3da8111b00f0b983f148e193777843007720c0407caa2f3d865fd0d233112
+      dce_ast: cdb3da8111b00f0b983f148e193777843007720c0407caa2f3d865fd0d233112
       bytecode: 937e45d26a72a2f9c73609facb8351023ac2bd00390e289501ad3729b65adbb4
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/ne.out b/tests/expectations/compiler/integers/u8/ne.out
index 76e4a999cc..67243cb186 100644
--- a/tests/expectations/compiler/integers/u8/ne.out
+++ b/tests/expectations/compiler/integers/u8/ne.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 28719bab062a2e18181636fc82068d3a995dc8cacd157db6c1f60b6d26f37e30
-      unrolled_ast: 28719bab062a2e18181636fc82068d3a995dc8cacd157db6c1f60b6d26f37e30
-      ssa_ast: 48b1d8e8233e4bd0dd319415401df4ad08ee4d748680a35bc760c55360d3617a
-      flattened_ast: 3915ca231457b11b1eb3ff7be1286e320304829f69eb1d7ef2010d0b24a63307
-      inlined_ast: 3915ca231457b11b1eb3ff7be1286e320304829f69eb1d7ef2010d0b24a63307
-      dce_ast: 3915ca231457b11b1eb3ff7be1286e320304829f69eb1d7ef2010d0b24a63307
+  - - initial_ast: 83dd8a67a4b493c9d63d08a3a05f699a09ff837bdd1e5bd0d9f01440dce01cc1
+      unrolled_ast: 83dd8a67a4b493c9d63d08a3a05f699a09ff837bdd1e5bd0d9f01440dce01cc1
+      ssa_ast: b54b601c158f40c56b790f1a05cafbc582967a4aecc4c90a5ba0d2f93bf5acdb
+      flattened_ast: ec824fc06631a75ea035c3b0ebb99497bfccafad9d689da96a1eef8f2d4f8f3f
+      inlined_ast: ec824fc06631a75ea035c3b0ebb99497bfccafad9d689da96a1eef8f2d4f8f3f
+      dce_ast: ec824fc06631a75ea035c3b0ebb99497bfccafad9d689da96a1eef8f2d4f8f3f
       bytecode: 675110e460b707b82a70a488ae58b8d118d946909f825c9afd6121254e676c03
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/operator_methods.out b/tests/expectations/compiler/integers/u8/operator_methods.out
index 7dda1ea04d..e87a0265ef 100644
--- a/tests/expectations/compiler/integers/u8/operator_methods.out
+++ b/tests/expectations/compiler/integers/u8/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9200995bed6861ba154c2514a8f0965e0479a166022be5619014f1eebeeaac58
-      unrolled_ast: 9200995bed6861ba154c2514a8f0965e0479a166022be5619014f1eebeeaac58
-      ssa_ast: d1101fc7de293ed7398566ac6c18d73f48ecf6f5e783953b2c91d4f3e7c4b5a4
-      flattened_ast: 799b3bbb432de6b38a995faffe78fd4b2e1ada7ef9a12288c01273768aafca6b
-      inlined_ast: 799b3bbb432de6b38a995faffe78fd4b2e1ada7ef9a12288c01273768aafca6b
-      dce_ast: c2f07e49075e8bbbc62036273866e09a4e464939a267cdca25e7bf8d0a68fdeb
+  - - initial_ast: 1c9c019fa2dd23b63cb858dca29677f6da45846e51cd924864db966df822dfb4
+      unrolled_ast: 1c9c019fa2dd23b63cb858dca29677f6da45846e51cd924864db966df822dfb4
+      ssa_ast: cc1ec6743c0b5d024f11d2c01dae7ea08010fa44d34db41c6a538f3b51f74fa5
+      flattened_ast: 1c21ccdd61e31172011764ca70715882023a2fae5887bde18068620e23c5ea9e
+      inlined_ast: 1c21ccdd61e31172011764ca70715882023a2fae5887bde18068620e23c5ea9e
+      dce_ast: bc8c6a51fc8ca6e0c5675eb16294711179ad10be662486a07041b2ca639657c1
       bytecode: 525aa7ee628bc18ddc77b4d2c0f21cc66858ecbdd517233862c7ba491158c69f
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/or.out b/tests/expectations/compiler/integers/u8/or.out
index 096b2dfcce..5b6d4aed29 100644
--- a/tests/expectations/compiler/integers/u8/or.out
+++ b/tests/expectations/compiler/integers/u8/or.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e6579fc8bd283337cc20a797fef4c5ed98e787d65d7c675bf3325ca85865ee4b
-      unrolled_ast: e6579fc8bd283337cc20a797fef4c5ed98e787d65d7c675bf3325ca85865ee4b
-      ssa_ast: 51eb5364c8d6be2a93f7d9dfd41ef10948d3293498123b7cb32e9903d926c3c2
-      flattened_ast: 914ba3d6409067b0b5eeb0765481388743dbc5f535c6556c8c589539b0ca631a
-      inlined_ast: 914ba3d6409067b0b5eeb0765481388743dbc5f535c6556c8c589539b0ca631a
-      dce_ast: 914ba3d6409067b0b5eeb0765481388743dbc5f535c6556c8c589539b0ca631a
+  - - initial_ast: 5e126cabd52c3fc86f1f9822b13fd6ad10f9cc2b0cac36349fd45f44738e0d79
+      unrolled_ast: 5e126cabd52c3fc86f1f9822b13fd6ad10f9cc2b0cac36349fd45f44738e0d79
+      ssa_ast: f3517ab519da2f08d40c6df16131b353065435821fd883326ea3dd13e3b566cf
+      flattened_ast: 6fac9f4cd71d79fc22ab6af03bc0d42a08cced825aad80156dddc57c852245f7
+      inlined_ast: 6fac9f4cd71d79fc22ab6af03bc0d42a08cced825aad80156dddc57c852245f7
+      dce_ast: 6fac9f4cd71d79fc22ab6af03bc0d42a08cced825aad80156dddc57c852245f7
       bytecode: dc659eaf16fad4225b86c68e2986ec498a85bfa9f34ad54a538119692169d54d
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/pow.out b/tests/expectations/compiler/integers/u8/pow.out
index 48ead1b1dd..60632d2155 100644
--- a/tests/expectations/compiler/integers/u8/pow.out
+++ b/tests/expectations/compiler/integers/u8/pow.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 9f9d292357c7c8985e3ba181569b690a764b18149d4d7972aa0866752ff8963f
-      unrolled_ast: 9f9d292357c7c8985e3ba181569b690a764b18149d4d7972aa0866752ff8963f
-      ssa_ast: e90d162d2ab8a7d080331f3a62e717ec659c43a1f734cc22001e90f1196326ce
-      flattened_ast: f26829937a536e3716c5d5c5d0a32a69ac4158500837e3435ad2a856acda10b3
-      inlined_ast: f26829937a536e3716c5d5c5d0a32a69ac4158500837e3435ad2a856acda10b3
-      dce_ast: f26829937a536e3716c5d5c5d0a32a69ac4158500837e3435ad2a856acda10b3
+  - - initial_ast: 38aa7cbd1058a50909da8feb3129794df4e41e145fe51d9ee0b0dcdcb66aa321
+      unrolled_ast: 38aa7cbd1058a50909da8feb3129794df4e41e145fe51d9ee0b0dcdcb66aa321
+      ssa_ast: 22f39f441905aa0505bed362c70d541f4ec65e13d291d925175b9db61985652a
+      flattened_ast: 3edae263b1a7a96b07f5b0c80e4ba925185a65654ff5f63570c1285caa221a57
+      inlined_ast: 3edae263b1a7a96b07f5b0c80e4ba925185a65654ff5f63570c1285caa221a57
+      dce_ast: 3edae263b1a7a96b07f5b0c80e4ba925185a65654ff5f63570c1285caa221a57
       bytecode: 6f39595f71ec6b6a1a2c622b9c18785cb99323fe027c8cd95d4f49a20b875f39
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/rem.out b/tests/expectations/compiler/integers/u8/rem.out
index 57bfa2348c..70691d46d8 100644
--- a/tests/expectations/compiler/integers/u8/rem.out
+++ b/tests/expectations/compiler/integers/u8/rem.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e8c97bf534b2a8133fbc965c57a24e9f5cfb94e25877db7b3a855e28331f06d4
-      unrolled_ast: e8c97bf534b2a8133fbc965c57a24e9f5cfb94e25877db7b3a855e28331f06d4
-      ssa_ast: d729a53686c485fe47d6f4b6e6608d0b21c4d879329a98184f2b7b955b5b4c54
-      flattened_ast: ba8989639b59189e2372c3a4e78f10d334a6792938970e709f4f140e0846a4b9
-      inlined_ast: ba8989639b59189e2372c3a4e78f10d334a6792938970e709f4f140e0846a4b9
-      dce_ast: ba8989639b59189e2372c3a4e78f10d334a6792938970e709f4f140e0846a4b9
+  - - initial_ast: a033d174a74c4d8f0490ca8b387374532a2c4d562d286a8c5db7167c01f047af
+      unrolled_ast: a033d174a74c4d8f0490ca8b387374532a2c4d562d286a8c5db7167c01f047af
+      ssa_ast: 4c6bf47d0bd39643508c9f91faad01e121d2960face7e4de4b89fbbce8146bf5
+      flattened_ast: 2bff1af5e0d73ad20f76d64dc4969f507f0664e6c9d880ddfbd170e2abd4114d
+      inlined_ast: 2bff1af5e0d73ad20f76d64dc4969f507f0664e6c9d880ddfbd170e2abd4114d
+      dce_ast: 2bff1af5e0d73ad20f76d64dc4969f507f0664e6c9d880ddfbd170e2abd4114d
       bytecode: eb0766ef7942b5b5f50c4778d1d82479583761acb0d4e903ca3b4998e9036ce8
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/shl.out b/tests/expectations/compiler/integers/u8/shl.out
index 067e925de7..b89f06da30 100644
--- a/tests/expectations/compiler/integers/u8/shl.out
+++ b/tests/expectations/compiler/integers/u8/shl.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 40d650ae98331290656d5cf5778571335ea4fc02ba5ef2fa9a256615127a721c
-      unrolled_ast: 40d650ae98331290656d5cf5778571335ea4fc02ba5ef2fa9a256615127a721c
-      ssa_ast: d20cda65491249967264b504f7a48217794ed01c758a32edff473d2663361167
-      flattened_ast: 1cf074ec03ff9c8aa15795348e668eed5a14d070f9aac4802b01510231fa7e47
-      inlined_ast: 1cf074ec03ff9c8aa15795348e668eed5a14d070f9aac4802b01510231fa7e47
-      dce_ast: 1cf074ec03ff9c8aa15795348e668eed5a14d070f9aac4802b01510231fa7e47
+  - - initial_ast: 835c877b0e07af0d204bfe5210edba1e4f3bac0ba40e8e0e41eab584f6cc12ff
+      unrolled_ast: 835c877b0e07af0d204bfe5210edba1e4f3bac0ba40e8e0e41eab584f6cc12ff
+      ssa_ast: c5deed36d8e7b953f2f69d01e4c77a611239501cd7669253d64851bef45689fd
+      flattened_ast: 5c18463c08029ac097aeb04855296bf90822f980dcd0be829d3ba175c270a32f
+      inlined_ast: 5c18463c08029ac097aeb04855296bf90822f980dcd0be829d3ba175c270a32f
+      dce_ast: 5c18463c08029ac097aeb04855296bf90822f980dcd0be829d3ba175c270a32f
       bytecode: c080998e39be58c165d147352fed55e49828e93d487976c27e4e6e160736f4f6
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/shr.out b/tests/expectations/compiler/integers/u8/shr.out
index 842e0c9572..a69f08f462 100644
--- a/tests/expectations/compiler/integers/u8/shr.out
+++ b/tests/expectations/compiler/integers/u8/shr.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: dc6a226cf8bc587a1d118e9d6202f40695f2d688ba5ab1632124bcc538293a90
-      unrolled_ast: dc6a226cf8bc587a1d118e9d6202f40695f2d688ba5ab1632124bcc538293a90
-      ssa_ast: 2a54337a9c929644ce6bd5d3bedde35ca7a3d8637ccac8025c05577f5bea4b3d
-      flattened_ast: 8b4e3f8a877e2df169a9e497e1a29ad8f4169a4b4f685d77d246c07f0442343d
-      inlined_ast: 8b4e3f8a877e2df169a9e497e1a29ad8f4169a4b4f685d77d246c07f0442343d
-      dce_ast: 8b4e3f8a877e2df169a9e497e1a29ad8f4169a4b4f685d77d246c07f0442343d
+  - - initial_ast: fd02b8e7e9800ab35187e1fea3521a223307e012f7eaad55d76136262bfdbea4
+      unrolled_ast: fd02b8e7e9800ab35187e1fea3521a223307e012f7eaad55d76136262bfdbea4
+      ssa_ast: 5beffd96b38f7b50f52c8219078b4b42cdca72fa1558c18809bad642822f4d28
+      flattened_ast: 2b1425b0c2bdf8b37b0350fb6cd0f96a2572c43515b4ff5b9471966a06eb2a9d
+      inlined_ast: 2b1425b0c2bdf8b37b0350fb6cd0f96a2572c43515b4ff5b9471966a06eb2a9d
+      dce_ast: 2b1425b0c2bdf8b37b0350fb6cd0f96a2572c43515b4ff5b9471966a06eb2a9d
       bytecode: 115a3954fe97b0bf052859b3e2060732a5988a738e33e38fa9fc6124009a3df1
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/sub.out b/tests/expectations/compiler/integers/u8/sub.out
index 3e3bdd16fb..a293d9385e 100644
--- a/tests/expectations/compiler/integers/u8/sub.out
+++ b/tests/expectations/compiler/integers/u8/sub.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8a44bd229d9dca2f5c25d498a4e03555f7165ea6e4a487361ab05b1d4368385a
-      unrolled_ast: 8a44bd229d9dca2f5c25d498a4e03555f7165ea6e4a487361ab05b1d4368385a
-      ssa_ast: cbf705e72fbb77076171f0e5c11da71338be55350885985f23183d8fef140859
-      flattened_ast: 0f73defa8c9c570dada45a3990a07adbf9acbb519ad6c3920b4ddd43d413566a
-      inlined_ast: 0f73defa8c9c570dada45a3990a07adbf9acbb519ad6c3920b4ddd43d413566a
-      dce_ast: 0f73defa8c9c570dada45a3990a07adbf9acbb519ad6c3920b4ddd43d413566a
+  - - initial_ast: 00477f6cf554c05f65093df9009fa609f29874fa40301f7dee4e13d7ff1f4885
+      unrolled_ast: 00477f6cf554c05f65093df9009fa609f29874fa40301f7dee4e13d7ff1f4885
+      ssa_ast: 3b070e235cc809979575b04f121d6e3ccb3b03b8f55a2abcbe6b8949e31c2267
+      flattened_ast: 8138811d2a68cb4d14f3e81bc940e602573be8858d449eca6d529a1729b1dfd6
+      inlined_ast: 8138811d2a68cb4d14f3e81bc940e602573be8858d449eca6d529a1729b1dfd6
+      dce_ast: 8138811d2a68cb4d14f3e81bc940e602573be8858d449eca6d529a1729b1dfd6
       bytecode: 000488241130473cec7bf53df1dc0bdab4ae452ab173fe563a9b9311c73f35fe
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/ternary.out b/tests/expectations/compiler/integers/u8/ternary.out
index 99f606ada4..ea0b0a7a2d 100644
--- a/tests/expectations/compiler/integers/u8/ternary.out
+++ b/tests/expectations/compiler/integers/u8/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f7e98f7058d9289fc9a615324be616c8537a24f587d4e395fe175b6dcce10820
-      unrolled_ast: f7e98f7058d9289fc9a615324be616c8537a24f587d4e395fe175b6dcce10820
-      ssa_ast: 6e5351ddf996064bd7af0856013851eb6e6cc66ff96462aa3e2207290a764a67
-      flattened_ast: a9b70903ec8cb3348e4fb8c8af6b801453db7de67c8200ba00274ed51eee6558
-      inlined_ast: a9b70903ec8cb3348e4fb8c8af6b801453db7de67c8200ba00274ed51eee6558
-      dce_ast: a9b70903ec8cb3348e4fb8c8af6b801453db7de67c8200ba00274ed51eee6558
+  - - initial_ast: 69253cba578ac45bda11b3de119f213375a2e9e200f877c5a8e1df297657a3be
+      unrolled_ast: 69253cba578ac45bda11b3de119f213375a2e9e200f877c5a8e1df297657a3be
+      ssa_ast: 11cc08fcbee56908021fae01c7c004004d11f95cff9d458862c92cc90166cd63
+      flattened_ast: adfd8c77f46fc0ac5404eb54978c527c724a3c296107ac392af09476d6849dc3
+      inlined_ast: adfd8c77f46fc0ac5404eb54978c527c724a3c296107ac392af09476d6849dc3
+      dce_ast: adfd8c77f46fc0ac5404eb54978c527c724a3c296107ac392af09476d6849dc3
       bytecode: 070a1a31af23c4436a8adf74befb9bae19c60a73da4ca1b8c295213c0505b1cb
       warnings: ""
diff --git a/tests/expectations/compiler/integers/u8/xor.out b/tests/expectations/compiler/integers/u8/xor.out
index 9ca0cb6448..5eb4426e10 100644
--- a/tests/expectations/compiler/integers/u8/xor.out
+++ b/tests/expectations/compiler/integers/u8/xor.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3841c326dac9d0538bb27b46c86b4c57dcf8a9f8e245d37b73a96505bb43e082
-      unrolled_ast: 3841c326dac9d0538bb27b46c86b4c57dcf8a9f8e245d37b73a96505bb43e082
-      ssa_ast: 01c319017ae30d95db5197c95051de220e39499647897771ecc3e18b695fe2f3
-      flattened_ast: 016a9537e1d034c9803d13bd5b6e42632ed63a05c8c084190515651472820f15
-      inlined_ast: 016a9537e1d034c9803d13bd5b6e42632ed63a05c8c084190515651472820f15
-      dce_ast: 016a9537e1d034c9803d13bd5b6e42632ed63a05c8c084190515651472820f15
+  - - initial_ast: 9bdbaefd52875f83ef47fd6e94a437d1aab81bd0c679b85dce994e3cbab01588
+      unrolled_ast: 9bdbaefd52875f83ef47fd6e94a437d1aab81bd0c679b85dce994e3cbab01588
+      ssa_ast: d7fe3ff947d9b0971e2263af006925e5df920dc494bfeb279d06ddce18554f8b
+      flattened_ast: 065f6e9bbf9c88f11331faebf96861f8a96488d1fb36e0b23f3de70c07b9e972
+      inlined_ast: 065f6e9bbf9c88f11331faebf96861f8a96488d1fb36e0b23f3de70c07b9e972
+      dce_ast: 065f6e9bbf9c88f11331faebf96861f8a96488d1fb36e0b23f3de70c07b9e972
       bytecode: a4c6a3559c050f7e666b347ea9cedd29ef60140d4bee54d145160726d4c31880
       warnings: ""
diff --git a/tests/expectations/compiler/mappings/max_mappings.out b/tests/expectations/compiler/mappings/max_mappings.out
index d21e26fc43..1e5eca13ca 100644
--- a/tests/expectations/compiler/mappings/max_mappings.out
+++ b/tests/expectations/compiler/mappings/max_mappings.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1106d2e14834bf0b5fcf00ce240100a6d7690ea287b5195f811e6e1134186ad1
-      unrolled_ast: 1106d2e14834bf0b5fcf00ce240100a6d7690ea287b5195f811e6e1134186ad1
-      ssa_ast: e557db66149774d41bb03e03ac851d82e049ad7e5498f7f7a385515c14d15c83
-      flattened_ast: 3198d4d9533b57042562176c3d449eb6e5298c2f2270482563c05131d70ee375
-      inlined_ast: 3198d4d9533b57042562176c3d449eb6e5298c2f2270482563c05131d70ee375
-      dce_ast: 3198d4d9533b57042562176c3d449eb6e5298c2f2270482563c05131d70ee375
+  - - initial_ast: bc2f34b3b7a3e2dfa04f417b1624946754ad7e77d485f0cf40462d04fd834b70
+      unrolled_ast: bc2f34b3b7a3e2dfa04f417b1624946754ad7e77d485f0cf40462d04fd834b70
+      ssa_ast: 11f9c3f2eeec46aa84efeffe555159da2d2ed83a6c5d196693d8b55d5f311343
+      flattened_ast: 21e973faead82a1f461ac320066a3338021fdc1cb2b29495f3e07fe8753b6c51
+      inlined_ast: 21e973faead82a1f461ac320066a3338021fdc1cb2b29495f3e07fe8753b6c51
+      dce_ast: 21e973faead82a1f461ac320066a3338021fdc1cb2b29495f3e07fe8753b6c51
       bytecode: b9f4013449f0c0c754435af754f6c68df5c36f26454f2a054e72e08e452cb891
       warnings: ""
diff --git a/tests/expectations/compiler/records/balance_wrong_ty.out b/tests/expectations/compiler/records/balance_wrong_ty.out
index 4bf5218077..ee820fd4c6 100644
--- a/tests/expectations/compiler/records/balance_wrong_ty.out
+++ b/tests/expectations/compiler/records/balance_wrong_ty.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 321f718bb0bd66f910f4a82399ec419611c6ede7c79be4b5fd500706a98ca984
-      unrolled_ast: 321f718bb0bd66f910f4a82399ec419611c6ede7c79be4b5fd500706a98ca984
-      ssa_ast: ac752badfd6cce970ea4adc26957f4a38e99dab59f79f13ea7ec57adc4b6182b
-      flattened_ast: 13a12e5f0bc7c802d46d5ea522947c3c3e4df25e6db9709f544b4edf4fe39b1a
-      inlined_ast: 13a12e5f0bc7c802d46d5ea522947c3c3e4df25e6db9709f544b4edf4fe39b1a
-      dce_ast: 13a12e5f0bc7c802d46d5ea522947c3c3e4df25e6db9709f544b4edf4fe39b1a
+  - - initial_ast: 6b9e4b552c561e50334246404ee1cbec64e9da67914a86610e0960a084a511e3
+      unrolled_ast: 6b9e4b552c561e50334246404ee1cbec64e9da67914a86610e0960a084a511e3
+      ssa_ast: fe3d5ab9ede4b6083953a4d732ea725bccb89a65971bb3061936d6b250e04a77
+      flattened_ast: 88d1e607e25b30f86564471903b11542410588ee93279fbbcfd496db70cfdb2a
+      inlined_ast: 88d1e607e25b30f86564471903b11542410588ee93279fbbcfd496db70cfdb2a
+      dce_ast: 88d1e607e25b30f86564471903b11542410588ee93279fbbcfd496db70cfdb2a
       bytecode: c0e06b094899a8b986048ec322e2fccaf4812febf185e635cb734797a25a7626
       warnings: ""
diff --git a/tests/expectations/compiler/records/declaration.out b/tests/expectations/compiler/records/declaration.out
index 1d9526ba7e..db231f154d 100644
--- a/tests/expectations/compiler/records/declaration.out
+++ b/tests/expectations/compiler/records/declaration.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3d4a20524220235085e3d03e49306e2f3811dd6d0a276059f6be076f792a4f33
-      unrolled_ast: 3d4a20524220235085e3d03e49306e2f3811dd6d0a276059f6be076f792a4f33
-      ssa_ast: 65738c323acf328dd28bc23d2ca3e0a6d9c010b49df70fa7c8ca0931ddd6f300
-      flattened_ast: 64f949877cf2d73728e234e75d630ed8233fccf1cdfa180185aa11299feaa027
-      inlined_ast: 64f949877cf2d73728e234e75d630ed8233fccf1cdfa180185aa11299feaa027
-      dce_ast: 64f949877cf2d73728e234e75d630ed8233fccf1cdfa180185aa11299feaa027
+  - - initial_ast: 6cf028f8ab27a5948e2aa3221b471dd4050b3bfc33cb4d7a6b4499f0fa44cd44
+      unrolled_ast: 6cf028f8ab27a5948e2aa3221b471dd4050b3bfc33cb4d7a6b4499f0fa44cd44
+      ssa_ast: f42a86c43df6ad83cb64c6f0179c00a28204fa98689f49e8ac4a598ea6570bcf
+      flattened_ast: f17b22c77e496ae3f4fc03518f4c80c2088f1c374d44d822bd9bba8739bda5f8
+      inlined_ast: f17b22c77e496ae3f4fc03518f4c80c2088f1c374d44d822bd9bba8739bda5f8
+      dce_ast: f17b22c77e496ae3f4fc03518f4c80c2088f1c374d44d822bd9bba8739bda5f8
       bytecode: 567f936a9f498a3648860fa0c7028b9fe84c93e9843fc82865e39298bc99c525
       warnings: ""
diff --git a/tests/expectations/compiler/records/gates_is_allowed.out b/tests/expectations/compiler/records/gates_is_allowed.out
index 08d83142d5..6ca50d57d6 100644
--- a/tests/expectations/compiler/records/gates_is_allowed.out
+++ b/tests/expectations/compiler/records/gates_is_allowed.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: bc07a971c3fce99d21fd10bac212a30d3d26dacd2ede2b2e834ff6f8c9e8b8d0
-      unrolled_ast: bc07a971c3fce99d21fd10bac212a30d3d26dacd2ede2b2e834ff6f8c9e8b8d0
-      ssa_ast: fc12e6787afaa02f8804781fcdbd9cbc6e849267834c9bf785cbce0ed3d86524
-      flattened_ast: 634b4ac8d4d35576e70b30252cc342513473a4447eab4b545a66dc2641c6c92a
-      inlined_ast: 634b4ac8d4d35576e70b30252cc342513473a4447eab4b545a66dc2641c6c92a
-      dce_ast: 634b4ac8d4d35576e70b30252cc342513473a4447eab4b545a66dc2641c6c92a
+  - - initial_ast: 0c25283ee2337090c476a0a045d4736a656ae04ba71ab6ce1ff11c52ca19c471
+      unrolled_ast: 0c25283ee2337090c476a0a045d4736a656ae04ba71ab6ce1ff11c52ca19c471
+      ssa_ast: 4af947e1e14ee893ab56fc7aeeea134e30ec6f684e70ebca5f24f36cafb2d070
+      flattened_ast: d8e4588d1d9c98136bd4fa7056641bac83d94871860218d7b0e1a68032902ddf
+      inlined_ast: d8e4588d1d9c98136bd4fa7056641bac83d94871860218d7b0e1a68032902ddf
+      dce_ast: d8e4588d1d9c98136bd4fa7056641bac83d94871860218d7b0e1a68032902ddf
       bytecode: 48e7881ab72ea8eaea757488386d315e8b5572f7ed34a5f1c70a5d19b2c4c481
       warnings: ""
diff --git a/tests/expectations/compiler/records/init_expression.out b/tests/expectations/compiler/records/init_expression.out
index 7561df1546..6a8fcc60c8 100644
--- a/tests/expectations/compiler/records/init_expression.out
+++ b/tests/expectations/compiler/records/init_expression.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 3d44898cdf3dd2dcc22180eb6f1f230a0f98fb3d7c173be78f0e9ddabe60bf97
-      unrolled_ast: 3d44898cdf3dd2dcc22180eb6f1f230a0f98fb3d7c173be78f0e9ddabe60bf97
-      ssa_ast: 5bad55baa9746ed7114dd3fb00ec70f6f6cb04a6b28b303ca985f8e3c7d380c7
-      flattened_ast: c52970591d9e3424ce769fe20f776427a743e30302f2901fc6612dcc4a74c13a
-      inlined_ast: c52970591d9e3424ce769fe20f776427a743e30302f2901fc6612dcc4a74c13a
-      dce_ast: e73a1b480570e56f607782fb94404e9e74397385ce40f78a1cdd393255ff6e40
+  - - initial_ast: 909bfb9bd82ff57f42a1e45a3a149bb2871a731a2208de1031cbef9e06cef34b
+      unrolled_ast: 909bfb9bd82ff57f42a1e45a3a149bb2871a731a2208de1031cbef9e06cef34b
+      ssa_ast: 373a937a7060133615a09617fef886d1179b47f57fba4ca93a708c38d17451b9
+      flattened_ast: db0e58324aec9cba1db6858add4b903bf5d26c13867488b9362ddc7cf9bf35a0
+      inlined_ast: db0e58324aec9cba1db6858add4b903bf5d26c13867488b9362ddc7cf9bf35a0
+      dce_ast: a8761e69f67d4866beb3f862677ac6e15ae1e859e384ef3093e06cd978c142ac
       bytecode: f243717a23b7bcbf2e4656d741a9e43b8a60184892683964efb628e22e36e7f1
       warnings: ""
diff --git a/tests/expectations/compiler/records/init_expression_shorthand.out b/tests/expectations/compiler/records/init_expression_shorthand.out
index 5b6c893ba7..09d56b50ea 100644
--- a/tests/expectations/compiler/records/init_expression_shorthand.out
+++ b/tests/expectations/compiler/records/init_expression_shorthand.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 01afa33d2e239f767703685ced844811bd54696394ae4abd030e29ec86a4363f
-      unrolled_ast: 01afa33d2e239f767703685ced844811bd54696394ae4abd030e29ec86a4363f
-      ssa_ast: b624a0c5a42f55e530263508bef689005a0a89397ae5fbfe89e765afbaceb3b1
-      flattened_ast: 17bb91fc549a97aa354e78f44783ac274ce2bca351b3fd73ed24186c701685cb
-      inlined_ast: 17bb91fc549a97aa354e78f44783ac274ce2bca351b3fd73ed24186c701685cb
-      dce_ast: 1d045a9b32e3dc4acb3b27f076c5df87a2e8ec3e6f3fadb990bf3132bcf8fbc4
+  - - initial_ast: 42727bc4ab4e9294867ee74a08e2fe78ff3112b999b4432135e52856576c8e99
+      unrolled_ast: 42727bc4ab4e9294867ee74a08e2fe78ff3112b999b4432135e52856576c8e99
+      ssa_ast: 45a7e89d56652adafaa251a2141711f47e772e2b55a4397e257892bebf01965b
+      flattened_ast: 5b0af0aebd2d18b4af1d877c888ccc6b3fa29b2e591452720740f4eb678b08d4
+      inlined_ast: 5b0af0aebd2d18b4af1d877c888ccc6b3fa29b2e591452720740f4eb678b08d4
+      dce_ast: 905a59375afb022b72f508d848d5ff8662054b86640a34f632c2397051e5c903
       bytecode: 0df6e3d77f2b3503e1b948582ccf17e40ef1cc0ba784bfb0ee91dd6388003630
       warnings: ""
diff --git a/tests/expectations/compiler/records/nested_record.out b/tests/expectations/compiler/records/nested_record.out
index 318cafbfb8..84c6255fd5 100644
--- a/tests/expectations/compiler/records/nested_record.out
+++ b/tests/expectations/compiler/records/nested_record.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 458384f84f4b9f22c703bc72bc9c7d19a68e500689b381467549e4353a0eeedc
-      unrolled_ast: 458384f84f4b9f22c703bc72bc9c7d19a68e500689b381467549e4353a0eeedc
-      ssa_ast: f3499f978e4998bc242c11eb4bc672405d50fd3c5b61da7af1568b9351721f8e
-      flattened_ast: b11d092cab0104f74feaf599475309c9b3cf367d45d14362f13d58204fb45e31
-      inlined_ast: b11d092cab0104f74feaf599475309c9b3cf367d45d14362f13d58204fb45e31
-      dce_ast: 776e1d01ef96b34b792c59e2a2a0ec4e70c25f39b80c04389db7bbe9bd1a5d2b
+  - - initial_ast: fe8475e42dfd5219b3d9f2ff294fa01e956ff298c4e352f8e1a51944cf4bd846
+      unrolled_ast: fe8475e42dfd5219b3d9f2ff294fa01e956ff298c4e352f8e1a51944cf4bd846
+      ssa_ast: 7b6c0f5dabd3c2deb5019dcaeab9f77699edf161ef1c20e56efe0bfee1315630
+      flattened_ast: 544fa7b2620256a88c5bae38ed3d38c5b91e89d07dfb125c7f9ac6a8ec36d1c2
+      inlined_ast: 544fa7b2620256a88c5bae38ed3d38c5b91e89d07dfb125c7f9ac6a8ec36d1c2
+      dce_ast: c1bd3e7d7217c74d67182a132e7f5f1950228011cd108325cd7a5a80fb788d36
       bytecode: 9477487eb30939ab953ae2b069d924cc89d50b2b1062bfad64dcb7c79d817b6f
       warnings: ""
diff --git a/tests/expectations/compiler/records/record_declaration_out_of_order.out b/tests/expectations/compiler/records/record_declaration_out_of_order.out
index efac51bc40..d08a47fa7a 100644
--- a/tests/expectations/compiler/records/record_declaration_out_of_order.out
+++ b/tests/expectations/compiler/records/record_declaration_out_of_order.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 855be2337c1b2fe1b04483947e4c4556fb960a952f61417d220ae84084aa21bd
-      unrolled_ast: 855be2337c1b2fe1b04483947e4c4556fb960a952f61417d220ae84084aa21bd
-      ssa_ast: caadd29b9c31fc41e2633d9d0b157c07239f5b14254af86091bfb87bff77ac9d
-      flattened_ast: ede360a6cc7cf673892a2289a6b30c2d26364758a00a8f0ff5078faf34413092
-      inlined_ast: ede360a6cc7cf673892a2289a6b30c2d26364758a00a8f0ff5078faf34413092
-      dce_ast: ede360a6cc7cf673892a2289a6b30c2d26364758a00a8f0ff5078faf34413092
+  - - initial_ast: 413ab323c761ed8898851fc9a11f7f71b8abef42ee5a067fb86bd1155d41e24d
+      unrolled_ast: 413ab323c761ed8898851fc9a11f7f71b8abef42ee5a067fb86bd1155d41e24d
+      ssa_ast: 430904d57804c8339aec65efb9d165d4d84be216df285fe96eb00499f2481426
+      flattened_ast: 79155de220a56fce6246ef3c1767971251aaa04417753ff452b1ecd69ca81021
+      inlined_ast: 79155de220a56fce6246ef3c1767971251aaa04417753ff452b1ecd69ca81021
+      dce_ast: 79155de220a56fce6246ef3c1767971251aaa04417753ff452b1ecd69ca81021
       bytecode: 567f936a9f498a3648860fa0c7028b9fe84c93e9843fc82865e39298bc99c525
       warnings: ""
diff --git a/tests/expectations/compiler/records/record_init_out_of_order.out b/tests/expectations/compiler/records/record_init_out_of_order.out
index 8339e2e18a..a0405c067f 100644
--- a/tests/expectations/compiler/records/record_init_out_of_order.out
+++ b/tests/expectations/compiler/records/record_init_out_of_order.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 46b9ca813dc8cf48f2e9573ffbab6f3f0cd21aaf1c43ca1034027540a350fd02
-      unrolled_ast: 46b9ca813dc8cf48f2e9573ffbab6f3f0cd21aaf1c43ca1034027540a350fd02
-      ssa_ast: af3418cb8ea8146e446bd75acefb8b67bbb4036b58bbbdf02b68aad042f50b5d
-      flattened_ast: 444cecc55b2d8c5eba5862d596c1bc99caaf4bc62297c559b93a8e9b23fa9bc5
-      inlined_ast: 444cecc55b2d8c5eba5862d596c1bc99caaf4bc62297c559b93a8e9b23fa9bc5
-      dce_ast: 444cecc55b2d8c5eba5862d596c1bc99caaf4bc62297c559b93a8e9b23fa9bc5
+  - - initial_ast: d62a5becf30494a5c07d515c158267012b6d1c3fdeb88fb07e2f054381cf8acd
+      unrolled_ast: d62a5becf30494a5c07d515c158267012b6d1c3fdeb88fb07e2f054381cf8acd
+      ssa_ast: ffe50cb7be9258000936ebe65897df029f1d552661be9e398cf932536a04a5c6
+      flattened_ast: 4efc05812dd074b640d27237c1efbeb006d2948ba97e377be1acaa92ca246a64
+      inlined_ast: 4efc05812dd074b640d27237c1efbeb006d2948ba97e377be1acaa92ca246a64
+      dce_ast: 4efc05812dd074b640d27237c1efbeb006d2948ba97e377be1acaa92ca246a64
       bytecode: 8c8992021f4a3ff29c9d5b1ddb3a34e14878b9cd822ac6e470018a4e268b2769
       warnings: ""
diff --git a/tests/expectations/compiler/records/record_with_visibility.out b/tests/expectations/compiler/records/record_with_visibility.out
index 265e973dba..bcab2803b1 100644
--- a/tests/expectations/compiler/records/record_with_visibility.out
+++ b/tests/expectations/compiler/records/record_with_visibility.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 59a8072d44a93b81545f9f3bee28097c3266cf541791fb3ab0c9520104560fa1
-      unrolled_ast: 59a8072d44a93b81545f9f3bee28097c3266cf541791fb3ab0c9520104560fa1
-      ssa_ast: 76005741194b7d8379500b4ef9815baf9a175e443780ba98c1c4d775f16c149b
-      flattened_ast: c3e73d2995856507f3028a29c85981995c55dbd1982fba15a57ab6199df3505f
-      inlined_ast: c3e73d2995856507f3028a29c85981995c55dbd1982fba15a57ab6199df3505f
-      dce_ast: c3e73d2995856507f3028a29c85981995c55dbd1982fba15a57ab6199df3505f
+  - - initial_ast: 25bafdcdf7af4d8824f95cc05da6ae2575ed046f3e55c4939a89f02ee5b70164
+      unrolled_ast: 25bafdcdf7af4d8824f95cc05da6ae2575ed046f3e55c4939a89f02ee5b70164
+      ssa_ast: 45e92e8d66b2a1032c027d4d6b2b30012cef9ef780332cf861cc2784a4e217dc
+      flattened_ast: ff69d89ea92c8277d4df2aa51ffc832e0345154d69591a8419560c82ed376750
+      inlined_ast: ff69d89ea92c8277d4df2aa51ffc832e0345154d69591a8419560c82ed376750
+      dce_ast: ff69d89ea92c8277d4df2aa51ffc832e0345154d69591a8419560c82ed376750
       bytecode: b028178300130b3ccbbce4d1d496a8feb1e4ac876572588e646c6e220105ff70
       warnings: ""
diff --git a/tests/expectations/compiler/scalar/add.out b/tests/expectations/compiler/scalar/add.out
index f947a25610..d6fa005c37 100644
--- a/tests/expectations/compiler/scalar/add.out
+++ b/tests/expectations/compiler/scalar/add.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: fe72ed13af108e870425f2133369d1b16c4a680231721f3e4a935deb4e845ff7
-      unrolled_ast: fe72ed13af108e870425f2133369d1b16c4a680231721f3e4a935deb4e845ff7
-      ssa_ast: 3e7267204a83d4480256a8feec33a1c7bebf839e528c62c44275c473954ddb59
-      flattened_ast: 42f8a5b720db034eeb4cde8ef52b29927219a223ac8f2f26335c0cfc2be90aca
-      inlined_ast: 42f8a5b720db034eeb4cde8ef52b29927219a223ac8f2f26335c0cfc2be90aca
-      dce_ast: 42f8a5b720db034eeb4cde8ef52b29927219a223ac8f2f26335c0cfc2be90aca
+  - - initial_ast: 70b189c5595874e8f73fd20693a1ac6044a88b6dbe40815a7b654b6b6262f7bd
+      unrolled_ast: 70b189c5595874e8f73fd20693a1ac6044a88b6dbe40815a7b654b6b6262f7bd
+      ssa_ast: b38392e169d2e3ed64b6e471bae7f8c1efcf2202ffc477538e7379e45e84e106
+      flattened_ast: 7d279af170b136786d0523183fc7b2be0a9e8d737aa4a048daa28fafba4d9288
+      inlined_ast: 7d279af170b136786d0523183fc7b2be0a9e8d737aa4a048daa28fafba4d9288
+      dce_ast: 7d279af170b136786d0523183fc7b2be0a9e8d737aa4a048daa28fafba4d9288
       bytecode: bfac2c829066d9dc43d56bc1d4e4f592f42e576220f3e3cfd57b060b7bb17222
       warnings: ""
diff --git a/tests/expectations/compiler/scalar/cmp.out b/tests/expectations/compiler/scalar/cmp.out
index 9a46560c83..5e65c55482 100644
--- a/tests/expectations/compiler/scalar/cmp.out
+++ b/tests/expectations/compiler/scalar/cmp.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a2c81a35c58eea6e3c411d95c6f2e25165c1a6822fa2a8c407fb6f2779a9e244
-      unrolled_ast: a2c81a35c58eea6e3c411d95c6f2e25165c1a6822fa2a8c407fb6f2779a9e244
-      ssa_ast: 09141db101cd0804de86dbc3423dd19c15e9df4c5bb6a54b86244170db9c1669
-      flattened_ast: c87f27c909c1c8f0f8eaebc560907d60d1e34a2d61ee5cabb4db720a9c071d35
-      inlined_ast: c87f27c909c1c8f0f8eaebc560907d60d1e34a2d61ee5cabb4db720a9c071d35
-      dce_ast: b9c48bf26594e14506b36534a517ac9f13bcfe3eb0a6030d3e4806ae0b6a7a0a
+  - - initial_ast: ff7bcb4c3b4941c9937b57cbfb516e815363fbac6090bf1553b636305f3a10c8
+      unrolled_ast: ff7bcb4c3b4941c9937b57cbfb516e815363fbac6090bf1553b636305f3a10c8
+      ssa_ast: 22e78b0a3e0382ca9437cbff0f1fdcf6d6fe93dd2ed0f62c8d6a15eb33ee4dfb
+      flattened_ast: f15fe1e250f71423ce105d4c2f7ac2ae9db8e937392fd2a75d79f4806a1e13b6
+      inlined_ast: f15fe1e250f71423ce105d4c2f7ac2ae9db8e937392fd2a75d79f4806a1e13b6
+      dce_ast: f5d72b71d1e9bc779780a87b02445e7c7eba7f205c007ec09287125202a7e28d
       bytecode: 09f008c4bdc1d4ba78adbf989c031779310385b96fa346f7979a810c7d7cb118
       warnings: ""
diff --git a/tests/expectations/compiler/scalar/eq.out b/tests/expectations/compiler/scalar/eq.out
index 29fec66808..a3a904ce6f 100644
--- a/tests/expectations/compiler/scalar/eq.out
+++ b/tests/expectations/compiler/scalar/eq.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4bd37de199abf0803b8a952ac3b9ea83e84598494f19a919036bd294134a444e
-      unrolled_ast: 4bd37de199abf0803b8a952ac3b9ea83e84598494f19a919036bd294134a444e
-      ssa_ast: 5cbafc48465520b96aa9feb6d994ab5267339a92236b50bdb38f369365dbb5e0
-      flattened_ast: f5be54ff67f0a9bf95431243b4b0ef9738631957344ba38428d5399346befcf9
-      inlined_ast: f5be54ff67f0a9bf95431243b4b0ef9738631957344ba38428d5399346befcf9
-      dce_ast: d7205c552719cc30590c8c48cdc0fb6840944b953b4c437a04e5d8fa6daebbaa
+  - - initial_ast: 32ab2eb32da943105c0a39531aed0fdc7b7d74d1a1a972cf144c57758bf23d5a
+      unrolled_ast: 32ab2eb32da943105c0a39531aed0fdc7b7d74d1a1a972cf144c57758bf23d5a
+      ssa_ast: c5c4fd93464f0a5bd036a6d6bed802777fb1bc3350abbc4be570828b261ebc77
+      flattened_ast: a6fcf2a523aa277a94974565f79b2dab8ebaf6f23db5e99895ad2207ed45551a
+      inlined_ast: a6fcf2a523aa277a94974565f79b2dab8ebaf6f23db5e99895ad2207ed45551a
+      dce_ast: d83d2fcbeecb0089ccac5554df4dc06b2a908bd524ed3e6f89afd6aed2544193
       bytecode: 5c71b9ef5f7774188b6b5be9f6ed558b26059dc5d008d590e2f6860076bcd893
       warnings: ""
diff --git a/tests/expectations/compiler/scalar/operator_methods.out b/tests/expectations/compiler/scalar/operator_methods.out
index 87bb1441c9..451eca2aaf 100644
--- a/tests/expectations/compiler/scalar/operator_methods.out
+++ b/tests/expectations/compiler/scalar/operator_methods.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7c78c69a9d468ad5d5ac5a3daab5a3e49227ce4d42b974f86d2fa6e7cbb7b044
-      unrolled_ast: 7c78c69a9d468ad5d5ac5a3daab5a3e49227ce4d42b974f86d2fa6e7cbb7b044
-      ssa_ast: 89428b692fd597f974cd4577f4a028468f092207f026195c3063231ef25d7805
-      flattened_ast: d509eb884cfbe261259403accc6743f21b5c24eca7d57efc8fbd8f8fdb67d773
-      inlined_ast: d509eb884cfbe261259403accc6743f21b5c24eca7d57efc8fbd8f8fdb67d773
-      dce_ast: 69e337ded0baba38f5c6df63c6de06cec2f3e8b463fa4cb53e1a96979a3623eb
+  - - initial_ast: fce3e6966de3e2d2a92370f989307118c5302f7db9ff14f246c243809c72b2df
+      unrolled_ast: fce3e6966de3e2d2a92370f989307118c5302f7db9ff14f246c243809c72b2df
+      ssa_ast: 2af66894a71cfbb9ae5cc6f4811c7e50b8bb8c4ddada5597dec45d4834131160
+      flattened_ast: 3534b51f4d5c0bd1b86cf9a8e207e8752947aa36ef7eecddc5b821d104805f66
+      inlined_ast: 3534b51f4d5c0bd1b86cf9a8e207e8752947aa36ef7eecddc5b821d104805f66
+      dce_ast: 7dfafadf81bcd26490bff97bd3b80411d08983407d82dc8cbca51e4c041a53fc
       bytecode: 36a164c1507612060ab556cee9d668118147a8f6bedb09e8eea30c9ce800f907
       warnings: ""
diff --git a/tests/expectations/compiler/scalar/scalar.out b/tests/expectations/compiler/scalar/scalar.out
index be04c9dafc..0cf465cd7e 100644
--- a/tests/expectations/compiler/scalar/scalar.out
+++ b/tests/expectations/compiler/scalar/scalar.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 04590d0fa7aab9853317f52e3f93ae7fdcb0c8730eb9f17a1d4b614bb32c0f15
-      unrolled_ast: 04590d0fa7aab9853317f52e3f93ae7fdcb0c8730eb9f17a1d4b614bb32c0f15
-      ssa_ast: a2bbb01352f77b8bceec411b39b1f0a8f64b06b0205e478b073419be0cb020d1
-      flattened_ast: 1c872b641b9189d3a00e8d135edfca6173a0fa3368e85fbd2f88d67a3e3ad351
-      inlined_ast: 1c872b641b9189d3a00e8d135edfca6173a0fa3368e85fbd2f88d67a3e3ad351
-      dce_ast: 1c872b641b9189d3a00e8d135edfca6173a0fa3368e85fbd2f88d67a3e3ad351
+  - - initial_ast: f49aac1182110c9547ce371175c0b287dd445e2585657fb6e7fdced7720524cd
+      unrolled_ast: f49aac1182110c9547ce371175c0b287dd445e2585657fb6e7fdced7720524cd
+      ssa_ast: 9afbb61751831b0c40a834e7de7be3baa2a8f55cd7eabb2cf4f8bf4be6d6f1fd
+      flattened_ast: f8572c4e9a3ccf56a85026cafbad560dc5ef448d0bc9fc1eb18cc19f57e99e4b
+      inlined_ast: f8572c4e9a3ccf56a85026cafbad560dc5ef448d0bc9fc1eb18cc19f57e99e4b
+      dce_ast: f8572c4e9a3ccf56a85026cafbad560dc5ef448d0bc9fc1eb18cc19f57e99e4b
       bytecode: 2ef042858531dce1d8583ebee5f799243cabbf2327d245957c535a35c146aef9
       warnings: ""
diff --git a/tests/expectations/compiler/scalar/ternary.out b/tests/expectations/compiler/scalar/ternary.out
index 1e9d02c8ac..293021369a 100644
--- a/tests/expectations/compiler/scalar/ternary.out
+++ b/tests/expectations/compiler/scalar/ternary.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: df44c10b907bdc10033d9ee1e922765879f9d81fef4893ac8ac76e7d9ef08e4f
-      unrolled_ast: df44c10b907bdc10033d9ee1e922765879f9d81fef4893ac8ac76e7d9ef08e4f
-      ssa_ast: d340b498b38de258913fb6e2ef8257908b0f6797b773ccad2c792020fe225396
-      flattened_ast: 32d2915bdb3d0ad35794b8f3e90e498c654c43fe3ed6900c21e3740630d0b1e4
-      inlined_ast: 32d2915bdb3d0ad35794b8f3e90e498c654c43fe3ed6900c21e3740630d0b1e4
-      dce_ast: 32d2915bdb3d0ad35794b8f3e90e498c654c43fe3ed6900c21e3740630d0b1e4
+  - - initial_ast: e8fd79a568a1bc6dcc22a17a6f824e3d64bb0abcfb900fdddbf18b6debad5189
+      unrolled_ast: e8fd79a568a1bc6dcc22a17a6f824e3d64bb0abcfb900fdddbf18b6debad5189
+      ssa_ast: ae9f86ca5bf46c73b236ee5f6d8810a6dc51736af1b60d302a783adfa4ceaf72
+      flattened_ast: d461339f5f332fe7ef11803dbe1d084b1aac943be5bf4ffe3d96b31edf340c89
+      inlined_ast: d461339f5f332fe7ef11803dbe1d084b1aac943be5bf4ffe3d96b31edf340c89
+      dce_ast: d461339f5f332fe7ef11803dbe1d084b1aac943be5bf4ffe3d96b31edf340c89
       bytecode: 23e6cb091f2093299d0ea6100cce0c3af523c81111da120d423976348681eda9
       warnings: ""
diff --git a/tests/expectations/compiler/statements/assign.out b/tests/expectations/compiler/statements/assign.out
index 1cbaabf464..2c2f927936 100644
--- a/tests/expectations/compiler/statements/assign.out
+++ b/tests/expectations/compiler/statements/assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: e638cafd5162ba5cdb972b2f2fc38f5bdde135765461ffbfd89ea20e7d7570dc
-      unrolled_ast: e638cafd5162ba5cdb972b2f2fc38f5bdde135765461ffbfd89ea20e7d7570dc
-      ssa_ast: 09508a1d5ca72aaab521feaa7703197642be924f799d9cad001a25ea9102147b
-      flattened_ast: 34fe74364252a3390de4c065e042fd471fb93f4a3b6b2a7228763ccfcb65e941
-      inlined_ast: 34fe74364252a3390de4c065e042fd471fb93f4a3b6b2a7228763ccfcb65e941
-      dce_ast: 34fe74364252a3390de4c065e042fd471fb93f4a3b6b2a7228763ccfcb65e941
+  - - initial_ast: b773f07a54bb622045207d5b6d75518cc61253db0d7df401bbc220db0f4cc84d
+      unrolled_ast: b773f07a54bb622045207d5b6d75518cc61253db0d7df401bbc220db0f4cc84d
+      ssa_ast: 863b1d1d2265ce5c75bdbe5942c9fc190d87f47f09292ebfada7c750757836f2
+      flattened_ast: 50be1427ea68e8dc759253ae97d32d024e454e833eea24b6b59aff30819ca062
+      inlined_ast: 50be1427ea68e8dc759253ae97d32d024e454e833eea24b6b59aff30819ca062
+      dce_ast: 50be1427ea68e8dc759253ae97d32d024e454e833eea24b6b59aff30819ca062
       bytecode: 5487f807b82f67172b386aaf992fed06bcb134d1749202c409a300633a37a9bf
       warnings: ""
diff --git a/tests/expectations/compiler/statements/block.out b/tests/expectations/compiler/statements/block.out
index efdf9a3e58..5347ce8c52 100644
--- a/tests/expectations/compiler/statements/block.out
+++ b/tests/expectations/compiler/statements/block.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 33a371d31a9e6be3adfeadee1d5be9875b4bb52d911198ac95b2c9a24622e00c
-      unrolled_ast: 33a371d31a9e6be3adfeadee1d5be9875b4bb52d911198ac95b2c9a24622e00c
-      ssa_ast: aee4f8d4c84b8dc706c9c1b2112cf9b251c79f5f2bcd18132d8147b34a1d24c6
-      flattened_ast: 2e8aa6e4c7c999cec8d7ac578dc79e83472baeeec860e1e32f6072a04aab8d3d
-      inlined_ast: 2e8aa6e4c7c999cec8d7ac578dc79e83472baeeec860e1e32f6072a04aab8d3d
-      dce_ast: 2e8aa6e4c7c999cec8d7ac578dc79e83472baeeec860e1e32f6072a04aab8d3d
+  - - initial_ast: 26ccd058cce0c3bd1c9812903f1cc21e8886905964ca565d41782e08631a4722
+      unrolled_ast: 26ccd058cce0c3bd1c9812903f1cc21e8886905964ca565d41782e08631a4722
+      ssa_ast: b99ef5259b4d8c13f7c716d548e5005b0f90291fa128cf5ff2c576a532bcf47d
+      flattened_ast: 29f8729f583503bf96da596bf6308c90a52837bfe47948b19bce1a75ee47efdb
+      inlined_ast: 29f8729f583503bf96da596bf6308c90a52837bfe47948b19bce1a75ee47efdb
+      dce_ast: 29f8729f583503bf96da596bf6308c90a52837bfe47948b19bce1a75ee47efdb
       bytecode: 9f2bbabd0f858db6e5f4e529fdd5e246023994bf27bbabe6dc1aa6bbf8bf5cfd
       warnings: ""
diff --git a/tests/expectations/compiler/statements/chain.out b/tests/expectations/compiler/statements/chain.out
index 8c83b2db6d..0e46f2d37d 100644
--- a/tests/expectations/compiler/statements/chain.out
+++ b/tests/expectations/compiler/statements/chain.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 0e972baf0498bafb7e86f8602ff97e80f291d33ff1c5347fef2898d30272f38f
-      unrolled_ast: 0e972baf0498bafb7e86f8602ff97e80f291d33ff1c5347fef2898d30272f38f
-      ssa_ast: 67f0c60b3b4ff53997f13f38eae29e2235d631cf995a6d3daf6d7fbafd0255bc
-      flattened_ast: 6c080c755c2ec4aaaadf7c28dcd89f53bfc1e35a1df1adab82d3757ab0c5f0b3
-      inlined_ast: 6c080c755c2ec4aaaadf7c28dcd89f53bfc1e35a1df1adab82d3757ab0c5f0b3
-      dce_ast: e9149282392ac07b497bb475675e44f5c0a040d392a3d38bbe50f8494aa437d7
+  - - initial_ast: f4d8ebae9a2cd573a000b7d9335cd04f0deb869af6e364ff11b41c9b9375496f
+      unrolled_ast: f4d8ebae9a2cd573a000b7d9335cd04f0deb869af6e364ff11b41c9b9375496f
+      ssa_ast: 51305af96d663cf4fc78bb55447ff2594b916366686a8958edc2c9088045b979
+      flattened_ast: 35297c88153301d2eafd83224b80fb38512eecc2b88a332f80499ad1178adb1a
+      inlined_ast: 35297c88153301d2eafd83224b80fb38512eecc2b88a332f80499ad1178adb1a
+      dce_ast: fc34ebaa48a76e80b068d4604ba9369f0c135e08e10f265e2c816dbb84ff99cc
       bytecode: f6aaf7f7a13fb233511385db7479f2612e7a77734ee6a189f063bd3d33a7afaa
       warnings: ""
diff --git a/tests/expectations/compiler/statements/expr_statement.out b/tests/expectations/compiler/statements/expr_statement.out
index 1dabf0b1ab..5cfa385f36 100644
--- a/tests/expectations/compiler/statements/expr_statement.out
+++ b/tests/expectations/compiler/statements/expr_statement.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 12d9b5a03e9a90aa2f1e225ce52c9c0ab2a6ce2f390fedbbb4c915649d7cd387
-      unrolled_ast: 12d9b5a03e9a90aa2f1e225ce52c9c0ab2a6ce2f390fedbbb4c915649d7cd387
-      ssa_ast: cb9320c526f2405f9da2af93a40c9969faf1e2572d5c4a334cc36b2eae36a1a2
-      flattened_ast: 59bc3b55e1cdb78842c76592d2e496573ff2aa7b8aea3ffe9e30ceb7a1493deb
-      inlined_ast: 59bc3b55e1cdb78842c76592d2e496573ff2aa7b8aea3ffe9e30ceb7a1493deb
-      dce_ast: 59bc3b55e1cdb78842c76592d2e496573ff2aa7b8aea3ffe9e30ceb7a1493deb
+  - - initial_ast: f09605a47a08fdaa74f817a4fdafb28c7d8b5aa79cdca9a22e5ab5b4e465db99
+      unrolled_ast: f09605a47a08fdaa74f817a4fdafb28c7d8b5aa79cdca9a22e5ab5b4e465db99
+      ssa_ast: dd47cb4c51bbb36c3ca4c184a0f741263b15a3bc331f65d33dfb66219a6fdfb5
+      flattened_ast: 7561b85fc6f1ad604f4d4f1992376fea24af030de4ff22a182b8d77cf121bbac
+      inlined_ast: 7561b85fc6f1ad604f4d4f1992376fea24af030de4ff22a182b8d77cf121bbac
+      dce_ast: 7561b85fc6f1ad604f4d4f1992376fea24af030de4ff22a182b8d77cf121bbac
       bytecode: c57c57bf012ff4c89e7526b32da8955cb4f880014d62a35493bffce6871c093b
       warnings: ""
diff --git a/tests/expectations/compiler/statements/iteration_basic.out b/tests/expectations/compiler/statements/iteration_basic.out
index a032f17ce6..4acf433157 100644
--- a/tests/expectations/compiler/statements/iteration_basic.out
+++ b/tests/expectations/compiler/statements/iteration_basic.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 71762985dddbae02fc71820ef234a4d71ef0db2c6c5b5e07f4790911b335f2eb
-      unrolled_ast: 93dc3615602b68509eca762541f9c97fd45992fb2b4ffcd40ccd222cc6718c4d
-      ssa_ast: 6f9e585354f5ff8d637d33790ba5b162fff5033173c11865e5ce0d123f18a4fa
-      flattened_ast: 720509a27137b6fa5f2ed9c3970d307c6332b7a37e77838bea2cd132da7e98da
-      inlined_ast: 720509a27137b6fa5f2ed9c3970d307c6332b7a37e77838bea2cd132da7e98da
-      dce_ast: 8fe8c24993ed82750ebd7be9be94feb033028c56d8ed91eaafde769b95cd553c
+  - - initial_ast: 023007f5185aba81ccd93a02cbc8be7001335a2b8bb2d1a9e882218070200e8d
+      unrolled_ast: ee980f51b61e1b42e109d91410df6b476f9321d8c95ec24923f4e01d08ecd84b
+      ssa_ast: 1d513bc1622d4e04fdd395af308cca6b3c2d8ba3d6554af1ad1827fe077f3709
+      flattened_ast: 1d5f2889f6975f107c260a049c62551ca111e76403c529b3270dda026a864e1d
+      inlined_ast: 1d5f2889f6975f107c260a049c62551ca111e76403c529b3270dda026a864e1d
+      dce_ast: 4c2cc24cdc6d84d67acd69c4afd75795a97c0bb1dd1d5856d13e4efabad91c1b
       bytecode: 41bf59ecf2ab2485e223b6501897613108441d2d881640d2d235f79201615cd3
       warnings: ""
diff --git a/tests/expectations/compiler/statements/iteration_nested.out b/tests/expectations/compiler/statements/iteration_nested.out
index 0ac29dfbe1..a59e692081 100644
--- a/tests/expectations/compiler/statements/iteration_nested.out
+++ b/tests/expectations/compiler/statements/iteration_nested.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 21579a213c1b3fbe034d97b5589ee974b23e1e1c820c9126567098bb2b6bccfe
-      unrolled_ast: ec7c1aeb019aaa85d79c2cb479dcee8eca60544f82dfb7cca1e5eb36a5315ad6
-      ssa_ast: 38f993d1597dfda1e6e930704c4a29e7493cc59a25e883b7da2de8f99d0670e9
-      flattened_ast: 86f16e682b4eade92d5092af65b35ba419100a3651a309584c26f6c3ccfdef6d
-      inlined_ast: 86f16e682b4eade92d5092af65b35ba419100a3651a309584c26f6c3ccfdef6d
-      dce_ast: 12e27180a7e37fa72298c4902c84f579cc6965faddbe0f1b3f54775660c230b0
+  - - initial_ast: 3d4dd7e185417776326c979a1fc56e7076c580f22674705da549e24b07cb77fc
+      unrolled_ast: dbaf7257923b0678472a2132d93ac5b609eb73a0b9cccb153bf530fe599d6b9e
+      ssa_ast: 758c2d76a87d0813e67dafed0fa6c0fc35c186731c8429fd2ffa57918752c507
+      flattened_ast: 3f8f99cdadbbef5a923c8a30cbaf2f32ed607908942ab3d635e62d3d6376a095
+      inlined_ast: 3f8f99cdadbbef5a923c8a30cbaf2f32ed607908942ab3d635e62d3d6376a095
+      dce_ast: 153a118479bd60331b294890fed38541c315107aaebb231070207e3901b62d71
       bytecode: e6fba28a70e1d844cc46f8e9dcf040658b9431f4fd49a4896dfc7ffb3ebfeb25
       warnings: ""
diff --git a/tests/expectations/compiler/statements/multiple_returns.out b/tests/expectations/compiler/statements/multiple_returns.out
index 9e31695d4d..00fa891235 100644
--- a/tests/expectations/compiler/statements/multiple_returns.out
+++ b/tests/expectations/compiler/statements/multiple_returns.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: aedde7c5c666d6969f1b81f922a4035db764a46940d4778b765b3b9804f5429c
-      unrolled_ast: aedde7c5c666d6969f1b81f922a4035db764a46940d4778b765b3b9804f5429c
-      ssa_ast: 6e03fe816e4e9d9266a5680d0501c8d8be6feab19698af76e7dd3c00c7a86f77
-      flattened_ast: eced601cfa93e42d2616522aee1a8920d59d17c91a2e0fea38e2a3d63ab84098
-      inlined_ast: eced601cfa93e42d2616522aee1a8920d59d17c91a2e0fea38e2a3d63ab84098
-      dce_ast: eced601cfa93e42d2616522aee1a8920d59d17c91a2e0fea38e2a3d63ab84098
+  - - initial_ast: 9f532ce879b719b9294c758c13edd368cbcaa06b9f6497eb1c799a7f3a7f6402
+      unrolled_ast: 9f532ce879b719b9294c758c13edd368cbcaa06b9f6497eb1c799a7f3a7f6402
+      ssa_ast: 5b1bc09646c8ad876e41acb317cccaf0f9f8ab2a253e09457bb2040b02c4020e
+      flattened_ast: 35ba603731703b6409e2ab3eb3dd6b17c93ecd89457522ac96abcaef0147bf62
+      inlined_ast: 35ba603731703b6409e2ab3eb3dd6b17c93ecd89457522ac96abcaef0147bf62
+      dce_ast: 35ba603731703b6409e2ab3eb3dd6b17c93ecd89457522ac96abcaef0147bf62
       bytecode: e8fad70723ee17dc768faab9e2ee64ec338b6b1bd4ec1d9350791665c1abd697
       warnings: ""
diff --git a/tests/expectations/compiler/statements/mutate.out b/tests/expectations/compiler/statements/mutate.out
index 5e75e006f4..93a215d9c9 100644
--- a/tests/expectations/compiler/statements/mutate.out
+++ b/tests/expectations/compiler/statements/mutate.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f19b490a00c1a62e1644bf8b8ed891b081e9c13fc707703716756120dc25e808
-      unrolled_ast: f19b490a00c1a62e1644bf8b8ed891b081e9c13fc707703716756120dc25e808
-      ssa_ast: 26141ab2b12ba8a9fbe9e69b7a9959c3039833f5aa91545c4f37bdf8ad216910
-      flattened_ast: d2ade4073321dde72e16747c2368cf585d64e779455d730c1eefa91ffa3dc694
-      inlined_ast: d2ade4073321dde72e16747c2368cf585d64e779455d730c1eefa91ffa3dc694
-      dce_ast: f41a9c31663cd30206a411e393acd0a09d52f82fc10c4bc8f01cde61f1e3c45e
+  - - initial_ast: 0cbaada5ee0ff0354e406ce96bb7e2e0625268022749aaec11ec9a98b7d45635
+      unrolled_ast: 0cbaada5ee0ff0354e406ce96bb7e2e0625268022749aaec11ec9a98b7d45635
+      ssa_ast: bed95a5b78e6d385cf756d8f56e7daefc5449c55c3d8ed174084508565ff69a3
+      flattened_ast: 6a27d685493b82a43db18acdc362f732ea478bf4b89f53e23eed90900b980ac4
+      inlined_ast: 6a27d685493b82a43db18acdc362f732ea478bf4b89f53e23eed90900b980ac4
+      dce_ast: d60fde16a0dfd2ca78a3a44b841ae3daa22817874a816b4b820f03eae6b57e86
       bytecode: 4f4c5c377fed78feede8ee754c9f838f449f8d00cf771b2bb65884e876f90b7e
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/add_assign.out b/tests/expectations/compiler/statements/operations/add_assign.out
index 7afe272936..b49ccbf94e 100644
--- a/tests/expectations/compiler/statements/operations/add_assign.out
+++ b/tests/expectations/compiler/statements/operations/add_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6d17f428a4e0e4d5326f96685803dbc197166a445049fa2965674bd38f18a93b
-      unrolled_ast: 6d17f428a4e0e4d5326f96685803dbc197166a445049fa2965674bd38f18a93b
-      ssa_ast: 096fc60aa3add9c78e420b0148e926482e6e6af9e42eae25b823fa37ae17d748
-      flattened_ast: ab545b4c1aa5d04b83604237292879b22f7ebce3d5b42c992cf58946fee4713b
-      inlined_ast: ab545b4c1aa5d04b83604237292879b22f7ebce3d5b42c992cf58946fee4713b
-      dce_ast: ab545b4c1aa5d04b83604237292879b22f7ebce3d5b42c992cf58946fee4713b
+  - - initial_ast: 34372704e95da741bb3697dad49c7c0d79ccbcb200bab121b4f69168e6cd23c7
+      unrolled_ast: 34372704e95da741bb3697dad49c7c0d79ccbcb200bab121b4f69168e6cd23c7
+      ssa_ast: 9c89efab2bed91a957236e72b0ce018622a97a8f579f91c0fc74cb5156acca31
+      flattened_ast: e20600a185796f1eb539c749d69f6ad962a782ed8178c80bad09fedd5e93731f
+      inlined_ast: e20600a185796f1eb539c749d69f6ad962a782ed8178c80bad09fedd5e93731f
+      dce_ast: e20600a185796f1eb539c749d69f6ad962a782ed8178c80bad09fedd5e93731f
       bytecode: f9bb06bbdb06665d260633e11e377d5b2a428e169220f31b9ad9cd8ac8c94f6d
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/and_assign.out b/tests/expectations/compiler/statements/operations/and_assign.out
index 0705b82f16..77ef0a78d6 100644
--- a/tests/expectations/compiler/statements/operations/and_assign.out
+++ b/tests/expectations/compiler/statements/operations/and_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b0d904e0dee9136f3e2ca52ac4872d1b3d345528f8b9bcfca6256e49a2ae55ad
-      unrolled_ast: b0d904e0dee9136f3e2ca52ac4872d1b3d345528f8b9bcfca6256e49a2ae55ad
-      ssa_ast: 699adbb4256d6b031836a7f083aefd75ed4fdc6df9425ec752e9f5770b5381d7
-      flattened_ast: ae9ef0dd00f78583ab2af16bc4280e07979d419c37aa4756daf3c6eb7994a03d
-      inlined_ast: ae9ef0dd00f78583ab2af16bc4280e07979d419c37aa4756daf3c6eb7994a03d
-      dce_ast: ae9ef0dd00f78583ab2af16bc4280e07979d419c37aa4756daf3c6eb7994a03d
+  - - initial_ast: 07ccc180d3da8e9ffe8f4e347c16b262e6aed006d4db6220b5b3a015fda17c04
+      unrolled_ast: 07ccc180d3da8e9ffe8f4e347c16b262e6aed006d4db6220b5b3a015fda17c04
+      ssa_ast: 3309504c057b06ca155b47754b523c92cedf7f65de4d20252f09984c53ff15fc
+      flattened_ast: e74772409ca6830c2cefaaecfd01df94a05e8cc7e2e333dbb7f0795c2f08349c
+      inlined_ast: e74772409ca6830c2cefaaecfd01df94a05e8cc7e2e333dbb7f0795c2f08349c
+      dce_ast: e74772409ca6830c2cefaaecfd01df94a05e8cc7e2e333dbb7f0795c2f08349c
       bytecode: 7b9e392bda5b29d56ff94dc3eaefe68313d852336209db998714308d19ea6102
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/bitand_assign.out b/tests/expectations/compiler/statements/operations/bitand_assign.out
index 4c4e5d2236..3b2779cfa9 100644
--- a/tests/expectations/compiler/statements/operations/bitand_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitand_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 24082d9b240148135834080c113cd0f5fadbd5586972347ee2ce02569275b879
-      unrolled_ast: 24082d9b240148135834080c113cd0f5fadbd5586972347ee2ce02569275b879
-      ssa_ast: 74c4a834dbd19d4c2afba8caeb4a36f00b0b5b8972f95b2b40efaf41263da5d3
-      flattened_ast: 27271a648806e9b233d0ccc5b965ef3ec7a03ce60b87423c6b3a275ba7af74dc
-      inlined_ast: 27271a648806e9b233d0ccc5b965ef3ec7a03ce60b87423c6b3a275ba7af74dc
-      dce_ast: 27271a648806e9b233d0ccc5b965ef3ec7a03ce60b87423c6b3a275ba7af74dc
+  - - initial_ast: 6d68c98efda5d036a6b272f87f5027fe1d3cd63d5a6691a43617772ea7e0ff11
+      unrolled_ast: 6d68c98efda5d036a6b272f87f5027fe1d3cd63d5a6691a43617772ea7e0ff11
+      ssa_ast: 2c5f06e57b2d35ed218ffef668d234f5434735802156b153e173c7a7318e2879
+      flattened_ast: 2f4220cc6bdbc2fa3f425ada1342769f8d48cd92a4746b266ddc53198c43434c
+      inlined_ast: 2f4220cc6bdbc2fa3f425ada1342769f8d48cd92a4746b266ddc53198c43434c
+      dce_ast: 2f4220cc6bdbc2fa3f425ada1342769f8d48cd92a4746b266ddc53198c43434c
       bytecode: 6dab0d771ad5e0b95b5ded8ffb214368621dc0ee9434113549f85abd0eb6c626
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/bitor_assign.out b/tests/expectations/compiler/statements/operations/bitor_assign.out
index f2b3242cb6..b5f21c285e 100644
--- a/tests/expectations/compiler/statements/operations/bitor_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitor_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 250e057dd087dec12b4e0d4de0310c1f04d2f74f07293ff7c3344b3f4760aff2
-      unrolled_ast: 250e057dd087dec12b4e0d4de0310c1f04d2f74f07293ff7c3344b3f4760aff2
-      ssa_ast: 5aa086c693dbf2454be67814e28ea79012f1ecee1dc7d4e781e46a253676076f
-      flattened_ast: e7de384b09d1778fe786af88f801660cd78327bb8f5de05be396fc759b4c70df
-      inlined_ast: e7de384b09d1778fe786af88f801660cd78327bb8f5de05be396fc759b4c70df
-      dce_ast: e7de384b09d1778fe786af88f801660cd78327bb8f5de05be396fc759b4c70df
+  - - initial_ast: c72c3f5d0b191b4d8a540a8ae81879dda60ece6423eb64600d9ec10af48af732
+      unrolled_ast: c72c3f5d0b191b4d8a540a8ae81879dda60ece6423eb64600d9ec10af48af732
+      ssa_ast: 7173bf90285248e3a5a2fb90443e21cb72d7b26d448c4d749a5a9090c707402b
+      flattened_ast: 5064e174f0ba53e0f32b77e1042c23cd11fc70351f5efbab13e9c2f36594ff24
+      inlined_ast: 5064e174f0ba53e0f32b77e1042c23cd11fc70351f5efbab13e9c2f36594ff24
+      dce_ast: 5064e174f0ba53e0f32b77e1042c23cd11fc70351f5efbab13e9c2f36594ff24
       bytecode: f551499188e28449b06b9aa17ef8af4d1daedbf0ac75484b5e3f8e81836ffb63
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/bitxor_assign.out b/tests/expectations/compiler/statements/operations/bitxor_assign.out
index c692acc29e..3022c0c08c 100644
--- a/tests/expectations/compiler/statements/operations/bitxor_assign.out
+++ b/tests/expectations/compiler/statements/operations/bitxor_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 98df3f3a84a2e4600a788a9bb0eb223d1fb9efe5fa5a3bc8c19e0ccf9c70a65b
-      unrolled_ast: 98df3f3a84a2e4600a788a9bb0eb223d1fb9efe5fa5a3bc8c19e0ccf9c70a65b
-      ssa_ast: e939dd90cdbbefa187fb1c92534f2891e2d8426bfd80b98db9d88b417cefd29c
-      flattened_ast: 0fcba5cfb2698a1a9a14e0570f34545eec9fe08c55ee960918073a11e3bbf580
-      inlined_ast: 0fcba5cfb2698a1a9a14e0570f34545eec9fe08c55ee960918073a11e3bbf580
-      dce_ast: 0fcba5cfb2698a1a9a14e0570f34545eec9fe08c55ee960918073a11e3bbf580
+  - - initial_ast: dab669d9864dca4cf8501d3a2a369efa00cbbf4d18e839440d80e5281b0242e7
+      unrolled_ast: dab669d9864dca4cf8501d3a2a369efa00cbbf4d18e839440d80e5281b0242e7
+      ssa_ast: 1cd28259b47094631fff7b18ac1d36ab5f7c72b64b2f2b0ff12cfb7c83e9477b
+      flattened_ast: dd3cfd4d5c79a74c04c4b4fee65574b207f352d1b3fe2d0c36bd894146f6fdc5
+      inlined_ast: dd3cfd4d5c79a74c04c4b4fee65574b207f352d1b3fe2d0c36bd894146f6fdc5
+      dce_ast: dd3cfd4d5c79a74c04c4b4fee65574b207f352d1b3fe2d0c36bd894146f6fdc5
       bytecode: cc7cc1d77829ab20a01838d82d9d75e2f4d9b5231667aeeb7517083740d299f5
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/div_assign.out b/tests/expectations/compiler/statements/operations/div_assign.out
index fd3e671143..248f54abfb 100644
--- a/tests/expectations/compiler/statements/operations/div_assign.out
+++ b/tests/expectations/compiler/statements/operations/div_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 8f3728c556b35ea8a0f84045e0db2a85a66dd1c6286efffc3e0b03a58612be2f
-      unrolled_ast: 8f3728c556b35ea8a0f84045e0db2a85a66dd1c6286efffc3e0b03a58612be2f
-      ssa_ast: 6a212d81111c993c4c65cf0f2e23762ea1f2dd8484d8f46aae892370430acae4
-      flattened_ast: b6b06d57677130d1c9e6e326d5fcc03ded77e2a65032545ab8c1b806ecd79e16
-      inlined_ast: b6b06d57677130d1c9e6e326d5fcc03ded77e2a65032545ab8c1b806ecd79e16
-      dce_ast: b6b06d57677130d1c9e6e326d5fcc03ded77e2a65032545ab8c1b806ecd79e16
+  - - initial_ast: 7ee38e320663cb39e74bc89402cac09d2e62cfa312358663cb79f03bf9a25ede
+      unrolled_ast: 7ee38e320663cb39e74bc89402cac09d2e62cfa312358663cb79f03bf9a25ede
+      ssa_ast: cc3f6e1fad35163050c33d98f94d8d1e7367ca976e5e15b27d5393da870c2824
+      flattened_ast: a50bce879733bd533d1750fa4eb1fbd0c7c8e0c3a556a80aa43ac335f8470d51
+      inlined_ast: a50bce879733bd533d1750fa4eb1fbd0c7c8e0c3a556a80aa43ac335f8470d51
+      dce_ast: a50bce879733bd533d1750fa4eb1fbd0c7c8e0c3a556a80aa43ac335f8470d51
       bytecode: 852a26ba7ae67c2f2cdf00814963c66786bd383cb645b9740b782cb07e747c41
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/mul_assign.out b/tests/expectations/compiler/statements/operations/mul_assign.out
index d3e6e430e3..c5f1d33c65 100644
--- a/tests/expectations/compiler/statements/operations/mul_assign.out
+++ b/tests/expectations/compiler/statements/operations/mul_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 1e4b6623f9ef5918e7e4164990685c70e1491e9925806e499068a24517651df6
-      unrolled_ast: 1e4b6623f9ef5918e7e4164990685c70e1491e9925806e499068a24517651df6
-      ssa_ast: 2726f057ca2f7d3a181425a0359e433a141e5c1c4094a9a30cddddbc5aa7046c
-      flattened_ast: 791142f029f85f2d416aab7d2c09ff10692dc1706a8e1edade9eb70b994e65ce
-      inlined_ast: 791142f029f85f2d416aab7d2c09ff10692dc1706a8e1edade9eb70b994e65ce
-      dce_ast: 791142f029f85f2d416aab7d2c09ff10692dc1706a8e1edade9eb70b994e65ce
+  - - initial_ast: 073ad98eab20774d8853957cca70c5a9f738f6dc85941abf5bf81521ee897137
+      unrolled_ast: 073ad98eab20774d8853957cca70c5a9f738f6dc85941abf5bf81521ee897137
+      ssa_ast: f61fb3a640798a8d3496c5715f730babe59623fc3e0a467f7bf60b8e3de5dd42
+      flattened_ast: 943cd89d468cede833fbb8c6978b4fa3195eac9d15fbdfa07a3ba5165324c4e8
+      inlined_ast: 943cd89d468cede833fbb8c6978b4fa3195eac9d15fbdfa07a3ba5165324c4e8
+      dce_ast: 943cd89d468cede833fbb8c6978b4fa3195eac9d15fbdfa07a3ba5165324c4e8
       bytecode: e458b602541d030c368e1e498d1dae92b0a26e9505a02ca3cd93858ca3bdb277
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/or_assign.out b/tests/expectations/compiler/statements/operations/or_assign.out
index 893aecb11f..a99ca0bd80 100644
--- a/tests/expectations/compiler/statements/operations/or_assign.out
+++ b/tests/expectations/compiler/statements/operations/or_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4f443b41abd57dc73d7422835ff0a8a6c41e11359dec8f2670c5f2271d480579
-      unrolled_ast: 4f443b41abd57dc73d7422835ff0a8a6c41e11359dec8f2670c5f2271d480579
-      ssa_ast: 8faa507b7d812b4e1dc6dc8eee42cc3db3046b8bbe1b0ff133a57886a83dd795
-      flattened_ast: 19d8f9cd38bc39820a608dd4cc8bac01b6c5bf157530ca8655b85c189fc15e57
-      inlined_ast: 19d8f9cd38bc39820a608dd4cc8bac01b6c5bf157530ca8655b85c189fc15e57
-      dce_ast: 19d8f9cd38bc39820a608dd4cc8bac01b6c5bf157530ca8655b85c189fc15e57
+  - - initial_ast: ea6d49c7835358f8ee8b6d27a6700183f6fdf144262720dd80645f7a80addce1
+      unrolled_ast: ea6d49c7835358f8ee8b6d27a6700183f6fdf144262720dd80645f7a80addce1
+      ssa_ast: 4012453eed7786b2a74ddcf91b7d897c6acfe4c5549b8989ca8658151608d65d
+      flattened_ast: d19d9b5a2028886da4655016dff47d126e3a57384de94c5186d3a43136aeddf0
+      inlined_ast: d19d9b5a2028886da4655016dff47d126e3a57384de94c5186d3a43136aeddf0
+      dce_ast: d19d9b5a2028886da4655016dff47d126e3a57384de94c5186d3a43136aeddf0
       bytecode: 6d6695b67fa8f1cff43f2d00c6ce7e118342fb3e0bd05008d952820bf0e6dca8
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/pow_assign.out b/tests/expectations/compiler/statements/operations/pow_assign.out
index 0dd7e4e3eb..2f4011c0f8 100644
--- a/tests/expectations/compiler/statements/operations/pow_assign.out
+++ b/tests/expectations/compiler/statements/operations/pow_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: af3d301e00802950e6fb5d04609185a570b6d3b75028cfe3ccdcb9595f69440e
-      unrolled_ast: af3d301e00802950e6fb5d04609185a570b6d3b75028cfe3ccdcb9595f69440e
-      ssa_ast: c6fda924231e0c443635c41e8dabee9c5f81843019278c07bae350c347d89c29
-      flattened_ast: ec007ffa05808bbd03ddb899ffa0a9cf1a344ae3861e05ccf057f7aa6ae13afa
-      inlined_ast: ec007ffa05808bbd03ddb899ffa0a9cf1a344ae3861e05ccf057f7aa6ae13afa
-      dce_ast: ec007ffa05808bbd03ddb899ffa0a9cf1a344ae3861e05ccf057f7aa6ae13afa
+  - - initial_ast: 1cdcf127463342fee594ba5e56c4c58db0416b3fb04b323928a591350052df71
+      unrolled_ast: 1cdcf127463342fee594ba5e56c4c58db0416b3fb04b323928a591350052df71
+      ssa_ast: a7a0a9004bb82ed87943a52a7ace9814b659195f30952d4ea57d84ba80d6138b
+      flattened_ast: 0ad42dd3c63adc157d27dd7253f948ebd4e4e7b84b7e8928ba6cf381b866a5c3
+      inlined_ast: 0ad42dd3c63adc157d27dd7253f948ebd4e4e7b84b7e8928ba6cf381b866a5c3
+      dce_ast: 0ad42dd3c63adc157d27dd7253f948ebd4e4e7b84b7e8928ba6cf381b866a5c3
       bytecode: 69c6644fb42c55979ce03fb2d5d6712f6eee57bafc5853fd5866a04a44e4e534
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/rem_assign.out b/tests/expectations/compiler/statements/operations/rem_assign.out
index 9123242bff..45033e9d6c 100644
--- a/tests/expectations/compiler/statements/operations/rem_assign.out
+++ b/tests/expectations/compiler/statements/operations/rem_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b8c00d33b7f8ff974af16508c2ce71d7f7832dcef880e6f325936512513e2550
-      unrolled_ast: b8c00d33b7f8ff974af16508c2ce71d7f7832dcef880e6f325936512513e2550
-      ssa_ast: 0cb4c58c6971b6baf752521fed304495e40c905b19d491999d9e4bb5fc4f8fb3
-      flattened_ast: d709ddc1a7234080c07fd2913e54c622fe2194f93f6adcecc8c016e80c3312b3
-      inlined_ast: d709ddc1a7234080c07fd2913e54c622fe2194f93f6adcecc8c016e80c3312b3
-      dce_ast: d709ddc1a7234080c07fd2913e54c622fe2194f93f6adcecc8c016e80c3312b3
+  - - initial_ast: 6de3f638f05bbda23edf34f576a167c059deb1154b7e29f5ed75a17c9b803115
+      unrolled_ast: 6de3f638f05bbda23edf34f576a167c059deb1154b7e29f5ed75a17c9b803115
+      ssa_ast: 62a73af4db5cfe57637b37a3577d13146e665723a70d36471c0a75cb49213d61
+      flattened_ast: 35340ef8d7698b13144a2332171a4bfd2c74a230b8620c3af713b53d5b11f07c
+      inlined_ast: 35340ef8d7698b13144a2332171a4bfd2c74a230b8620c3af713b53d5b11f07c
+      dce_ast: 35340ef8d7698b13144a2332171a4bfd2c74a230b8620c3af713b53d5b11f07c
       bytecode: f67d2ba495c6cbed24bf76003e4521182d8aaec5f8a3d42ab1929d56af65452b
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/shl_assign.out b/tests/expectations/compiler/statements/operations/shl_assign.out
index 453949d9a1..b4d2de0d23 100644
--- a/tests/expectations/compiler/statements/operations/shl_assign.out
+++ b/tests/expectations/compiler/statements/operations/shl_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: a9dc1326e2cb15a79b5a9ae45560cab65a7ecc29eb3e4bed31983974f963ce76
-      unrolled_ast: a9dc1326e2cb15a79b5a9ae45560cab65a7ecc29eb3e4bed31983974f963ce76
-      ssa_ast: 5220a073012f5ac1ad58b8bc4b9a7d88974e96afbcd09949486ea0a7e9fec1e4
-      flattened_ast: 673821e8ba47035a18e2852843876601e47c8f699e045d6435c44b15360ae31a
-      inlined_ast: 673821e8ba47035a18e2852843876601e47c8f699e045d6435c44b15360ae31a
-      dce_ast: 673821e8ba47035a18e2852843876601e47c8f699e045d6435c44b15360ae31a
+  - - initial_ast: 2932a44a43a09604e6aca8e95d84e43a08e0422b2cd821fe4cfd7167c3a4ff6f
+      unrolled_ast: 2932a44a43a09604e6aca8e95d84e43a08e0422b2cd821fe4cfd7167c3a4ff6f
+      ssa_ast: 19a37272c75adfc19eeec11e81f9b8493b4fe3a771c457b93f99c170dbed042e
+      flattened_ast: 8eb2c4470d58ce93c2c6b27d9439192f010748f50397e81e04db688269326e79
+      inlined_ast: 8eb2c4470d58ce93c2c6b27d9439192f010748f50397e81e04db688269326e79
+      dce_ast: 8eb2c4470d58ce93c2c6b27d9439192f010748f50397e81e04db688269326e79
       bytecode: c7e481877eba9b3d2f0f08797c30c5404e6da930c4fc82bf58a7bdeb46ba251e
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/shr_assign.out b/tests/expectations/compiler/statements/operations/shr_assign.out
index a5d795866a..ee77e9fb7c 100644
--- a/tests/expectations/compiler/statements/operations/shr_assign.out
+++ b/tests/expectations/compiler/statements/operations/shr_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 86be3573f7259463aca3036c8444cec711238b56159224b2fa0f20dd5410ebfb
-      unrolled_ast: 86be3573f7259463aca3036c8444cec711238b56159224b2fa0f20dd5410ebfb
-      ssa_ast: 7f8ac53ea5472b583e7a4dfaa432ff044759957598485d82d510e491871d08fa
-      flattened_ast: 8e426d8eb3564ac47eb11215c22273e9aae2d18fc6fc9c089ac111fb584640a8
-      inlined_ast: 8e426d8eb3564ac47eb11215c22273e9aae2d18fc6fc9c089ac111fb584640a8
-      dce_ast: 8e426d8eb3564ac47eb11215c22273e9aae2d18fc6fc9c089ac111fb584640a8
+  - - initial_ast: c6fc797ca01f4d1c701d1e79882dbd02bbfb8746ea57415eb32917b2173ba5a4
+      unrolled_ast: c6fc797ca01f4d1c701d1e79882dbd02bbfb8746ea57415eb32917b2173ba5a4
+      ssa_ast: 1c3ed0e0b7dce3ced16b0720c9e3087c804585e6c5ff20463ebfb3870647d910
+      flattened_ast: 152a5109ca2c922209afe828bec97858c036a2965416990b7002705c5803c8e3
+      inlined_ast: 152a5109ca2c922209afe828bec97858c036a2965416990b7002705c5803c8e3
+      dce_ast: 152a5109ca2c922209afe828bec97858c036a2965416990b7002705c5803c8e3
       bytecode: c9b6d8b47fbe5b72e82bc81b952ba14ed281fd0bde9182bf8c6d8e165fa84001
       warnings: ""
diff --git a/tests/expectations/compiler/statements/operations/sub_assign.out b/tests/expectations/compiler/statements/operations/sub_assign.out
index cd9ee7c0ba..11b9abff40 100644
--- a/tests/expectations/compiler/statements/operations/sub_assign.out
+++ b/tests/expectations/compiler/statements/operations/sub_assign.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 979e65fa1ddc753e023488f6f5c3ea2406404fdfa8a18adb57cb8cc68387a5db
-      unrolled_ast: 979e65fa1ddc753e023488f6f5c3ea2406404fdfa8a18adb57cb8cc68387a5db
-      ssa_ast: 0caf32fb42aad2152a4f8c3c081e0baa032b1c57417c20307ec2ada77ccaf546
-      flattened_ast: 4bc4b8f1fdf8206775ec8df693807eee85329bdcc45333fe52cbfed2501f3ceb
-      inlined_ast: 4bc4b8f1fdf8206775ec8df693807eee85329bdcc45333fe52cbfed2501f3ceb
-      dce_ast: 4bc4b8f1fdf8206775ec8df693807eee85329bdcc45333fe52cbfed2501f3ceb
+  - - initial_ast: 6e5dba9a601b190bd9fb737462f66eb4068ea2262c231bda13ebcb563ff5f684
+      unrolled_ast: 6e5dba9a601b190bd9fb737462f66eb4068ea2262c231bda13ebcb563ff5f684
+      ssa_ast: dc47f335c136ee97bc8e348fbaea2d53a77a21eb77b6baa99c87a887e64c89bc
+      flattened_ast: 7b3186974e7ac333e6f324e45596c4f0ebbef1cec9157b2e538802ba8586982a
+      inlined_ast: 7b3186974e7ac333e6f324e45596c4f0ebbef1cec9157b2e538802ba8586982a
+      dce_ast: 7b3186974e7ac333e6f324e45596c4f0ebbef1cec9157b2e538802ba8586982a
       bytecode: e2d11ed53799ed66404c1913fe646293953de9e3b44fca9a3add80e04e9a34fc
       warnings: ""
diff --git a/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out b/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
index 4509bbfc32..59e41ba4cd 100644
--- a/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
+++ b/tests/expectations/compiler/statements/ternary_explicit_and_implicit.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 79544efc62ff50f5bbd1c22c046e43f174b3ca0301387db07eb5de814bf8806d
-      unrolled_ast: 79544efc62ff50f5bbd1c22c046e43f174b3ca0301387db07eb5de814bf8806d
-      ssa_ast: aba8d20e26aefbc09329ffb2457e446b7b17df803681683c013748bce5ce6ba7
-      flattened_ast: afb4e4dd8a67cb28ea544e2bd271763226228cf57a5666a4662a3a3d12b582ab
-      inlined_ast: afb4e4dd8a67cb28ea544e2bd271763226228cf57a5666a4662a3a3d12b582ab
-      dce_ast: afb4e4dd8a67cb28ea544e2bd271763226228cf57a5666a4662a3a3d12b582ab
+  - - initial_ast: f43610de735e78ebb573f1e8158af1951789b0d7253213b535aec642e55bdcb6
+      unrolled_ast: f43610de735e78ebb573f1e8158af1951789b0d7253213b535aec642e55bdcb6
+      ssa_ast: 112cececcfb33f4176bf5efe6c48b4e451801ec5a7bfc35d88ce1e66057da6d7
+      flattened_ast: 92654303e8b5c0f049b2320841cc8d074d0f38c4c467d0dc14091d2ea45fe36b
+      inlined_ast: 92654303e8b5c0f049b2320841cc8d074d0f38c4c467d0dc14091d2ea45fe36b
+      dce_ast: 92654303e8b5c0f049b2320841cc8d074d0f38c4c467d0dc14091d2ea45fe36b
       bytecode: f8245e78b1dfaf2eeeb6aff9629ee561cdf6bf80f029c173fd32c6c002ad6e73
       warnings: ""
diff --git a/tests/expectations/compiler/structs/inline.out b/tests/expectations/compiler/structs/inline.out
index 7cece37300..ce8af6fa24 100644
--- a/tests/expectations/compiler/structs/inline.out
+++ b/tests/expectations/compiler/structs/inline.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: f52458969f838f9ed859e21ad557e905134203a60ea7daf5c5e0e21e15a50ca2
-      unrolled_ast: f52458969f838f9ed859e21ad557e905134203a60ea7daf5c5e0e21e15a50ca2
-      ssa_ast: a3e93ce52260b447a54294c123020c7caf2ff46cd0c46c3ecc6378f96670c0a5
-      flattened_ast: f123b58af350e1a99da2cfba0f05a4e35d46ba2b74329b175bb6b8568f950433
-      inlined_ast: f123b58af350e1a99da2cfba0f05a4e35d46ba2b74329b175bb6b8568f950433
-      dce_ast: f123b58af350e1a99da2cfba0f05a4e35d46ba2b74329b175bb6b8568f950433
+  - - initial_ast: e1945f26287157069e3e8be02e55403cc573de12ce1197d983069e37ee2ce4a6
+      unrolled_ast: e1945f26287157069e3e8be02e55403cc573de12ce1197d983069e37ee2ce4a6
+      ssa_ast: 86fb8e83713eda75bc15aa07c90ed2d8f9af18e05c728a0d2200ac20135c7bc3
+      flattened_ast: d83db540f5556f1e92e96ca7e9fe65c0157c6a973fef3cb404e09c3d0bc1c101
+      inlined_ast: d83db540f5556f1e92e96ca7e9fe65c0157c6a973fef3cb404e09c3d0bc1c101
+      dce_ast: d83db540f5556f1e92e96ca7e9fe65c0157c6a973fef3cb404e09c3d0bc1c101
       bytecode: ec61be65e2947187dd58fdd1cf6f98301443d81e225b3ba2a3971b38ed950b05
       warnings: ""
diff --git a/tests/expectations/compiler/structs/member_variable.out b/tests/expectations/compiler/structs/member_variable.out
index a5aa75826b..f675a9d926 100644
--- a/tests/expectations/compiler/structs/member_variable.out
+++ b/tests/expectations/compiler/structs/member_variable.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 84f20cecc171a10b2e76f52c1373ee2402ed750983f8f8404b7e8f6c6fb284b4
-      unrolled_ast: 84f20cecc171a10b2e76f52c1373ee2402ed750983f8f8404b7e8f6c6fb284b4
-      ssa_ast: 6e6e2e8222245e406829e7b869a00db99075a25bd35b92b81bf7529e88afe9e7
-      flattened_ast: 41f314ed2d0e9137eb1478f5aaf3baa609a8583f70fdb4cde29f1614f29d7db9
-      inlined_ast: 41f314ed2d0e9137eb1478f5aaf3baa609a8583f70fdb4cde29f1614f29d7db9
-      dce_ast: 41f314ed2d0e9137eb1478f5aaf3baa609a8583f70fdb4cde29f1614f29d7db9
+  - - initial_ast: 3299745f965349640068b900b8466eee2fa897431ef09edf0c92c8278c230e19
+      unrolled_ast: 3299745f965349640068b900b8466eee2fa897431ef09edf0c92c8278c230e19
+      ssa_ast: 983d3932f0201b036459e9d18126971712be5723a6760da52cb5c626c5187521
+      flattened_ast: d50a2d6fe77443506f7adf705fb841936b448c1cc7d66b5e3420f02918dd7d40
+      inlined_ast: d50a2d6fe77443506f7adf705fb841936b448c1cc7d66b5e3420f02918dd7d40
+      dce_ast: d50a2d6fe77443506f7adf705fb841936b448c1cc7d66b5e3420f02918dd7d40
       bytecode: 762d4097e94ed495b4a3996bae354d8c1b9396d0620e8f794ae4356829a6e89d
       warnings: ""
diff --git a/tests/expectations/compiler/structs/struct_declaration_out_of_order.out b/tests/expectations/compiler/structs/struct_declaration_out_of_order.out
index d5ddf11aa4..6cc116a3ed 100644
--- a/tests/expectations/compiler/structs/struct_declaration_out_of_order.out
+++ b/tests/expectations/compiler/structs/struct_declaration_out_of_order.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 7f8286aa48c005ce3146b1abb0f3b74fd6a5b66ca51cf793bde59ee4f26d7da9
-      unrolled_ast: 7f8286aa48c005ce3146b1abb0f3b74fd6a5b66ca51cf793bde59ee4f26d7da9
-      ssa_ast: dd38acc31bf5dc927f92e1562d36fef7065cc5e8d5d1e960fe4f51c6d1fd6fb6
-      flattened_ast: ee96859703849d6d8321574c6c9c40231e20e67cf7fab64130e7ba2d2f2ce148
-      inlined_ast: ee96859703849d6d8321574c6c9c40231e20e67cf7fab64130e7ba2d2f2ce148
-      dce_ast: ee96859703849d6d8321574c6c9c40231e20e67cf7fab64130e7ba2d2f2ce148
+  - - initial_ast: 1225b280e5afa582fb75b744a3b75355722fecb5826f37e0b164f0f6e75b9a43
+      unrolled_ast: 1225b280e5afa582fb75b744a3b75355722fecb5826f37e0b164f0f6e75b9a43
+      ssa_ast: 8363426550364601ef6d1b193bf6d8d5396a6a46ae0c52728765fc106dae9828
+      flattened_ast: 796656e0ae882cc3d945416de44db703d5f3065edfba1c8720fd06082c256870
+      inlined_ast: 796656e0ae882cc3d945416de44db703d5f3065edfba1c8720fd06082c256870
+      dce_ast: 796656e0ae882cc3d945416de44db703d5f3065edfba1c8720fd06082c256870
       bytecode: 863e38ce365f290cb635173708362b07c114f9c938e377d5373d2cdbd5555098
       warnings: ""
diff --git a/tests/expectations/compiler/structs/struct_init_out_of_order.out b/tests/expectations/compiler/structs/struct_init_out_of_order.out
index 768bf514e6..79bd00aeb2 100644
--- a/tests/expectations/compiler/structs/struct_init_out_of_order.out
+++ b/tests/expectations/compiler/structs/struct_init_out_of_order.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 651344e64ecd3a2de54b37543356f59e2bb18191a7b19fdd3800ae08c7645ac8
-      unrolled_ast: 651344e64ecd3a2de54b37543356f59e2bb18191a7b19fdd3800ae08c7645ac8
-      ssa_ast: a430ec530f08dc45994dd6690c4e67e7cebdb521c5afc68a000aee2286f11b0c
-      flattened_ast: 81764cd6a9e8f39cc7905c5c7cf28cdfc6895928fcbb3fbc8e186874005a49cd
-      inlined_ast: 81764cd6a9e8f39cc7905c5c7cf28cdfc6895928fcbb3fbc8e186874005a49cd
-      dce_ast: 81764cd6a9e8f39cc7905c5c7cf28cdfc6895928fcbb3fbc8e186874005a49cd
+  - - initial_ast: 1b6ec4f27ad2ed129471b29c599d5adab9b25804b1e28bc6bae753216034e8d1
+      unrolled_ast: 1b6ec4f27ad2ed129471b29c599d5adab9b25804b1e28bc6bae753216034e8d1
+      ssa_ast: 44df155339c4a620c59b1be116d6c4a2016d59915fe2b04f68c7d27cf87e6523
+      flattened_ast: 44439565278ff3b3a2a3c0a5ac15ea95679ce3519b30002df4f3a907969fda1d
+      inlined_ast: 44439565278ff3b3a2a3c0a5ac15ea95679ce3519b30002df4f3a907969fda1d
+      dce_ast: 44439565278ff3b3a2a3c0a5ac15ea95679ce3519b30002df4f3a907969fda1d
       bytecode: e8b13087d9609aaed141be0bd8bcdcf8941faa1eff034046212c276ff58e0cf4
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/function_call_returns_tuple.out b/tests/expectations/compiler/tuple/function_call_returns_tuple.out
index 7fe3057f7d..01241c3dd8 100644
--- a/tests/expectations/compiler/tuple/function_call_returns_tuple.out
+++ b/tests/expectations/compiler/tuple/function_call_returns_tuple.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 6d9958951a67054c715abd79b9b22154e2a1442e7c4b9e3416b1f0bedd0226d4
-      unrolled_ast: 6d9958951a67054c715abd79b9b22154e2a1442e7c4b9e3416b1f0bedd0226d4
-      ssa_ast: 7b45ec167123c4c352d90898248f42d87657a4dcde68556b09f32e3ccf884a6a
-      flattened_ast: 5069b0357373df1f99e68f56a2b240f0b0469be5b28c6243050fba6afb6b7561
-      inlined_ast: 5069b0357373df1f99e68f56a2b240f0b0469be5b28c6243050fba6afb6b7561
-      dce_ast: 5069b0357373df1f99e68f56a2b240f0b0469be5b28c6243050fba6afb6b7561
+  - - initial_ast: efc2379f3a2a85e67ef9f7dc9b3b00fc3b863f5bcc172f0e92f070fe48d8b513
+      unrolled_ast: efc2379f3a2a85e67ef9f7dc9b3b00fc3b863f5bcc172f0e92f070fe48d8b513
+      ssa_ast: cc3df42aa7c3a8c94ebfb84e9e8281faded07f50db6034c3767e35250a138625
+      flattened_ast: 691dd63abb2419a4e6ed3204115b5f7597ecb2212547be69c7fde586f68bc97a
+      inlined_ast: 691dd63abb2419a4e6ed3204115b5f7597ecb2212547be69c7fde586f68bc97a
+      dce_ast: 691dd63abb2419a4e6ed3204115b5f7597ecb2212547be69c7fde586f68bc97a
       bytecode: f8a3d7352634db2882bc62840443ed6981ab356b6037c6bce8b2361189e82319
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/function_early_return.out b/tests/expectations/compiler/tuple/function_early_return.out
index 1858cb78eb..62b9e722f8 100644
--- a/tests/expectations/compiler/tuple/function_early_return.out
+++ b/tests/expectations/compiler/tuple/function_early_return.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 4e35ad1b55bb71244f6449b22b8c78ec0ab59d9f6f6c602e03c15e3fe6d01dbb
-      unrolled_ast: 4e35ad1b55bb71244f6449b22b8c78ec0ab59d9f6f6c602e03c15e3fe6d01dbb
-      ssa_ast: 8e7ad820ea24059df91d856c66a96e35219682f969d66e52a4e32efce161678a
-      flattened_ast: 96e0bfa62e4c781325e5d32af201f19f52f1c6774e27699b69365ef65a82d494
-      inlined_ast: 96e0bfa62e4c781325e5d32af201f19f52f1c6774e27699b69365ef65a82d494
-      dce_ast: 96e0bfa62e4c781325e5d32af201f19f52f1c6774e27699b69365ef65a82d494
+  - - initial_ast: c2c83ef5cdd2f2dd38c422eb8fc1bb53d26102a6f27d2cfc317496f235a4f9db
+      unrolled_ast: c2c83ef5cdd2f2dd38c422eb8fc1bb53d26102a6f27d2cfc317496f235a4f9db
+      ssa_ast: ff2061c6916b093122f1d1d3f33b4c51ba276ed8942a6081473fac64c66174a8
+      flattened_ast: 6e507a4cdd6b0bace62208e05c05b79848dc81c8c8e10fd61f8d49235cf681a0
+      inlined_ast: 6e507a4cdd6b0bace62208e05c05b79848dc81c8c8e10fd61f8d49235cf681a0
+      dce_ast: 6e507a4cdd6b0bace62208e05c05b79848dc81c8c8e10fd61f8d49235cf681a0
       bytecode: cab2a38bed741bf7b4ae067086da9762dfce98c256155aece53158ebbfad7198
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/function_return.out b/tests/expectations/compiler/tuple/function_return.out
index 6039169975..6ba0193f5a 100644
--- a/tests/expectations/compiler/tuple/function_return.out
+++ b/tests/expectations/compiler/tuple/function_return.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 29e872189b45db5490869113783f632c5394a9b1fe8556655fbffe1ffdc35d9a
-      unrolled_ast: 29e872189b45db5490869113783f632c5394a9b1fe8556655fbffe1ffdc35d9a
-      ssa_ast: dbbc0070fad39aa285f45913400812df4bf75acb9be9bf43cce2d8bc31bafbb4
-      flattened_ast: d89bc5ca94a0a151526e1b8833c57df1e05ad6c5294fe1f30d3ed0c5c363f5f7
-      inlined_ast: d89bc5ca94a0a151526e1b8833c57df1e05ad6c5294fe1f30d3ed0c5c363f5f7
-      dce_ast: d89bc5ca94a0a151526e1b8833c57df1e05ad6c5294fe1f30d3ed0c5c363f5f7
+  - - initial_ast: 37be04e7f87f2d4b9503b1312a01561900c86633219d92dae74263adfe74a011
+      unrolled_ast: 37be04e7f87f2d4b9503b1312a01561900c86633219d92dae74263adfe74a011
+      ssa_ast: 26f578e4e60dbaf354e5344de676d60c47b2f8229d801f0b608e43c5b2380699
+      flattened_ast: 61c1814b17c71bb9bdc302e132adc87edb64050441a3a84e48a2e2ce95fe0867
+      inlined_ast: 61c1814b17c71bb9bdc302e132adc87edb64050441a3a84e48a2e2ce95fe0867
+      dce_ast: 61c1814b17c71bb9bdc302e132adc87edb64050441a3a84e48a2e2ce95fe0867
       bytecode: 4ab0ff9007818a0bf7b45a22297f4a5bdbed8a46d1b2a70e6f6d2f347f8e8b1e
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/function_return_nothing.out b/tests/expectations/compiler/tuple/function_return_nothing.out
index df38f7b874..6bb3616142 100644
--- a/tests/expectations/compiler/tuple/function_return_nothing.out
+++ b/tests/expectations/compiler/tuple/function_return_nothing.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 185164cea27c15680cecb0130b538edec4eb95882c5471b8f0f97246aadc9a59
-      unrolled_ast: 185164cea27c15680cecb0130b538edec4eb95882c5471b8f0f97246aadc9a59
-      ssa_ast: 185164cea27c15680cecb0130b538edec4eb95882c5471b8f0f97246aadc9a59
-      flattened_ast: cc9e9c04b793a662342e0802f6e3c0a15f4c103d14b95dd002e60453aa3d2efd
-      inlined_ast: cc9e9c04b793a662342e0802f6e3c0a15f4c103d14b95dd002e60453aa3d2efd
-      dce_ast: cc9e9c04b793a662342e0802f6e3c0a15f4c103d14b95dd002e60453aa3d2efd
+  - - initial_ast: ea268a73b92668882459a2e2d5b603b5e2255214905e3ccb0bd10fd0dcc3bcd5
+      unrolled_ast: ea268a73b92668882459a2e2d5b603b5e2255214905e3ccb0bd10fd0dcc3bcd5
+      ssa_ast: ea268a73b92668882459a2e2d5b603b5e2255214905e3ccb0bd10fd0dcc3bcd5
+      flattened_ast: d212a5d92073f7f59e68bc695553c77f735b1c723dcaa7cf16c167a7abb38681
+      inlined_ast: d212a5d92073f7f59e68bc695553c77f735b1c723dcaa7cf16c167a7abb38681
+      dce_ast: d212a5d92073f7f59e68bc695553c77f735b1c723dcaa7cf16c167a7abb38681
       bytecode: e997c02547a6881722d6ea219cf748dd821a13a4a7f2e4063aad71bb683a94c2
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/function_return_unit.out b/tests/expectations/compiler/tuple/function_return_unit.out
index df38f7b874..6bb3616142 100644
--- a/tests/expectations/compiler/tuple/function_return_unit.out
+++ b/tests/expectations/compiler/tuple/function_return_unit.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 185164cea27c15680cecb0130b538edec4eb95882c5471b8f0f97246aadc9a59
-      unrolled_ast: 185164cea27c15680cecb0130b538edec4eb95882c5471b8f0f97246aadc9a59
-      ssa_ast: 185164cea27c15680cecb0130b538edec4eb95882c5471b8f0f97246aadc9a59
-      flattened_ast: cc9e9c04b793a662342e0802f6e3c0a15f4c103d14b95dd002e60453aa3d2efd
-      inlined_ast: cc9e9c04b793a662342e0802f6e3c0a15f4c103d14b95dd002e60453aa3d2efd
-      dce_ast: cc9e9c04b793a662342e0802f6e3c0a15f4c103d14b95dd002e60453aa3d2efd
+  - - initial_ast: ea268a73b92668882459a2e2d5b603b5e2255214905e3ccb0bd10fd0dcc3bcd5
+      unrolled_ast: ea268a73b92668882459a2e2d5b603b5e2255214905e3ccb0bd10fd0dcc3bcd5
+      ssa_ast: ea268a73b92668882459a2e2d5b603b5e2255214905e3ccb0bd10fd0dcc3bcd5
+      flattened_ast: d212a5d92073f7f59e68bc695553c77f735b1c723dcaa7cf16c167a7abb38681
+      inlined_ast: d212a5d92073f7f59e68bc695553c77f735b1c723dcaa7cf16c167a7abb38681
+      dce_ast: d212a5d92073f7f59e68bc695553c77f735b1c723dcaa7cf16c167a7abb38681
       bytecode: e997c02547a6881722d6ea219cf748dd821a13a4a7f2e4063aad71bb683a94c2
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/function_return_varying_modes.out b/tests/expectations/compiler/tuple/function_return_varying_modes.out
index caa43e5b5d..c8f0b0f49a 100644
--- a/tests/expectations/compiler/tuple/function_return_varying_modes.out
+++ b/tests/expectations/compiler/tuple/function_return_varying_modes.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 131fa70d8cffd1a9429535f3c8527bb8f6b09332a8037f2b7b264914aed96988
-      unrolled_ast: 131fa70d8cffd1a9429535f3c8527bb8f6b09332a8037f2b7b264914aed96988
-      ssa_ast: 00852e49f73a53a33df6e4b9e3263a4741a9aff932a8b8951ec4bdf0a05f52cc
-      flattened_ast: 20e43f52aa0e7cb8353dae1da28265c12f0fef6387cfc2744b96407c4a2c8b69
-      inlined_ast: 20e43f52aa0e7cb8353dae1da28265c12f0fef6387cfc2744b96407c4a2c8b69
-      dce_ast: 20e43f52aa0e7cb8353dae1da28265c12f0fef6387cfc2744b96407c4a2c8b69
+  - - initial_ast: 7fdf62529d60952d8aa1a2a026a9e48967fa18fee90b115b8111df9d87781602
+      unrolled_ast: 7fdf62529d60952d8aa1a2a026a9e48967fa18fee90b115b8111df9d87781602
+      ssa_ast: a63638baa697c6e671805e3c958087306d048ace6f09b22b8c0c5420668e8a4f
+      flattened_ast: 99597f24ea5ff8757c16a8b78ed08c53311ff0a5e26a8f6ed36aa9a69215bd68
+      inlined_ast: 99597f24ea5ff8757c16a8b78ed08c53311ff0a5e26a8f6ed36aa9a69215bd68
+      dce_ast: 99597f24ea5ff8757c16a8b78ed08c53311ff0a5e26a8f6ed36aa9a69215bd68
       bytecode: 1743c6b346840b6c0bf0662b87f679119996cf9d3023c1236730fd0f5ff28df4
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/return_with_different_modes.out b/tests/expectations/compiler/tuple/return_with_different_modes.out
index 69d2a21d36..e3f0da0d64 100644
--- a/tests/expectations/compiler/tuple/return_with_different_modes.out
+++ b/tests/expectations/compiler/tuple/return_with_different_modes.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 845ae96bb6543f7b32744dee270b9c29d14116cdc21b16e56496859837f4098a
-      unrolled_ast: 845ae96bb6543f7b32744dee270b9c29d14116cdc21b16e56496859837f4098a
-      ssa_ast: 3cfe969ba8aabfeec0d5e27ca0580c662bc35fcd2ad442939602ba08db2324b3
-      flattened_ast: e413bbf1af2a2e589f30d91ed3499616516427a9434882a180d97ae9d6b8d118
-      inlined_ast: e413bbf1af2a2e589f30d91ed3499616516427a9434882a180d97ae9d6b8d118
-      dce_ast: e413bbf1af2a2e589f30d91ed3499616516427a9434882a180d97ae9d6b8d118
+  - - initial_ast: c554c2e2dd39ba812c91932e246e95a841414f7169dac823323f00f369351b9f
+      unrolled_ast: c554c2e2dd39ba812c91932e246e95a841414f7169dac823323f00f369351b9f
+      ssa_ast: dfea75d01a3c860d7ae35c341a233336ca9c1b4d93916f0e2c4b37a96fb848ca
+      flattened_ast: 478122a8c74b74c7d19485c0dd3c8de235ba2e6f4420c0274cfa89271b1b9d6d
+      inlined_ast: 478122a8c74b74c7d19485c0dd3c8de235ba2e6f4420c0274cfa89271b1b9d6d
+      dce_ast: 478122a8c74b74c7d19485c0dd3c8de235ba2e6f4420c0274cfa89271b1b9d6d
       bytecode: 1743c6b346840b6c0bf0662b87f679119996cf9d3023c1236730fd0f5ff28df4
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/tuple_access.out b/tests/expectations/compiler/tuple/tuple_access.out
index 1362bdfe60..49c7451d26 100644
--- a/tests/expectations/compiler/tuple/tuple_access.out
+++ b/tests/expectations/compiler/tuple/tuple_access.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: cb80c7f4fb6cb63f1df48569a927b1069eda2b98e4d08bb3bb57cb08b5c81ee8
-      unrolled_ast: cb80c7f4fb6cb63f1df48569a927b1069eda2b98e4d08bb3bb57cb08b5c81ee8
-      ssa_ast: e37a1d32743fa2145b542a2622d6046097033019fa1cce2a57ffa80d07e940ef
-      flattened_ast: 43b6f02228edf8da62c4b0a11983aca6106aab1bafc3ec6e519e94718d36d549
-      inlined_ast: 43b6f02228edf8da62c4b0a11983aca6106aab1bafc3ec6e519e94718d36d549
-      dce_ast: 43b6f02228edf8da62c4b0a11983aca6106aab1bafc3ec6e519e94718d36d549
+  - - initial_ast: 8e6038b97c4d9885177e8494d90e9b4a8c0e1214bfb7b6b2721aa36d4d4d8118
+      unrolled_ast: 8e6038b97c4d9885177e8494d90e9b4a8c0e1214bfb7b6b2721aa36d4d4d8118
+      ssa_ast: 0e47756de51941bd0f128cc666dc8e238904daab65ffe3d8b64dbe284da92466
+      flattened_ast: 495df013a415554f5b5cd76ab17459e6bf3d56453e8901ce145239034c983a60
+      inlined_ast: 495df013a415554f5b5cd76ab17459e6bf3d56453e8901ce145239034c983a60
+      dce_ast: 495df013a415554f5b5cd76ab17459e6bf3d56453e8901ce145239034c983a60
       bytecode: 66ae5f7e0fec4de855fa451272351313df6f03b4a3799edd57ce21da859051da
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/tuple_destructure.out b/tests/expectations/compiler/tuple/tuple_destructure.out
index fadda71c0a..51e17365de 100644
--- a/tests/expectations/compiler/tuple/tuple_destructure.out
+++ b/tests/expectations/compiler/tuple/tuple_destructure.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 87f7741ad8fae712f4483530a984ab545d661f89b13e8b340b5ad97824c419cd
-      unrolled_ast: 87f7741ad8fae712f4483530a984ab545d661f89b13e8b340b5ad97824c419cd
-      ssa_ast: 0aa4da19c53248d1539443460feec42ff1ac3644f32a6c7e2d9d6182c8c6fba0
-      flattened_ast: a5f2b4382f5a84dd8898910beedbd9c61d3b18778caf8ae2cedd6d6295cba83a
-      inlined_ast: a5f2b4382f5a84dd8898910beedbd9c61d3b18778caf8ae2cedd6d6295cba83a
-      dce_ast: a5f2b4382f5a84dd8898910beedbd9c61d3b18778caf8ae2cedd6d6295cba83a
+  - - initial_ast: 714c22b6dbb094f3b2245ff38933a285cb1e0408a8d54b624f713cc1a480141a
+      unrolled_ast: 714c22b6dbb094f3b2245ff38933a285cb1e0408a8d54b624f713cc1a480141a
+      ssa_ast: a5b3fe7193f7d8b1e723d485213dff167cf98e6dcb9e7cb40e898c7a70b91e86
+      flattened_ast: d3ca4fca8a9529fd9bb41fc3ddfd30d1c70a00765b05b35272a0e7b025e4e4dc
+      inlined_ast: d3ca4fca8a9529fd9bb41fc3ddfd30d1c70a00765b05b35272a0e7b025e4e4dc
+      dce_ast: d3ca4fca8a9529fd9bb41fc3ddfd30d1c70a00765b05b35272a0e7b025e4e4dc
       bytecode: 404bfa1fcdb0b113686f984a5d33322565e6acbb2438db7def4dd40d20f52093
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/tuple_in_assignment.out b/tests/expectations/compiler/tuple/tuple_in_assignment.out
index 384ce6c51c..e4a669d327 100644
--- a/tests/expectations/compiler/tuple/tuple_in_assignment.out
+++ b/tests/expectations/compiler/tuple/tuple_in_assignment.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: b73921f397afab5039f0e3de977317ffea069f6f7ace623e3a7416c33b9cd180
-      unrolled_ast: b73921f397afab5039f0e3de977317ffea069f6f7ace623e3a7416c33b9cd180
-      ssa_ast: aaef275ec720a848d8ab6e928f59f645043c1202a1cc4ec902f845507ea86017
-      flattened_ast: a98236961d1ff8b766fb59e138b84d37878f4c37055c31379bb6adad047339dd
-      inlined_ast: a98236961d1ff8b766fb59e138b84d37878f4c37055c31379bb6adad047339dd
-      dce_ast: a98236961d1ff8b766fb59e138b84d37878f4c37055c31379bb6adad047339dd
+  - - initial_ast: c703d221038c5279866edb95bc795fa1a6d4ef73cdd69d92a93eacbec40060e8
+      unrolled_ast: c703d221038c5279866edb95bc795fa1a6d4ef73cdd69d92a93eacbec40060e8
+      ssa_ast: d01c2cc4f0d0d636141940eaa679c31510cf43f24782a44b7fad97e3b9b8a68c
+      flattened_ast: e80bc26725a9749c7786943e530c5161af3550957e7b2b657296d55bf3536e19
+      inlined_ast: e80bc26725a9749c7786943e530c5161af3550957e7b2b657296d55bf3536e19
+      dce_ast: e80bc26725a9749c7786943e530c5161af3550957e7b2b657296d55bf3536e19
       bytecode: e58af56a6497ae064f0ac928ee1f89df6f05c41482ef3619acbacd8f1dfae217
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/tuple_in_definition.out b/tests/expectations/compiler/tuple/tuple_in_definition.out
index af6dcab2f2..0c5d8bdc0e 100644
--- a/tests/expectations/compiler/tuple/tuple_in_definition.out
+++ b/tests/expectations/compiler/tuple/tuple_in_definition.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 81d85e15124a39e0ad172681b650304a1803446c50f2881851582d878c8ebb55
-      unrolled_ast: 81d85e15124a39e0ad172681b650304a1803446c50f2881851582d878c8ebb55
-      ssa_ast: b408a7d92dcdbfe24435a8f5d2ef9c16f260ee015b9db3f65a4637a93fc76348
-      flattened_ast: 06090fe8391e153bace92192e314d904605cc7b354de46be39b9e735c80af26f
-      inlined_ast: 06090fe8391e153bace92192e314d904605cc7b354de46be39b9e735c80af26f
-      dce_ast: 06090fe8391e153bace92192e314d904605cc7b354de46be39b9e735c80af26f
+  - - initial_ast: 04da92606a32ccc01e8a3fafbbfe521c9a2fbd3ab98ffba12c99f0b18ba396f5
+      unrolled_ast: 04da92606a32ccc01e8a3fafbbfe521c9a2fbd3ab98ffba12c99f0b18ba396f5
+      ssa_ast: e00d87f2b676a4ae3644910cc2ac198cf920ebe55c95074455635cefd14d922c
+      flattened_ast: 5f43f58a98d6306e1df9e5625470ade78916bf907e0b39931de342a250e3da21
+      inlined_ast: 5f43f58a98d6306e1df9e5625470ade78916bf907e0b39931de342a250e3da21
+      dce_ast: 5f43f58a98d6306e1df9e5625470ade78916bf907e0b39931de342a250e3da21
       bytecode: 26120360e31f59b6a23dae65fe61c87e9e310aa11c12d90e995485dbeef81151
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/tuple_in_loop.out b/tests/expectations/compiler/tuple/tuple_in_loop.out
index 3f8c9d6d19..84611be1ca 100644
--- a/tests/expectations/compiler/tuple/tuple_in_loop.out
+++ b/tests/expectations/compiler/tuple/tuple_in_loop.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: 09fe78adadcdc2d23a3afd036ee408fac3fb89347428ffb50b55617d75ac053a
-      unrolled_ast: 0e7e55b259a6e7221d13fe27d5d8275e588aaaaae0529f8dcc2947c67273f560
-      ssa_ast: 8f9412eea6ac56a802ec05841da188b06dcc806fbd725c2ae7b9c2561e18e6f4
-      flattened_ast: b091707e5c583e95a3b5371100bf82e7ccdf679c12398539dfba18bd9444bb2d
-      inlined_ast: b091707e5c583e95a3b5371100bf82e7ccdf679c12398539dfba18bd9444bb2d
-      dce_ast: 615045a925a6ce54a9c5cbe4d8cfad1bc8fabae80f0d917e738dafb333c5d007
+  - - initial_ast: e0bbd6e4ae14d6e6772e349d7eb6ee946653b11aa06516ea905c3ced11facc20
+      unrolled_ast: 2e806cafcdad194459c9ee51d9eb6f9633856145be6596c4d8318bca407953fa
+      ssa_ast: 7cd1bae41e5787a0ba3614cdf4aab2437769cedfd4420ab085d576176f14807c
+      flattened_ast: cd2e37bce5ffebb0c0360d289371b0cf5ea52510bd16ce12747c7f187a9690d3
+      inlined_ast: cd2e37bce5ffebb0c0360d289371b0cf5ea52510bd16ce12747c7f187a9690d3
+      dce_ast: 7b82583b53a2409646c769513ea6d788c1d9a428b383dc7303462de62fe7214a
       bytecode: 9ef5de2d557b3a8119e5545ab597779492a53ca6f7097a946262eb65c1acdca7
       warnings: ""
diff --git a/tests/expectations/compiler/tuple/unit.out b/tests/expectations/compiler/tuple/unit.out
index 431b77567c..dcadd6cac4 100644
--- a/tests/expectations/compiler/tuple/unit.out
+++ b/tests/expectations/compiler/tuple/unit.out
@@ -2,11 +2,11 @@
 namespace: Compile
 expectation: Pass
 outputs:
-  - - initial_ast: ba5a8190ed368a0e6d0819912ec46f1dda0ffb1148b7bca5df12ef6f55209b81
-      unrolled_ast: ba5a8190ed368a0e6d0819912ec46f1dda0ffb1148b7bca5df12ef6f55209b81
-      ssa_ast: ba5a8190ed368a0e6d0819912ec46f1dda0ffb1148b7bca5df12ef6f55209b81
-      flattened_ast: 187c8dfd192fb5432a72dae59956235af2ffe3ce1dff0152a0129a32c3cbcb4f
-      inlined_ast: 187c8dfd192fb5432a72dae59956235af2ffe3ce1dff0152a0129a32c3cbcb4f
-      dce_ast: 187c8dfd192fb5432a72dae59956235af2ffe3ce1dff0152a0129a32c3cbcb4f
+  - - initial_ast: 3e840d6d12714ef8956ee5963751b635942fccc2943303d540751d6e9850737a
+      unrolled_ast: 3e840d6d12714ef8956ee5963751b635942fccc2943303d540751d6e9850737a
+      ssa_ast: 3e840d6d12714ef8956ee5963751b635942fccc2943303d540751d6e9850737a
+      flattened_ast: a045456f4c53e69d9d16b3116ba80c00d249c930794154cccd884797f4f0e22c
+      inlined_ast: a045456f4c53e69d9d16b3116ba80c00d249c930794154cccd884797f4f0e22c
+      dce_ast: a045456f4c53e69d9d16b3116ba80c00d249c930794154cccd884797f4f0e22c
       bytecode: 0b868939da4554de26106307f8749db7e5c629b71ec06c0870b138bc7ffabad4
       warnings: ""
diff --git a/tests/expectations/execution/cast_coersion.out b/tests/expectations/execution/cast_coersion.out
index 423ae50f05..400ff1c871 100644
--- a/tests/expectations/execution/cast_coersion.out
+++ b/tests/expectations/execution/cast_coersion.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: a7cb02232b6f9d8e33436926af175836f043f4bfc64e23ab60045991d80b1de9
-      unrolled_ast: a7cb02232b6f9d8e33436926af175836f043f4bfc64e23ab60045991d80b1de9
-      ssa_ast: f5872bdba93fac52632e71b53713fe708412557a8b2a3e7367bcbdef6d0f2b36
-      flattened_ast: 7f29e06daeb7de6c15371d3f3f5c2d277b1b28094a6eac4bd4948b85d60bd703
-      inlined_ast: 7f29e06daeb7de6c15371d3f3f5c2d277b1b28094a6eac4bd4948b85d60bd703
-      dce_ast: 7f29e06daeb7de6c15371d3f3f5c2d277b1b28094a6eac4bd4948b85d60bd703
+  - - initial_ast: d67fe912e3c3427c15b910461c059b508123c12dc685af92c6439c79d064975b
+      unrolled_ast: d67fe912e3c3427c15b910461c059b508123c12dc685af92c6439c79d064975b
+      ssa_ast: 7fbe4c15c6ba4294b51c1f2926d431e1a2266b44f4c5b168c9ef625b9dfe69af
+      flattened_ast: bfafcc4c80d2161b67041096bedea6ed9e4064fba2647cbf6c3097b802cf2004
+      inlined_ast: bfafcc4c80d2161b67041096bedea6ed9e4064fba2647cbf6c3097b802cf2004
+      dce_ast: bfafcc4c80d2161b67041096bedea6ed9e4064fba2647cbf6c3097b802cf2004
       bytecode: 675912267b82b91bd854fa2ef169b85c74ecaac6b73a157d7e99818e256b53b1
       warnings: ""
       results:
diff --git a/tests/expectations/execution/chain.out b/tests/expectations/execution/chain.out
index d15e041ccd..215a763ede 100644
--- a/tests/expectations/execution/chain.out
+++ b/tests/expectations/execution/chain.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: 3143f8fe7773434aa22676682cf2c847a82191d5380adf29b2ae8a887f2c4e1f
-      unrolled_ast: 3143f8fe7773434aa22676682cf2c847a82191d5380adf29b2ae8a887f2c4e1f
-      ssa_ast: bfe7a5ff8c2ca8b1d5525d38d9275fe974deb93d689ec7e5feb73778ed18a016
-      flattened_ast: 5786c81c3431d9e8ec6c47814d002342e0bf8df4801bd26f5915edda21eba74b
-      inlined_ast: 5786c81c3431d9e8ec6c47814d002342e0bf8df4801bd26f5915edda21eba74b
-      dce_ast: cc145d241dde552ff942fcf241a27f18eb0442f2593ff0f9c355a60b78f585c6
+  - - initial_ast: 85f1861ca5f01910e0ed54a18f8f0b82c2322e47e05612113a060115f7264829
+      unrolled_ast: 85f1861ca5f01910e0ed54a18f8f0b82c2322e47e05612113a060115f7264829
+      ssa_ast: b4f0209f08878d12455bd616cd448b4743819d44d1014d5d6f4d2751a3483529
+      flattened_ast: 1cac7e9104b100342a34786e2eddfdd372181306a2f9c46d804287ebfdcd30b6
+      inlined_ast: 1cac7e9104b100342a34786e2eddfdd372181306a2f9c46d804287ebfdcd30b6
+      dce_ast: b86c6b26d7a33ddba494e27775e0630cef0674a17903ce10366acb5a61cba9e7
       bytecode: f6aaf7f7a13fb233511385db7479f2612e7a77734ee6a189f063bd3d33a7afaa
       warnings: ""
       results:
diff --git a/tests/expectations/execution/counter.out b/tests/expectations/execution/counter.out
index 73d5dc8c52..ee5b1eedff 100644
--- a/tests/expectations/execution/counter.out
+++ b/tests/expectations/execution/counter.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: 84718d43d9ad9d45aa45429ee16671e242af938d08a399a3d0acf12bce605aae
-      unrolled_ast: 84718d43d9ad9d45aa45429ee16671e242af938d08a399a3d0acf12bce605aae
-      ssa_ast: 604d6e5ca7435131c8c3a60f268858e3713e0fed7ff849cde33e42a72b79d99e
-      flattened_ast: 40ce39646172a5d3a9220d4dbaddf2be7ab6e7734f2d3fa6eb4c55054019c2ac
-      inlined_ast: 40ce39646172a5d3a9220d4dbaddf2be7ab6e7734f2d3fa6eb4c55054019c2ac
-      dce_ast: 40ce39646172a5d3a9220d4dbaddf2be7ab6e7734f2d3fa6eb4c55054019c2ac
+  - - initial_ast: ff08a4a92839ebe43e5c035ff1ab8991da994f84b167630c9b26cdc8e30028e6
+      unrolled_ast: ff08a4a92839ebe43e5c035ff1ab8991da994f84b167630c9b26cdc8e30028e6
+      ssa_ast: 8fea46feeceac4607d6e09181bce795520d9403f0be606b049225459f10dfe47
+      flattened_ast: 561824a5b5b1291ca6d59dace67780a62c1089536e895830f901c133fa74da85
+      inlined_ast: 561824a5b5b1291ca6d59dace67780a62c1089536e895830f901c133fa74da85
+      dce_ast: 561824a5b5b1291ca6d59dace67780a62c1089536e895830f901c133fa74da85
       bytecode: f6055195b401bef6fe1e686a256bb743941b1945b7fd4b8f1800aa83dc3b7495
       warnings: ""
       results:
diff --git a/tests/expectations/execution/eq.out b/tests/expectations/execution/eq.out
index 547812b788..085eee759e 100644
--- a/tests/expectations/execution/eq.out
+++ b/tests/expectations/execution/eq.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: 51ea54c80b003b2d3f36ac7a01956f9308f53d7f5bce1d64fd76c5463ddcde18
-      unrolled_ast: 51ea54c80b003b2d3f36ac7a01956f9308f53d7f5bce1d64fd76c5463ddcde18
-      ssa_ast: 0827268f355b39f305570d89ea418f2ff9537ed6de1cd7cf1a521cf502e000ec
-      flattened_ast: 2ebb5e0e4701622ce7f1e03b906199bf832d02fd5605c43f0845dda46e6251bb
-      inlined_ast: 2ebb5e0e4701622ce7f1e03b906199bf832d02fd5605c43f0845dda46e6251bb
-      dce_ast: 2ebb5e0e4701622ce7f1e03b906199bf832d02fd5605c43f0845dda46e6251bb
+  - - initial_ast: 3f89ab3b00edae0dd7e5d95bc175ba37ff99b4261048f8001dd735699b532e19
+      unrolled_ast: 3f89ab3b00edae0dd7e5d95bc175ba37ff99b4261048f8001dd735699b532e19
+      ssa_ast: f6bc1e520a53cec350bab38d38122136f6b23f4784205d63aeb379131e630585
+      flattened_ast: 7b1454584a43ba236c2917770e5dabf5e5516f02c9b00d41f0d3ff3b8a3c9d67
+      inlined_ast: 7b1454584a43ba236c2917770e5dabf5e5516f02c9b00d41f0d3ff3b8a3c9d67
+      dce_ast: 7b1454584a43ba236c2917770e5dabf5e5516f02c9b00d41f0d3ff3b8a3c9d67
       bytecode: 15a3a90b1837b318b43b3f3bfc5e454a8821357b4c3feb01da00a4db810bde89
       warnings: ""
       results:
diff --git a/tests/expectations/execution/flattened_function_and_inline_matches.out b/tests/expectations/execution/flattened_function_and_inline_matches.out
index b640316460..36a81bbb37 100644
--- a/tests/expectations/execution/flattened_function_and_inline_matches.out
+++ b/tests/expectations/execution/flattened_function_and_inline_matches.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: 46c2d1250227df9631b01e70d5ec73a8a5be0fa6906688cc57f215fc6d1d81bb
-      unrolled_ast: 46c2d1250227df9631b01e70d5ec73a8a5be0fa6906688cc57f215fc6d1d81bb
-      ssa_ast: e99c611245c6bd28307fd7049c3add9e4bcb0f9e8c53f04e1b56d5c668dc832e
-      flattened_ast: cd51002215f7079f427d2e77707a907daa0d14d0189abff6c00f161d3cc9fbe8
-      inlined_ast: d29828f1142959caa91d614b9cf12291e8587b91f76edf197e80dd34396b47d6
-      dce_ast: d29828f1142959caa91d614b9cf12291e8587b91f76edf197e80dd34396b47d6
+  - - initial_ast: 312ddd4f956e0c21463e992634f659afb147d2916b2dd3ea3b4cdf77da83ea2d
+      unrolled_ast: 312ddd4f956e0c21463e992634f659afb147d2916b2dd3ea3b4cdf77da83ea2d
+      ssa_ast: 916c11c30f5603bd550dd9f02a59cff5ad3dac9519817506e44ab4e041ae53dd
+      flattened_ast: fa0c633312b9e571902cc78901d6daf2f05121c9081ff23d76d5521af8b9dc35
+      inlined_ast: f2fb9af6d7aa19ee8bad573bb9cdb2d96cb80022e2bbee84d0f2679e98a49259
+      dce_ast: f2fb9af6d7aa19ee8bad573bb9cdb2d96cb80022e2bbee84d0f2679e98a49259
       bytecode: 05437006a7a0a278a18c8ff76e9fec336ec4f86f6ff8abfb06b816256babef45
       warnings: ""
       results:
diff --git a/tests/expectations/execution/group_operations.out b/tests/expectations/execution/group_operations.out
index dd420984ae..6f2a2912fa 100644
--- a/tests/expectations/execution/group_operations.out
+++ b/tests/expectations/execution/group_operations.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: baab537ca7f107791ab87538998049d0d6b9d55c038eb3fc65b834e4e7b6ecea
-      unrolled_ast: baab537ca7f107791ab87538998049d0d6b9d55c038eb3fc65b834e4e7b6ecea
-      ssa_ast: c8499be30529bd57c62fdef771652c86bb27ec30275f242a04c2d8d52c59d833
-      flattened_ast: 64ee3ec00e18ef47bea94bd2f25ff1d363b48e7d14e111afde3c9a6333a2fce1
-      inlined_ast: 64ee3ec00e18ef47bea94bd2f25ff1d363b48e7d14e111afde3c9a6333a2fce1
-      dce_ast: 64ee3ec00e18ef47bea94bd2f25ff1d363b48e7d14e111afde3c9a6333a2fce1
+  - - initial_ast: c6561e11b00108d9e95095330258e877704f21213ae969ab1f05fdd5e4a7cf8d
+      unrolled_ast: c6561e11b00108d9e95095330258e877704f21213ae969ab1f05fdd5e4a7cf8d
+      ssa_ast: 7f7921c91e08bef5b25478e060502b5d9adbaef50287491cb23e1d097a94dea2
+      flattened_ast: d4945ce9276bc78ec711ae9b85e8b16eae492e5933c6e1695a2ede97877a1545
+      inlined_ast: d4945ce9276bc78ec711ae9b85e8b16eae492e5933c6e1695a2ede97877a1545
+      dce_ast: d4945ce9276bc78ec711ae9b85e8b16eae492e5933c6e1695a2ede97877a1545
       bytecode: 5c20fda21a40464a1462524cf913438776a39383a671949312f48ce8ceb2dd16
       warnings: ""
       results:
diff --git a/tests/expectations/execution/mint.out b/tests/expectations/execution/mint.out
index 1f6397352d..c9884364c8 100644
--- a/tests/expectations/execution/mint.out
+++ b/tests/expectations/execution/mint.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: 9405126486702353bf0858dbb8fa3407d71b8ee9158251908ba00415acbfeede
-      unrolled_ast: 9405126486702353bf0858dbb8fa3407d71b8ee9158251908ba00415acbfeede
-      ssa_ast: 7b7f76fb596f0c21b39215fd38daf6532a1c902b96dc7874602d498049e64b53
-      flattened_ast: f8591b5ee025e3ea4d973d27ffc3f22860dda1e7ee48ba28de194f06b8f10d93
-      inlined_ast: f8591b5ee025e3ea4d973d27ffc3f22860dda1e7ee48ba28de194f06b8f10d93
-      dce_ast: f8591b5ee025e3ea4d973d27ffc3f22860dda1e7ee48ba28de194f06b8f10d93
+  - - initial_ast: 52c7b2b75064c6546d44fc697f86b746d9cd07e316cfb4dc93cccabf63d0708c
+      unrolled_ast: 52c7b2b75064c6546d44fc697f86b746d9cd07e316cfb4dc93cccabf63d0708c
+      ssa_ast: afc1d818c985c0fd4aee5264405f7758c96810c5362c7764b71d60bc8da32ff5
+      flattened_ast: e24f4c783778f4b9508e45bef5d7e2c69eb220d8d16f3cb5c86cb5bb145ce19e
+      inlined_ast: e24f4c783778f4b9508e45bef5d7e2c69eb220d8d16f3cb5c86cb5bb145ce19e
+      dce_ast: e24f4c783778f4b9508e45bef5d7e2c69eb220d8d16f3cb5c86cb5bb145ce19e
       bytecode: d47819ba59e730eb159ee9e33fef5a35aac6062e70c743a749157d54824a45d9
       warnings: ""
       results:
diff --git a/tests/expectations/execution/primitive_casts.out b/tests/expectations/execution/primitive_casts.out
index 39d8caabe3..3222fe215c 100644
--- a/tests/expectations/execution/primitive_casts.out
+++ b/tests/expectations/execution/primitive_casts.out
@@ -2,12 +2,12 @@
 namespace: Execute
 expectation: Pass
 outputs:
-  - - initial_ast: d5194180e59b7bdbca5294add1fb22d30a56c6acffb9f2f0e4f81ddbebd9d8b3
-      unrolled_ast: d5194180e59b7bdbca5294add1fb22d30a56c6acffb9f2f0e4f81ddbebd9d8b3
-      ssa_ast: 42567a5418a27c775dab3baed303db0da02172aa3982d68e6e85ae020c0f3001
-      flattened_ast: 98861b7914bebe10a3e7f01bfb3612e9f8292f4ce263878667123207fd300325
-      inlined_ast: 98861b7914bebe10a3e7f01bfb3612e9f8292f4ce263878667123207fd300325
-      dce_ast: 98861b7914bebe10a3e7f01bfb3612e9f8292f4ce263878667123207fd300325
+  - - initial_ast: a437250a76f757f0e1572b39cb86f1730870864da53b4edd7267542b2a3c6001
+      unrolled_ast: a437250a76f757f0e1572b39cb86f1730870864da53b4edd7267542b2a3c6001
+      ssa_ast: 76f173a3d87c32b5ad22951de4d9f880a42682a979c9543f7332afba951e8d9d
+      flattened_ast: a7893af01e645ca6f48dd64875adcb1385ee322bc9bbf17c5c06bb645a1da733
+      inlined_ast: a7893af01e645ca6f48dd64875adcb1385ee322bc9bbf17c5c06bb645a1da733
+      dce_ast: a7893af01e645ca6f48dd64875adcb1385ee322bc9bbf17c5c06bb645a1da733
       bytecode: 9f8baa3f1bada186c32440e4880e858bd76b54dedb2d667a2b93c2d2a98f0752
       warnings: ""
       results:
diff --git a/tests/expectations/parser/expression/access/associated_function.out b/tests/expectations/parser/expression/access/associated_function.out
index 573aef7436..f88fd1ea1d 100644
--- a/tests/expectations/parser/expression/access/associated_function.out
+++ b/tests/expectations/parser/expression/access/associated_function.out
@@ -5,22 +5,22 @@ outputs:
   - Access:
       AssociatedFunction:
         ty:
-          Identifier: "{\"name\":\"group\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-        name: "{\"name\":\"to_x_coordinate\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":22}\"}"
+          Identifier: "{\"id\":\"0\",\"name\":\"group\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+        name: "{\"id\":\"1\",\"name\":\"to_x_coordinate\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":22}\"}"
         arguments:
-          - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
+          - Identifier: "{\"id\":\"2\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
         span:
           lo: 0
           hi: 25
-        id: 0
+        id: 3
   - Access:
       AssociatedFunction:
         ty:
-          Identifier: "{\"name\":\"group\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-        name: "{\"name\":\"to_y_coordinate\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":22}\"}"
+          Identifier: "{\"id\":\"0\",\"name\":\"group\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+        name: "{\"id\":\"1\",\"name\":\"to_y_coordinate\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":22}\"}"
         arguments:
-          - Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
+          - Identifier: "{\"id\":\"2\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
         span:
           lo: 0
           hi: 25
-        id: 0
+        id: 3
diff --git a/tests/expectations/parser/expression/access/call.out b/tests/expectations/parser/expression/access/call.out
index 3c860fe201..1daf270ec7 100644
--- a/tests/expectations/parser/expression/access/call.out
+++ b/tests/expectations/parser/expression/access/call.out
@@ -4,52 +4,52 @@ expectation: Pass
 outputs:
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments: []
       external: ~
       span:
         lo: 0
         hi: 3
-      id: 0
+      id: 1
   - Call:
       function:
-        Identifier: "{\"name\":\"X\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"X\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments: []
       external: ~
       span:
         lo: 0
         hi: 3
-      id: 0
+      id: 1
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments:
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+        - Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
       external: ~
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 2
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments:
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        - Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+        - Identifier: "{\"id\":\"2\",\"name\":\"z\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       external: ~
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 3
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments:
-        - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
-        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        - Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+        - Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        - Identifier: "{\"id\":\"3\",\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       external: ~
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
diff --git a/tests/expectations/parser/expression/access/method_function.out b/tests/expectations/parser/expression/access/method_function.out
index 0433e29329..d9d4c87a09 100644
--- a/tests/expectations/parser/expression/access/method_function.out
+++ b/tests/expectations/parser/expression/access/method_function.out
@@ -4,17 +4,17 @@ expectation: Pass
 outputs:
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       op: ToXCoordinate
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 2
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       op: ToYCoordinate
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 2
diff --git a/tests/expectations/parser/expression/binary/add.out b/tests/expectations/parser/expression/binary/add.out
index 438c24b443..df174839a4 100644
--- a/tests/expectations/parser/expression/binary/add.out
+++ b/tests/expectations/parser/expression/binary/add.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Add
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: Add
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: Add
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Mul
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 12
                     hi: 15
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,17 +135,17 @@ outputs:
                 - span:
                     lo: 18
                     hi: 21
-                - 0
+                - 4
           op: Mul
           span:
             lo: 12
             hi: 21
-          id: 0
+          id: 5
       op: Add
       span:
         lo: 0
         hi: 21
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -166,12 +166,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -180,12 +180,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: Sub
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -208,12 +208,12 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               op: Mul
               span:
                 lo: 0
                 hi: 9
-              id: 0
+              id: 2
           right:
             Binary:
               left:
@@ -224,7 +224,7 @@ outputs:
                     - span:
                         lo: 12
                         hi: 15
-                    - 0
+                    - 3
               right:
                 Literal:
                   Integer:
@@ -233,17 +233,17 @@ outputs:
                     - span:
                         lo: 18
                         hi: 21
-                    - 0
+                    - 4
               op: Mul
               span:
                 lo: 12
                 hi: 21
-              id: 0
+              id: 5
           op: Add
           span:
             lo: 0
             hi: 21
-          id: 0
+          id: 6
       right:
         Binary:
           left:
@@ -254,7 +254,7 @@ outputs:
                 - span:
                     lo: 24
                     hi: 27
-                - 0
+                - 7
           right:
             Literal:
               Integer:
@@ -263,284 +263,284 @@ outputs:
                 - span:
                     lo: 30
                     hi: 33
-                - 0
+                - 8
           op: Mul
           span:
             lo: 24
             hi: 33
-          id: 0
+          id: 9
       op: Sub
       span:
         lo: 0
         hi: 33
-      id: 0
+      id: 10
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Add
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Add
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Add
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Add
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Add
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Add
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Add
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Add
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Add
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Add
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Add
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Add
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Add
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Add
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Add
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: Add
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Add
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: Add
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: Add
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Add
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: Add
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/add_wrapped.out b/tests/expectations/parser/expression/binary/add_wrapped.out
index 4e56c21e93..b66a4a0140 100644
--- a/tests/expectations/parser/expression/binary/add_wrapped.out
+++ b/tests/expectations/parser/expression/binary/add_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: AddWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
               op: AddWrapped
               span:
                 lo: 0
                 hi: 16
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
           op: AddWrapped
           span:
             lo: 0
             hi: 31
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
       op: AddWrapped
       span:
         lo: 0
         hi: 46
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: AddWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: AddWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: AddWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: AddWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: AddWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: AddWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: AddWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: AddWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: AddWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: AddWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
               op: AddWrapped
               span:
                 lo: 1
                 hi: 17
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
               op: AddWrapped
               span:
                 lo: 20
                 hi: 36
-              id: 0
+              id: 7
           op: Add
           span:
             lo: 1
             hi: 36
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
               op: AddWrapped
               span:
                 lo: 50
                 hi: 66
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
               op: AddWrapped
               span:
                 lo: 69
                 hi: 85
-              id: 0
+              id: 17
           op: Add
           span:
             lo: 50
             hi: 85
-          id: 0
+          id: 18
       op: AddWrapped
       span:
         lo: 1
         hi: 86
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/and.out b/tests/expectations/parser/expression/binary/and.out
index cad5090623..485bb40be5 100644
--- a/tests/expectations/parser/expression/binary/and.out
+++ b/tests/expectations/parser/expression/binary/and.out
@@ -18,12 +18,12 @@ outputs:
             - span:
                 lo: 8
                 hi: 13
-            - 0
+            - 1
       op: And
       span:
         lo: 0
         hi: 13
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -40,12 +40,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 11
-            - 0
+            - 1
       op: And
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -64,12 +64,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 11
-                - 0
+                - 1
           op: And
           span:
             lo: 0
             hi: 11
-          id: 0
+          id: 2
       right:
         Literal:
           Boolean:
@@ -77,279 +77,279 @@ outputs:
             - span:
                 lo: 13
                 hi: 17
-            - 0
+            - 3
       op: And
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: BitwiseAnd
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: BitwiseAnd
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: BitwiseAnd
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: BitwiseAnd
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: BitwiseAnd
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: BitwiseAnd
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: BitwiseAnd
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: BitwiseAnd
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: BitwiseAnd
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: BitwiseAnd
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: BitwiseAnd
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: BitwiseAnd
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Add
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: BitwiseAnd
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: BitwiseAnd
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Add
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: BitwiseAnd
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/bit_and.out b/tests/expectations/parser/expression/binary/bit_and.out
index 757978764f..2c3301b0ff 100644
--- a/tests/expectations/parser/expression/binary/bit_and.out
+++ b/tests/expectations/parser/expression/binary/bit_and.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: BitwiseAnd
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: BitwiseAnd
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: BitwiseAnd
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: BitwiseAnd
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -112,7 +112,7 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               right:
                 Literal:
                   Integer:
@@ -121,17 +121,17 @@ outputs:
                     - span:
                         lo: 12
                         hi: 15
-                    - 0
+                    - 2
               op: BitwiseAnd
               span:
                 lo: 6
                 hi: 15
-              id: 0
+              id: 3
           op: BitwiseOr
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 4
       right:
         Literal:
           Integer:
@@ -140,12 +140,12 @@ outputs:
             - span:
                 lo: 18
                 hi: 21
-            - 0
+            - 5
       op: BitwiseOr
       span:
         lo: 0
         hi: 21
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -166,12 +166,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: BitwiseAnd
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -180,12 +180,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: BitwiseAnd
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -210,7 +210,7 @@ outputs:
                         - span:
                             lo: 6
                             hi: 9
-                        - 0
+                        - 1
                   right:
                     Literal:
                       Integer:
@@ -219,17 +219,17 @@ outputs:
                         - span:
                             lo: 12
                             hi: 15
-                        - 0
+                        - 2
                   op: BitwiseAnd
                   span:
                     lo: 6
                     hi: 15
-                  id: 0
+                  id: 3
               op: BitwiseOr
               span:
                 lo: 0
                 hi: 15
-              id: 0
+              id: 4
           right:
             Binary:
               left:
@@ -240,7 +240,7 @@ outputs:
                     - span:
                         lo: 18
                         hi: 21
-                    - 0
+                    - 5
               right:
                 Literal:
                   Integer:
@@ -249,17 +249,17 @@ outputs:
                     - span:
                         lo: 24
                         hi: 27
-                    - 0
+                    - 6
               op: BitwiseAnd
               span:
                 lo: 18
                 hi: 27
-              id: 0
+              id: 7
           op: BitwiseOr
           span:
             lo: 0
             hi: 27
-          id: 0
+          id: 8
       right:
         Literal:
           Integer:
@@ -268,279 +268,279 @@ outputs:
             - span:
                 lo: 30
                 hi: 33
-            - 0
+            - 9
       op: BitwiseOr
       span:
         lo: 0
         hi: 33
-      id: 0
+      id: 10
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: BitwiseAnd
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: BitwiseAnd
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: BitwiseAnd
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: BitwiseAnd
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: BitwiseAnd
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: BitwiseAnd
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: BitwiseAnd
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: BitwiseAnd
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: BitwiseAnd
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: BitwiseAnd
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: BitwiseAnd
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: BitwiseAnd
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: BitwiseAnd
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: BitwiseAnd
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: BitwiseAnd
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: BitwiseAnd
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: BitwiseAnd
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: BitwiseAnd
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/bit_or.out b/tests/expectations/parser/expression/binary/bit_or.out
index 3df4960d61..3aba6b8fb0 100644
--- a/tests/expectations/parser/expression/binary/bit_or.out
+++ b/tests/expectations/parser/expression/binary/bit_or.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: BitwiseOr
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: BitwiseOr
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: BitwiseOr
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: BitwiseOr
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -112,7 +112,7 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               right:
                 Literal:
                   Integer:
@@ -121,17 +121,17 @@ outputs:
                     - span:
                         lo: 12
                         hi: 15
-                    - 0
+                    - 2
               op: BitwiseOr
               span:
                 lo: 6
                 hi: 15
-              id: 0
+              id: 3
           op: Xor
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 4
       right:
         Literal:
           Integer:
@@ -140,12 +140,12 @@ outputs:
             - span:
                 lo: 18
                 hi: 21
-            - 0
+            - 5
       op: Xor
       span:
         lo: 0
         hi: 21
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -166,12 +166,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: BitwiseOr
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -180,12 +180,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: BitwiseOr
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -210,7 +210,7 @@ outputs:
                         - span:
                             lo: 6
                             hi: 9
-                        - 0
+                        - 1
                   right:
                     Literal:
                       Integer:
@@ -219,17 +219,17 @@ outputs:
                         - span:
                             lo: 12
                             hi: 15
-                        - 0
+                        - 2
                   op: BitwiseOr
                   span:
                     lo: 6
                     hi: 15
-                  id: 0
+                  id: 3
               op: Xor
               span:
                 lo: 0
                 hi: 15
-              id: 0
+              id: 4
           right:
             Binary:
               left:
@@ -240,7 +240,7 @@ outputs:
                     - span:
                         lo: 18
                         hi: 21
-                    - 0
+                    - 5
               right:
                 Literal:
                   Integer:
@@ -249,17 +249,17 @@ outputs:
                     - span:
                         lo: 24
                         hi: 27
-                    - 0
+                    - 6
               op: BitwiseOr
               span:
                 lo: 18
                 hi: 27
-              id: 0
+              id: 7
           op: Xor
           span:
             lo: 0
             hi: 27
-          id: 0
+          id: 8
       right:
         Literal:
           Integer:
@@ -268,279 +268,279 @@ outputs:
             - span:
                 lo: 30
                 hi: 33
-            - 0
+            - 9
       op: Xor
       span:
         lo: 0
         hi: 33
-      id: 0
+      id: 10
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: BitwiseOr
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
               op: BitwiseOr
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
           op: BitwiseOr
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: BitwiseOr
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: BitwiseOr
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: BitwiseOr
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: BitwiseOr
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: BitwiseOr
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: BitwiseOr
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: BitwiseOr
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: BitwiseOr
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: BitwiseOr
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: BitwiseOr
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: BitwiseOr
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: BitwiseOr
               span:
                 lo: 1
                 hi: 8
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: BitwiseOr
               span:
                 lo: 11
                 hi: 18
-              id: 0
+              id: 7
           op: BitwiseOr
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
               op: BitwiseOr
               span:
                 lo: 23
                 hi: 30
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
               op: BitwiseOr
               span:
                 lo: 33
                 hi: 40
-              id: 0
+              id: 17
           op: BitwiseOr
           span:
             lo: 23
             hi: 40
-          id: 0
+          id: 18
       op: BitwiseOr
       span:
         lo: 1
         hi: 41
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/bit_xor.out b/tests/expectations/parser/expression/binary/bit_xor.out
index 33e12ad789..c51ad41544 100644
--- a/tests/expectations/parser/expression/binary/bit_xor.out
+++ b/tests/expectations/parser/expression/binary/bit_xor.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Xor
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: Xor
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Xor
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: Xor
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: BitwiseAnd
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 12
                     hi: 15
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,17 +135,17 @@ outputs:
                 - span:
                     lo: 18
                     hi: 21
-                - 0
+                - 4
           op: BitwiseAnd
           span:
             lo: 12
             hi: 21
-          id: 0
+          id: 5
       op: Xor
       span:
         lo: 0
         hi: 21
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -166,12 +166,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Xor
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -180,12 +180,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: Xor
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -208,12 +208,12 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               op: BitwiseAnd
               span:
                 lo: 0
                 hi: 9
-              id: 0
+              id: 2
           right:
             Binary:
               left:
@@ -224,7 +224,7 @@ outputs:
                     - span:
                         lo: 12
                         hi: 15
-                    - 0
+                    - 3
               right:
                 Literal:
                   Integer:
@@ -233,17 +233,17 @@ outputs:
                     - span:
                         lo: 18
                         hi: 21
-                    - 0
+                    - 4
               op: BitwiseAnd
               span:
                 lo: 12
                 hi: 21
-              id: 0
+              id: 5
           op: Xor
           span:
             lo: 0
             hi: 21
-          id: 0
+          id: 6
       right:
         Binary:
           left:
@@ -254,7 +254,7 @@ outputs:
                 - span:
                     lo: 24
                     hi: 27
-                - 0
+                - 7
           right:
             Literal:
               Integer:
@@ -263,284 +263,284 @@ outputs:
                 - span:
                     lo: 30
                     hi: 33
-                - 0
+                - 8
           op: BitwiseAnd
           span:
             lo: 24
             hi: 33
-          id: 0
+          id: 9
       op: Xor
       span:
         lo: 0
         hi: 33
-      id: 0
+      id: 10
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Xor
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Xor
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Xor
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Xor
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Xor
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Xor
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Xor
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Xor
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Xor
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Xor
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Xor
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Xor
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Xor
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Xor
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Xor
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: Xor
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Xor
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: Xor
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: Xor
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Xor
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: Xor
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/div.out b/tests/expectations/parser/expression/binary/div.out
index b3bcf1b439..074d45a4f3 100644
--- a/tests/expectations/parser/expression/binary/div.out
+++ b/tests/expectations/parser/expression/binary/div.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Div
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: Div
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Div
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: Div
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Pow
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,284 +135,284 @@ outputs:
                 - span:
                     lo: 20
                     hi: 23
-                - 0
+                - 4
           op: Pow
           span:
             lo: 13
             hi: 23
-          id: 0
+          id: 5
       op: Div
       span:
         lo: 0
         hi: 23
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Div
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Div
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Div
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Div
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Div
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Div
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Div
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Div
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Div
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Div
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Div
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Div
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Div
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Div
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Div
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: Div
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Div
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: Div
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: Div
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Div
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: Div
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/div_wrapped.out b/tests/expectations/parser/expression/binary/div_wrapped.out
index dcd4e3a63c..6571d10424 100644
--- a/tests/expectations/parser/expression/binary/div_wrapped.out
+++ b/tests/expectations/parser/expression/binary/div_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Div
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Div
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Div
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Div
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Div
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Div
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Div
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Div
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Div
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Div
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Div
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Div
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Div
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Div
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Div
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: Div
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Div
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: Div
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: Div
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Div
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: Div
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/eq.out b/tests/expectations/parser/expression/binary/eq.out
index 532440c133..e35b5b0b42 100644
--- a/tests/expectations/parser/expression/binary/eq.out
+++ b/tests/expectations/parser/expression/binary/eq.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Eq
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 5
                 hi: 8
-            - 0
+            - 1
       op: Eq
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Lt
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -86,7 +86,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -95,17 +95,17 @@ outputs:
                 - span:
                     lo: 19
                     hi: 22
-                - 0
+                - 4
           op: Lt
           span:
             lo: 13
             hi: 22
-          id: 0
+          id: 5
       op: Eq
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -128,12 +128,12 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               op: Lt
               span:
                 lo: 0
                 hi: 9
-              id: 0
+              id: 2
           right:
             Binary:
               left:
@@ -144,7 +144,7 @@ outputs:
                     - span:
                         lo: 13
                         hi: 16
-                    - 0
+                    - 3
               right:
                 Literal:
                   Integer:
@@ -153,17 +153,17 @@ outputs:
                     - span:
                         lo: 19
                         hi: 22
-                    - 0
+                    - 4
               op: Lt
               span:
                 lo: 13
                 hi: 22
-              id: 0
+              id: 5
           op: Eq
           span:
             lo: 0
             hi: 22
-          id: 0
+          id: 6
       right:
         Binary:
           left:
@@ -176,7 +176,7 @@ outputs:
                     - span:
                         lo: 26
                         hi: 29
-                    - 0
+                    - 7
               right:
                 Literal:
                   Integer:
@@ -185,12 +185,12 @@ outputs:
                     - span:
                         lo: 32
                         hi: 35
-                    - 0
+                    - 8
               op: Lt
               span:
                 lo: 26
                 hi: 35
-              id: 0
+              id: 9
           right:
             Binary:
               left:
@@ -201,7 +201,7 @@ outputs:
                     - span:
                         lo: 39
                         hi: 42
-                    - 0
+                    - 10
               right:
                 Literal:
                   Integer:
@@ -210,289 +210,289 @@ outputs:
                     - span:
                         lo: 45
                         hi: 48
-                    - 0
+                    - 11
               op: Lt
               span:
                 lo: 39
                 hi: 48
-              id: 0
+              id: 12
           op: Eq
           span:
             lo: 26
             hi: 48
-          id: 0
+          id: 13
       op: And
       span:
         lo: 0
         hi: 48
-      id: 0
+      id: 14
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Eq
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
               op: Eq
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
           op: Eq
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: Eq
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Eq
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: Eq
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Eq
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Eq
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: Eq
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Eq
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: Eq
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Eq
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Eq
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: Eq
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Eq
               span:
                 lo: 1
                 hi: 8
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
               op: Eq
               span:
                 lo: 12
                 hi: 19
-              id: 0
+              id: 7
           op: Eq
           span:
             lo: 1
             hi: 19
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":24,\\\"hi\\\":25}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":24,\\\"hi\\\":25}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
               op: Eq
               span:
                 lo: 24
                 hi: 31
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":40,\\\"hi\\\":41}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":40,\\\"hi\\\":41}\"}"
               op: Eq
               span:
                 lo: 35
                 hi: 42
-              id: 0
+              id: 17
           op: Eq
           span:
             lo: 24
             hi: 42
-          id: 0
+          id: 18
       op: Eq
       span:
         lo: 1
         hi: 43
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/ge.out b/tests/expectations/parser/expression/binary/ge.out
index f2df2e2dc0..55c0081ed2 100644
--- a/tests/expectations/parser/expression/binary/ge.out
+++ b/tests/expectations/parser/expression/binary/ge.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Gte
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Gte
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -86,7 +86,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -95,284 +95,284 @@ outputs:
                 - span:
                     lo: 19
                     hi: 22
-                - 0
+                - 4
           op: Add
           span:
             lo: 13
             hi: 22
-          id: 0
+          id: 5
       op: Gte
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Gte
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Gte
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Gte
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Gte
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Gte
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Gte
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Gte
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Gte
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Gte
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Gte
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Gte
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Gte
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Gte
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Gte
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Gte
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Gte
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Gte
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Gte
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Gte
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Gte
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Gte
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/gt.out b/tests/expectations/parser/expression/binary/gt.out
index 64136d79bb..c9da17fb8e 100644
--- a/tests/expectations/parser/expression/binary/gt.out
+++ b/tests/expectations/parser/expression/binary/gt.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Gt
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: Gt
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -86,7 +86,7 @@ outputs:
                 - span:
                     lo: 12
                     hi: 15
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -95,284 +95,284 @@ outputs:
                 - span:
                     lo: 18
                     hi: 21
-                - 0
+                - 4
           op: Add
           span:
             lo: 12
             hi: 21
-          id: 0
+          id: 5
       op: Gt
       span:
         lo: 0
         hi: 21
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Gt
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
               op: Gt
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
           op: Gt
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: Gt
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Gt
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: Gt
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Gt
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Gt
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: Gt
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Gt
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: Gt
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Gt
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Gt
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: Gt
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Gt
               span:
                 lo: 1
                 hi: 8
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: Gt
               span:
                 lo: 11
                 hi: 18
-              id: 0
+              id: 7
           op: Gt
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
               op: Gt
               span:
                 lo: 23
                 hi: 30
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
               op: Gt
               span:
                 lo: 33
                 hi: 40
-              id: 0
+              id: 17
           op: Gt
           span:
             lo: 23
             hi: 40
-          id: 0
+          id: 18
       op: Gt
       span:
         lo: 1
         hi: 41
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/le.out b/tests/expectations/parser/expression/binary/le.out
index 21235fb32b..c5439fa8dc 100644
--- a/tests/expectations/parser/expression/binary/le.out
+++ b/tests/expectations/parser/expression/binary/le.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Lte
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Lte
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -86,7 +86,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -95,284 +95,284 @@ outputs:
                 - span:
                     lo: 19
                     hi: 22
-                - 0
+                - 4
           op: Add
           span:
             lo: 13
             hi: 22
-          id: 0
+          id: 5
       op: Lte
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Lte
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Lte
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Lte
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Lte
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Lte
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Lte
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Lte
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Lte
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Lte
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Lte
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Lte
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Lte
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Lte
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Lte
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Lte
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Lte
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Lte
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Lte
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Lte
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Lte
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Lte
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/lt.out b/tests/expectations/parser/expression/binary/lt.out
index 82df933945..1d7538af9e 100644
--- a/tests/expectations/parser/expression/binary/lt.out
+++ b/tests/expectations/parser/expression/binary/lt.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Lt
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: Lt
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -86,7 +86,7 @@ outputs:
                 - span:
                     lo: 12
                     hi: 15
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -95,284 +95,284 @@ outputs:
                 - span:
                     lo: 18
                     hi: 21
-                - 0
+                - 4
           op: Add
           span:
             lo: 12
             hi: 21
-          id: 0
+          id: 5
       op: Lt
       span:
         lo: 0
         hi: 21
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Lt
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
               op: Lt
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
           op: Lt
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: Lt
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Lt
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: Lt
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Lt
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Lt
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: Lt
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Lt
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       op: Lt
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Lt
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Lt
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       op: Lt
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Lt
               span:
                 lo: 1
                 hi: 8
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: Lt
               span:
                 lo: 11
                 hi: 18
-              id: 0
+              id: 7
           op: Lt
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
               op: Lt
               span:
                 lo: 23
                 hi: 30
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
               op: Lt
               span:
                 lo: 33
                 hi: 40
-              id: 0
+              id: 17
           op: Lt
           span:
             lo: 23
             hi: 40
-          id: 0
+          id: 18
       op: Lt
       span:
         lo: 1
         hi: 41
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/modulo.out b/tests/expectations/parser/expression/binary/modulo.out
index 43a8008815..305d8fc1c1 100644
--- a/tests/expectations/parser/expression/binary/modulo.out
+++ b/tests/expectations/parser/expression/binary/modulo.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Mod
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Mod
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Mod
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Mod
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Mod
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Mod
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Mod
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Mod
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Mod
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Mod
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Mod
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Mod
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Mod
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Mod
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Mod
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: Mod
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Div
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: Mod
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: Mod
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Div
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: Mod
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/mul.out b/tests/expectations/parser/expression/binary/mul.out
index 1f0c489652..97c25a0346 100644
--- a/tests/expectations/parser/expression/binary/mul.out
+++ b/tests/expectations/parser/expression/binary/mul.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Mul
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: Mul
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Mul
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: Mul
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Pow
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,17 +135,17 @@ outputs:
                 - span:
                     lo: 20
                     hi: 23
-                - 0
+                - 4
           op: Pow
           span:
             lo: 13
             hi: 23
-          id: 0
+          id: 5
       op: Mul
       span:
         lo: 0
         hi: 23
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -168,12 +168,12 @@ outputs:
                     - span:
                         lo: 7
                         hi: 10
-                    - 0
+                    - 1
               op: Pow
               span:
                 lo: 0
                 hi: 10
-              id: 0
+              id: 2
           right:
             Binary:
               left:
@@ -184,7 +184,7 @@ outputs:
                     - span:
                         lo: 13
                         hi: 16
-                    - 0
+                    - 3
               right:
                 Literal:
                   Integer:
@@ -193,17 +193,17 @@ outputs:
                     - span:
                         lo: 20
                         hi: 23
-                    - 0
+                    - 4
               op: Pow
               span:
                 lo: 13
                 hi: 23
-              id: 0
+              id: 5
           op: Mul
           span:
             lo: 0
             hi: 23
-          id: 0
+          id: 6
       right:
         Binary:
           left:
@@ -214,7 +214,7 @@ outputs:
                 - span:
                     lo: 26
                     hi: 29
-                - 0
+                - 7
           right:
             Literal:
               Integer:
@@ -223,284 +223,284 @@ outputs:
                 - span:
                     lo: 33
                     hi: 36
-                - 0
+                - 8
           op: Pow
           span:
             lo: 26
             hi: 36
-          id: 0
+          id: 9
       op: Div
       span:
         lo: 0
         hi: 36
-      id: 0
+      id: 10
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Mul
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Mul
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Mul
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Mul
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Mul
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Mul
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Mul
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Mul
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Mul
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Mul
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Mul
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Mul
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Mul
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Mul
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Mul
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: Mul
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Mul
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: Mul
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: Mul
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Mul
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: Mul
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/mul_wrapped.out b/tests/expectations/parser/expression/binary/mul_wrapped.out
index 0f0e748049..faab0fbd86 100644
--- a/tests/expectations/parser/expression/binary/mul_wrapped.out
+++ b/tests/expectations/parser/expression/binary/mul_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: MulWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
               op: MulWrapped
               span:
                 lo: 0
                 hi: 16
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
           op: MulWrapped
           span:
             lo: 0
             hi: 31
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
       op: MulWrapped
       span:
         lo: 0
         hi: 46
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: MulWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: MulWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: MulWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: MulWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: MulWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: MulWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: MulWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: MulWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: MulWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: MulWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
               op: MulWrapped
               span:
                 lo: 1
                 hi: 17
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
               op: MulWrapped
               span:
                 lo: 20
                 hi: 36
-              id: 0
+              id: 7
           op: Mul
           span:
             lo: 1
             hi: 36
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
               op: MulWrapped
               span:
                 lo: 50
                 hi: 66
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
               op: MulWrapped
               span:
                 lo: 69
                 hi: 85
-              id: 0
+              id: 17
           op: Mul
           span:
             lo: 50
             hi: 85
-          id: 0
+          id: 18
       op: MulWrapped
       span:
         lo: 1
         hi: 86
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/nand.out b/tests/expectations/parser/expression/binary/nand.out
index 66a99f4ad9..dbd8827619 100644
--- a/tests/expectations/parser/expression/binary/nand.out
+++ b/tests/expectations/parser/expression/binary/nand.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
               op: Nand
               span:
                 lo: 2
                 hi: 11
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 11
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Nand
               span:
                 lo: 0
                 hi: 9
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: Nand
           span:
             lo: 0
             hi: 17
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
       op: Nand
       span:
         lo: 0
         hi: 25
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Nand
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
       op: Nand
       span:
         lo: 1
         hi: 12
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
           op: Nand
           span:
             lo: 2
             hi: 11
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
               op: Nand
               span:
                 lo: 2
                 hi: 11
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 11
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
       op: Nand
       span:
         lo: 1
         hi: 20
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Nand
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
       op: Nand
       span:
         lo: 1
         hi: 12
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
           op: Nand
           span:
             lo: 2
             hi: 11
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
               op: Nand
               span:
                 lo: 2
                 hi: 11
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 11
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
       op: Nand
       span:
         lo: 1
         hi: 20
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Nand
               span:
                 lo: 1
                 hi: 10
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
               op: Nand
               span:
                 lo: 13
                 hi: 22
-              id: 0
+              id: 7
           op: BitwiseAnd
           span:
             lo: 1
             hi: 22
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":36,\\\"hi\\\":37}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":36,\\\"hi\\\":37}\"}"
               op: Nand
               span:
                 lo: 29
                 hi: 38
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":48,\\\"hi\\\":49}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":48,\\\"hi\\\":49}\"}"
               op: Nand
               span:
                 lo: 41
                 hi: 50
-              id: 0
+              id: 17
           op: BitwiseAnd
           span:
             lo: 29
             hi: 50
-          id: 0
+          id: 18
       op: Nand
       span:
         lo: 1
         hi: 51
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/neq.out b/tests/expectations/parser/expression/binary/neq.out
index f8f7f5d66a..bb548d9262 100644
--- a/tests/expectations/parser/expression/binary/neq.out
+++ b/tests/expectations/parser/expression/binary/neq.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Neq
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 5
                 hi: 8
-            - 0
+            - 1
       op: Neq
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Lt
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -86,7 +86,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -95,17 +95,17 @@ outputs:
                 - span:
                     lo: 19
                     hi: 22
-                - 0
+                - 4
           op: Lt
           span:
             lo: 13
             hi: 22
-          id: 0
+          id: 5
       op: Neq
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -128,12 +128,12 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               op: Lt
               span:
                 lo: 0
                 hi: 9
-              id: 0
+              id: 2
           right:
             Binary:
               left:
@@ -144,7 +144,7 @@ outputs:
                     - span:
                         lo: 13
                         hi: 16
-                    - 0
+                    - 3
               right:
                 Literal:
                   Integer:
@@ -153,17 +153,17 @@ outputs:
                     - span:
                         lo: 19
                         hi: 22
-                    - 0
+                    - 4
               op: Lt
               span:
                 lo: 13
                 hi: 22
-              id: 0
+              id: 5
           op: Neq
           span:
             lo: 0
             hi: 22
-          id: 0
+          id: 6
       right:
         Binary:
           left:
@@ -176,7 +176,7 @@ outputs:
                     - span:
                         lo: 26
                         hi: 29
-                    - 0
+                    - 7
               right:
                 Literal:
                   Integer:
@@ -185,12 +185,12 @@ outputs:
                     - span:
                         lo: 32
                         hi: 35
-                    - 0
+                    - 8
               op: Lt
               span:
                 lo: 26
                 hi: 35
-              id: 0
+              id: 9
           right:
             Binary:
               left:
@@ -201,7 +201,7 @@ outputs:
                     - span:
                         lo: 39
                         hi: 42
-                    - 0
+                    - 10
               right:
                 Literal:
                   Integer:
@@ -210,289 +210,289 @@ outputs:
                     - span:
                         lo: 45
                         hi: 48
-                    - 0
+                    - 11
               op: Lt
               span:
                 lo: 39
                 hi: 48
-              id: 0
+              id: 12
           op: Neq
           span:
             lo: 26
             hi: 48
-          id: 0
+          id: 13
       op: Or
       span:
         lo: 0
         hi: 48
-      id: 0
+      id: 14
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Neq
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Neq
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Neq
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Neq
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Neq
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Neq
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Neq
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Neq
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Neq
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Neq
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Neq
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Neq
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Neq
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Neq
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Neq
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Neq
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Neq
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Neq
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Neq
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Neq
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Neq
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/nor.out b/tests/expectations/parser/expression/binary/nor.out
index d5a566c908..895cbe7685 100644
--- a/tests/expectations/parser/expression/binary/nor.out
+++ b/tests/expectations/parser/expression/binary/nor.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Nor
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Nor
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Nor
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Nor
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Nor
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Nor
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Nor
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Nor
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Nor
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Nor
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Nor
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Nor
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Nor
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Nor
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Nor
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Nor
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Neq
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Nor
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Nor
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Neq
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Nor
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/or.out b/tests/expectations/parser/expression/binary/or.out
index 6ca2ee8f89..566a111b1b 100644
--- a/tests/expectations/parser/expression/binary/or.out
+++ b/tests/expectations/parser/expression/binary/or.out
@@ -18,12 +18,12 @@ outputs:
             - span:
                 lo: 8
                 hi: 12
-            - 0
+            - 1
       op: Or
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -40,12 +40,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 11
-            - 0
+            - 1
       op: Or
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -64,12 +64,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 11
-                - 0
+                - 1
           op: Or
           span:
             lo: 0
             hi: 11
-          id: 0
+          id: 2
       right:
         Literal:
           Boolean:
@@ -77,12 +77,12 @@ outputs:
             - span:
                 lo: 15
                 hi: 20
-            - 0
+            - 3
       op: Or
       span:
         lo: 0
         hi: 20
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -103,12 +103,12 @@ outputs:
                     - span:
                         lo: 8
                         hi: 13
-                    - 0
+                    - 1
               op: Or
               span:
                 lo: 0
                 hi: 13
-              id: 0
+              id: 2
           right:
             Literal:
               Boolean:
@@ -116,12 +116,12 @@ outputs:
                 - span:
                     lo: 17
                     hi: 21
-                - 0
+                - 3
           op: Or
           span:
             lo: 0
             hi: 21
-          id: 0
+          id: 4
       right:
         Literal:
           Boolean:
@@ -129,12 +129,12 @@ outputs:
             - span:
                 lo: 25
                 hi: 30
-            - 0
+            - 5
       op: Or
       span:
         lo: 0
         hi: 30
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -155,7 +155,7 @@ outputs:
                     - span:
                         lo: 9
                         hi: 13
-                    - 0
+                    - 1
               right:
                 Literal:
                   Boolean:
@@ -163,17 +163,17 @@ outputs:
                     - span:
                         lo: 17
                         hi: 22
-                    - 0
+                    - 2
               op: Or
               span:
                 lo: 9
                 hi: 22
-              id: 0
+              id: 3
           op: Or
           span:
             lo: 0
             hi: 22
-          id: 0
+          id: 4
       right:
         Literal:
           Boolean:
@@ -181,9 +181,9 @@ outputs:
             - span:
                 lo: 27
                 hi: 31
-            - 0
+            - 5
       op: Or
       span:
         lo: 0
         hi: 31
-      id: 0
+      id: 6
diff --git a/tests/expectations/parser/expression/binary/pow.out b/tests/expectations/parser/expression/binary/pow.out
index 55002010d2..0b1d6e92ba 100644
--- a/tests/expectations/parser/expression/binary/pow.out
+++ b/tests/expectations/parser/expression/binary/pow.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Pow
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 5
                 hi: 8
-            - 0
+            - 1
       op: Pow
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Pow
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,279 +84,279 @@ outputs:
             - span:
                 lo: 14
                 hi: 17
-            - 0
+            - 3
       op: Pow
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Pow
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Pow
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Pow
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Pow
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Pow
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Pow
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Pow
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Pow
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Pow
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Pow
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Pow
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Pow
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Pow
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Pow
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Pow
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Pow
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Pow
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Pow
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Pow
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Pow
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Pow
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/pow_wrapped.out b/tests/expectations/parser/expression/binary/pow_wrapped.out
index 54f72fc70a..d39406d38d 100644
--- a/tests/expectations/parser/expression/binary/pow_wrapped.out
+++ b/tests/expectations/parser/expression/binary/pow_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: PowWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
               op: PowWrapped
               span:
                 lo: 0
                 hi: 16
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
           op: PowWrapped
           span:
             lo: 0
             hi: 31
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
       op: PowWrapped
       span:
         lo: 0
         hi: 46
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: PowWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: PowWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: PowWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: PowWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: PowWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: PowWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: PowWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: PowWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: PowWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: PowWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
               op: PowWrapped
               span:
                 lo: 1
                 hi: 17
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
               op: PowWrapped
               span:
                 lo: 21
                 hi: 37
-              id: 0
+              id: 7
           op: Pow
           span:
             lo: 1
             hi: 37
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
               op: PowWrapped
               span:
                 lo: 51
                 hi: 67
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
               op: PowWrapped
               span:
                 lo: 71
                 hi: 87
-              id: 0
+              id: 17
           op: Pow
           span:
             lo: 51
             hi: 87
-          id: 0
+          id: 18
       op: PowWrapped
       span:
         lo: 1
         hi: 88
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/rem.out b/tests/expectations/parser/expression/binary/rem.out
index 5c45bb79d0..bec8858a97 100644
--- a/tests/expectations/parser/expression/binary/rem.out
+++ b/tests/expectations/parser/expression/binary/rem.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Rem
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 4
                 hi: 7
-            - 0
+            - 1
       op: Rem
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Rem
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 12
                 hi: 15
-            - 0
+            - 3
       op: Rem
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Pow
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,284 +135,284 @@ outputs:
                 - span:
                     lo: 20
                     hi: 23
-                - 0
+                - 4
           op: Pow
           span:
             lo: 13
             hi: 23
-          id: 0
+          id: 5
       op: Rem
       span:
         lo: 0
         hi: 23
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Rem
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Rem
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Rem
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Rem
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Rem
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Rem
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Rem
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Rem
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Rem
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Rem
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Rem
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Rem
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Rem
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Rem
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Rem
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               op: Rem
               span:
                 lo: 12
                 hi: 20
-              id: 0
+              id: 7
           op: Rem
           span:
             lo: 1
             hi: 20
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":27}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
               op: Rem
               span:
                 lo: 26
                 hi: 34
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":43,\\\"hi\\\":44}\"}"
               op: Rem
               span:
                 lo: 37
                 hi: 45
-              id: 0
+              id: 17
           op: Rem
           span:
             lo: 26
             hi: 45
-          id: 0
+          id: 18
       op: Rem
       span:
         lo: 1
         hi: 46
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/rem_wrapped.out b/tests/expectations/parser/expression/binary/rem_wrapped.out
index 601d103052..63f0e4cd91 100644
--- a/tests/expectations/parser/expression/binary/rem_wrapped.out
+++ b/tests/expectations/parser/expression/binary/rem_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: RemWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
               op: RemWrapped
               span:
                 lo: 0
                 hi: 16
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
           op: RemWrapped
           span:
             lo: 0
             hi: 31
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
       op: RemWrapped
       span:
         lo: 0
         hi: 46
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: RemWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: RemWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: RemWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: RemWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: RemWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: RemWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: RemWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: RemWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: RemWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: RemWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
               op: RemWrapped
               span:
                 lo: 1
                 hi: 17
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":34,\\\"hi\\\":35}\"}"
               op: RemWrapped
               span:
                 lo: 20
                 hi: 36
-              id: 0
+              id: 7
           op: Div
           span:
             lo: 1
             hi: 36
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
               op: RemWrapped
               span:
                 lo: 50
                 hi: 66
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":83,\\\"hi\\\":84}\"}"
               op: RemWrapped
               span:
                 lo: 69
                 hi: 85
-              id: 0
+              id: 17
           op: Div
           span:
             lo: 50
             hi: 85
-          id: 0
+          id: 18
       op: RemWrapped
       span:
         lo: 1
         hi: 86
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/shl.out b/tests/expectations/parser/expression/binary/shl.out
index 489af8cdef..afebc8d9ac 100644
--- a/tests/expectations/parser/expression/binary/shl.out
+++ b/tests/expectations/parser/expression/binary/shl.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Shl
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 5
                 hi: 8
-            - 0
+            - 1
       op: Shl
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Shl
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 14
                 hi: 17
-            - 0
+            - 3
       op: Shl
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,17 +135,17 @@ outputs:
                 - span:
                     lo: 19
                     hi: 22
-                - 0
+                - 4
           op: Add
           span:
             lo: 13
             hi: 22
-          id: 0
+          id: 5
       op: Shl
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -166,12 +166,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Shl
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -180,12 +180,12 @@ outputs:
             - span:
                 lo: 14
                 hi: 17
-            - 0
+            - 3
       op: Shl
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -208,12 +208,12 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               op: Add
               span:
                 lo: 0
                 hi: 9
-              id: 0
+              id: 2
           right:
             Binary:
               left:
@@ -224,7 +224,7 @@ outputs:
                     - span:
                         lo: 13
                         hi: 16
-                    - 0
+                    - 3
               right:
                 Literal:
                   Integer:
@@ -233,17 +233,17 @@ outputs:
                     - span:
                         lo: 19
                         hi: 22
-                    - 0
+                    - 4
               op: Add
               span:
                 lo: 13
                 hi: 22
-              id: 0
+              id: 5
           op: Shl
           span:
             lo: 0
             hi: 22
-          id: 0
+          id: 6
       right:
         Binary:
           left:
@@ -254,7 +254,7 @@ outputs:
                 - span:
                     lo: 26
                     hi: 29
-                - 0
+                - 7
           right:
             Literal:
               Integer:
@@ -263,284 +263,284 @@ outputs:
                 - span:
                     lo: 32
                     hi: 35
-                - 0
+                - 8
           op: Add
           span:
             lo: 26
             hi: 35
-          id: 0
+          id: 9
       op: Shl
       span:
         lo: 0
         hi: 35
-      id: 0
+      id: 10
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Shl
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Shl
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Shl
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Shl
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Shl
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Shl
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Shl
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Shl
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Shl
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Shl
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Shl
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Shl
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Shl
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Shl
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Shl
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Shl
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Shl
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Shl
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Shl
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Shl
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Shl
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/shl_wrapped.out b/tests/expectations/parser/expression/binary/shl_wrapped.out
index ffcee7abeb..3978fe1747 100644
--- a/tests/expectations/parser/expression/binary/shl_wrapped.out
+++ b/tests/expectations/parser/expression/binary/shl_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: ShlWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
               op: ShlWrapped
               span:
                 lo: 0
                 hi: 16
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
           op: ShlWrapped
           span:
             lo: 0
             hi: 31
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
       op: ShlWrapped
       span:
         lo: 0
         hi: 46
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: ShlWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: ShlWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: ShlWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: ShlWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: ShlWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: ShlWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: ShlWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: ShlWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: ShlWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: ShlWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
               op: ShlWrapped
               span:
                 lo: 1
                 hi: 17
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
               op: ShlWrapped
               span:
                 lo: 21
                 hi: 37
-              id: 0
+              id: 7
           op: Shl
           span:
             lo: 1
             hi: 37
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
               op: ShlWrapped
               span:
                 lo: 51
                 hi: 67
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
               op: ShlWrapped
               span:
                 lo: 71
                 hi: 87
-              id: 0
+              id: 17
           op: Shl
           span:
             lo: 51
             hi: 87
-          id: 0
+          id: 18
       op: ShlWrapped
       span:
         lo: 1
         hi: 88
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/shr.out b/tests/expectations/parser/expression/binary/shr.out
index 982fd542a4..926a822d48 100644
--- a/tests/expectations/parser/expression/binary/shr.out
+++ b/tests/expectations/parser/expression/binary/shr.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       op: Shr
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 5
                 hi: 8
-            - 0
+            - 1
       op: Shr
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Shr
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 14
                 hi: 17
-            - 0
+            - 3
       op: Shr
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 9
-                - 0
+                - 1
           op: Add
           span:
             lo: 0
             hi: 9
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,17 +135,17 @@ outputs:
                 - span:
                     lo: 19
                     hi: 22
-                - 0
+                - 4
           op: Add
           span:
             lo: 13
             hi: 22
-          id: 0
+          id: 5
       op: Shr
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 6
   - Binary:
       left:
         Binary:
@@ -166,12 +166,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 10
-                - 0
+                - 1
           op: Shr
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -180,12 +180,12 @@ outputs:
             - span:
                 lo: 14
                 hi: 17
-            - 0
+            - 3
       op: Shr
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -208,12 +208,12 @@ outputs:
                     - span:
                         lo: 6
                         hi: 9
-                    - 0
+                    - 1
               op: Add
               span:
                 lo: 0
                 hi: 9
-              id: 0
+              id: 2
           right:
             Binary:
               left:
@@ -224,7 +224,7 @@ outputs:
                     - span:
                         lo: 13
                         hi: 16
-                    - 0
+                    - 3
               right:
                 Literal:
                   Integer:
@@ -233,17 +233,17 @@ outputs:
                     - span:
                         lo: 19
                         hi: 22
-                    - 0
+                    - 4
               op: Add
               span:
                 lo: 13
                 hi: 22
-              id: 0
+              id: 5
           op: Shr
           span:
             lo: 0
             hi: 22
-          id: 0
+          id: 6
       right:
         Binary:
           left:
@@ -254,7 +254,7 @@ outputs:
                 - span:
                     lo: 26
                     hi: 29
-                - 0
+                - 7
           right:
             Literal:
               Integer:
@@ -263,284 +263,284 @@ outputs:
                 - span:
                     lo: 32
                     hi: 35
-                - 0
+                - 8
           op: Add
           span:
             lo: 26
             hi: 35
-          id: 0
+          id: 9
       op: Shr
       span:
         lo: 0
         hi: 35
-      id: 0
+      id: 10
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Shr
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Shr
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Shr
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Shr
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Shr
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Shr
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Shr
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Shr
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Shr
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Shr
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Shr
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Shr
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Shr
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Shr
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Shr
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Shr
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Shr
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Shr
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Shr
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Shr
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Shr
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/shr_wrapped.out b/tests/expectations/parser/expression/binary/shr_wrapped.out
index fe8004ee20..b86ed152b5 100644
--- a/tests/expectations/parser/expression/binary/shr_wrapped.out
+++ b/tests/expectations/parser/expression/binary/shr_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: ShrWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
               op: ShrWrapped
               span:
                 lo: 0
                 hi: 16
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
           op: ShrWrapped
           span:
             lo: 0
             hi: 31
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
       op: ShrWrapped
       span:
         lo: 0
         hi: 46
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: ShrWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: ShrWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: ShrWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: ShrWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: ShrWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: ShrWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: ShrWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: ShrWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: ShrWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: ShrWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
               op: ShrWrapped
               span:
                 lo: 1
                 hi: 17
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
               op: ShrWrapped
               span:
                 lo: 21
                 hi: 37
-              id: 0
+              id: 7
           op: Shr
           span:
             lo: 1
             hi: 37
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
               op: ShrWrapped
               span:
                 lo: 51
                 hi: 67
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
               op: ShrWrapped
               span:
                 lo: 71
                 hi: 87
-              id: 0
+              id: 17
           op: Shr
           span:
             lo: 51
             hi: 87
-          id: 0
+          id: 18
       op: ShrWrapped
       span:
         lo: 1
         hi: 88
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/sub.out b/tests/expectations/parser/expression/binary/sub.out
index fa5a7c9527..dc6e6e994f 100644
--- a/tests/expectations/parser/expression/binary/sub.out
+++ b/tests/expectations/parser/expression/binary/sub.out
@@ -20,12 +20,12 @@ outputs:
             - span:
                 lo: 6
                 hi: 9
-            - 0
+            - 1
       op: Sub
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Literal:
@@ -44,12 +44,12 @@ outputs:
             - span:
                 lo: 5
                 hi: 9
-            - 0
+            - 1
       op: Sub
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Binary:
       left:
         Binary:
@@ -70,12 +70,12 @@ outputs:
                 - span:
                     lo: 7
                     hi: 11
-                - 0
+                - 1
           op: Sub
           span:
             lo: 0
             hi: 11
-          id: 0
+          id: 2
       right:
         Literal:
           Integer:
@@ -84,12 +84,12 @@ outputs:
             - span:
                 lo: 14
                 hi: 18
-            - 0
+            - 3
       op: Sub
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Binary:
@@ -110,12 +110,12 @@ outputs:
                 - span:
                     lo: 6
                     hi: 10
-                - 0
+                - 1
           op: Mul
           span:
             lo: 0
             hi: 10
-          id: 0
+          id: 2
       right:
         Binary:
           left:
@@ -126,7 +126,7 @@ outputs:
                 - span:
                     lo: 13
                     hi: 17
-                - 0
+                - 3
           right:
             Literal:
               Integer:
@@ -135,284 +135,284 @@ outputs:
                 - span:
                     lo: 20
                     hi: 24
-                - 0
+                - 4
           op: Mul
           span:
             lo: 13
             hi: 24
-          id: 0
+          id: 5
       op: Sub
       span:
         lo: 0
         hi: 24
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Sub
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
               op: Sub
               span:
                 lo: 0
                 hi: 8
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           op: Sub
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
       op: Sub
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Sub
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Sub
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Sub
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Sub
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Sub
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
           op: Sub
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       op: Sub
       span:
         lo: 1
         hi: 11
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           op: Sub
           span:
             lo: 2
             hi: 10
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
               op: Sub
               span:
                 lo: 2
                 hi: 10
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 10
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       op: Sub
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
               op: Sub
               span:
                 lo: 1
                 hi: 9
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               op: Sub
               span:
                 lo: 13
                 hi: 21
-              id: 0
+              id: 7
           op: Shl
           span:
             lo: 1
             hi: 21
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":27,\\\"hi\\\":28}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
               op: Sub
               span:
                 lo: 27
                 hi: 35
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
               op: Sub
               span:
                 lo: 39
                 hi: 47
-              id: 0
+              id: 17
           op: Shl
           span:
             lo: 27
             hi: 47
-          id: 0
+          id: 18
       op: Sub
       span:
         lo: 1
         hi: 48
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/binary/sub_wrapped.out b/tests/expectations/parser/expression/binary/sub_wrapped.out
index e9abb9f545..3b94073874 100644
--- a/tests/expectations/parser/expression/binary/sub_wrapped.out
+++ b/tests/expectations/parser/expression/binary/sub_wrapped.out
@@ -8,267 +8,267 @@ outputs:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: SubWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 5
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
               op: SubWrapped
               span:
                 lo: 0
                 hi: 16
-              id: 0
+              id: 3
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
+            Identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":30}\"}"
           op: SubWrapped
           span:
             lo: 0
             hi: 31
-          id: 0
+          id: 6
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+        Identifier: "{\"id\":\"8\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
       op: SubWrapped
       span:
         lo: 0
         hi: 46
-      id: 0
+      id: 9
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: SubWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: SubWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: SubWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: SubWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Negate
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: SubWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: SubWrapped
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
       op: SubWrapped
       span:
         lo: 1
         hi: 19
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: SubWrapped
           span:
             lo: 2
             hi: 18
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Binary:
       left:
         Unary:
           receiver:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
               op: SubWrapped
               span:
                 lo: 2
                 hi: 18
-              id: 0
+              id: 3
           op: Not
           span:
             lo: 1
             hi: 18
-          id: 0
+          id: 4
       right:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
+        Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":32,\\\"hi\\\":33}\"}"
       op: SubWrapped
       span:
         lo: 1
         hi: 34
-      id: 0
+      id: 7
   - Binary:
       left:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
               op: SubWrapped
               span:
                 lo: 1
                 hi: 17
-              id: 0
+              id: 3
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
+                Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":36}\"}"
               op: SubWrapped
               span:
                 lo: 21
                 hi: 37
-              id: 0
+              id: 7
           op: Shl
           span:
             lo: 1
             hi: 37
-          id: 0
+          id: 8
       right:
         Binary:
           left:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
+                Identifier: "{\"id\":\"10\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":51,\\\"hi\\\":52}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
+                Identifier: "{\"id\":\"12\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":65,\\\"hi\\\":66}\"}"
               op: SubWrapped
               span:
                 lo: 51
                 hi: 67
-              id: 0
+              id: 13
           right:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
+                Identifier: "{\"id\":\"14\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":71,\\\"hi\\\":72}\"}"
               right:
-                Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
+                Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
               op: SubWrapped
               span:
                 lo: 71
                 hi: 87
-              id: 0
+              id: 17
           op: Shl
           span:
             lo: 51
             hi: 87
-          id: 0
+          id: 18
       op: SubWrapped
       span:
         lo: 1
         hi: 88
-      id: 0
+      id: 19
diff --git a/tests/expectations/parser/expression/cast.out b/tests/expectations/parser/expression/cast.out
index 42406008dc..2ffc458e66 100644
--- a/tests/expectations/parser/expression/cast.out
+++ b/tests/expectations/parser/expression/cast.out
@@ -4,13 +4,13 @@ expectation: Pass
 outputs:
   - Cast:
       expression:
-        Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
       type_:
         Integer: U8
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 1
   - Cast:
       expression:
         Literal:
@@ -26,31 +26,31 @@ outputs:
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 1
   - Cast:
       expression:
         Struct:
-          name: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
+          name: "{\"id\":\"0\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
           members:
-            - identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":9}\"}"
+            - identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":9}\"}"
               expression:
-                Identifier: "{\"name\":\"u8\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":13}\"}"
+                Identifier: "{\"id\":\"2\",\"name\":\"u8\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":13}\"}"
               span:
                 lo: 6
                 hi: 13
-              id: 0
+              id: 3
           span:
             lo: 0
             hi: 15
-          id: 0
+          id: 4
       type_: Scalar
       span:
         lo: 0
         hi: 25
-      id: 0
+      id: 5
   - Ternary:
       condition:
-        Identifier: "{\"name\":\"flag\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"flag\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       if_true:
         Literal:
           Integer:
@@ -59,7 +59,7 @@ outputs:
             - span:
                 lo: 7
                 hi: 10
-            - 0
+            - 1
       if_false:
         Cast:
           expression:
@@ -70,21 +70,21 @@ outputs:
                 - span:
                     lo: 13
                     hi: 16
-                - 0
+                - 2
           type_: Scalar
           span:
             lo: 13
             hi: 26
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 26
-      id: 0
+      id: 4
   - Cast:
       expression:
         Ternary:
           condition:
-            Identifier: "{\"name\":\"flag\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":5}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"flag\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":5}\"}"
           if_true:
             Literal:
               Integer:
@@ -93,7 +93,7 @@ outputs:
                 - span:
                     lo: 8
                     hi: 11
-                - 0
+                - 1
           if_false:
             Literal:
               Integer:
@@ -102,16 +102,16 @@ outputs:
                 - span:
                     lo: 14
                     hi: 17
-                - 0
+                - 2
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       type_: Scalar
       span:
         lo: 1
         hi: 28
-      id: 0
+      id: 4
   - Cast:
       expression:
         Literal:
@@ -126,7 +126,7 @@ outputs:
       span:
         lo: 0
         hi: 13
-      id: 0
+      id: 1
   - Cast:
       expression:
         Literal:
@@ -141,4 +141,4 @@ outputs:
       span:
         lo: 0
         hi: 24
-      id: 0
+      id: 1
diff --git a/tests/expectations/parser/expression/ident.out b/tests/expectations/parser/expression/ident.out
index 17dcc95565..72957e3e05 100644
--- a/tests/expectations/parser/expression/ident.out
+++ b/tests/expectations/parser/expression/ident.out
@@ -2,22 +2,22 @@
 namespace: ParseExpression
 expectation: Pass
 outputs:
-  - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-  - Identifier: "{\"name\":\"X\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
-  - Identifier: "{\"name\":\"xxx\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
-  - Identifier: "{\"name\":\"XXX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
-  - Identifier: "{\"name\":\"x1\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
-  - Identifier: "{\"name\":\"xu32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"testx\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"truex\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"TRUE\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"testX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"letX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"constX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
-  - Identifier: "{\"name\":\"test_test\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
-  - Identifier: "{\"name\":\"self\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
-  - Identifier: "{\"name\":\"input\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"selfX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"SelfX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
-  - Identifier: "{\"name\":\"inputX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"X\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"xxx\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"XXX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"x1\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"xu32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"testx\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"truex\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"TRUE\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"testX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"letX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"constX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"test_test\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"self\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"Self\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"input\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"selfX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"SelfX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+  - Identifier: "{\"id\":\"0\",\"name\":\"inputX\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
diff --git a/tests/expectations/parser/expression/literal/comment.out b/tests/expectations/parser/expression/literal/comment.out
index 75124c3fb7..943fcf914b 100644
--- a/tests/expectations/parser/expression/literal/comment.out
+++ b/tests/expectations/parser/expression/literal/comment.out
@@ -4,8 +4,8 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":126,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":130}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":126,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":130}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":126,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":130}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":126,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":130}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions: {}
diff --git a/tests/expectations/parser/expression/ternary.out b/tests/expectations/parser/expression/ternary.out
index d3c2f1907e..b128cdd658 100644
--- a/tests/expectations/parser/expression/ternary.out
+++ b/tests/expectations/parser/expression/ternary.out
@@ -4,54 +4,54 @@ expectation: Pass
 outputs:
   - Ternary:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       if_true:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       if_false:
-        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"2\",\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Ternary:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       if_true:
         Ternary:
           condition:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           if_true:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           if_false:
-            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"3\",\"name\":\"c\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           span:
             lo: 4
             hi: 13
-          id: 0
+          id: 4
       if_false:
-        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"5\",\"name\":\"z\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 6
   - Ternary:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       if_true:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       if_false:
         Ternary:
           condition:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           if_true:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"3\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           if_false:
-            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"4\",\"name\":\"c\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           span:
             lo: 8
             hi: 17
-          id: 0
+          id: 5
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 6
diff --git a/tests/expectations/parser/expression/unary/abs.out b/tests/expectations/parser/expression/unary/abs.out
index 78e9ad769b..6af714545b 100644
--- a/tests/expectations/parser/expression/unary/abs.out
+++ b/tests/expectations/parser/expression/unary/abs.out
@@ -4,165 +4,165 @@ expectation: Pass
 outputs:
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       op: Abs
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: Abs
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 2
           op: Abs
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 4
       op: Abs
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Abs
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Abs
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Abs
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Abs
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Abs
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Abs
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Abs
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Abs
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Abs
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Abs
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/expression/unary/abs_wrapped.out b/tests/expectations/parser/expression/unary/abs_wrapped.out
index b975fe0caa..a1a6b6ea94 100644
--- a/tests/expectations/parser/expression/unary/abs_wrapped.out
+++ b/tests/expectations/parser/expression/unary/abs_wrapped.out
@@ -4,165 +4,165 @@ expectation: Pass
 outputs:
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       op: AbsWrapped
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: AbsWrapped
               span:
                 lo: 0
                 hi: 15
-              id: 0
+              id: 2
           op: AbsWrapped
           span:
             lo: 0
             hi: 29
-          id: 0
+          id: 4
       op: AbsWrapped
       span:
         lo: 0
         hi: 43
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: AbsWrapped
           span:
             lo: 1
             hi: 16
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: AbsWrapped
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: AbsWrapped
           span:
             lo: 2
             hi: 17
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: AbsWrapped
               span:
                 lo: 2
                 hi: 17
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: AbsWrapped
       span:
         lo: 1
         hi: 32
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: AbsWrapped
           span:
             lo: 1
             hi: 16
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: AbsWrapped
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: AbsWrapped
           span:
             lo: 2
             hi: 17
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: AbsWrapped
               span:
                 lo: 2
                 hi: 17
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: AbsWrapped
       span:
         lo: 1
         hi: 32
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/expression/unary/double.out b/tests/expectations/parser/expression/unary/double.out
index 90d200b172..0adc8ea3e4 100644
--- a/tests/expectations/parser/expression/unary/double.out
+++ b/tests/expectations/parser/expression/unary/double.out
@@ -4,165 +4,165 @@ expectation: Pass
 outputs:
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       op: Double
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: Double
               span:
                 lo: 0
                 hi: 10
-              id: 0
+              id: 2
           op: Double
           span:
             lo: 0
             hi: 19
-          id: 0
+          id: 4
       op: Double
       span:
         lo: 0
         hi: 28
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Double
           span:
             lo: 1
             hi: 11
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Double
       span:
         lo: 1
         hi: 13
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Double
           span:
             lo: 2
             hi: 12
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Double
               span:
                 lo: 2
                 hi: 12
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 12
-          id: 0
+          id: 3
       op: Double
       span:
         lo: 1
         hi: 22
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Double
           span:
             lo: 1
             hi: 11
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Double
       span:
         lo: 1
         hi: 13
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Double
           span:
             lo: 2
             hi: 12
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Double
               span:
                 lo: 2
                 hi: 12
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 12
-          id: 0
+          id: 3
       op: Double
       span:
         lo: 1
         hi: 22
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/expression/unary/inv.out b/tests/expectations/parser/expression/unary/inv.out
index 6c9eb10081..007014a636 100644
--- a/tests/expectations/parser/expression/unary/inv.out
+++ b/tests/expectations/parser/expression/unary/inv.out
@@ -4,165 +4,165 @@ expectation: Pass
 outputs:
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       op: Inverse
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: Inverse
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 2
           op: Inverse
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 4
       op: Inverse
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Inverse
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Inverse
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Inverse
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Inverse
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Inverse
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Inverse
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Inverse
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Inverse
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Inverse
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Inverse
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/expression/unary/neg.out b/tests/expectations/parser/expression/unary/neg.out
index c41495d9bb..e19a9bc3fa 100644
--- a/tests/expectations/parser/expression/unary/neg.out
+++ b/tests/expectations/parser/expression/unary/neg.out
@@ -4,58 +4,58 @@ expectation: Pass
 outputs:
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
       op: Negate
       span:
         lo: 0
         hi: 2
-      id: 0
+      id: 1
   - Unary:
       receiver:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           arguments: []
           external: ~
           span:
             lo: 1
             hi: 4
-          id: 0
+          id: 1
       op: Negate
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Negate
       span:
         lo: 0
         hi: 3
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Negate
       span:
         lo: 0
         hi: 3
-      id: 0
+      id: 2
   - Literal:
       Integer:
         - I8
@@ -82,165 +82,165 @@ outputs:
         - 0
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       op: Negate
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: Negate
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 4
       op: Negate
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Negate
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Negate
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Negate
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Negate
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Negate
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Negate
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Negate
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/expression/unary/not.out b/tests/expectations/parser/expression/unary/not.out
index c775caf361..f0581499a9 100644
--- a/tests/expectations/parser/expression/unary/not.out
+++ b/tests/expectations/parser/expression/unary/not.out
@@ -4,218 +4,218 @@ expectation: Pass
 outputs:
   - Unary:
       receiver:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
       op: Not
       span:
         lo: 0
         hi: 2
-      id: 0
+      id: 1
   - Unary:
       receiver:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           arguments: []
           external: ~
           span:
             lo: 1
             hi: 4
-          id: 0
+          id: 1
       op: Not
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Not
       span:
         lo: 0
         hi: 3
-      id: 0
+      id: 2
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Not
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: Not
               span:
                 lo: 0
                 hi: 7
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 0
             hi: 13
-          id: 0
+          id: 4
       op: Not
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Not
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Not
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Not
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Not
           span:
             lo: 1
             hi: 8
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Not
       span:
         lo: 1
         hi: 10
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 2
             hi: 9
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Not
               span:
                 lo: 2
                 hi: 9
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 9
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 1
         hi: 16
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/expression/unary/sqrt.out b/tests/expectations/parser/expression/unary/sqrt.out
index 0f5e4ef719..713cd0e8b7 100644
--- a/tests/expectations/parser/expression/unary/sqrt.out
+++ b/tests/expectations/parser/expression/unary/sqrt.out
@@ -8,175 +8,175 @@ outputs:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: SquareRoot
               span:
                 lo: 2
                 hi: 17
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: SquareRoot
               span:
                 lo: 0
                 hi: 15
-              id: 0
+              id: 2
           op: SquareRoot
           span:
             lo: 0
             hi: 29
-          id: 0
+          id: 4
       op: SquareRoot
       span:
         lo: 0
         hi: 43
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: SquareRoot
           span:
             lo: 1
             hi: 16
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: SquareRoot
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: SquareRoot
           span:
             lo: 2
             hi: 17
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: SquareRoot
               span:
                 lo: 2
                 hi: 17
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: SquareRoot
       span:
         lo: 1
         hi: 32
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: SquareRoot
           span:
             lo: 1
             hi: 16
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: SquareRoot
       span:
         lo: 1
         hi: 18
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: SquareRoot
           span:
             lo: 2
             hi: 17
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: SquareRoot
               span:
                 lo: 2
                 hi: 17
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 17
-          id: 0
+          id: 3
       op: SquareRoot
       span:
         lo: 1
         hi: 32
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/expression/unary/square.out b/tests/expectations/parser/expression/unary/square.out
index efa80deb59..395a436fa5 100644
--- a/tests/expectations/parser/expression/unary/square.out
+++ b/tests/expectations/parser/expression/unary/square.out
@@ -8,175 +8,175 @@ outputs:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Square
               span:
                 lo: 2
                 hi: 12
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 12
-          id: 0
+          id: 3
       op: Not
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 4
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
               op: Square
               span:
                 lo: 0
                 hi: 10
-              id: 0
+              id: 2
           op: Square
           span:
             lo: 0
             hi: 19
-          id: 0
+          id: 4
       op: Square
       span:
         lo: 0
         hi: 28
-      id: 0
+      id: 6
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Square
           span:
             lo: 1
             hi: 11
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Square
       span:
         lo: 1
         hi: 13
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Square
           span:
             lo: 2
             hi: 12
-          id: 0
+          id: 2
       op: Negate
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Square
               span:
                 lo: 2
                 hi: 12
-              id: 0
+              id: 2
           op: Negate
           span:
             lo: 1
             hi: 12
-          id: 0
+          id: 3
       op: Square
       span:
         lo: 1
         hi: 22
-      id: 0
+      id: 5
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           op: Square
           span:
             lo: 1
             hi: 11
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
             lo: 1
             hi: 3
-          id: 0
+          id: 1
       op: Square
       span:
         lo: 1
         hi: 13
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Square
           span:
             lo: 2
             hi: 12
-          id: 0
+          id: 2
       op: Not
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 3
   - Unary:
       receiver:
         Unary:
           receiver:
             Unary:
               receiver:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+                Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
               op: Square
               span:
                 lo: 2
                 hi: 12
-              id: 0
+              id: 2
           op: Not
           span:
             lo: 1
             hi: 12
-          id: 0
+          id: 3
       op: Square
       span:
         lo: 1
         hi: 22
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/finalize/decrement.out b/tests/expectations/parser/finalize/decrement.out
index 7846d920ef..71204d9afb 100644
--- a/tests/expectations/parser/finalize/decrement.out
+++ b/tests/expectations/parser/finalize/decrement.out
@@ -6,27 +6,27 @@ outputs:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments:
-            - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-            - Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
-            - Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":23}\"}"
+            - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
+            - Identifier: "{\"id\":\"2\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
+            - Identifier: "{\"id\":\"3\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":23}\"}"
           external: ~
           span:
             lo: 0
             hi: 24
-          id: 0
+          id: 4
       span:
         lo: 0
         hi: 25
-      id: 0
+      id: 5
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments:
-            - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
+            - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
             - Literal:
                 Integer:
                   - U8
@@ -34,7 +34,7 @@ outputs:
                   - span:
                       lo: 15
                       hi: 18
-                  - 0
+                  - 2
             - Literal:
                 Integer:
                   - U8
@@ -42,45 +42,45 @@ outputs:
                   - span:
                       lo: 20
                       hi: 23
-                  - 0
+                  - 3
           external: ~
           span:
             lo: 0
             hi: 24
-          id: 0
+          id: 4
       span:
         lo: 0
         hi: 25
-      id: 0
+      id: 5
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments:
-            - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-            - Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
+            - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
+            - Identifier: "{\"id\":\"2\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
           external: ~
           span:
             lo: 0
             hi: 19
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 20
-      id: 0
+      id: 4
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"decrement\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments: []
           external: ~
           span:
             lo: 0
             hi: 11
-          id: 0
+          id: 1
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 2
diff --git a/tests/expectations/parser/finalize/finalize.out b/tests/expectations/parser/finalize/finalize.out
index 503769f53b..14dceec6a1 100644
--- a/tests/expectations/parser/finalize/finalize.out
+++ b/tests/expectations/parser/finalize/finalize.out
@@ -4,15 +4,15 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           main:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":123,\\\"hi\\\":127}\"}"
+            identifier: "{\"id\":\"9\",\"name\":\"main\",\"span\":\"{\\\"lo\\\":123,\\\"hi\\\":127}\"}"
             input: []
             output:
               - Internal:
@@ -21,60 +21,60 @@ outputs:
                   span:
                     lo: 133
                     hi: 137
-                  id: 0
+                  id: 10
             output_type: Boolean
             block:
               statements: []
               span:
                 lo: 138
                 hi: 150
-              id: 0
+              id: 11
             finalize:
-              identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":160,\\\"hi\\\":164}\"}"
+              identifier: "{\"id\":\"12\",\"name\":\"main\",\"span\":\"{\\\"lo\\\":160,\\\"hi\\\":164}\"}"
               input:
                 - Internal:
-                    identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":165,\\\"hi\\\":166}\"}"
+                    identifier: "{\"id\":\"13\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":165,\\\"hi\\\":166}\"}"
                     mode: None
                     type_:
-                      Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":168,\\\"hi\\\":171}\"}"
+                      Identifier: "{\"id\":\"14\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":168,\\\"hi\\\":171}\"}"
                     span:
                       lo: 165
                       hi: 166
-                    id: 0
+                    id: 15
                 - Internal:
-                    identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":173,\\\"hi\\\":174}\"}"
+                    identifier: "{\"id\":\"16\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":173,\\\"hi\\\":174}\"}"
                     mode: None
                     type_:
-                      Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":176,\\\"hi\\\":179}\"}"
+                      Identifier: "{\"id\":\"17\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":176,\\\"hi\\\":179}\"}"
                     span:
                       lo: 173
                       hi: 174
-                    id: 0
+                    id: 18
               output:
                 - Internal:
                     mode: None
                     type_:
-                      Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":184,\\\"hi\\\":187}\"}"
+                      Identifier: "{\"id\":\"19\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":184,\\\"hi\\\":187}\"}"
                     span:
                       lo: 184
                       hi: 187
-                    id: 0
+                    id: 20
               output_type:
-                Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":184,\\\"hi\\\":187}\"}"
+                Identifier: "{\"id\":\"19\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":184,\\\"hi\\\":187}\"}"
               block:
                 statements: []
                 span:
                   lo: 188
                   hi: 200
-                id: 0
+                id: 21
               span:
                 lo: 151
                 hi: 200
-              id: 0
+              id: 22
             span:
               lo: 114
               hi: 150
-            id: 0
+            id: 23
         span:
           lo: 2
           hi: 212
diff --git a/tests/expectations/parser/finalize/finalize_statement.out b/tests/expectations/parser/finalize/finalize_statement.out
index ff9472625d..1abf304181 100644
--- a/tests/expectations/parser/finalize/finalize_statement.out
+++ b/tests/expectations/parser/finalize/finalize_statement.out
@@ -13,7 +13,7 @@ outputs:
       span:
         lo: 0
         hi: 21
-      id: 0
+      id: 1
   - Return:
       expression:
         Unit:
@@ -25,7 +25,7 @@ outputs:
       span:
         lo: 0
         hi: 23
-      id: 0
+      id: 1
   - Return:
       expression:
         Unit:
@@ -34,11 +34,11 @@ outputs:
             hi: 11
           id: 0
       finalize_arguments:
-        - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":24}\"}"
+        - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":24}\"}"
       span:
         lo: 0
         hi: 26
-      id: 0
+      id: 2
   - Return:
       expression:
         Unit:
@@ -47,9 +47,9 @@ outputs:
             hi: 11
           id: 0
       finalize_arguments:
-        - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":24}\"}"
-        - Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":29}\"}"
+        - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":24}\"}"
+        - Identifier: "{\"id\":\"2\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":26,\\\"hi\\\":29}\"}"
       span:
         lo: 0
         hi: 31
-      id: 0
+      id: 3
diff --git a/tests/expectations/parser/finalize/increment.out b/tests/expectations/parser/finalize/increment.out
index 26afed6d07..88550cd418 100644
--- a/tests/expectations/parser/finalize/increment.out
+++ b/tests/expectations/parser/finalize/increment.out
@@ -6,27 +6,27 @@ outputs:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments:
-            - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-            - Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
-            - Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":23}\"}"
+            - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
+            - Identifier: "{\"id\":\"2\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
+            - Identifier: "{\"id\":\"3\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":23}\"}"
           external: ~
           span:
             lo: 0
             hi: 24
-          id: 0
+          id: 4
       span:
         lo: 0
         hi: 25
-      id: 0
+      id: 5
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments:
-            - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
+            - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
             - Literal:
                 Integer:
                   - U8
@@ -34,7 +34,7 @@ outputs:
                   - span:
                       lo: 15
                       hi: 18
-                  - 0
+                  - 2
             - Literal:
                 Integer:
                   - U8
@@ -42,45 +42,45 @@ outputs:
                   - span:
                       lo: 20
                       hi: 23
-                  - 0
+                  - 3
           external: ~
           span:
             lo: 0
             hi: 24
-          id: 0
+          id: 4
       span:
         lo: 0
         hi: 25
-      id: 0
+      id: 5
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments:
-            - Identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
-            - Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
+            - Identifier: "{\"id\":\"1\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
+            - Identifier: "{\"id\":\"2\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":18}\"}"
           external: ~
           span:
             lo: 0
             hi: 19
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 20
-      id: 0
+      id: 4
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"increment\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":9}\"}"
           arguments: []
           external: ~
           span:
             lo: 0
             hi: 11
-          id: 0
+          id: 1
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 2
diff --git a/tests/expectations/parser/finalize/mapping.out b/tests/expectations/parser/finalize/mapping.out
index 69980679ed..e811194015 100644
--- a/tests/expectations/parser/finalize/mapping.out
+++ b/tests/expectations/parser/finalize/mapping.out
@@ -4,12 +4,12 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings:
           foo:
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":72,\\\"hi\\\":75}\"}"
+            identifier: "{\"id\":\"6\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":72,\\\"hi\\\":75}\"}"
             key_type:
               Integer: U8
             value_type:
@@ -17,7 +17,7 @@ outputs:
             span:
               lo: 64
               hi: 86
-            id: 0
+            id: 7
         functions: {}
         span:
           lo: 2
diff --git a/tests/expectations/parser/functions/annotated_context.out b/tests/expectations/parser/functions/annotated_context.out
index e0972f78db..cca6f28ea6 100644
--- a/tests/expectations/parser/functions/annotated_context.out
+++ b/tests/expectations/parser/functions/annotated_context.out
@@ -4,20 +4,20 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           f:
             annotations:
-              - identifier: "{\"name\":\"context\",\"span\":\"{\\\"lo\\\":31,\\\"hi\\\":38}\"}"
+              - identifier: "{\"id\":\"2\",\"name\":\"context\",\"span\":\"{\\\"lo\\\":31,\\\"hi\\\":38}\"}"
                 span:
                   lo: 30
                   hi: 38
-                id: 0
+                id: 3
             variant: Standard
-            identifier: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":52,\\\"hi\\\":53}\"}"
+            identifier: "{\"id\":\"4\",\"name\":\"f\",\"span\":\"{\\\"lo\\\":52,\\\"hi\\\":53}\"}"
             input: []
             output:
               - Internal:
@@ -27,7 +27,7 @@ outputs:
                   span:
                     lo: 59
                     hi: 61
-                  id: 0
+                  id: 5
             output_type:
               Integer: U8
             block:
@@ -41,30 +41,30 @@ outputs:
                           - span:
                               lo: 79
                               hi: 82
-                          - 0
+                          - 6
                     finalize_arguments: ~
                     span:
                       lo: 72
                       hi: 83
-                    id: 0
+                    id: 7
               span:
                 lo: 62
                 hi: 89
-              id: 0
+              id: 8
             finalize: ~
             span:
               lo: 43
               hi: 89
-            id: 0
+            id: 9
           g:
             annotations:
-              - identifier: "{\"name\":\"context\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":107}\"}"
+              - identifier: "{\"id\":\"10\",\"name\":\"context\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":107}\"}"
                 span:
                   lo: 99
                   hi: 107
-                id: 0
+                id: 11
             variant: Standard
-            identifier: "{\"name\":\"g\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}"
+            identifier: "{\"id\":\"12\",\"name\":\"g\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}"
             input: []
             output:
               - Internal:
@@ -74,7 +74,7 @@ outputs:
                   span:
                     lo: 148
                     hi: 150
-                  id: 0
+                  id: 13
             output_type:
               Integer: U8
             block:
@@ -88,21 +88,21 @@ outputs:
                           - span:
                               lo: 168
                               hi: 171
-                          - 0
+                          - 14
                     finalize_arguments: ~
                     span:
                       lo: 161
                       hi: 172
-                    id: 0
+                    id: 15
               span:
                 lo: 151
                 hi: 178
-              id: 0
+              id: 16
             finalize: ~
             span:
               lo: 132
               hi: 178
-            id: 0
+            id: 17
         span:
           lo: 2
           hi: 180
diff --git a/tests/expectations/parser/functions/annotated_functions.out b/tests/expectations/parser/functions/annotated_functions.out
index 68318e6955..b172ea38c8 100644
--- a/tests/expectations/parser/functions/annotated_functions.out
+++ b/tests/expectations/parser/functions/annotated_functions.out
@@ -4,20 +4,20 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           foo:
             annotations:
-              - identifier: "{\"name\":\"program\",\"span\":\"{\\\"lo\\\":171,\\\"hi\\\":178}\"}"
+              - identifier: "{\"id\":\"22\",\"name\":\"program\",\"span\":\"{\\\"lo\\\":171,\\\"hi\\\":178}\"}"
                 span:
                   lo: 170
                   hi: 178
-                id: 0
+                id: 23
             variant: Standard
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":192,\\\"hi\\\":195}\"}"
+            identifier: "{\"id\":\"24\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":192,\\\"hi\\\":195}\"}"
             input: []
             output:
               - Internal:
@@ -27,7 +27,7 @@ outputs:
                   span:
                     lo: 201
                     hi: 203
-                  id: 0
+                  id: 25
             output_type:
               Integer: U8
             block:
@@ -35,16 +35,16 @@ outputs:
               span:
                 lo: 204
                 hi: 206
-              id: 0
+              id: 26
             finalize: ~
             span:
               lo: 183
               hi: 206
-            id: 0
+            id: 27
           mint:
             annotations: []
             variant: Transition
-            identifier: "{\"name\":\"mint\",\"span\":\"{\\\"lo\\\":101,\\\"hi\\\":105}\"}"
+            identifier: "{\"id\":\"12\",\"name\":\"mint\",\"span\":\"{\\\"lo\\\":101,\\\"hi\\\":105}\"}"
             input: []
             output:
               - Internal:
@@ -54,7 +54,7 @@ outputs:
                   span:
                     lo: 111
                     hi: 113
-                  id: 0
+                  id: 13
             output_type:
               Integer: U8
             block:
@@ -62,21 +62,21 @@ outputs:
               span:
                 lo: 114
                 hi: 116
-              id: 0
+              id: 14
             finalize: ~
             span:
               lo: 90
               hi: 116
-            id: 0
+            id: 15
           test:
             annotations:
-              - identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":127,\\\"hi\\\":131}\"}"
+              - identifier: "{\"id\":\"16\",\"name\":\"test\",\"span\":\"{\\\"lo\\\":127,\\\"hi\\\":131}\"}"
                 span:
                   lo: 126
                   hi: 131
-                id: 0
+                id: 17
             variant: Standard
-            identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}"
+            identifier: "{\"id\":\"18\",\"name\":\"test\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}"
             input: []
             output:
               - Internal:
@@ -86,7 +86,7 @@ outputs:
                   span:
                     lo: 155
                     hi: 157
-                  id: 0
+                  id: 19
             output_type:
               Integer: U8
             block:
@@ -94,12 +94,12 @@ outputs:
               span:
                 lo: 158
                 hi: 160
-              id: 0
+              id: 20
             finalize: ~
             span:
               lo: 136
               hi: 160
-            id: 0
+            id: 21
         span:
           lo: 2
           hi: 208
diff --git a/tests/expectations/parser/functions/bounded_recursion.out b/tests/expectations/parser/functions/bounded_recursion.out
index b3865aaec2..47119726bb 100644
--- a/tests/expectations/parser/functions/bounded_recursion.out
+++ b/tests/expectations/parser/functions/bounded_recursion.out
@@ -4,25 +4,25 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
+                  identifier: "{\"id\":\"3\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
                   mode: Constant
                   type_:
                     Integer: U32
                   span:
                     lo: 50
                     hi: 51
-                  id: 0
+                  id: 4
             output:
               - Internal:
                   mode: None
@@ -31,7 +31,7 @@ outputs:
                   span:
                     lo: 61
                     hi: 63
-                  id: 0
+                  id: 5
             output_type:
               Integer: U8
             block:
@@ -40,7 +40,7 @@ outputs:
                     condition:
                       Binary:
                         left:
-                          Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":77,\\\"hi\\\":78}\"}"
+                          Identifier: "{\"id\":\"6\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":77,\\\"hi\\\":78}\"}"
                         right:
                           Literal:
                             Integer:
@@ -49,23 +49,23 @@ outputs:
                               - span:
                                   lo: 81
                                   hi: 85
-                              - 0
+                              - 7
                         op: Lt
                         span:
                           lo: 77
                           hi: 85
-                        id: 0
+                        id: 8
                     then:
                       statements:
                         - Expression:
                             expression:
                               Call:
                                 function:
-                                  Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":101}\"}"
+                                  Identifier: "{\"id\":\"9\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":101}\"}"
                                 arguments:
                                   - Binary:
                                       left:
-                                        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":102,\\\"hi\\\":103}\"}"
+                                        Identifier: "{\"id\":\"10\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":102,\\\"hi\\\":103}\"}"
                                       right:
                                         Literal:
                                           Integer:
@@ -74,52 +74,52 @@ outputs:
                                             - span:
                                                 lo: 104
                                                 hi: 108
-                                            - 0
+                                            - 11
                                       op: Add
                                       span:
                                         lo: 102
                                         hi: 108
-                                      id: 0
+                                      id: 12
                                 external: ~
                                 span:
                                   lo: 100
                                   hi: 109
-                                id: 0
+                                id: 13
                             span:
                               lo: 100
                               hi: 110
-                            id: 0
+                            id: 14
                       span:
                         lo: 86
                         hi: 120
-                      id: 0
+                      id: 15
                     otherwise: ~
                     span:
                       lo: 74
                       hi: 120
-                    id: 0
+                    id: 16
               span:
                 lo: 64
                 hi: 126
-              id: 0
+              id: 17
             finalize: ~
             span:
               lo: 30
               hi: 126
-            id: 0
+            id: 18
           main:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}"
+            identifier: "{\"id\":\"19\",\"name\":\"main\",\"span\":\"{\\\"lo\\\":145,\\\"hi\\\":149}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":150,\\\"hi\\\":151}\"}"
+                  identifier: "{\"id\":\"20\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":150,\\\"hi\\\":151}\"}"
                   mode: None
                   type_: Boolean
                   span:
                     lo: 150
                     hi: 151
-                  id: 0
+                  id: 21
             output:
               - Internal:
                   mode: None
@@ -127,7 +127,7 @@ outputs:
                   span:
                     lo: 162
                     hi: 166
-                  id: 0
+                  id: 22
             output_type: Boolean
             block:
               statements:
@@ -135,7 +135,7 @@ outputs:
                     expression:
                       Call:
                         function:
-                          Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":177,\\\"hi\\\":178}\"}"
+                          Identifier: "{\"id\":\"23\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":177,\\\"hi\\\":178}\"}"
                         arguments:
                           - Literal:
                               Integer:
@@ -144,33 +144,33 @@ outputs:
                                 - span:
                                     lo: 179
                                     hi: 183
-                                - 0
+                                - 24
                         external: ~
                         span:
                           lo: 177
                           hi: 184
-                        id: 0
+                        id: 25
                     span:
                       lo: 177
                       hi: 185
-                    id: 0
+                    id: 26
                 - Return:
                     expression:
-                      Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":201,\\\"hi\\\":202}\"}"
+                      Identifier: "{\"id\":\"27\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":201,\\\"hi\\\":202}\"}"
                     finalize_arguments: ~
                     span:
                       lo: 194
                       hi: 203
-                    id: 0
+                    id: 28
               span:
                 lo: 167
                 hi: 209
-              id: 0
+              id: 29
             finalize: ~
             span:
               lo: 136
               hi: 209
-            id: 0
+            id: 30
         span:
           lo: 2
           hi: 211
diff --git a/tests/expectations/parser/functions/const_param.out b/tests/expectations/parser/functions/const_param.out
index f99f25cef0..19e9189617 100644
--- a/tests/expectations/parser/functions/const_param.out
+++ b/tests/expectations/parser/functions/const_param.out
@@ -4,34 +4,34 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":118,\\\"hi\\\":119}\"}"
+            identifier: "{\"id\":\"12\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":118,\\\"hi\\\":119}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":129,\\\"hi\\\":130}\"}"
+                  identifier: "{\"id\":\"13\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":129,\\\"hi\\\":130}\"}"
                   mode: Constant
                   type_:
                     Integer: U32
                   span:
                     lo: 129
                     hi: 130
-                  id: 0
+                  id: 14
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":137,\\\"hi\\\":138}\"}"
+                  identifier: "{\"id\":\"15\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":137,\\\"hi\\\":138}\"}"
                   mode: None
                   type_:
                     Integer: I32
                   span:
                     lo: 137
                     hi: 138
-                  id: 0
+                  id: 16
             output:
               - Internal:
                   mode: None
@@ -40,7 +40,7 @@ outputs:
                   span:
                     lo: 148
                     hi: 150
-                  id: 0
+                  id: 17
             output_type:
               Integer: U8
             block:
@@ -54,21 +54,21 @@ outputs:
                           - span:
                               lo: 168
                               hi: 171
-                          - 0
+                          - 18
                     finalize_arguments: ~
                     span:
                       lo: 161
                       hi: 172
-                    id: 0
+                    id: 19
               span:
                 lo: 151
                 hi: 178
-              id: 0
+              id: 20
             finalize: ~
             span:
               lo: 109
               hi: 178
-            id: 0
+            id: 21
         span:
           lo: 2
           hi: 179
diff --git a/tests/expectations/parser/functions/constant_input.out b/tests/expectations/parser/functions/constant_input.out
index ffb6350fa8..9207601a3c 100644
--- a/tests/expectations/parser/functions/constant_input.out
+++ b/tests/expectations/parser/functions/constant_input.out
@@ -4,25 +4,25 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
+                  identifier: "{\"id\":\"3\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":50,\\\"hi\\\":51}\"}"
                   mode: Constant
                   type_:
                     Integer: U8
                   span:
                     lo: 50
                     hi: 51
-                  id: 0
+                  id: 4
             output:
               - Internal:
                   mode: None
@@ -31,7 +31,7 @@ outputs:
                   span:
                     lo: 60
                     hi: 62
-                  id: 0
+                  id: 5
             output_type:
               Integer: U8
             block:
@@ -39,12 +39,12 @@ outputs:
               span:
                 lo: 63
                 hi: 65
-              id: 0
+              id: 6
             finalize: ~
             span:
               lo: 30
               hi: 65
-            id: 0
+            id: 7
         span:
           lo: 2
           hi: 67
diff --git a/tests/expectations/parser/functions/danling_annotations_fail.out b/tests/expectations/parser/functions/danling_annotations_fail.out
index 5a77765d14..424f4af91b 100644
--- a/tests/expectations/parser/functions/danling_annotations_fail.out
+++ b/tests/expectations/parser/functions/danling_annotations_fail.out
@@ -4,20 +4,20 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           test:
             annotations:
-              - identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":111,\\\"hi\\\":115}\"}"
+              - identifier: "{\"id\":\"2\",\"name\":\"test\",\"span\":\"{\\\"lo\\\":111,\\\"hi\\\":115}\"}"
                 span:
                   lo: 110
                   hi: 115
-                id: 0
+                id: 3
             variant: Standard
-            identifier: "{\"name\":\"test\",\"span\":\"{\\\"lo\\\":134,\\\"hi\\\":138}\"}"
+            identifier: "{\"id\":\"4\",\"name\":\"test\",\"span\":\"{\\\"lo\\\":134,\\\"hi\\\":138}\"}"
             input: []
             output:
               - Internal:
@@ -27,7 +27,7 @@ outputs:
                   span:
                     lo: 144
                     hi: 146
-                  id: 0
+                  id: 5
             output_type:
               Integer: U8
             block:
@@ -35,12 +35,12 @@ outputs:
               span:
                 lo: 147
                 hi: 149
-              id: 0
+              id: 6
             finalize: ~
             span:
               lo: 125
               hi: 149
-            id: 0
+            id: 7
         span:
           lo: 2
           hi: 151
diff --git a/tests/expectations/parser/functions/empty2.out b/tests/expectations/parser/functions/empty2.out
index 4263e07754..437e86d83c 100644
--- a/tests/expectations/parser/functions/empty2.out
+++ b/tests/expectations/parser/functions/empty2.out
@@ -4,15 +4,15 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
             input: []
             output:
               - Internal:
@@ -22,7 +22,7 @@ outputs:
                   span:
                     lo: 46
                     hi: 48
-                  id: 0
+                  id: 3
             output_type:
               Integer: U8
             block:
@@ -30,12 +30,12 @@ outputs:
               span:
                 lo: 49
                 hi: 51
-              id: 0
+              id: 4
             finalize: ~
             span:
               lo: 30
               hi: 51
-            id: 0
+            id: 5
         span:
           lo: 2
           hi: 52
diff --git a/tests/expectations/parser/functions/infinite_recursion.out b/tests/expectations/parser/functions/infinite_recursion.out
index f89c8281c1..dec0820c73 100644
--- a/tests/expectations/parser/functions/infinite_recursion.out
+++ b/tests/expectations/parser/functions/infinite_recursion.out
@@ -4,15 +4,15 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           "inf":
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":42}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"inf\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":42}\"}"
             input: []
             output:
               - Internal:
@@ -22,7 +22,7 @@ outputs:
                   span:
                     lo: 48
                     hi: 50
-                  id: 0
+                  id: 3
             output_type:
               Integer: U8
             block:
@@ -31,39 +31,39 @@ outputs:
                     expression:
                       Call:
                         function:
-                          Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":61,\\\"hi\\\":64}\"}"
+                          Identifier: "{\"id\":\"4\",\"name\":\"inf\",\"span\":\"{\\\"lo\\\":61,\\\"hi\\\":64}\"}"
                         arguments: []
                         external: ~
                         span:
                           lo: 61
                           hi: 66
-                        id: 0
+                        id: 5
                     span:
                       lo: 61
                       hi: 67
-                    id: 0
+                    id: 6
               span:
                 lo: 51
                 hi: 73
-              id: 0
+              id: 7
             finalize: ~
             span:
               lo: 30
               hi: 73
-            id: 0
+            id: 8
           main:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":92,\\\"hi\\\":96}\"}"
+            identifier: "{\"id\":\"9\",\"name\":\"main\",\"span\":\"{\\\"lo\\\":92,\\\"hi\\\":96}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":97,\\\"hi\\\":98}\"}"
+                  identifier: "{\"id\":\"10\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":97,\\\"hi\\\":98}\"}"
                   mode: None
                   type_: Boolean
                   span:
                     lo: 97
                     hi: 98
-                  id: 0
+                  id: 11
             output:
               - Internal:
                   mode: None
@@ -71,7 +71,7 @@ outputs:
                   span:
                     lo: 109
                     hi: 113
-                  id: 0
+                  id: 12
             output_type: Boolean
             block:
               statements:
@@ -79,34 +79,34 @@ outputs:
                     expression:
                       Call:
                         function:
-                          Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":124,\\\"hi\\\":127}\"}"
+                          Identifier: "{\"id\":\"13\",\"name\":\"inf\",\"span\":\"{\\\"lo\\\":124,\\\"hi\\\":127}\"}"
                         arguments: []
                         external: ~
                         span:
                           lo: 124
                           hi: 129
-                        id: 0
+                        id: 14
                     span:
                       lo: 124
                       hi: 130
-                    id: 0
+                    id: 15
                 - Return:
                     expression:
-                      Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":146,\\\"hi\\\":147}\"}"
+                      Identifier: "{\"id\":\"16\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":146,\\\"hi\\\":147}\"}"
                     finalize_arguments: ~
                     span:
                       lo: 139
                       hi: 148
-                    id: 0
+                    id: 17
               span:
                 lo: 114
                 hi: 154
-              id: 0
+              id: 18
             finalize: ~
             span:
               lo: 83
               hi: 154
-            id: 0
+            id: 19
         span:
           lo: 2
           hi: 156
diff --git a/tests/expectations/parser/functions/inline_function.out b/tests/expectations/parser/functions/inline_function.out
index d7c6f56f30..a851943adf 100644
--- a/tests/expectations/parser/functions/inline_function.out
+++ b/tests/expectations/parser/functions/inline_function.out
@@ -4,34 +4,34 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           foo:
             annotations: []
             variant: Inline
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":36}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":36}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
+                  identifier: "{\"id\":\"3\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":38}\"}"
                   mode: None
                   type_:
                     Integer: U32
                   span:
                     lo: 37
                     hi: 38
-                  id: 0
+                  id: 4
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
+                  identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
                   mode: None
                   type_:
                     Integer: I32
                   span:
                     lo: 45
                     hi: 46
-                  id: 0
+                  id: 6
             output:
               - Internal:
                   mode: None
@@ -40,7 +40,7 @@ outputs:
                   span:
                     lo: 56
                     hi: 59
-                  id: 0
+                  id: 7
             output_type:
               Integer: U32
             block:
@@ -54,21 +54,21 @@ outputs:
                           - span:
                               lo: 77
                               hi: 81
-                          - 0
+                          - 8
                     finalize_arguments: ~
                     span:
                       lo: 70
                       hi: 82
-                    id: 0
+                    id: 9
               span:
                 lo: 60
                 hi: 88
-              id: 0
+              id: 10
             finalize: ~
             span:
               lo: 26
               hi: 88
-            id: 0
+            id: 11
         span:
           lo: 2
           hi: 90
diff --git a/tests/expectations/parser/functions/params.out b/tests/expectations/parser/functions/params.out
index 68c8a8973c..68400229dd 100644
--- a/tests/expectations/parser/functions/params.out
+++ b/tests/expectations/parser/functions/params.out
@@ -4,34 +4,34 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
+                  identifier: "{\"id\":\"3\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
                   mode: None
                   type_:
                     Integer: U32
                   span:
                     lo: 41
                     hi: 42
-                  id: 0
+                  id: 4
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
+                  identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
                   mode: None
                   type_:
                     Integer: I32
                   span:
                     lo: 49
                     hi: 50
-                  id: 0
+                  id: 6
             output:
               - Internal:
                   mode: None
@@ -40,7 +40,7 @@ outputs:
                   span:
                     lo: 60
                     hi: 62
-                  id: 0
+                  id: 7
             output_type:
               Integer: U8
             block:
@@ -54,21 +54,21 @@ outputs:
                           - span:
                               lo: 80
                               hi: 83
-                          - 0
+                          - 8
                     finalize_arguments: ~
                     span:
                       lo: 73
                       hi: 84
-                    id: 0
+                    id: 9
               span:
                 lo: 63
                 hi: 90
-              id: 0
+              id: 10
             finalize: ~
             span:
               lo: 30
               hi: 90
-            id: 0
+            id: 11
         span:
           lo: 2
           hi: 91
diff --git a/tests/expectations/parser/functions/params_return.out b/tests/expectations/parser/functions/params_return.out
index 4ba06f7f23..440dbc6317 100644
--- a/tests/expectations/parser/functions/params_return.out
+++ b/tests/expectations/parser/functions/params_return.out
@@ -4,34 +4,34 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
+                  identifier: "{\"id\":\"3\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
                   mode: None
                   type_:
                     Integer: U32
                   span:
                     lo: 41
                     hi: 42
-                  id: 0
+                  id: 4
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
+                  identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
                   mode: None
                   type_:
                     Integer: I32
                   span:
                     lo: 49
                     hi: 50
-                  id: 0
+                  id: 6
             output:
               - Internal:
                   mode: None
@@ -40,7 +40,7 @@ outputs:
                   span:
                     lo: 60
                     hi: 63
-                  id: 0
+                  id: 7
             output_type:
               Integer: U32
             block:
@@ -54,21 +54,21 @@ outputs:
                           - span:
                               lo: 81
                               hi: 84
-                          - 0
+                          - 8
                     finalize_arguments: ~
                     span:
                       lo: 74
                       hi: 85
-                    id: 0
+                    id: 9
               span:
                 lo: 64
                 hi: 91
-              id: 0
+              id: 10
             finalize: ~
             span:
               lo: 30
               hi: 91
-            id: 0
+            id: 11
         span:
           lo: 2
           hi: 92
diff --git a/tests/expectations/parser/functions/public_param.out b/tests/expectations/parser/functions/public_param.out
index 786484eb9f..2fb29f3d12 100644
--- a/tests/expectations/parser/functions/public_param.out
+++ b/tests/expectations/parser/functions/public_param.out
@@ -4,34 +4,34 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":116,\\\"hi\\\":117}\"}"
+            identifier: "{\"id\":\"12\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":116,\\\"hi\\\":117}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":125,\\\"hi\\\":126}\"}"
+                  identifier: "{\"id\":\"13\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":125,\\\"hi\\\":126}\"}"
                   mode: Public
                   type_:
                     Integer: U32
                   span:
                     lo: 125
                     hi: 126
-                  id: 0
+                  id: 14
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":133,\\\"hi\\\":134}\"}"
+                  identifier: "{\"id\":\"15\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":133,\\\"hi\\\":134}\"}"
                   mode: None
                   type_:
                     Integer: I32
                   span:
                     lo: 133
                     hi: 134
-                  id: 0
+                  id: 16
             output:
               - Internal:
                   mode: None
@@ -40,7 +40,7 @@ outputs:
                   span:
                     lo: 144
                     hi: 146
-                  id: 0
+                  id: 17
             output_type:
               Integer: U8
             block:
@@ -54,21 +54,21 @@ outputs:
                           - span:
                               lo: 164
                               hi: 167
-                          - 0
+                          - 18
                     finalize_arguments: ~
                     span:
                       lo: 157
                       hi: 168
-                    id: 0
+                    id: 19
               span:
                 lo: 147
                 hi: 174
-              id: 0
+              id: 20
             finalize: ~
             span:
               lo: 107
               hi: 174
-            id: 0
+            id: 21
         span:
           lo: 2
           hi: 176
diff --git a/tests/expectations/parser/functions/return.out b/tests/expectations/parser/functions/return.out
index c7aa010360..cf2611aaff 100644
--- a/tests/expectations/parser/functions/return.out
+++ b/tests/expectations/parser/functions/return.out
@@ -4,15 +4,15 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           x:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":39,\\\"hi\\\":40}\"}"
             input: []
             output:
               - Internal:
@@ -22,7 +22,7 @@ outputs:
                   span:
                     lo: 46
                     hi: 49
-                  id: 0
+                  id: 3
             output_type:
               Integer: U32
             block:
@@ -36,21 +36,21 @@ outputs:
                           - span:
                               lo: 67
                               hi: 70
-                          - 0
+                          - 4
                     finalize_arguments: ~
                     span:
                       lo: 60
                       hi: 71
-                    id: 0
+                    id: 5
               span:
                 lo: 50
                 hi: 77
-              id: 0
+              id: 6
             finalize: ~
             span:
               lo: 30
               hi: 77
-            id: 0
+            id: 7
         span:
           lo: 2
           hi: 78
diff --git a/tests/expectations/parser/functions/transition_function.out b/tests/expectations/parser/functions/transition_function.out
index 2dca269a21..041e094488 100644
--- a/tests/expectations/parser/functions/transition_function.out
+++ b/tests/expectations/parser/functions/transition_function.out
@@ -4,34 +4,34 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           foo:
             annotations: []
             variant: Transition
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":40}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":37,\\\"hi\\\":40}\"}"
             input:
               - Internal:
-                  identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
+                  identifier: "{\"id\":\"3\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":41,\\\"hi\\\":42}\"}"
                   mode: None
                   type_:
                     Integer: U32
                   span:
                     lo: 41
                     hi: 42
-                  id: 0
+                  id: 4
               - Internal:
-                  identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
+                  identifier: "{\"id\":\"5\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":49,\\\"hi\\\":50}\"}"
                   mode: None
                   type_:
                     Integer: I32
                   span:
                     lo: 49
                     hi: 50
-                  id: 0
+                  id: 6
             output:
               - Internal:
                   mode: None
@@ -40,7 +40,7 @@ outputs:
                   span:
                     lo: 60
                     hi: 63
-                  id: 0
+                  id: 7
             output_type:
               Integer: U32
             block:
@@ -54,21 +54,21 @@ outputs:
                           - span:
                               lo: 81
                               hi: 85
-                          - 0
+                          - 8
                     finalize_arguments: ~
                     span:
                       lo: 74
                       hi: 86
-                    id: 0
+                    id: 9
               span:
                 lo: 64
                 hi: 92
-              id: 0
+              id: 10
             finalize: ~
             span:
               lo: 26
               hi: 92
-            id: 0
+            id: 11
         span:
           lo: 2
           hi: 94
diff --git a/tests/expectations/parser/inputs/input_constant.out b/tests/expectations/parser/inputs/input_constant.out
index 2dca5f787e..b0742e2b17 100644
--- a/tests/expectations/parser/inputs/input_constant.out
+++ b/tests/expectations/parser/inputs/input_constant.out
@@ -7,7 +7,7 @@ outputs:
         definitions:
           - mode: Constant
             type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+            name: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
             value:
               Literal:
                 Boolean:
@@ -15,14 +15,14 @@ outputs:
                   - span:
                       lo: 29
                       hi: 33
-                  - 0
+                  - 2
             span:
               lo: 21
               hi: 25
           - mode: Constant
             type_:
               Integer: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
+            name: "{\"id\":\"3\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
             value:
               Literal:
                 Integer:
@@ -31,13 +31,13 @@ outputs:
                   - span:
                       lo: 55
                       hi: 58
-                  - 0
+                  - 4
             span:
               lo: 47
               hi: 49
           - mode: Constant
             type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
+            name: "{\"id\":\"5\",\"name\":\"c\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
             value:
               Literal:
                 Field:
@@ -45,13 +45,13 @@ outputs:
                   - span:
                       lo: 80
                       hi: 86
-                  - 0
+                  - 6
             span:
               lo: 72
               hi: 77
           - mode: Constant
             type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":97,\\\"hi\\\":98}\"}"
+            name: "{\"id\":\"7\",\"name\":\"d\",\"span\":\"{\\\"lo\\\":97,\\\"hi\\\":98}\"}"
             value:
               Literal:
                 Group:
@@ -71,13 +71,13 @@ outputs:
                     span:
                       lo: 108
                       hi: 119
-                    id: 0
+                    id: 8
             span:
               lo: 100
               hi: 105
           - mode: Constant
             type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":130,\\\"hi\\\":131}\"}"
+            name: "{\"id\":\"9\",\"name\":\"e\",\"span\":\"{\\\"lo\\\":130,\\\"hi\\\":131}\"}"
             value:
               Literal:
                 Address:
@@ -85,14 +85,14 @@ outputs:
                   - span:
                       lo: 143
                       hi: 206
-                  - 0
+                  - 10
             span:
               lo: 133
               hi: 140
           - mode: Constant
             type_:
               Integer: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":217,\\\"hi\\\":218}\"}"
+            name: "{\"id\":\"11\",\"name\":\"f\",\"span\":\"{\\\"lo\\\":217,\\\"hi\\\":218}\"}"
             value:
               Literal:
                 Integer:
@@ -101,7 +101,7 @@ outputs:
                   - span:
                       lo: 228
                       hi: 232
-                  - 0
+                  - 12
             span:
               lo: 220
               hi: 222
@@ -112,7 +112,7 @@ outputs:
         definitions:
           - mode: None
             type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":247,\\\"hi\\\":249}\"}"
+            name: "{\"id\":\"14\",\"name\":\"r0\",\"span\":\"{\\\"lo\\\":247,\\\"hi\\\":249}\"}"
             value:
               Literal:
                 Boolean:
@@ -120,14 +120,14 @@ outputs:
                   - span:
                       lo: 259
                       hi: 263
-                  - 0
+                  - 15
             span:
               lo: 251
               hi: 255
           - mode: None
             type_:
               Integer: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":265,\\\"hi\\\":267}\"}"
+            name: "{\"id\":\"16\",\"name\":\"r1\",\"span\":\"{\\\"lo\\\":265,\\\"hi\\\":267}\"}"
             value:
               Literal:
                 Integer:
@@ -136,13 +136,13 @@ outputs:
                   - span:
                       lo: 277
                       hi: 280
-                  - 0
+                  - 17
             span:
               lo: 269
               hi: 271
           - mode: None
             type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":282,\\\"hi\\\":284}\"}"
+            name: "{\"id\":\"18\",\"name\":\"r2\",\"span\":\"{\\\"lo\\\":282,\\\"hi\\\":284}\"}"
             value:
               Literal:
                 Field:
@@ -150,13 +150,13 @@ outputs:
                   - span:
                       lo: 294
                       hi: 300
-                  - 0
+                  - 19
             span:
               lo: 286
               hi: 291
           - mode: None
             type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
+            name: "{\"id\":\"20\",\"name\":\"r3\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
             value:
               Literal:
                 Group:
@@ -176,13 +176,13 @@ outputs:
                     span:
                       lo: 314
                       hi: 325
-                    id: 0
+                    id: 21
             span:
               lo: 306
               hi: 311
           - mode: None
             type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":327,\\\"hi\\\":329}\"}"
+            name: "{\"id\":\"22\",\"name\":\"r4\",\"span\":\"{\\\"lo\\\":327,\\\"hi\\\":329}\"}"
             value:
               Literal:
                 Address:
@@ -190,14 +190,14 @@ outputs:
                   - span:
                       lo: 341
                       hi: 404
-                  - 0
+                  - 23
             span:
               lo: 331
               hi: 338
           - mode: None
             type_:
               Integer: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":406,\\\"hi\\\":408}\"}"
+            name: "{\"id\":\"24\",\"name\":\"r4\",\"span\":\"{\\\"lo\\\":406,\\\"hi\\\":408}\"}"
             value:
               Literal:
                 Integer:
@@ -206,7 +206,7 @@ outputs:
                   - span:
                       lo: 415
                       hi: 419
-                  - 0
+                  - 25
             span:
               lo: 410
               hi: 412
diff --git a/tests/expectations/parser/inputs/input_public.out b/tests/expectations/parser/inputs/input_public.out
index 9456fb19ed..6c19b60b50 100644
--- a/tests/expectations/parser/inputs/input_public.out
+++ b/tests/expectations/parser/inputs/input_public.out
@@ -7,7 +7,7 @@ outputs:
         definitions:
           - mode: Public
             type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            name: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
             value:
               Literal:
                 Boolean:
@@ -15,14 +15,14 @@ outputs:
                   - span:
                       lo: 27
                       hi: 31
-                  - 0
+                  - 2
             span:
               lo: 19
               hi: 23
           - mode: Public
             type_:
               Integer: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":57,\\\"hi\\\":58}\"}"
+            name: "{\"id\":\"3\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":57,\\\"hi\\\":58}\"}"
             value:
               Literal:
                 Integer:
@@ -31,13 +31,13 @@ outputs:
                   - span:
                       lo: 68
                       hi: 71
-                  - 0
+                  - 4
             span:
               lo: 60
               hi: 62
           - mode: Public
             type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":101}\"}"
+            name: "{\"id\":\"5\",\"name\":\"c\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":101}\"}"
             value:
               Literal:
                 Field:
@@ -45,13 +45,13 @@ outputs:
                   - span:
                       lo: 111
                       hi: 117
-                  - 0
+                  - 6
             span:
               lo: 103
               hi: 108
           - mode: Public
             type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":146,\\\"hi\\\":147}\"}"
+            name: "{\"id\":\"7\",\"name\":\"d\",\"span\":\"{\\\"lo\\\":146,\\\"hi\\\":147}\"}"
             value:
               Literal:
                 Group:
@@ -71,13 +71,13 @@ outputs:
                     span:
                       lo: 157
                       hi: 168
-                    id: 0
+                    id: 8
             span:
               lo: 149
               hi: 154
           - mode: Public
             type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":187,\\\"hi\\\":188}\"}"
+            name: "{\"id\":\"9\",\"name\":\"e\",\"span\":\"{\\\"lo\\\":187,\\\"hi\\\":188}\"}"
             value:
               Literal:
                 Address:
@@ -85,14 +85,14 @@ outputs:
                   - span:
                       lo: 200
                       hi: 263
-                  - 0
+                  - 10
             span:
               lo: 190
               hi: 197
           - mode: Public
             type_:
               Integer: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":272,\\\"hi\\\":273}\"}"
+            name: "{\"id\":\"11\",\"name\":\"f\",\"span\":\"{\\\"lo\\\":272,\\\"hi\\\":273}\"}"
             value:
               Literal:
                 Integer:
@@ -101,7 +101,7 @@ outputs:
                   - span:
                       lo: 283
                       hi: 287
-                  - 0
+                  - 12
             span:
               lo: 275
               hi: 277
@@ -112,7 +112,7 @@ outputs:
         definitions:
           - mode: None
             type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
+            name: "{\"id\":\"14\",\"name\":\"r0\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
             value:
               Literal:
                 Boolean:
@@ -120,14 +120,14 @@ outputs:
                   - span:
                       lo: 314
                       hi: 318
-                  - 0
+                  - 15
             span:
               lo: 306
               hi: 310
           - mode: None
             type_:
               Integer: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":337,\\\"hi\\\":339}\"}"
+            name: "{\"id\":\"16\",\"name\":\"r1\",\"span\":\"{\\\"lo\\\":337,\\\"hi\\\":339}\"}"
             value:
               Literal:
                 Integer:
@@ -136,13 +136,13 @@ outputs:
                   - span:
                       lo: 349
                       hi: 352
-                  - 0
+                  - 17
             span:
               lo: 341
               hi: 343
           - mode: None
             type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":374,\\\"hi\\\":376}\"}"
+            name: "{\"id\":\"18\",\"name\":\"r2\",\"span\":\"{\\\"lo\\\":374,\\\"hi\\\":376}\"}"
             value:
               Literal:
                 Field:
@@ -150,13 +150,13 @@ outputs:
                   - span:
                       lo: 386
                       hi: 392
-                  - 0
+                  - 19
             span:
               lo: 378
               hi: 383
           - mode: None
             type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":414,\\\"hi\\\":416}\"}"
+            name: "{\"id\":\"20\",\"name\":\"r3\",\"span\":\"{\\\"lo\\\":414,\\\"hi\\\":416}\"}"
             value:
               Literal:
                 Group:
@@ -176,13 +176,13 @@ outputs:
                     span:
                       lo: 426
                       hi: 437
-                    id: 0
+                    id: 21
             span:
               lo: 418
               hi: 423
           - mode: None
             type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":449,\\\"hi\\\":451}\"}"
+            name: "{\"id\":\"22\",\"name\":\"r4\",\"span\":\"{\\\"lo\\\":449,\\\"hi\\\":451}\"}"
             value:
               Literal:
                 Address:
@@ -190,14 +190,14 @@ outputs:
                   - span:
                       lo: 463
                       hi: 526
-                  - 0
+                  - 23
             span:
               lo: 453
               hi: 460
           - mode: None
             type_:
               Integer: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":528,\\\"hi\\\":530}\"}"
+            name: "{\"id\":\"24\",\"name\":\"r4\",\"span\":\"{\\\"lo\\\":528,\\\"hi\\\":530}\"}"
             value:
               Literal:
                 Integer:
@@ -206,7 +206,7 @@ outputs:
                   - span:
                       lo: 537
                       hi: 541
-                  - 0
+                  - 25
             span:
               lo: 532
               hi: 534
diff --git a/tests/expectations/parser/program/mapping.out b/tests/expectations/parser/program/mapping.out
index a87f401fb9..42165969fc 100644
--- a/tests/expectations/parser/program/mapping.out
+++ b/tests/expectations/parser/program/mapping.out
@@ -4,29 +4,29 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings:
           balances:
-            identifier: "{\"name\":\"balances\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":46}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"balances\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":46}\"}"
             key_type: Address
             value_type:
               Integer: U128
             span:
               lo: 30
               hi: 64
-            id: 0
+            id: 3
           foo:
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":82,\\\"hi\\\":85}\"}"
+            identifier: "{\"id\":\"4\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":82,\\\"hi\\\":85}\"}"
             key_type:
-              Identifier: "{\"name\":\"bar\",\"span\":\"{\\\"lo\\\":87,\\\"hi\\\":90}\"}"
+              Identifier: "{\"id\":\"5\",\"name\":\"bar\",\"span\":\"{\\\"lo\\\":87,\\\"hi\\\":90}\"}"
             value_type:
-              Identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":94,\\\"hi\\\":97}\"}"
+              Identifier: "{\"id\":\"6\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":94,\\\"hi\\\":97}\"}"
             span:
               lo: 74
               hi: 98
-            id: 0
+            id: 7
         functions: {}
         span:
           lo: 2
diff --git a/tests/expectations/parser/program/record_with_visibility.out b/tests/expectations/parser/program/record_with_visibility.out
index 1560eb1f27..c803484e48 100644
--- a/tests/expectations/parser/program/record_with_visibility.out
+++ b/tests/expectations/parser/program/record_with_visibility.out
@@ -4,24 +4,24 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs:
           token:
-            identifier: "{\"name\":\"token\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":38}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"token\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":38}\"}"
             members:
               - mode: Private
-                identifier: "{\"name\":\"owner\",\"span\":\"{\\\"lo\\\":57,\\\"hi\\\":62}\"}"
+                identifier: "{\"id\":\"3\",\"name\":\"owner\",\"span\":\"{\\\"lo\\\":57,\\\"hi\\\":62}\"}"
                 type_: Address
                 span:
                   lo: 57
                   hi: 71
-                id: 0
+                id: 4
             is_record: true
             span:
               lo: 26
               hi: 78
-            id: 0
+            id: 5
         mappings: {}
         functions: {}
         span:
diff --git a/tests/expectations/parser/program/struct_with_visibility.out b/tests/expectations/parser/program/struct_with_visibility.out
index 2fce76c4d6..39d6f558c4 100644
--- a/tests/expectations/parser/program/struct_with_visibility.out
+++ b/tests/expectations/parser/program/struct_with_visibility.out
@@ -4,39 +4,39 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs:
           foo:
-            identifier: "{\"name\":\"foo\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":36}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"foo\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":36}\"}"
             members:
               - mode: Public
-                identifier: "{\"name\":\"baz\",\"span\":\"{\\\"lo\\\":54,\\\"hi\\\":57}\"}"
+                identifier: "{\"id\":\"3\",\"name\":\"baz\",\"span\":\"{\\\"lo\\\":54,\\\"hi\\\":57}\"}"
                 type_: Address
                 span:
                   lo: 54
                   hi: 66
-                id: 0
+                id: 4
               - mode: Private
-                identifier: "{\"name\":\"floo\",\"span\":\"{\\\"lo\\\":84,\\\"hi\\\":88}\"}"
+                identifier: "{\"id\":\"5\",\"name\":\"floo\",\"span\":\"{\\\"lo\\\":84,\\\"hi\\\":88}\"}"
                 type_:
                   Integer: U64
                 span:
                   lo: 84
                   hi: 93
-                id: 0
+                id: 6
               - mode: None
-                identifier: "{\"name\":\"data\",\"span\":\"{\\\"lo\\\":103,\\\"hi\\\":107}\"}"
+                identifier: "{\"id\":\"7\",\"name\":\"data\",\"span\":\"{\\\"lo\\\":103,\\\"hi\\\":107}\"}"
                 type_: Boolean
                 span:
                   lo: 103
                   hi: 113
-                id: 0
+                id: 8
             is_record: false
             span:
               lo: 26
               hi: 120
-            id: 0
+            id: 9
         mappings: {}
         functions: {}
         span:
diff --git a/tests/expectations/parser/serialize/one_plus_one.out b/tests/expectations/parser/serialize/one_plus_one.out
index d7828efd60..7418cafdad 100644
--- a/tests/expectations/parser/serialize/one_plus_one.out
+++ b/tests/expectations/parser/serialize/one_plus_one.out
@@ -4,22 +4,22 @@ expectation: Pass
 outputs:
   - imports: {}
     program_scopes:
-      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
-        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
+      "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}":
+        program_id: "{\"name\":\"test\",\"network\":\"\\\"{\\\\\\\"id\\\\\\\":\\\\\\\"1\\\\\\\",\\\\\\\"name\\\\\\\":\\\\\\\"aleo\\\\\\\",\\\\\\\"span\\\\\\\":\\\\\\\"{\\\\\\\\\\\\\\\"lo\\\\\\\\\\\\\\\":15,\\\\\\\\\\\\\\\"hi\\\\\\\\\\\\\\\":19}\\\\\\\"}\\\"\"}"
         structs: {}
         mappings: {}
         functions:
           main:
             annotations: []
             variant: Standard
-            identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":39}\"}"
+            identifier: "{\"id\":\"2\",\"name\":\"main\",\"span\":\"{\\\"lo\\\":35,\\\"hi\\\":39}\"}"
             input: []
             output:
               - Internal:
                   mode: None
                   type_:
                     Integer: U8
-                  id: 0
+                  id: 3
             output_type:
               Integer: U8
             block:
@@ -32,17 +32,17 @@ outputs:
                             Integer:
                               - U8
                               - "1"
-                              - 0
+                              - 4
                         right:
                           Literal:
                             Integer:
                               - U8
                               - "1"
-                              - 0
+                              - 5
                         op: Add
-                        id: 0
+                        id: 6
                     finalize_arguments: ~
-                    id: 0
-              id: 0
+                    id: 7
+              id: 8
             finalize: ~
-            id: 0
+            id: 9
diff --git a/tests/expectations/parser/statement/assert.out b/tests/expectations/parser/statement/assert.out
index 46ed02b465..7be38ce360 100644
--- a/tests/expectations/parser/statement/assert.out
+++ b/tests/expectations/parser/statement/assert.out
@@ -5,56 +5,56 @@ outputs:
   - Assert:
       variant:
         AssertEq:
-          - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
-          - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+          - Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":11}\"}"
+          - Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 2
   - Assert:
       variant:
         AssertEq:
           - Struct:
-              name: "{\"name\":\"Foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
+              name: "{\"id\":\"0\",\"name\":\"Foo\",\"span\":\"{\\\"lo\\\":10,\\\"hi\\\":13}\"}"
               members:
-                - identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+                - identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
                   expression:
-                    Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
+                    Identifier: "{\"id\":\"2\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
                   span:
                     lo: 16
                     hi: 20
-                  id: 0
+                  id: 3
               span:
                 lo: 10
                 hi: 22
-              id: 0
+              id: 4
           - Struct:
-              name: "{\"name\":\"Foo\",\"span\":\"{\\\"lo\\\":24,\\\"hi\\\":27}\"}"
+              name: "{\"id\":\"5\",\"name\":\"Foo\",\"span\":\"{\\\"lo\\\":24,\\\"hi\\\":27}\"}"
               members:
-                - identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":30,\\\"hi\\\":31}\"}"
+                - identifier: "{\"id\":\"6\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":30,\\\"hi\\\":31}\"}"
                   expression:
-                    Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
+                    Identifier: "{\"id\":\"7\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":33,\\\"hi\\\":34}\"}"
                   span:
                     lo: 30
                     hi: 34
-                  id: 0
+                  id: 8
               span:
                 lo: 24
                 hi: 36
-              id: 0
+              id: 9
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 10
   - Assert:
       variant:
         AssertNeq:
-          - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
-          - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
+          - Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
+          - Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 2
   - Assert:
       variant:
         Assert:
@@ -68,4 +68,4 @@ outputs:
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 1
diff --git a/tests/expectations/parser/statement/assign.out b/tests/expectations/parser/statement/assign.out
index e985533c57..3f9b9c8a90 100644
--- a/tests/expectations/parser/statement/assign.out
+++ b/tests/expectations/parser/statement/assign.out
@@ -4,45 +4,45 @@ expectation: Pass
 outputs:
   - Assign:
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":8}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":8}\"}"
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Add
           span:
             lo: 4
             hi: 7
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 5
   - Assign:
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           arguments: []
           external: ~
           span:
             lo: 4
             hi: 7
-          id: 0
+          id: 2
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 4
diff --git a/tests/expectations/parser/statement/block.out b/tests/expectations/parser/statement/block.out
index 5d0566b902..07684edeff 100644
--- a/tests/expectations/parser/statement/block.out
+++ b/tests/expectations/parser/statement/block.out
@@ -24,11 +24,11 @@ outputs:
             span:
               lo: 2
               hi: 13
-            id: 0
+            id: 1
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 2
   - Block:
       statements:
         - Block:
@@ -40,7 +40,7 @@ outputs:
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 1
   - Block:
       statements:
         - Block:
@@ -59,20 +59,20 @@ outputs:
                   span:
                     lo: 4
                     hi: 15
-                  id: 0
+                  id: 1
             span:
               lo: 2
               hi: 17
-            id: 0
+            id: 2
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 3
   - Block:
       statements:
         - Conditional:
             condition:
-              Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+              Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
             then:
               statements:
                 - Return:
@@ -84,22 +84,22 @@ outputs:
                           - span:
                               lo: 16
                               hi: 19
-                          - 0
+                          - 1
                     finalize_arguments: ~
                     span:
                       lo: 9
                       hi: 20
-                    id: 0
+                    id: 2
               span:
                 lo: 7
                 hi: 22
-              id: 0
+              id: 3
             otherwise: ~
             span:
               lo: 2
               hi: 22
-            id: 0
+            id: 4
       span:
         lo: 0
         hi: 24
-      id: 0
+      id: 5
diff --git a/tests/expectations/parser/statement/conditional.out b/tests/expectations/parser/statement/conditional.out
index 778a3d5c76..11f5c90d8c 100644
--- a/tests/expectations/parser/statement/conditional.out
+++ b/tests/expectations/parser/statement/conditional.out
@@ -4,7 +4,7 @@ expectation: Pass
 outputs:
   - Conditional:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
       then:
         statements:
           - Return:
@@ -16,24 +16,24 @@ outputs:
                     - span:
                         lo: 14
                         hi: 17
-                    - 0
+                    - 1
               finalize_arguments: ~
               span:
                 lo: 7
                 hi: 18
-              id: 0
+              id: 2
         span:
           lo: 5
           hi: 20
-        id: 0
+        id: 3
       otherwise: ~
       span:
         lo: 0
         hi: 20
-      id: 0
+      id: 4
   - Conditional:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       then:
         statements:
           - Return:
@@ -45,105 +45,105 @@ outputs:
                     - span:
                         lo: 16
                         hi: 19
-                    - 0
+                    - 1
               finalize_arguments: ~
               span:
                 lo: 9
                 hi: 20
-              id: 0
+              id: 2
         span:
           lo: 7
           hi: 22
-        id: 0
+        id: 3
       otherwise: ~
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 4
   - Conditional:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       then:
         statements: []
         span:
           lo: 7
           hi: 9
-        id: 0
+        id: 1
       otherwise:
         Block:
           statements: []
           span:
             lo: 15
             hi: 17
-          id: 0
+          id: 2
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 3
   - Conditional:
       condition:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
           op: Add
           span:
             lo: 3
             hi: 6
-          id: 0
+          id: 2
       then:
         statements: []
         span:
           lo: 7
           hi: 9
-        id: 0
+        id: 3
       otherwise:
         Conditional:
           condition:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
+                Identifier: "{\"id\":\"4\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               right:
-                Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+                Identifier: "{\"id\":\"5\",\"name\":\"z\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
               op: Add
               span:
                 lo: 18
                 hi: 21
-              id: 0
+              id: 6
           then:
             statements: []
             span:
               lo: 22
               hi: 24
-            id: 0
+            id: 7
           otherwise:
             Block:
               statements: []
               span:
                 lo: 30
                 hi: 32
-              id: 0
+              id: 8
           span:
             lo: 15
             hi: 32
-          id: 0
+          id: 9
       span:
         lo: 0
         hi: 32
-      id: 0
+      id: 10
   - Conditional:
       condition:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
           op: Add
           span:
             lo: 3
             hi: 6
-          id: 0
+          id: 2
       then:
         statements:
           - Return:
@@ -155,18 +155,18 @@ outputs:
                     - span:
                         lo: 16
                         hi: 19
-                    - 0
+                    - 3
               finalize_arguments: ~
               span:
                 lo: 9
                 hi: 20
-              id: 0
+              id: 4
         span:
           lo: 7
           hi: 22
-        id: 0
+        id: 5
       otherwise: ~
       span:
         lo: 0
         hi: 22
-      id: 0
+      id: 6
diff --git a/tests/expectations/parser/statement/definition.out b/tests/expectations/parser/statement/definition.out
index edd7936c69..e9e61303af 100644
--- a/tests/expectations/parser/statement/definition.out
+++ b/tests/expectations/parser/statement/definition.out
@@ -5,241 +5,241 @@ outputs:
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U16
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: Add
           span:
             lo: 13
             hi: 16
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           arguments: []
           external: ~
           span:
             lo: 12
             hi: 15
-          id: 0
+          id: 2
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 3
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_: String
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":20}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":20}\"}"
       span:
         lo: 0
         hi: 20
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: I8
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: I16
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: Add
           span:
             lo: 13
             hi: 16
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: I8
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           arguments: []
           external: ~
           span:
             lo: 12
             hi: 15
-          id: 0
+          id: 2
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 3
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_: String
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":20}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":20}\"}"
       span:
         lo: 0
         hi: 20
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U32
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U32
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: Add
           span:
             lo: 13
             hi: 16
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U32
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           arguments: []
           external: ~
           span:
             lo: 13
             hi: 16
-          id: 0
+          id: 2
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 3
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U32
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U32
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: Add
           span:
             lo: 13
             hi: 16
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U32
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           arguments: []
           external: ~
           span:
             lo: 13
             hi: 16
-          id: 0
+          id: 2
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 3
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_: Address
       value:
         Literal:
@@ -248,8 +248,8 @@ outputs:
             - span:
                 lo: 17
                 hi: 80
-            - 0
+            - 1
       span:
         lo: 0
         hi: 80
-      id: 0
+      id: 2
diff --git a/tests/expectations/parser/statement/expression.out b/tests/expectations/parser/statement/expression.out
index 65f436ab35..5566d0a6b2 100644
--- a/tests/expectations/parser/statement/expression.out
+++ b/tests/expectations/parser/statement/expression.out
@@ -4,39 +4,39 @@ expectation: Pass
 outputs:
   - Expression:
       expression:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       span:
         lo: 0
         hi: 5
-      id: 0
+      id: 1
   - Expression:
       expression:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Add
           span:
             lo: 0
             hi: 3
-          id: 0
+          id: 2
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 3
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
+            Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           arguments: []
           external: ~
           span:
             lo: 0
             hi: 3
-          id: 0
+          id: 1
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 2
diff --git a/tests/expectations/parser/statement/iteration.out b/tests/expectations/parser/statement/iteration.out
index e167505458..cc0f5850f9 100644
--- a/tests/expectations/parser/statement/iteration.out
+++ b/tests/expectations/parser/statement/iteration.out
@@ -3,7 +3,7 @@ namespace: ParseStatement
 expectation: Pass
 outputs:
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+      variable: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       start:
@@ -14,7 +14,7 @@ outputs:
             - span:
                 lo: 13
                 hi: 16
-            - 0
+            - 1
       stop:
         Literal:
           Integer:
@@ -23,20 +23,20 @@ outputs:
             - span:
                 lo: 18
                 hi: 21
-            - 0
+            - 2
       inclusive: false
       block:
         statements: []
         span:
           lo: 22
           hi: 24
-        id: 0
+        id: 3
       span:
         lo: 0
         hi: 24
-      id: 0
+      id: 4
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+      variable: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: I64
       start:
@@ -47,7 +47,7 @@ outputs:
             - span:
                 lo: 14
                 hi: 18
-            - 0
+            - 1
       stop:
         Literal:
           Integer:
@@ -56,7 +56,7 @@ outputs:
             - span:
                 lo: 20
                 hi: 24
-            - 0
+            - 2
       inclusive: false
       block:
         statements:
@@ -69,22 +69,22 @@ outputs:
                     - span:
                         lo: 34
                         hi: 37
-                    - 0
+                    - 3
               finalize_arguments: ~
               span:
                 lo: 27
                 hi: 38
-              id: 0
+              id: 4
         span:
           lo: 25
           hi: 40
-        id: 0
+        id: 5
       span:
         lo: 0
         hi: 40
-      id: 0
+      id: 6
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+      variable: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_: Field
       start:
         Literal:
@@ -93,7 +93,7 @@ outputs:
             - span:
                 lo: 16
                 hi: 22
-            - 0
+            - 1
       stop:
         Literal:
           Integer:
@@ -102,7 +102,7 @@ outputs:
             - span:
                 lo: 24
                 hi: 28
-            - 0
+            - 2
       inclusive: false
       block:
         statements:
@@ -115,22 +115,22 @@ outputs:
                     - span:
                         lo: 38
                         hi: 41
-                    - 0
+                    - 3
               finalize_arguments: ~
               span:
                 lo: 31
                 hi: 42
-              id: 0
+              id: 4
         span:
           lo: 29
           hi: 44
-        id: 0
+        id: 5
       span:
         lo: 0
         hi: 44
-      id: 0
+      id: 6
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+      variable: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_: Boolean
       start:
         Literal:
@@ -140,9 +140,9 @@ outputs:
             - span:
                 lo: 15
                 hi: 18
-            - 0
+            - 1
       stop:
-        Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":24}\"}"
+        Identifier: "{\"id\":\"2\",\"name\":\"Self\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":24}\"}"
       inclusive: false
       block:
         statements:
@@ -155,17 +155,17 @@ outputs:
                     - span:
                         lo: 34
                         hi: 37
-                    - 0
+                    - 3
               finalize_arguments: ~
               span:
                 lo: 27
                 hi: 38
-              id: 0
+              id: 4
         span:
           lo: 25
           hi: 40
-        id: 0
+        id: 5
       span:
         lo: 0
         hi: 40
-      id: 0
+      id: 6
diff --git a/tests/expectations/parser/statement/return.out b/tests/expectations/parser/statement/return.out
index aa03cf2213..2668dd24d5 100644
--- a/tests/expectations/parser/statement/return.out
+++ b/tests/expectations/parser/statement/return.out
@@ -4,12 +4,12 @@ expectation: Pass
 outputs:
   - Return:
       expression:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":11}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"expr\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":11}\"}"
       finalize_arguments: ~
       span:
         lo: 0
         hi: 12
-      id: 0
+      id: 1
   - Return:
       expression:
         Literal:
@@ -24,4 +24,4 @@ outputs:
       span:
         lo: 0
         hi: 11
-      id: 0
+      id: 1
diff --git a/tests/expectations/parser/unreachable/math_op_pass.out b/tests/expectations/parser/unreachable/math_op_pass.out
index f0b05f39eb..85f45119ac 100644
--- a/tests/expectations/parser/unreachable/math_op_pass.out
+++ b/tests/expectations/parser/unreachable/math_op_pass.out
@@ -5,336 +5,336 @@ outputs:
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Eq
           span:
             lo: 12
             hi: 18
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Neq
           span:
             lo: 12
             hi: 18
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: Gt
           span:
             lo: 12
             hi: 17
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Gte
           span:
             lo: 12
             hi: 18
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: Lt
           span:
             lo: 12
             hi: 17
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Lte
           span:
             lo: 12
             hi: 18
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 4
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
+            Identifier: "{\"id\":\"1\",\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
+            Identifier: "{\"id\":\"2\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: Gt
           span:
             lo: 12
             hi: 17
-          id: 0
+          id: 3
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 4
   - Assign:
       place:
-        Identifier: "{\"name\":\"x_\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x_\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xconsole\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":8}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xconsole\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":8}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       span:
         lo: 0
         hi: 10
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xconst\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xconst\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xlet\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xlet\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xfor\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xfor\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xif\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xif\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       span:
         lo: 0
         hi: 5
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xelse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xelse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xi8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xi8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       span:
         lo: 0
         hi: 5
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xi16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xi16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xi32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xi32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xi64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xi64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xi128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xi128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xu8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xu8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       span:
         lo: 0
         hi: 5
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xu16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xu16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xu32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xu32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xu64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xu64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
         lo: 0
         hi: 6
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xu128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xu128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xreturn\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":7}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xreturn\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":7}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       span:
         lo: 0
         hi: 9
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xtrue\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xtrue\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
         lo: 0
         hi: 7
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"xfalse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"xfalse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
       span:
         lo: 0
         hi: 8
-      id: 0
+      id: 3
   - Assign:
       place:
-        Identifier: "{\"name\":\"x0\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x0\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
       span:
         lo: 0
         hi: 4
-      id: 0
+      id: 3
diff --git a/tests/expectations/parser/unreachable/postfix_pass.out b/tests/expectations/parser/unreachable/postfix_pass.out
index a2c2f380c5..c8f6b716d8 100644
--- a/tests/expectations/parser/unreachable/postfix_pass.out
+++ b/tests/expectations/parser/unreachable/postfix_pass.out
@@ -5,300 +5,300 @@ outputs:
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aimport\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aimport\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"a_\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"a_\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
       span:
         lo: 0
         hi: 14
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aas\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aas\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aconsole\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":20}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aconsole\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":20}\"}"
       span:
         lo: 0
         hi: 20
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aconst\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aconst\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"alet\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"alet\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"afor\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"afor\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aif\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aif\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aelse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aelse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"ai8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"ai8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"ai16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"ai16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"ai32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"ai32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"ai64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"ai64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"ai128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"ai128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"au8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"au8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
         lo: 0
         hi: 15
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"au16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"au16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"au32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"au32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"au64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"au64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
         lo: 0
         hi: 16
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"au128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"au128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"areturn\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"areturn\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
       span:
         lo: 0
         hi: 19
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aself\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aself\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"aSelf\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"aSelf\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"atrue\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"atrue\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
         lo: 0
         hi: 17
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"afalse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"afalse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
       span:
         lo: 0
         hi: 18
-      id: 0
+      id: 2
   - Definition:
       declaration_type: Let
       place:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
+        Identifier: "{\"id\":\"0\",\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         Integer: U8
       value:
-        Identifier: "{\"name\":\"a0\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
+        Identifier: "{\"id\":\"1\",\"name\":\"a0\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
       span:
         lo: 0
         hi: 14
-      id: 0
+      id: 2
diff --git a/tests/test-framework/benches/leo_compiler.rs b/tests/test-framework/benches/leo_compiler.rs
index 1670998e8c..d74d764c2b 100644
--- a/tests/test-framework/benches/leo_compiler.rs
+++ b/tests/test-framework/benches/leo_compiler.rs
@@ -216,9 +216,9 @@ impl Sample {
             let (symbol_table, _struct_graph, _call_graph) =
                 compiler.type_checker_pass(symbol_table).expect("failed to run type check pass");
             let symbol_table = compiler.loop_unrolling_pass(symbol_table).expect("failed to run loop unrolling pass");
-            let assigner = compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
+            compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
             let start = Instant::now();
-            let out = compiler.flattening_pass(&symbol_table, assigner);
+            let out = compiler.flattening_pass(&symbol_table);
             let time = start.elapsed();
             out.expect("failed to run flattener pass");
             time
@@ -231,10 +231,10 @@ impl Sample {
             let (symbol_table, _struct_graph, call_graph) =
                 compiler.type_checker_pass(symbol_table).expect("failed to run type check pass");
             let symbol_table = compiler.loop_unrolling_pass(symbol_table).expect("failed to run loop unrolling pass");
-            let assigner = compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
-            let assigner = compiler.flattening_pass(&symbol_table, assigner).expect("failed to run flattener pass");
+            compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
+            compiler.flattening_pass(&symbol_table).expect("failed to run flattener pass");
             let start = Instant::now();
-            let out = compiler.function_inlining_pass(&call_graph, assigner);
+            let out = compiler.function_inlining_pass(&call_graph);
             let time = start.elapsed();
             out.expect("failed to run inliner pass");
             time
@@ -247,9 +247,9 @@ impl Sample {
             let (symbol_table, _struct_graph, call_graph) =
                 compiler.type_checker_pass(symbol_table).expect("failed to run type check pass");
             let symbol_table = compiler.loop_unrolling_pass(symbol_table).expect("failed to run loop unrolling pass");
-            let assigner = compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
-            let assigner = compiler.flattening_pass(&symbol_table, assigner).expect("failed to run flattener pass");
-            let _ = compiler.function_inlining_pass(&call_graph, assigner).expect("failed to run inliner pass");
+            compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
+            compiler.flattening_pass(&symbol_table).expect("failed to run flattener pass");
+            compiler.function_inlining_pass(&call_graph).expect("failed to run inliner pass");
             let start = Instant::now();
             let out = compiler.dead_code_elimination_pass();
             let time = start.elapsed();
@@ -264,9 +264,9 @@ impl Sample {
             let (symbol_table, struct_graph, call_graph) =
                 compiler.type_checker_pass(symbol_table).expect("failed to run type check pass");
             let symbol_table = compiler.loop_unrolling_pass(symbol_table).expect("failed to run loop unrolling pass");
-            let assigner = compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
-            let assigner = compiler.flattening_pass(&symbol_table, assigner).expect("failed to run flattener pass");
-            let _ = compiler.function_inlining_pass(&call_graph, assigner).expect("failed to run inliner pass");
+            compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
+            compiler.flattening_pass(&symbol_table).expect("failed to run flattener pass");
+            compiler.function_inlining_pass(&call_graph).expect("failed to run inliner pass");
             compiler.dead_code_elimination_pass().expect("failed to run dce pass");
             let start = Instant::now();
             let out = compiler.code_generation_pass(&symbol_table, &struct_graph, &call_graph);
@@ -285,9 +285,9 @@ impl Sample {
             let (symbol_table, struct_graph, call_graph) =
                 compiler.type_checker_pass(symbol_table).expect("failed to run type check pass");
             let symbol_table = compiler.loop_unrolling_pass(symbol_table).expect("failed to run loop unrolling pass");
-            let assigner = compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
-            let assigner = compiler.flattening_pass(&symbol_table, assigner).expect("failed to run flattening pass");
-            compiler.function_inlining_pass(&call_graph, assigner).expect("failed to run function inlining pass");
+            compiler.static_single_assignment_pass(&symbol_table).expect("failed to run ssa pass");
+            compiler.flattening_pass(&symbol_table).expect("failed to run flattening pass");
+            compiler.function_inlining_pass(&call_graph).expect("failed to run function inlining pass");
             compiler.dead_code_elimination_pass().expect("failed to run dce pass");
             compiler
                 .code_generation_pass(&symbol_table, &struct_graph, &call_graph)