diff --git a/compiler/ast/src/common/identifier.rs b/compiler/ast/src/common/identifier.rs
index a3937c0bc0..d32d8b1a5d 100644
--- a/compiler/ast/src/common/identifier.rs
+++ b/compiler/ast/src/common/identifier.rs
@@ -17,7 +17,7 @@
 use leo_errors::Result;
 use leo_span::{Span, Symbol};
 
-use crate::Node;
+use crate::{simple_node_impl, Node};
 use serde::{
     de::{
         Visitor, {self},
@@ -43,15 +43,7 @@ pub struct Identifier {
     pub span: Span,
 }
 
-impl Node for Identifier {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+simple_node_impl!(Identifier);
 
 impl Identifier {
     /// Constructs a new identifier with `name` and a default span.
diff --git a/compiler/ast/src/expression/binary.rs b/compiler/ast/src/expression/binary.rs
index f183626566..52ac5b40ec 100644
--- a/compiler/ast/src/expression/binary.rs
+++ b/compiler/ast/src/expression/binary.rs
@@ -120,12 +120,4 @@ impl fmt::Display for BinaryExpression {
     }
 }
 
-impl Node for BinaryExpression {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(BinaryExpression);
diff --git a/compiler/ast/src/expression/call.rs b/compiler/ast/src/expression/call.rs
index 2670141391..8d1dec4613 100644
--- a/compiler/ast/src/expression/call.rs
+++ b/compiler/ast/src/expression/call.rs
@@ -41,12 +41,4 @@ impl fmt::Display for CallExpression {
     }
 }
 
-impl Node for CallExpression {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(CallExpression);
diff --git a/compiler/ast/src/expression/err.rs b/compiler/ast/src/expression/err.rs
index 23c94eeeeb..b665192a58 100644
--- a/compiler/ast/src/expression/err.rs
+++ b/compiler/ast/src/expression/err.rs
@@ -29,12 +29,4 @@ impl fmt::Display for ErrExpression {
     }
 }
 
-impl Node for ErrExpression {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(ErrExpression);
diff --git a/compiler/ast/src/expression/mod.rs b/compiler/ast/src/expression/mod.rs
index 601b29c914..4b6ee17b44 100644
--- a/compiler/ast/src/expression/mod.rs
+++ b/compiler/ast/src/expression/mod.rs
@@ -54,9 +54,9 @@ pub enum Expression {
 }
 
 impl Node for Expression {
-    fn span(&self) -> &Span {
+    fn span(&self) -> Span {
         use Expression::*;
-        match &self {
+        match self {
             Identifier(n) => n.span(),
             Value(n) => n.span(),
             Binary(n) => n.span(),
diff --git a/compiler/ast/src/expression/ternary.rs b/compiler/ast/src/expression/ternary.rs
index 55b17a0630..43c32eb748 100644
--- a/compiler/ast/src/expression/ternary.rs
+++ b/compiler/ast/src/expression/ternary.rs
@@ -35,12 +35,4 @@ impl fmt::Display for TernaryExpression {
     }
 }
 
-impl Node for TernaryExpression {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(TernaryExpression);
diff --git a/compiler/ast/src/expression/unary.rs b/compiler/ast/src/expression/unary.rs
index d0abc53fef..b1bb1e68c6 100644
--- a/compiler/ast/src/expression/unary.rs
+++ b/compiler/ast/src/expression/unary.rs
@@ -52,12 +52,4 @@ impl fmt::Display for UnaryExpression {
     }
 }
 
-impl Node for UnaryExpression {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(UnaryExpression);
diff --git a/compiler/ast/src/expression/value.rs b/compiler/ast/src/expression/value.rs
index 550b947c1b..6c2248e940 100644
--- a/compiler/ast/src/expression/value.rs
+++ b/compiler/ast/src/expression/value.rs
@@ -60,14 +60,14 @@ impl fmt::Display for ValueExpression {
 }
 
 impl Node for ValueExpression {
-    fn span(&self) -> &Span {
+    fn span(&self) -> Span {
         use ValueExpression::*;
         match &self {
-            Address(_, span) | Boolean(_, span) | Field(_, span) | Integer(_, _, span) | String(_, span) => span,
-            Char(character) => &character.span,
+            Address(_, span) | Boolean(_, span) | Field(_, span) | Integer(_, _, span) | String(_, span) => *span,
+            Char(character) => character.span,
             Group(group) => match &**group {
-                GroupValue::Single(_, span) => span,
-                GroupValue::Tuple(tuple) => &tuple.span,
+                GroupValue::Single(_, span) => *span,
+                GroupValue::Tuple(tuple) => tuple.span,
             },
         }
     }
diff --git a/compiler/ast/src/functions/function.rs b/compiler/ast/src/functions/function.rs
index 0aae9a2d49..8b1cb057d6 100644
--- a/compiler/ast/src/functions/function.rs
+++ b/compiler/ast/src/functions/function.rs
@@ -82,12 +82,4 @@ impl fmt::Debug for Function {
     }
 }
 
-impl Node for Function {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(Function);
diff --git a/compiler/ast/src/functions/input/function_input.rs b/compiler/ast/src/functions/input/function_input.rs
index def6089a4c..0c7ee2ab51 100644
--- a/compiler/ast/src/functions/input/function_input.rs
+++ b/compiler/ast/src/functions/input/function_input.rs
@@ -87,12 +87,4 @@ impl fmt::Debug for FunctionInputVariable {
     }
 }
 
-impl Node for FunctionInputVariable {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(FunctionInputVariable);
diff --git a/compiler/ast/src/functions/input/input_variable.rs b/compiler/ast/src/functions/input/input_variable.rs
index 9317cb7b23..9a924f44e1 100644
--- a/compiler/ast/src/functions/input/input_variable.rs
+++ b/compiler/ast/src/functions/input/input_variable.rs
@@ -70,10 +70,10 @@ impl PartialEq for FunctionInput {
 impl Eq for FunctionInput {}
 
 impl Node for FunctionInput {
-    fn span(&self) -> &Span {
+    fn span(&self) -> Span {
         use FunctionInput::*;
         match self {
-            Variable(variable) => &variable.span,
+            Variable(variable) => variable.span,
         }
     }
 
diff --git a/compiler/ast/src/input/input_value.rs b/compiler/ast/src/input/input_value.rs
index b5dc1c904a..8a2687b592 100644
--- a/compiler/ast/src/input/input_value.rs
+++ b/compiler/ast/src/input/input_value.rs
@@ -38,7 +38,7 @@ impl TryFrom<(Type, Expression)> for InputValue {
                 match (type_, value) {
                     (Type::Address, ValueExpression::Address(value, _)) => Self::Address(value),
                     (Type::Boolean, ValueExpression::Boolean(value, span)) => {
-                        let bool_value = value.parse::<bool>().map_err(|_| ParserError::unexpected_eof(&span))?; // TODO: change error
+                        let bool_value = value.parse::<bool>().map_err(|_| ParserError::unexpected_eof(span))?; // TODO: change error
                         Self::Boolean(bool_value)
                     }
                     (Type::Char, ValueExpression::Char(value)) => Self::Char(value),
@@ -48,7 +48,7 @@ impl TryFrom<(Type, Expression)> for InputValue {
                         if expected == actual {
                             Self::Integer(expected, value)
                         } else {
-                            return Err(InputError::unexpected_type(expected.to_string(), actual, &span).into());
+                            return Err(InputError::unexpected_type(expected.to_string(), actual, span).into());
                         }
                     }
                     (x, y) => {
diff --git a/compiler/ast/src/input/program_input.rs b/compiler/ast/src/input/program_input.rs
index 858bdb2a03..55ab527c98 100644
--- a/compiler/ast/src/input/program_input.rs
+++ b/compiler/ast/src/input/program_input.rs
@@ -35,7 +35,7 @@ impl TryFrom<InputAst> for ProgramInput {
                 sym::registers => &mut registers,
                 _ => {
                     return Err(
-                        InputError::unexpected_section(&["main", "registers"], section.name, &section.span).into(),
+                        InputError::unexpected_section(&["main", "registers"], section.name, section.span).into(),
                     )
                 }
             };
diff --git a/compiler/ast/src/input/program_state.rs b/compiler/ast/src/input/program_state.rs
index 6d12aa2bae..b3ecc3a644 100644
--- a/compiler/ast/src/input/program_state.rs
+++ b/compiler/ast/src/input/program_state.rs
@@ -39,7 +39,7 @@ impl TryFrom<InputAst> for ProgramState {
                 return Err(InputError::unexpected_section(
                     &["state", "record", "state_leaf"],
                     section.name,
-                    &section.span,
+                    section.span,
                 )
                 .into());
             }
diff --git a/compiler/ast/src/node.rs b/compiler/ast/src/node.rs
index be0c100b9c..71f4c56700 100644
--- a/compiler/ast/src/node.rs
+++ b/compiler/ast/src/node.rs
@@ -21,8 +21,23 @@ pub trait Node:
     std::fmt::Debug + std::fmt::Display + Clone + PartialEq + Eq + serde::Serialize + serde::de::DeserializeOwned
 {
     /// Returns the span of the node.
-    fn span(&self) -> &Span;
+    fn span(&self) -> Span;
 
     /// Sets the span of the node.
     fn set_span(&mut self, span: Span);
 }
+
+#[macro_export]
+macro_rules! simple_node_impl {
+    ($ty:ty) => {
+        impl Node for $ty {
+            fn span(&self) -> Span {
+                self.span
+            }
+
+            fn set_span(&mut self, span: Span) {
+                self.span = span;
+            }
+        }
+    };
+}
diff --git a/compiler/ast/src/passes/reconstructing_director.rs b/compiler/ast/src/passes/reconstructing_director.rs
index d77551b5c5..5cd29a1510 100644
--- a/compiler/ast/src/passes/reconstructing_director.rs
+++ b/compiler/ast/src/passes/reconstructing_director.rs
@@ -206,7 +206,7 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
 
     pub fn reduce_iteration(&mut self, iteration: &IterationStatement) -> Result<IterationStatement> {
         let variable = self.reduce_identifier(&iteration.variable)?;
-        let type_ = self.reduce_type(&iteration.type_, iteration.span())?;
+        let type_ = self.reduce_type(&iteration.type_, &iteration.span())?;
         let start = self.reduce_expression(&iteration.start)?;
         let stop = self.reduce_expression(&iteration.stop)?;
         let block = self.reduce_block(&iteration.block)?;
@@ -227,13 +227,13 @@ impl<R: ReconstructingReducer> ReconstructingDirector<R> {
                 let formatted = ConsoleArgs {
                     string: args.string.clone(),
                     parameters,
-                    span: args.span.clone(),
+                    span: args.span,
                 };
 
                 match &console_function_call.function {
                     ConsoleFunction::Error(_) => ConsoleFunction::Error(formatted),
                     ConsoleFunction::Log(_) => ConsoleFunction::Log(formatted),
-                    _ => return Err(AstError::impossible_console_assert_call(&args.span).into()),
+                    _ => return Err(AstError::impossible_console_assert_call(args.span).into()),
                 }
             }
         };
diff --git a/compiler/ast/src/passes/reconstructing_reducer.rs b/compiler/ast/src/passes/reconstructing_reducer.rs
index 1290f03788..5284ba47b5 100644
--- a/compiler/ast/src/passes/reconstructing_reducer.rs
+++ b/compiler/ast/src/passes/reconstructing_reducer.rs
@@ -43,7 +43,7 @@ pub trait ReconstructingReducer {
     fn reduce_identifier(&mut self, identifier: &Identifier) -> Result<Identifier> {
         Ok(Identifier {
             name: identifier.name,
-            span: identifier.span.clone(),
+            span: identifier.span,
         })
     }
 
@@ -51,7 +51,7 @@ pub trait ReconstructingReducer {
         Ok(GroupTuple {
             x: group_tuple.x.clone(),
             y: group_tuple.y.clone(),
-            span: group_tuple.span.clone(),
+            span: group_tuple.span,
         })
     }
 
@@ -60,10 +60,7 @@ pub trait ReconstructingReducer {
     }
 
     fn reduce_string(&mut self, string: &[Char], span: &Span) -> Result<Expression> {
-        Ok(Expression::Value(ValueExpression::String(
-            string.to_vec(),
-            span.clone(),
-        )))
+        Ok(Expression::Value(ValueExpression::String(string.to_vec(), *span)))
     }
 
     fn reduce_value(&mut self, _value: &ValueExpression, new: Expression) -> Result<Expression> {
@@ -81,7 +78,7 @@ pub trait ReconstructingReducer {
             left: Box::new(left),
             right: Box::new(right),
             op,
-            span: binary.span.clone(),
+            span: binary.span,
         })
     }
 
@@ -94,7 +91,7 @@ pub trait ReconstructingReducer {
         Ok(UnaryExpression {
             inner: Box::new(inner),
             op,
-            span: unary.span.clone(),
+            span: unary.span,
         })
     }
 
@@ -109,7 +106,7 @@ pub trait ReconstructingReducer {
             condition: Box::new(condition),
             if_true: Box::new(if_true),
             if_false: Box::new(if_false),
-            span: ternary.span.clone(),
+            span: ternary.span,
         })
     }
 
@@ -122,7 +119,7 @@ pub trait ReconstructingReducer {
         Ok(CallExpression {
             function: Box::new(function),
             arguments,
-            span: call.span.clone(),
+            span: call.span,
         })
     }
 
@@ -134,7 +131,7 @@ pub trait ReconstructingReducer {
     fn reduce_return(&mut self, return_statement: &ReturnStatement, expression: Expression) -> Result<ReturnStatement> {
         Ok(ReturnStatement {
             expression,
-            span: return_statement.span.clone(),
+            span: return_statement.span,
         })
     }
 
@@ -142,7 +139,7 @@ pub trait ReconstructingReducer {
         Ok(VariableName {
             mutable: variable_name.mutable,
             identifier,
-            span: variable_name.span.clone(),
+            span: variable_name.span,
         })
     }
 
@@ -158,7 +155,7 @@ pub trait ReconstructingReducer {
             variable_names,
             type_,
             value,
-            span: definition.span.clone(),
+            span: definition.span,
         })
     }
 
@@ -175,7 +172,7 @@ pub trait ReconstructingReducer {
         Ok(Assignee {
             identifier,
             accesses,
-            span: assignee.span.clone(),
+            span: assignee.span,
         })
     }
 
@@ -189,7 +186,7 @@ pub trait ReconstructingReducer {
             operation: assign.operation,
             assignee,
             value,
-            span: assign.span.clone(),
+            span: assign.span,
         })
     }
 
@@ -204,7 +201,7 @@ pub trait ReconstructingReducer {
             condition,
             block,
             next: statement.map(|statement| Box::new(statement)),
-            span: conditional.span.clone(),
+            span: conditional.span,
         })
     }
 
@@ -224,14 +221,14 @@ pub trait ReconstructingReducer {
             stop,
             inclusive: iteration.inclusive,
             block,
-            span: iteration.span.clone(),
+            span: iteration.span,
         })
     }
 
     fn reduce_console(&mut self, console: &ConsoleStatement, function: ConsoleFunction) -> Result<ConsoleStatement> {
         Ok(ConsoleStatement {
             function,
-            span: console.span.clone(),
+            span: console.span,
         })
     }
 
@@ -242,14 +239,14 @@ pub trait ReconstructingReducer {
     ) -> Result<ExpressionStatement> {
         Ok(ExpressionStatement {
             expression,
-            span: expression_statement.span.clone(),
+            span: expression_statement.span,
         })
     }
 
     fn reduce_block(&mut self, block: &Block, statements: Vec<Statement>) -> Result<Block> {
         Ok(Block {
             statements,
-            span: block.span.clone(),
+            span: block.span,
         })
     }
 
@@ -278,7 +275,7 @@ pub trait ReconstructingReducer {
             identifier,
             variable.mode(),
             type_,
-            variable.span.clone(),
+            variable.span,
         ))
     }
 
@@ -305,7 +302,7 @@ pub trait ReconstructingReducer {
             output,
             block,
             core_mapping: function.core_mapping.clone(),
-            span: function.span.clone(),
+            span: function.span,
         })
     }
 }
diff --git a/compiler/ast/src/statements/assign/mod.rs b/compiler/ast/src/statements/assign/mod.rs
index 3aba9075f5..214e092388 100644
--- a/compiler/ast/src/statements/assign/mod.rs
+++ b/compiler/ast/src/statements/assign/mod.rs
@@ -100,12 +100,4 @@ impl fmt::Display for AssignStatement {
     }
 }
 
-impl Node for AssignStatement {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(AssignStatement);
diff --git a/compiler/ast/src/statements/block.rs b/compiler/ast/src/statements/block.rs
index e54a4a6ba5..ac200e2798 100644
--- a/compiler/ast/src/statements/block.rs
+++ b/compiler/ast/src/statements/block.rs
@@ -43,12 +43,4 @@ impl fmt::Display for Block {
     }
 }
 
-impl Node for Block {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(Block);
diff --git a/compiler/ast/src/statements/conditional.rs b/compiler/ast/src/statements/conditional.rs
index 2e4adf6b65..56bbb5a993 100644
--- a/compiler/ast/src/statements/conditional.rs
+++ b/compiler/ast/src/statements/conditional.rs
@@ -43,12 +43,4 @@ impl fmt::Display for ConditionalStatement {
     }
 }
 
-impl Node for ConditionalStatement {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(ConditionalStatement);
diff --git a/compiler/ast/src/statements/console/console_args.rs b/compiler/ast/src/statements/console/console_args.rs
index 4c03aa26df..b6a4d4ec50 100644
--- a/compiler/ast/src/statements/console/console_args.rs
+++ b/compiler/ast/src/statements/console/console_args.rs
@@ -46,12 +46,4 @@ impl fmt::Display for ConsoleArgs {
     }
 }
 
-impl Node for ConsoleArgs {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(ConsoleArgs);
diff --git a/compiler/ast/src/statements/console/console_function.rs b/compiler/ast/src/statements/console/console_function.rs
index dc7a2baf08..5013e43ad4 100644
--- a/compiler/ast/src/statements/console/console_function.rs
+++ b/compiler/ast/src/statements/console/console_function.rs
@@ -45,10 +45,10 @@ impl fmt::Display for ConsoleFunction {
 }
 
 impl Node for ConsoleFunction {
-    fn span(&self) -> &Span {
+    fn span(&self) -> Span {
         match self {
             ConsoleFunction::Assert(assert) => assert.span(),
-            ConsoleFunction::Error(formatted) | ConsoleFunction::Log(formatted) => &formatted.span,
+            ConsoleFunction::Error(formatted) | ConsoleFunction::Log(formatted) => formatted.span,
         }
     }
 
diff --git a/compiler/ast/src/statements/console/console_statement.rs b/compiler/ast/src/statements/console/console_statement.rs
index 7673ef3ca3..bb7e04d06d 100644
--- a/compiler/ast/src/statements/console/console_statement.rs
+++ b/compiler/ast/src/statements/console/console_statement.rs
@@ -41,12 +41,4 @@ impl fmt::Debug for ConsoleStatement {
     }
 }
 
-impl Node for ConsoleStatement {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(ConsoleStatement);
diff --git a/compiler/ast/src/statements/definition/mod.rs b/compiler/ast/src/statements/definition/mod.rs
index 4f0e514438..2074e9dac7 100644
--- a/compiler/ast/src/statements/definition/mod.rs
+++ b/compiler/ast/src/statements/definition/mod.rs
@@ -64,12 +64,4 @@ impl fmt::Display for DefinitionStatement {
     }
 }
 
-impl Node for DefinitionStatement {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(DefinitionStatement);
diff --git a/compiler/ast/src/statements/definition/variable_name.rs b/compiler/ast/src/statements/definition/variable_name.rs
index 71f43aa6d1..66c90e37dc 100644
--- a/compiler/ast/src/statements/definition/variable_name.rs
+++ b/compiler/ast/src/statements/definition/variable_name.rs
@@ -37,12 +37,4 @@ impl fmt::Display for VariableName {
     }
 }
 
-impl Node for VariableName {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(VariableName);
diff --git a/compiler/ast/src/statements/expression.rs b/compiler/ast/src/statements/expression.rs
index 93ed15c3e5..72c3e40c16 100644
--- a/compiler/ast/src/statements/expression.rs
+++ b/compiler/ast/src/statements/expression.rs
@@ -35,12 +35,4 @@ impl fmt::Display for ExpressionStatement {
     }
 }
 
-impl Node for ExpressionStatement {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(ExpressionStatement);
diff --git a/compiler/ast/src/statements/iteration.rs b/compiler/ast/src/statements/iteration.rs
index 3fdfc94bc9..612bc239d1 100644
--- a/compiler/ast/src/statements/iteration.rs
+++ b/compiler/ast/src/statements/iteration.rs
@@ -51,12 +51,4 @@ impl fmt::Display for IterationStatement {
     }
 }
 
-impl Node for IterationStatement {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(IterationStatement);
diff --git a/compiler/ast/src/statements/return_statement.rs b/compiler/ast/src/statements/return_statement.rs
index e1d25dc050..5b85d01f90 100644
--- a/compiler/ast/src/statements/return_statement.rs
+++ b/compiler/ast/src/statements/return_statement.rs
@@ -35,12 +35,4 @@ impl fmt::Display for ReturnStatement {
     }
 }
 
-impl Node for ReturnStatement {
-    fn span(&self) -> &Span {
-        &self.span
-    }
-
-    fn set_span(&mut self, span: Span) {
-        self.span = span;
-    }
-}
+crate::simple_node_impl!(ReturnStatement);
diff --git a/compiler/ast/src/statements/statement.rs b/compiler/ast/src/statements/statement.rs
index c6f97e8f45..01a4fad1d1 100644
--- a/compiler/ast/src/statements/statement.rs
+++ b/compiler/ast/src/statements/statement.rs
@@ -59,9 +59,9 @@ impl fmt::Display for Statement {
 }
 
 impl Node for Statement {
-    fn span(&self) -> &Span {
+    fn span(&self) -> Span {
         use Statement::*;
-        match &self {
+        match self {
             Return(n) => n.span(),
             Definition(n) => n.span(),
             Assign(n) => n.span(),
diff --git a/compiler/compiler/Cargo.toml b/compiler/compiler/Cargo.toml
index f68daefee2..3298ae7acc 100644
--- a/compiler/compiler/Cargo.toml
+++ b/compiler/compiler/Cargo.toml
@@ -37,7 +37,7 @@ version = "1.5.3"
 [dependencies.sha2]
 version = "0.10"
 
-[dev-dependencies.leo-span]
+[dependencies.leo-span]
 path = "../../leo/span"
 version = "1.5.3"
 
diff --git a/compiler/compiler/src/lib.rs b/compiler/compiler/src/lib.rs
index e94381c40b..40308980fd 100644
--- a/compiler/compiler/src/lib.rs
+++ b/compiler/compiler/src/lib.rs
@@ -31,6 +31,8 @@ use leo_errors::emitter::Handler;
 use leo_errors::{CompilerError, Result};
 pub use leo_passes::SymbolTable;
 use leo_passes::*;
+use leo_span::source_map::FileName;
+use leo_span::symbol::with_session_globals;
 
 use sha2::{Digest, Sha256};
 use std::fs;
@@ -77,13 +79,12 @@ impl<'a> Compiler<'a> {
     }
 
     // Parses and stores a program file content from a string, constructs a syntax tree, and generates a program.
-    pub fn parse_program_from_string(&mut self, program_string: &str) -> Result<()> {
+    pub fn parse_program_from_string(&mut self, program_string: &str, name: FileName) -> Result<()> {
+        // Register the source (`program_string`) in the source map.
+        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).
-        let ast: leo_ast::Ast = leo_parser::parse_ast(
-            self.handler,
-            self.main_file_path.to_str().unwrap_or_default(),
-            program_string,
-        )?;
+        let ast: leo_ast::Ast = leo_parser::parse_ast(self.handler, &prg_sf.src, prg_sf.start_pos)?;
         // Write the AST snapshot post parsing.
         ast.to_json_file_without_keys(self.output_directory.clone(), "initial_ast.json", &["span"])?;
 
@@ -96,31 +97,24 @@ impl<'a> Compiler<'a> {
     pub fn parse_program(&mut self) -> Result<()> {
         // Load the program file.
         let program_string = fs::read_to_string(&self.main_file_path)
-            .map_err(|e| CompilerError::file_read_error(self.main_file_path.clone(), e))?;
+            .map_err(|e| CompilerError::file_read_error(&self.main_file_path, e))?;
 
-        self.parse_program_from_string(&program_string)
-    }
-
-    /// Parses and stores the input file, constructs a syntax tree, and generates a program input.
-    pub fn parse_input_from_string(&mut self, input_file_path: PathBuf, input_string: &str) -> Result<()> {
-        let input_ast =
-            leo_parser::parse_input(self.handler, input_file_path.to_str().unwrap_or_default(), input_string)?;
-        input_ast.to_json_file_without_keys(self.output_directory.clone(), "inital_input_ast.json", &["span"])?;
-
-        self.input_ast = Some(input_ast);
-        Ok(())
+        self.parse_program_from_string(&program_string, FileName::Real(self.main_file_path.clone()))
     }
 
     /// Parses and stores the input file, constructs a syntax tree, and generates a program input.
     pub fn parse_input(&mut self, input_file_path: PathBuf) -> Result<()> {
-        // Load the input file if it exists.
         if input_file_path.exists() {
-            let input_string = fs::read_to_string(&input_file_path)
-                .map_err(|e| CompilerError::file_read_error(input_file_path.clone(), e))?;
+            // Load the input file into the source map.
+            let input_sf = with_session_globals(|s| s.source_map.load_file(&input_file_path))
+                .map_err(|e| CompilerError::file_read_error(&input_file_path, e))?;
 
-            self.parse_input_from_string(input_file_path, &input_string)?;
+            // Parse and serialize it.
+            let input_ast = leo_parser::parse_input(self.handler, &input_sf.src, input_sf.start_pos)?;
+            input_ast.to_json_file_without_keys(self.output_directory.clone(), "inital_input_ast.json", &["span"])?;
+
+            self.input_ast = Some(input_ast);
         }
-
         Ok(())
     }
 
diff --git a/compiler/compiler/src/test.rs b/compiler/compiler/src/test.rs
index 72549089ed..acc0e64e8c 100644
--- a/compiler/compiler/src/test.rs
+++ b/compiler/compiler/src/test.rs
@@ -28,7 +28,7 @@ use leo_errors::{
     LeoError, LeoWarning,
 };
 use leo_passes::SymbolTable;
-use leo_span::symbol::create_session_if_not_set_then;
+use leo_span::{source_map::FileName, symbol::create_session_if_not_set_then};
 use leo_test_framework::{
     runner::{Namespace, ParseType, Runner},
     Test,
@@ -48,8 +48,9 @@ fn parse_program<'a>(
     program_string: &str,
     cwd: Option<PathBuf>,
 ) -> Result<Compiler<'a>, LeoError> {
-    let mut compiler = new_compiler(handler, cwd.unwrap_or_else(|| "compiler-test".into()));
-    compiler.parse_program_from_string(program_string)?;
+    let mut compiler = new_compiler(handler, cwd.clone().unwrap_or_else(|| "compiler-test".into()));
+    let name = cwd.map_or_else(|| FileName::Custom("compiler-test".into()), FileName::Real);
+    compiler.parse_program_from_string(program_string, name)?;
 
     Ok(compiler)
 }
diff --git a/compiler/parser/benches/leo_ast.rs b/compiler/parser/benches/leo_ast.rs
index 94f3f598b0..140e46a6da 100644
--- a/compiler/parser/benches/leo_ast.rs
+++ b/compiler/parser/benches/leo_ast.rs
@@ -16,14 +16,15 @@
 
 use leo_ast::Ast;
 use leo_errors::emitter::Handler;
-use leo_span::symbol::create_session_if_not_set_then;
+use leo_span::{source_map::FileName, symbol::create_session_if_not_set_then};
 
 use criterion::{criterion_group, criterion_main, Criterion};
 use std::time::Duration;
 
 fn parse_ast(path: &str, input: &str) -> Ast {
-    create_session_if_not_set_then(|_| {
-        leo_parser::parse_ast(&Handler::default(), path, input).expect("failed to parse benchmark")
+    create_session_if_not_set_then(|s| {
+        let sf = s.source_map.new_source(input, FileName::Custom(path.into()));
+        leo_parser::parse_ast(&Handler::default(), &sf.src, sf.start_pos).expect("failed to parse benchmark")
     })
 }
 
@@ -34,6 +35,8 @@ macro_rules! bench {
                 concat!("./", $file_name, ".leo"),
                 include_str!(concat!("./", $file_name, ".leo"),),
             );
+            // TODO(Centril): This benchmark seems like it actually does nothing
+            // but take a reference to `&ast`, which should be optimized out?
             c.bench_function(concat!("Ast::", $file_name), |b| b.iter(|| &ast));
         }
     };
diff --git a/compiler/parser/examples/input_parser.rs b/compiler/parser/examples/input_parser.rs
index 23da6f59e6..13b640227e 100644
--- a/compiler/parser/examples/input_parser.rs
+++ b/compiler/parser/examples/input_parser.rs
@@ -44,11 +44,14 @@ struct Opt {
 
 fn main() -> Result<(), String> {
     let opt = Opt::from_args();
-    let input_string = fs::read_to_string(&opt.input_path).expect("failed to open an input file");
-    let input_tree = create_session_if_not_set_then(|_| {
+    let input_tree = create_session_if_not_set_then(|s| {
+        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.clone(), opt.input_path.to_str().unwrap())?;
+            let input = leo_parser::parse_program_inputs(handler, &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 d9757a04f9..988ef13b6d 100644
--- a/compiler/parser/examples/parser.rs
+++ b/compiler/parser/examples/parser.rs
@@ -42,12 +42,12 @@ struct Opt {
 
 fn main() -> Result<(), String> {
     let opt = Opt::from_args();
-    let code = fs::read_to_string(&opt.input_path).expect("failed to open file");
-
     // Parses the Leo file constructing an ast which is then serialized.
-    let serialized_leo_tree = create_session_if_not_set_then(|_| {
+    let serialized_leo_tree = create_session_if_not_set_then(|s| {
+        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, opt.input_path.to_str().unwrap(), &code)?;
+            let ast = leo_parser::parse_ast(h, &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 917a6a1a7a..00fc0d8893 100644
--- a/compiler/parser/src/lib.rs
+++ b/compiler/parser/src/lib.rs
@@ -23,6 +23,7 @@
 #![doc = include_str!("../README.md")]
 
 pub(crate) mod tokenizer;
+use leo_span::span::BytePos;
 pub use tokenizer::KEYWORD_TOKENS;
 pub(crate) use tokenizer::*;
 
@@ -37,18 +38,13 @@ use leo_errors::Result;
 mod test;
 
 /// Creates a new AST from a given file path and source code text.
-pub fn parse_ast<T: AsRef<str>, Y: AsRef<str>>(handler: &Handler, path: T, source: Y) -> Result<Ast> {
-    Ok(Ast::new(parser::parse(handler, path.as_ref(), source.as_ref())?))
+pub fn parse_ast(handler: &Handler, source: &str, start_pos: BytePos) -> Result<Ast> {
+    Ok(Ast::new(parser::parse(handler, source, start_pos)?))
 }
 
 /// Parses program inputs from from the input file path and state file path
-pub fn parse_program_inputs<T: AsRef<str>, Y: AsRef<str>>(
-    handler: &Handler,
-    input_string: T,
-    input_path: Y,
-) -> Result<Input> {
-    let program_input: ProgramInput =
-        parser::parse_input(handler, input_path.as_ref(), input_string.as_ref())?.try_into()?;
+pub fn parse_program_inputs(handler: &Handler, input_string: &str, start_pos: BytePos) -> Result<Input> {
+    let program_input: ProgramInput = parser::parse_input(handler, input_string, start_pos)?.try_into()?;
 
     Ok(Input {
         program_input,
diff --git a/compiler/parser/src/parser/context.rs b/compiler/parser/src/parser/context.rs
index aa1eed8c42..fe7d7fff41 100644
--- a/compiler/parser/src/parser/context.rs
+++ b/compiler/parser/src/parser/context.rs
@@ -39,11 +39,14 @@ pub struct ParserContext<'a> {
     pub(crate) prev_token: SpannedToken,
     /// true if parsing an expression for if and loop statements -- means circuit inits are not legal
     pub(crate) disallow_circuit_construction: bool,
-    /// HACK(Centril): Place to store a dummy EOF.
-    /// Exists to appease borrow checker for now.
-    dummy_eof: SpannedToken,
 }
 
+/// Dummy span used to appease borrow checker.
+const DUMMY_EOF: SpannedToken = SpannedToken {
+    token: Token::Eof,
+    span: Span::dummy(),
+};
+
 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 {
@@ -53,14 +56,9 @@ impl<'a> ParserContext<'a> {
         tokens.reverse();
 
         let token = SpannedToken::dummy();
-        let dummy_eof = SpannedToken {
-            token: Token::Eof,
-            span: token.span.clone(),
-        };
         let mut p = Self {
             handler,
             disallow_circuit_construction: false,
-            dummy_eof,
             prev_token: token.clone(),
             token,
             tokens,
@@ -80,9 +78,9 @@ impl<'a> ParserContext<'a> {
         }
 
         // Extract next token, or `Eof` if there was none.
-        let next_token = self.tokens.pop().unwrap_or_else(|| SpannedToken {
+        let next_token = self.tokens.pop().unwrap_or(SpannedToken {
             token: Token::Eof,
-            span: self.token.span.clone(),
+            span: self.token.span,
         });
 
         // Set the new token.
@@ -108,11 +106,11 @@ impl<'a> ParserContext<'a> {
         }
 
         let idx = match self.tokens.len().checked_sub(dist) {
-            None => return looker(&self.dummy_eof),
+            None => return looker(&DUMMY_EOF),
             Some(idx) => idx,
         };
 
-        looker(self.tokens.get(idx).unwrap_or(&self.dummy_eof))
+        looker(self.tokens.get(idx).unwrap_or(&DUMMY_EOF))
     }
 
     /// Emit the error `err`.
@@ -132,7 +130,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.clone();
+        let span = self.prev_token.span;
         Identifier { name, span }
     }
 
@@ -161,7 +159,7 @@ impl<'a> ParserContext<'a> {
     /// Expects an [`Identifier`], or errors.
     pub fn expect_ident(&mut self) -> Result<Identifier> {
         self.eat_identifier()
-            .ok_or_else(|| ParserError::unexpected_str(&self.token.token, "ident", &self.token.span).into())
+            .ok_or_else(|| ParserError::unexpected_str(&self.token.token, "ident", self.token.span).into())
     }
 
     /// Returns a reference to the next token if it is a [`GroupCoordinate`], or [None] if
@@ -170,11 +168,11 @@ impl<'a> ParserContext<'a> {
         let (advanced, gc) = self.look_ahead(*dist, |t0| match &t0.token {
             Token::Add => Some((1, GroupCoordinate::SignHigh)),
             Token::Minus => self.look_ahead(*dist + 1, |t1| match &t1.token {
-                Token::Int(value) => Some((2, GroupCoordinate::Number(format!("-{}", value), t1.span.clone()))),
+                Token::Int(value) => Some((2, GroupCoordinate::Number(format!("-{}", value), t1.span))),
                 _ => Some((1, GroupCoordinate::SignLow)),
             }),
             Token::Underscore => Some((1, GroupCoordinate::Inferred)),
-            Token::Int(value) => Some((1, GroupCoordinate::Number(value.clone(), t0.span.clone()))),
+            Token::Int(value) => Some((1, GroupCoordinate::Number(value.clone(), t0.span))),
             _ => None,
         })?;
         *dist += advanced;
@@ -200,7 +198,7 @@ impl<'a> ParserContext<'a> {
         let mut dist = 1; // 0th is `(` so 1st is first gc's start.
         let first_gc = self.peek_group_coordinate(&mut dist)?;
 
-        let check_ahead = |d, token: &_| self.look_ahead(d, |t| (&t.token == token).then(|| t.span.clone()));
+        let check_ahead = |d, token: &_| self.look_ahead(d, |t| (&t.token == token).then(|| t.span));
 
         // Peek at `,`.
         check_ahead(dist, &Token::Comma)?;
@@ -228,7 +226,7 @@ impl<'a> ParserContext<'a> {
             self.bump();
         }
 
-        if let Err(e) = assert_no_whitespace(&right_paren_span, &end_span, &format!("({},{})", gt.x, gt.y), "group") {
+        if let Err(e) = assert_no_whitespace(right_paren_span, end_span, &format!("({},{})", gt.x, gt.y), "group") {
             return Some(Err(e));
         }
 
@@ -252,13 +250,13 @@ impl<'a> ParserContext<'a> {
 
     /// Returns an unexpected error at the current token.
     fn unexpected<T>(&self, expected: impl Display) -> Result<T> {
-        Err(ParserError::unexpected(&self.token.token, expected, &self.token.span).into())
+        Err(ParserError::unexpected(&self.token.token, expected, self.token.span).into())
     }
 
     /// Eats the expected `token`, or errors.
     pub fn expect(&mut self, token: &Token) -> Result<Span> {
         if self.eat(token) {
-            Ok(self.prev_token.span.clone())
+            Ok(self.prev_token.span)
         } else {
             self.unexpected(token)
         }
@@ -267,7 +265,7 @@ impl<'a> ParserContext<'a> {
     /// Eats one of the expected `tokens`, or errors.
     pub fn expect_any(&mut self, tokens: &[Token]) -> Result<Span> {
         if self.eat_any(tokens) {
-            Ok(self.prev_token.span.clone())
+            Ok(self.prev_token.span)
         } else {
             self.unexpected(tokens.iter().map(|x| format!("'{}'", x)).collect::<Vec<_>>().join(", "))
         }
diff --git a/compiler/parser/src/parser/expression.rs b/compiler/parser/src/parser/expression.rs
index 5892ef6fa6..fce644b3bb 100644
--- a/compiler/parser/src/parser/expression.rs
+++ b/compiler/parser/src/parser/expression.rs
@@ -205,12 +205,12 @@ impl ParserContext<'_> {
                 Token::Minus => UnaryOperation::Negate,
                 _ => unreachable!("parse_unary_expression_ shouldn't produce this"),
             };
-            ops.push((operation, self.prev_token.span.clone()));
+            ops.push((operation, self.prev_token.span));
         }
         let mut inner = self.parse_postfix_expression()?;
         for (op, op_span) in ops.into_iter().rev() {
             inner = Expression::Unary(UnaryExpression {
-                span: &op_span + inner.span(),
+                span: op_span + inner.span(),
                 op,
                 inner: Box::new(inner),
             });
@@ -230,7 +230,7 @@ impl ParserContext<'_> {
         loop {
             if self.eat(&Token::Dot) {
                 let curr = &self.token;
-                return Err(ParserError::unexpected_str(&curr.token, "int or ident", &curr.span).into());
+                return Err(ParserError::unexpected_str(&curr.token, "int or ident", curr.span).into());
             }
 
             if !self.check(&Token::LeftParen) {
@@ -239,7 +239,7 @@ impl ParserContext<'_> {
 
             let (arguments, _, span) = self.parse_paren_comma_list(|p| p.parse_expression().map(Some))?;
             expr = Expression::Call(CallExpression {
-                span: expr.span() + &span,
+                span: expr.span() + span,
                 function: Box::new(expr),
                 arguments,
             });
@@ -261,7 +261,7 @@ impl ParserContext<'_> {
         if !trailing && tuple.len() == 1 {
             Ok(tuple.remove(0))
         } else {
-            Err(ParserError::unexpected("A tuple expression.", "A valid expression.", &span).into())
+            Err(ParserError::unexpected("A tuple expression.", "A valid expression.", span).into())
         }
     }
 
@@ -282,9 +282,9 @@ impl ParserContext<'_> {
 
         Ok(match token {
             Token::Int(value) => {
-                let suffix_span = self.token.span.clone();
-                let full_span = &span + &suffix_span;
-                let assert_no_whitespace = |x| assert_no_whitespace(&span, &suffix_span, &value, x);
+                let suffix_span = self.token.span;
+                let full_span = span + suffix_span;
+                let assert_no_whitespace = |x| assert_no_whitespace(span, suffix_span, &value, x);
                 match self.eat_any(INT_TYPES).then(|| &self.prev_token.token) {
                     // Literal followed by `field`, e.g., `42field`.
                     Some(Token::Field) => {
@@ -302,7 +302,7 @@ impl ParserContext<'_> {
                         let int_ty = Self::token_to_int_type(suffix).expect("unknown int type token");
                         Expression::Value(ValueExpression::Integer(int_ty, value, full_span))
                     }
-                    None => return Err(ParserError::implicit_values_not_allowed(value, &span).into()),
+                    None => return Err(ParserError::implicit_values_not_allowed(value, span).into()),
                 }
             }
             Token::True => Expression::Value(ValueExpression::Boolean("true".into(), span)),
@@ -323,7 +323,7 @@ impl ParserContext<'_> {
                 span,
             }),
             token => {
-                return Err(ParserError::unexpected_str(token, "expression", &span).into());
+                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 5a3afd2e7e..a64e526b5e 100644
--- a/compiler/parser/src/parser/file.rs
+++ b/compiler/parser/src/parser/file.rs
@@ -26,7 +26,7 @@ impl ParserContext<'_> {
 
         while self.has_next() {
             match &self.token.token {
-                Token::Ident(sym::test) => return Err(ParserError::test_function(&self.token.span).into()),
+                Token::Ident(sym::test) => return Err(ParserError::test_function(self.token.span).into()),
                 // Const functions share the first token with the global Const.
                 Token::Const if self.peek_is_function() => {
                     let (id, function) = self.parse_function_declaration()?;
@@ -54,17 +54,17 @@ impl ParserContext<'_> {
                 .map(|x| format!("'{}'", x))
                 .collect::<Vec<_>>()
                 .join(", "),
-            &token.span,
+            token.span,
         )
     }
 
     /// Returns a [`ParamMode`] AST node if the next tokens represent a function parameter mode.
     pub fn parse_function_parameter_mode(&mut self) -> Result<ParamMode> {
-        let public = self.eat(&Token::Public).then(|| self.prev_token.span.clone());
-        let constant = self.eat(&Token::Constant).then(|| self.prev_token.span.clone());
-        let const_ = self.eat(&Token::Const).then(|| self.prev_token.span.clone());
+        let public = self.eat(&Token::Public).then(|| self.prev_token.span);
+        let constant = self.eat(&Token::Constant).then(|| self.prev_token.span);
+        let const_ = self.eat(&Token::Const).then(|| self.prev_token.span);
 
-        if let Some(span) = &const_ {
+        if let Some(span) = const_ {
             self.emit_warning(ParserWarning::const_parameter_or_input(span));
         }
 
@@ -74,10 +74,10 @@ impl ParserContext<'_> {
             (None, None, None) => Ok(ParamMode::Private),
             (Some(_), None, None) => Ok(ParamMode::Public),
             (Some(m1), Some(m2), None) | (Some(m1), None, Some(m2)) | (None, Some(m1), Some(m2)) => {
-                Err(ParserError::inputs_multiple_variable_types_specified(&(m1 + m2)).into())
+                Err(ParserError::inputs_multiple_variable_types_specified(m1 + m2).into())
             }
             (Some(m1), Some(m2), Some(m3)) => {
-                Err(ParserError::inputs_multiple_variable_types_specified(&(m1 + m2 + m3)).into())
+                Err(ParserError::inputs_multiple_variable_types_specified(m1 + m2 + m3).into())
             }
         }
     }
@@ -90,7 +90,7 @@ impl ParserContext<'_> {
         let name = self.expect_ident()?;
 
         if let Some(mutable) = &mutable {
-            self.emit_err(ParserError::mut_function_input(&(&mutable.span + &name.span)));
+            self.emit_err(ParserError::mut_function_input(mutable.span + name.span));
         }
 
         self.expect(&Token::Colon)?;
@@ -126,7 +126,7 @@ impl ParserContext<'_> {
                 identifier: name,
                 input: inputs,
                 output,
-                span: start + block.span.clone(),
+                span: start + block.span,
                 block,
                 core_mapping: <_>::default(),
             },
diff --git a/compiler/parser/src/parser/input.rs b/compiler/parser/src/parser/input.rs
index 5acf09ca61..1640ac42c4 100644
--- a/compiler/parser/src/parser/input.rs
+++ b/compiler/parser/src/parser/input.rs
@@ -27,7 +27,7 @@ impl ParserContext<'_> {
             if self.check(&Token::LeftSquare) {
                 sections.push(self.parse_section()?);
             } else {
-                return Err(ParserError::unexpected_token(self.token.token.clone(), &self.token.span).into());
+                return Err(ParserError::unexpected_token(self.token.token.clone(), self.token.span).into());
             }
         }
 
diff --git a/compiler/parser/src/parser/mod.rs b/compiler/parser/src/parser/mod.rs
index 5868847406..fc61c7bbd1 100644
--- a/compiler/parser/src/parser/mod.rs
+++ b/compiler/parser/src/parser/mod.rs
@@ -27,6 +27,7 @@ use leo_errors::{ParserError, Result};
 use leo_span::Span;
 
 use indexmap::IndexMap;
+use leo_span::span::BytePos;
 use std::unreachable;
 
 mod context;
@@ -38,27 +39,25 @@ pub mod input;
 pub mod statement;
 pub mod type_;
 
-pub(crate) fn assert_no_whitespace(left_span: &Span, right_span: &Span, left: &str, right: &str) -> Result<()> {
-    if left_span.col_stop != right_span.col_start {
-        let mut error_span = left_span + right_span;
-        error_span.col_start = left_span.col_stop - 1;
-        error_span.col_stop = right_span.col_start - 1;
-        return Err(ParserError::unexpected_whitespace(left, right, &error_span).into());
+pub(crate) fn assert_no_whitespace(left_span: Span, right_span: Span, left: &str, right: &str) -> Result<()> {
+    if left_span.hi != right_span.lo {
+        let error_span = Span::new(left_span.hi, right_span.lo); // The span between them.
+        return Err(ParserError::unexpected_whitespace(left, right, error_span).into());
     }
 
     Ok(())
 }
 
 /// Creates a new program from a given file path and source code text.
-pub fn parse(handler: &Handler, path: &str, source: &str) -> Result<Program> {
-    let mut tokens = ParserContext::new(handler, crate::tokenize(path, source)?);
+pub fn parse(handler: &Handler, source: &str, start_pos: BytePos) -> Result<Program> {
+    let mut tokens = ParserContext::new(handler, 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<T: AsRef<str>, Y: AsRef<str>>(handler: &Handler, path: T, source: Y) -> Result<InputAst> {
-    let mut tokens = ParserContext::new(handler, crate::tokenize(path.as_ref(), source.as_ref())?);
+pub fn parse_input(handler: &Handler, source: &str, start_pos: BytePos) -> Result<InputAst> {
+    let mut tokens = ParserContext::new(handler, crate::tokenize(source, start_pos)?);
 
     tokens.parse_input()
 }
diff --git a/compiler/parser/src/parser/statement.rs b/compiler/parser/src/parser/statement.rs
index 3e74dde006..b464bf21e2 100644
--- a/compiler/parser/src/parser/statement.rs
+++ b/compiler/parser/src/parser/statement.rs
@@ -27,19 +27,16 @@ impl ParserContext<'_> {
     pub fn construct_assignee_access(expr: Expression, _accesses: &mut [AssigneeAccess]) -> Result<Identifier> {
         match expr {
             Expression::Identifier(id) => Ok(id),
-            _ => return Err(ParserError::invalid_assignment_target(expr.span()).into()),
+            _ => Err(ParserError::invalid_assignment_target(expr.span()).into()),
         }
     }
 
     /// Returns an [`Assignee`] AST node from the given [`Expression`] AST node with accesses.
     pub fn construct_assignee(expr: Expression) -> Result<Assignee> {
-        let expr_span = expr.span().clone();
         let mut accesses = Vec::new();
-        let identifier = Self::construct_assignee_access(expr, &mut accesses)?;
-
         Ok(Assignee {
-            span: expr_span,
-            identifier,
+            span: expr.span(),
+            identifier: Self::construct_assignee_access(expr, &mut accesses)?,
             accesses,
         })
     }
@@ -66,7 +63,7 @@ impl ParserContext<'_> {
             let assignee = Self::construct_assignee(expr)?;
             self.expect(&Token::Semicolon)?;
             Ok(Statement::Assign(Box::new(AssignStatement {
-                span: &assignee.span + value.span(),
+                span: assignee.span + value.span(),
                 assignee,
                 // Currently only `=` so this is alright.
                 operation: AssignOperation::Assign,
@@ -75,7 +72,7 @@ impl ParserContext<'_> {
         } else {
             self.expect(&Token::Semicolon)?;
             Ok(Statement::Expression(ExpressionStatement {
-                span: expr.span().clone(),
+                span: expr.span(),
                 expression: expr,
             }))
         }
@@ -89,7 +86,7 @@ impl ParserContext<'_> {
         loop {
             if self.eat(&Token::RightCurly) {
                 return Ok(Block {
-                    span: &start + &self.prev_token.span,
+                    span: start + self.prev_token.span,
                     statements,
                 });
             }
@@ -103,7 +100,7 @@ impl ParserContext<'_> {
         let start = self.expect(&Token::Return)?;
         let expression = self.parse_expression()?;
         self.expect(&Token::Semicolon)?;
-        let span = &start + expression.span();
+        let span = start + expression.span();
         Ok(ReturnStatement { span, expression })
     }
 
@@ -125,7 +122,7 @@ impl ParserContext<'_> {
         };
 
         Ok(ConditionalStatement {
-            span: &start + next.as_ref().map(|x| x.span()).unwrap_or(&body.span),
+            span: start + next.as_ref().map(|x| x.span()).unwrap_or(body.span),
             condition: expr,
             block: body,
             next,
@@ -151,7 +148,7 @@ impl ParserContext<'_> {
         let block = self.parse_block()?;
 
         Ok(IterationStatement {
-            span: start_span + block.span.clone(),
+            span: start_span + block.span,
             variable: ident,
             type_: type_.0,
             start,
@@ -171,7 +168,7 @@ impl ParserContext<'_> {
                 string = Some(match token {
                     Token::StringLit(chars) => chars,
                     _ => {
-                        p.emit_err(ParserError::unexpected_str(token, "formatted string", &span));
+                        p.emit_err(ParserError::unexpected_str(token, "formatted string", span));
                         Vec::new()
                     }
                 });
@@ -207,7 +204,7 @@ impl ParserContext<'_> {
                 self.emit_err(ParserError::unexpected_ident(
                     x,
                     &["assert", "error", "log"],
-                    &function.span,
+                    function.span,
                 ));
                 ConsoleFunction::Log(self.parse_console_args()?)
             }
@@ -215,21 +212,21 @@ impl ParserContext<'_> {
         self.expect(&Token::Semicolon)?;
 
         Ok(ConsoleStatement {
-            span: &keyword + function.span(),
+            span: keyword + function.span(),
             function,
         })
     }
 
     /// Returns a [`VariableName`] AST node if the next tokens represent a variable name with
     /// valid keywords.
-    pub fn parse_variable_name(&mut self, decl_ty: Declare, span: &Span) -> Result<VariableName> {
+    pub fn parse_variable_name(&mut self, decl_ty: Declare, span: Span) -> Result<VariableName> {
         if self.eat(&Token::Mut) {
-            self.emit_err(ParserError::let_mut_statement(&(&self.prev_token.span + span)));
+            self.emit_err(ParserError::let_mut_statement(self.prev_token.span + span));
         }
 
         let name = self.expect_ident()?;
         Ok(VariableName {
-            span: name.span.clone(),
+            span: name.span,
             mutable: matches!(decl_ty, Declare::Let),
             identifier: name,
         })
@@ -238,7 +235,7 @@ impl ParserContext<'_> {
     /// Returns a [`DefinitionStatement`] AST node if the next tokens represent a definition statement.
     pub fn parse_definition_statement(&mut self) -> Result<DefinitionStatement> {
         self.expect_any(&[Token::Let, Token::Const])?;
-        let decl_span = self.prev_token.span.clone();
+        let decl_span = self.prev_token.span;
         let decl_type = match &self.prev_token.token {
             Token::Let => Declare::Let,
             Token::Const => Declare::Const,
@@ -247,7 +244,7 @@ impl ParserContext<'_> {
         // Parse variable names.
         let variable_names = if self.peek_is_left_par() {
             let vars = self
-                .parse_paren_comma_list(|p| p.parse_variable_name(decl_type, &decl_span).map(Some))
+                .parse_paren_comma_list(|p| p.parse_variable_name(decl_type, decl_span).map(Some))
                 .map(|(vars, ..)| vars)?;
 
             if vars.len() == 1 {
@@ -256,7 +253,7 @@ impl ParserContext<'_> {
 
             vars
         } else {
-            vec![self.parse_variable_name(decl_type, &decl_span)?]
+            vec![self.parse_variable_name(decl_type, decl_span)?]
         };
 
         self.expect(&Token::Colon)?;
@@ -267,7 +264,7 @@ impl ParserContext<'_> {
         self.expect(&Token::Semicolon)?;
 
         Ok(DefinitionStatement {
-            span: &decl_span + expr.span(),
+            span: decl_span + expr.span(),
             declaration_type: decl_type,
             variable_names,
             type_: type_.0,
diff --git a/compiler/parser/src/test.rs b/compiler/parser/src/test.rs
index 6eb034b686..8336e64d4f 100644
--- a/compiler/parser/src/test.rs
+++ b/compiler/parser/src/test.rs
@@ -17,7 +17,11 @@
 use crate::{tokenizer, ParserContext, SpannedToken};
 use leo_ast::{Expression, ExpressionStatement, Statement, ValueExpression};
 use leo_errors::{emitter::Handler, LeoError};
-use leo_span::{symbol::create_session_if_not_set_then, Span};
+use leo_span::{
+    source_map::FileName,
+    symbol::{create_session_if_not_set_then, SessionGlobals},
+    Span,
+};
 use leo_test_framework::{
     runner::{Namespace, ParseType, Runner},
     Test,
@@ -34,18 +38,16 @@ impl Namespace for TokenNamespace {
     }
 
     fn run_test(&self, test: Test) -> Result<Value, String> {
-        create_session_if_not_set_then(|_| {
-            tokenizer::tokenize("test", &test.content)
-                .map(|tokens| {
-                    Value::String(
-                        tokens
-                            .into_iter()
-                            .map(|x| x.to_string())
-                            .collect::<Vec<String>>()
-                            .join(","),
-                    )
-                })
-                .map_err(|x| x.to_string())
+        create_session_if_not_set_then(|s| {
+            tokenize(test, s).map(|tokens| {
+                Value::String(
+                    tokens
+                        .into_iter()
+                        .map(|x| x.to_string())
+                        .collect::<Vec<String>>()
+                        .join(","),
+                )
+            })
         })
     }
 }
@@ -76,8 +78,9 @@ fn with_handler<T>(
     Ok(parsed)
 }
 
-fn tokenize(test: Test) -> Result<Vec<SpannedToken>, String> {
-    tokenizer::tokenize("test", &test.content).map_err(|x| x.to_string())
+fn tokenize(test: Test, s: &SessionGlobals) -> Result<Vec<SpannedToken>, String> {
+    let sf = s.source_map.new_source(&test.content, FileName::Custom("test".into()));
+    tokenizer::tokenize(&sf.src, sf.start_pos).map_err(|x| x.to_string())
 }
 
 fn all_are_comments(tokens: &[SpannedToken]) -> bool {
@@ -98,8 +101,8 @@ impl Namespace for ParseExpressionNamespace {
     }
 
     fn run_test(&self, test: Test) -> Result<Value, String> {
-        create_session_if_not_set_then(|_| {
-            let tokenizer = tokenize(test)?;
+        create_session_if_not_set_then(|s| {
+            let tokenizer = tokenize(test, s)?;
             if all_are_comments(&tokenizer) {
                 return Ok(yaml_or_fail(""));
             }
@@ -116,8 +119,8 @@ impl Namespace for ParseStatementNamespace {
     }
 
     fn run_test(&self, test: Test) -> Result<Value, String> {
-        create_session_if_not_set_then(|_| {
-            let tokenizer = tokenize(test)?;
+        create_session_if_not_set_then(|s| {
+            let tokenizer = tokenize(test, s)?;
             if all_are_comments(&tokenizer) {
                 return Ok(yaml_or_fail(Statement::Expression(ExpressionStatement {
                     expression: Expression::Value(ValueExpression::String(Vec::new(), Default::default())),
@@ -137,7 +140,7 @@ impl Namespace for ParseNamespace {
     }
 
     fn run_test(&self, test: Test) -> Result<Value, String> {
-        create_session_if_not_set_then(|_| with_handler(tokenize(test)?, |p| p.parse_program()).map(yaml_or_fail))
+        create_session_if_not_set_then(|s| with_handler(tokenize(test, s)?, |p| p.parse_program()).map(yaml_or_fail))
     }
 }
 
@@ -193,8 +196,8 @@ impl Namespace for SerializeNamespace {
     }
 
     fn run_test(&self, test: Test) -> Result<Value, String> {
-        create_session_if_not_set_then(|_| {
-            let tokenizer = tokenize(test)?;
+        create_session_if_not_set_then(|s| {
+            let tokenizer = tokenize(test, s)?;
             let parsed = with_handler(tokenizer, |p| p.parse_program())?;
 
             let mut json = serde_json::to_value(parsed).expect("failed to convert to json value");
@@ -214,7 +217,7 @@ impl Namespace for InputNamespace {
     }
 
     fn run_test(&self, test: Test) -> Result<Value, String> {
-        create_session_if_not_set_then(|_| with_handler(tokenize(test)?, |p| p.parse_input()).map(yaml_or_fail))
+        create_session_if_not_set_then(|s| with_handler(tokenize(test, s)?, |p| p.parse_input()).map(yaml_or_fail))
     }
 }
 
diff --git a/compiler/parser/src/tokenizer/lexer.rs b/compiler/parser/src/tokenizer/lexer.rs
index 4764d341b0..da372b9636 100644
--- a/compiler/parser/src/tokenizer/lexer.rs
+++ b/compiler/parser/src/tokenizer/lexer.rs
@@ -449,7 +449,7 @@ pub struct SpannedToken {
 
 impl SpannedToken {
     /// Returns a dummy token at a dummy span.
-    pub fn dummy() -> Self {
+    pub const fn dummy() -> Self {
         Self {
             token: Token::Question,
             span: Span::dummy(),
diff --git a/compiler/parser/src/tokenizer/mod.rs b/compiler/parser/src/tokenizer/mod.rs
index 4829268689..92ef2e59b4 100644
--- a/compiler/parser/src/tokenizer/mod.rs
+++ b/compiler/parser/src/tokenizer/mod.rs
@@ -21,7 +21,6 @@
 
 pub(crate) mod token;
 use std::iter;
-use std::sync::Arc;
 
 pub use self::token::KEYWORD_TOKENS;
 pub(crate) use self::token::*;
@@ -30,78 +29,38 @@ pub(crate) mod lexer;
 pub(crate) use self::lexer::*;
 
 use leo_errors::{ParserError, Result};
-use leo_span::Span;
+use leo_span::{
+    span::{BytePos, Pos},
+    Span,
+};
 
 /// Creates a new vector of spanned tokens from a given file path and source code text.
-pub(crate) fn tokenize(path: &str, input: &str) -> Result<Vec<SpannedToken>> {
-    tokenize_iter(path, input).collect()
+pub(crate) fn tokenize(input: &str, start_pos: BytePos) -> Result<Vec<SpannedToken>> {
+    tokenize_iter(input, start_pos).collect()
 }
 
-/// Yields spanned tokens from a given file path and source code text.
-pub(crate) fn tokenize_iter<'a>(path: &'a str, input: &'a str) -> impl 'a + Iterator<Item = Result<SpannedToken>> {
-    let path = Arc::new(path.to_string());
+/// Yields spanned tokens from the given source code text.
+///
+/// The `lo` byte position determines where spans will start.
+pub(crate) fn tokenize_iter(input: &str, mut lo: BytePos) -> impl '_ + Iterator<Item = Result<SpannedToken>> {
     let mut index = 0usize;
-    let mut line_no = 1usize;
-    let mut line_start = 0usize;
     iter::from_fn(move || {
         while input.len() > index {
-            let token = match Token::eat(&input[index..]) {
+            let (token_len, token) = match Token::eat(&input[index..]) {
                 Err(e) => return Some(Err(e)),
                 Ok(t) => t,
             };
+            index += token_len;
+
+            let span = Span::new(lo, lo + BytePos::from_usize(token_len));
+            lo = span.hi;
 
             match token {
-                (token_len, Token::WhiteSpace) => {
-                    let bytes = input.as_bytes();
-                    if bytes[index] == 0x000D && matches!(bytes.get(index + 1), Some(0x000A)) {
-                        // Check carriage return followed by newline.
-                        line_no += 1;
-                        line_start = index + token_len + 1;
-                        index += token_len;
-                    } else if matches!(bytes[index], 0x000A | 0x000D) {
-                        // Check new-line or carriage-return
-                        line_no += 1;
-                        line_start = index + token_len;
-                    }
-                    index += token_len;
-                }
-                (token_len, token) => {
-                    let mut span = Span::new(
-                        line_no,
-                        line_no,
-                        index - line_start + 1,
-                        index - line_start + token_len + 1,
-                        path.clone(),
-                        input[line_start
-                            ..input[line_start..]
-                                .find('\n')
-                                .map(|i| i + line_start)
-                                .unwrap_or(input.len())]
-                            .to_string(),
-                    );
-                    match &token {
-                        Token::CommentLine(_) => {
-                            line_no += 1;
-                            line_start = index + token_len;
-                        }
-                        Token::CommentBlock(block) => {
-                            let line_ct = block.chars().filter(|x| *x == '\n').count();
-                            line_no += line_ct;
-                            if line_ct > 0 {
-                                let last_line_index = block.rfind('\n').unwrap();
-                                line_start = index + last_line_index + 1;
-                                span.col_stop = index + token_len - line_start + 1;
-                            }
-                            span.line_stop = line_no;
-                        }
-                        Token::AddressLit(address) if !check_address(address) => {
-                            return Some(Err(ParserError::invalid_address_lit(address, &span).into()));
-                        }
-                        _ => (),
-                    }
-                    index += token_len;
-                    return Some(Ok(SpannedToken { token, span }));
+                Token::WhiteSpace => continue,
+                Token::AddressLit(address) if !check_address(&address) => {
+                    return Some(Err(ParserError::invalid_address_lit(address, span).into()));
                 }
+                _ => return Some(Ok(SpannedToken { token, span })),
             }
         }
 
@@ -112,91 +71,89 @@ pub(crate) fn tokenize_iter<'a>(path: &'a str, input: &'a str) -> impl 'a + Iter
 #[cfg(test)]
 mod tests {
     use super::*;
-    use leo_span::symbol::create_session_if_not_set_then;
+    use leo_span::{source_map::FileName, symbol::create_session_if_not_set_then};
 
     #[test]
     fn test_tokenizer() {
-        create_session_if_not_set_then(|_| {
-            let tokens = tokenize(
-                "test_path",
-                r#"
-        'a'
-        '😭'
-        "test"
-        "test{}test"
-        "test{}"
-        "{}test"
-        "test{"
-        "test}"
-        "test{test"
-        "test}test"
-        "te{{}}"
-        aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
-        test_ident
-        12345
-        address
-        bool
-        const
-        else
-        false
-        field
-        for
-        function
-        group
-        i128
-        i64
-        i32
-        i16
-        i8
-        if
-        in
-        input
-        let
-        mut
-        return
-        string
-        test
-        true
-        u128
-        u64
-        u32
-        u16
-        u8
-        console
-        !
-        !=
-        &&
-        (
-        )
-        *
-        **
-        +
-        ,
-        -
-        ->
-        _
-        .
-        ..
-        /
-        :
-        ;
-        <
-        <=
-        =
-        ==
-        >
-        >=
-        [
-        ]
-        {{
-        }}
-        ||
-        ?
-        // test
-        /* test */
-        //"#,
-            )
-            .unwrap();
+        create_session_if_not_set_then(|s| {
+            let raw = r#"
+    'a'
+    '😭'
+    "test"
+    "test{}test"
+    "test{}"
+    "{}test"
+    "test{"
+    "test}"
+    "test{test"
+    "test}test"
+    "te{{}}"
+    aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
+    test_ident
+    12345
+    address
+    bool
+    const
+    else
+    false
+    field
+    for
+    function
+    group
+    i128
+    i64
+    i32
+    i16
+    i8
+    if
+    in
+    input
+    let
+    mut
+    return
+    string
+    test
+    true
+    u128
+    u64
+    u32
+    u16
+    u8
+    console
+    !
+    !=
+    &&
+    (
+    )
+    *
+    **
+    +
+    ,
+    -
+    ->
+    _
+    .
+    ..
+    /
+    :
+    ;
+    <
+    <=
+    =
+    ==
+    >
+    >=
+    [
+    ]
+    {{
+    }}
+    ||
+    ?
+    // test
+    /* test */
+    //"#;
+            let sf = s.source_map.new_source(raw, FileName::Custom("test".into()));
+            let tokens = tokenize(&sf.src, sf.start_pos).unwrap();
             let mut output = String::new();
             for SpannedToken { token, .. } in tokens.iter() {
                 output += &format!("{} ", token);
@@ -212,7 +169,7 @@ mod tests {
 
     #[test]
     fn test_spans() {
-        create_session_if_not_set_then(|_| {
+        create_session_if_not_set_then(|s| {
             let raw = r#"
 ppp            test
             // test
@@ -223,7 +180,10 @@ ppp            test
             test */
             test
             "#;
-            let tokens = tokenize("test_path", raw).unwrap();
+
+            let sm = &s.source_map;
+            let sf = sm.new_source(raw, FileName::Custom("test".into()));
+            let tokens = tokenize(&sf.src, sf.start_pos).unwrap();
             let mut line_indicies = vec![0];
             for (i, c) in raw.chars().enumerate() {
                 if c == '\n' {
@@ -231,11 +191,7 @@ ppp            test
                 }
             }
             for token in tokens.iter() {
-                let token_raw = token.token.to_string();
-                let start = line_indicies.get(token.span.line_start - 1).unwrap();
-                let stop = line_indicies.get(token.span.line_stop - 1).unwrap();
-                let original = &raw[*start + token.span.col_start - 1..*stop + token.span.col_stop - 1];
-                assert_eq!(original, &token_raw);
+                assert_eq!(token.token.to_string(), sm.contents_of_span(token.span).unwrap());
             }
         })
     }
diff --git a/compiler/passes/src/symbol_table/table.rs b/compiler/passes/src/symbol_table/table.rs
index 5c9df7b6ad..3ef4f45d4a 100644
--- a/compiler/passes/src/symbol_table/table.rs
+++ b/compiler/passes/src/symbol_table/table.rs
@@ -37,7 +37,7 @@ pub struct SymbolTable<'a> {
 impl<'a> SymbolTable<'a> {
     pub fn check_shadowing(&self, symbol: &Symbol) -> Result<()> {
         if let Some(function) = self.functions.get(symbol) {
-            Err(AstError::shadowed_function(symbol, &function.span).into())
+            Err(AstError::shadowed_function(symbol, function.span).into())
         } else {
             self.variables.check_shadowing(symbol)?;
             Ok(())
diff --git a/compiler/passes/src/symbol_table/variable_symbol.rs b/compiler/passes/src/symbol_table/variable_symbol.rs
index bcd2463206..c96aaffecb 100644
--- a/compiler/passes/src/symbol_table/variable_symbol.rs
+++ b/compiler/passes/src/symbol_table/variable_symbol.rs
@@ -41,7 +41,7 @@ impl Display for Declaration {
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct VariableSymbol<'a> {
     pub type_: &'a Type,
-    pub span: &'a Span,
+    pub span: Span,
     pub declaration: Declaration,
 }
 
diff --git a/compiler/passes/src/type_checker/check_expressions.rs b/compiler/passes/src/type_checker/check_expressions.rs
index bcbccba8eb..1ae6d7bddf 100644
--- a/compiler/passes/src/type_checker/check_expressions.rs
+++ b/compiler/passes/src/type_checker/check_expressions.rs
@@ -39,7 +39,7 @@ fn return_incorrect_type(t1: Option<Type>, t2: Option<Type>, expected: Option<Ty
 }
 
 impl<'a> TypeChecker<'a> {
-    pub(crate) fn compare_expr_type(&mut self, expr: &Expression, expected: Option<Type>, span: &Span) -> Option<Type> {
+    pub(crate) fn compare_expr_type(&mut self, expr: &Expression, expected: Option<Type>, span: Span) -> Option<Type> {
         match expr {
             Expression::Identifier(ident) => {
                 if let Some(var) = self.symbol_table.lookup_variable(&ident.name) {
diff --git a/compiler/passes/src/type_checker/check_statements.rs b/compiler/passes/src/type_checker/check_statements.rs
index 21f8ef53ef..52e9e19c15 100644
--- a/compiler/passes/src/type_checker/check_statements.rs
+++ b/compiler/passes/src/type_checker/check_statements.rs
@@ -73,7 +73,7 @@ impl<'a> StatementVisitor<'a> for TypeChecker<'a> {
             Some(var.type_.clone())
         } else {
             self.handler.emit_err(
-                TypeCheckerError::unknown_sym("variable", &input.assignee.identifier.name, &input.assignee.span).into(),
+                TypeCheckerError::unknown_sym("variable", &input.assignee.identifier.name, input.assignee.span).into(),
             );
 
             None
diff --git a/compiler/passes/src/type_checker/checker.rs b/compiler/passes/src/type_checker/checker.rs
index 2039a66cdd..212c3a9725 100644
--- a/compiler/passes/src/type_checker/checker.rs
+++ b/compiler/passes/src/type_checker/checker.rs
@@ -79,7 +79,7 @@ impl<'a> TypeChecker<'a> {
         }
     }
 
-    pub(crate) fn assert_type(&self, type_: Type, expected: Option<Type>, span: &Span) -> Type {
+    pub(crate) fn assert_type(&self, type_: Type, expected: Option<Type>, span: Span) -> Type {
         if let Some(expected) = expected {
             if type_ != expected {
                 self.handler
@@ -90,7 +90,7 @@ impl<'a> TypeChecker<'a> {
         type_
     }
 
-    pub(crate) fn assert_one_of_types(&self, type_: Option<Type>, expected: &[Type], span: &Span) -> Option<Type> {
+    pub(crate) fn assert_one_of_types(&self, type_: Option<Type>, expected: &[Type], span: Span) -> Option<Type> {
         if let Some(type_) = type_.clone() {
             for t in expected.iter() {
                 if &type_ == t {
@@ -111,15 +111,15 @@ impl<'a> TypeChecker<'a> {
         type_
     }
 
-    pub(crate) fn assert_arith_type(&self, type_: Option<Type>, span: &Span) -> Option<Type> {
+    pub(crate) fn assert_arith_type(&self, type_: Option<Type>, span: Span) -> Option<Type> {
         self.assert_one_of_types(type_, ARITHMETIC_TYPES, span)
     }
 
-    pub(crate) fn assert_field_or_int_type(&self, type_: Option<Type>, span: &Span) -> Option<Type> {
+    pub(crate) fn assert_field_or_int_type(&self, type_: Option<Type>, span: Span) -> Option<Type> {
         self.assert_one_of_types(type_, FIELD_AND_INT_TYPES, span)
     }
 
-    pub(crate) fn assert_int_type(&self, type_: Option<Type>, span: &Span) -> Option<Type> {
+    pub(crate) fn assert_int_type(&self, type_: Option<Type>, span: Span) -> Option<Type> {
         self.assert_one_of_types(type_, INT_TYPES, span)
     }
 }
diff --git a/leo/errors/src/common/backtraced.rs b/leo/errors/src/common/backtraced.rs
index a9bda2768d..c2f17c4ece 100644
--- a/leo/errors/src/common/backtraced.rs
+++ b/leo/errors/src/common/backtraced.rs
@@ -20,6 +20,7 @@ use backtrace::Backtrace;
 use color_backtrace::{BacktracePrinter, Verbosity};
 use colored::Colorize;
 use derivative::Derivative;
+use leo_span::source_map::is_not_test_framework;
 
 /// The indent for an error message.
 pub(crate) const INDENT: &str = "    ";
@@ -120,12 +121,7 @@ impl fmt::Display for Backtraced {
         let message = format!("{kind} [{code}]: {message}", message = self.message,);
 
         // To avoid the color enabling characters for comparison with test expectations.
-        if std::env::var("LEO_TESTFRAMEWORK")
-            .unwrap_or_default()
-            .trim()
-            .to_owned()
-            .is_empty()
-        {
+        if is_not_test_framework() {
             if self.error {
                 write!(f, "{}", message.bold().red())?;
             } else {
diff --git a/leo/errors/src/common/formatted.rs b/leo/errors/src/common/formatted.rs
index 37ee87cde7..f8bc20ec64 100644
--- a/leo/errors/src/common/formatted.rs
+++ b/leo/errors/src/common/formatted.rs
@@ -16,7 +16,7 @@
 
 use crate::{Backtraced, INDENT};
 
-use leo_span::Span;
+use leo_span::{source_map::SpanLocation, symbol::with_session_globals, Span};
 
 use backtrace::Backtrace;
 use color_backtrace::{BacktracePrinter, Verbosity};
@@ -50,14 +50,14 @@ impl Formatted {
         code_identifier: i8,
         type_: String,
         error: bool,
-        span: &Span,
+        span: Span,
         backtrace: Backtrace,
     ) -> Self
     where
         S: ToString,
     {
         Self {
-            span: span.clone(),
+            span,
             backtrace: Backtraced::new_from_backtrace(
                 message.to_string(),
                 help,
@@ -107,7 +107,18 @@ impl fmt::Display for Formatted {
             underline
         };
 
-        let underlined = underline(self.span.col_start, self.span.col_stop);
+        let (loc, contents) = with_session_globals(|s| {
+            (
+                s.source_map
+                    .span_to_location(self.span)
+                    .unwrap_or_else(SpanLocation::dummy),
+                s.source_map
+                    .line_contents_of_span(self.span)
+                    .unwrap_or_else(|| "<contents unavailable>".to_owned()),
+            )
+        });
+
+        let underlined = underline(loc.col_start, loc.col_stop);
 
         let (kind, code) = if self.backtrace.error {
             ("Error", self.error_code())
@@ -138,17 +149,17 @@ impl fmt::Display for Formatted {
             "\n{indent     }--> {path}:{line_start}:{start}\n\
             {indent     } |\n",
             indent = INDENT,
-            path = &*self.span.path,
-            line_start = self.span.line_start,
-            start = self.span.col_start,
+            path = &loc.source_file.name,
+            line_start = loc.line_start,
+            start = loc.col_start,
         )?;
 
-        for (line_no, line) in self.span.content.lines().enumerate() {
+        for (line_no, line) in contents.lines().enumerate() {
             writeln!(
                 f,
                 "{line_no:width$} | {text}",
                 width = INDENT.len(),
-                line_no = self.span.line_start + line_no,
+                line_no = loc.line_start + line_no,
                 text = line,
             )?;
         }
diff --git a/leo/errors/src/common/macros.rs b/leo/errors/src/common/macros.rs
index 4f880c1c17..7654630452 100644
--- a/leo/errors/src/common/macros.rs
+++ b/leo/errors/src/common/macros.rs
@@ -96,7 +96,7 @@ macro_rules! create_messages {
         // Formatted errors always takes a span.
         $(#[$error_func_docs])*
         // Expands additional arguments for the error defining function.
-        pub fn $name($($arg_names: $arg_types,)* span: &leo_span::Span) -> Self {
+        pub fn $name($($arg_names: $arg_types,)* span: leo_span::Span) -> Self {
             Self::Formatted(
                 Formatted::new_from_span(
                     $message,
diff --git a/leo/errors/src/emitter/mod.rs b/leo/errors/src/emitter/mod.rs
index ce3d407ac8..4be8c4300c 100644
--- a/leo/errors/src/emitter/mod.rs
+++ b/leo/errors/src/emitter/mod.rs
@@ -265,7 +265,7 @@ impl Handler {
 mod tests {
     use super::*;
     use crate::ParserError;
-    use leo_span::Span;
+    use leo_span::{symbol::create_session_if_not_set_then, Span};
 
     #[test]
     fn fresh_no_errors() {
@@ -276,28 +276,30 @@ mod tests {
 
     #[test]
     fn buffer_works() {
-        let count_err = |s: String| s.lines().filter(|l| l.contains("Error")).count();
+        create_session_if_not_set_then(|_| {
+            let count_err = |s: String| s.lines().filter(|l| l.contains("Error")).count();
 
-        let res: Result<(), _> = Handler::with(|h| {
-            let s = Span::default();
-            assert_eq!(h.err_count(), 0);
-            h.emit_err(ParserError::invalid_import_list(&s).into());
-            assert_eq!(h.err_count(), 1);
-            h.emit_err(ParserError::unexpected_eof(&s).into());
-            assert_eq!(h.err_count(), 2);
-            Err(ParserError::spread_in_array_init(&s).into())
-        });
+            let res: Result<(), _> = Handler::with(|h| {
+                let s = Span::default();
+                assert_eq!(h.err_count(), 0);
+                h.emit_err(ParserError::invalid_import_list(s).into());
+                assert_eq!(h.err_count(), 1);
+                h.emit_err(ParserError::unexpected_eof(s).into());
+                assert_eq!(h.err_count(), 2);
+                Err(ParserError::spread_in_array_init(s).into())
+            });
 
-        assert_eq!(count_err(res.unwrap_err().to_string()), 3);
+            assert_eq!(count_err(res.unwrap_err().to_string()), 3);
 
-        let res: Result<(), _> = Handler::with(|h| {
-            let s = Span::default();
-            h.emit_err(ParserError::invalid_import_list(&s).into());
-            h.emit_err(ParserError::unexpected_eof(&s).into());
-            Ok(())
-        });
-        assert_eq!(count_err(res.unwrap_err().to_string()), 2);
+            let res: Result<(), _> = Handler::with(|h| {
+                let s = Span::default();
+                h.emit_err(ParserError::invalid_import_list(s).into());
+                h.emit_err(ParserError::unexpected_eof(s).into());
+                Ok(())
+            });
+            assert_eq!(count_err(res.unwrap_err().to_string()), 2);
 
-        let () = Handler::with(|_| Ok(())).unwrap();
+            let () = Handler::with(|_| Ok(())).unwrap();
+        })
     }
 }
diff --git a/leo/span/Cargo.toml b/leo/span/Cargo.toml
index 4bf317337a..2cccb5612d 100644
--- a/leo/span/Cargo.toml
+++ b/leo/span/Cargo.toml
@@ -18,16 +18,8 @@ license = "GPL-3.0"
 edition = "2021"
 rust-version = "1.56.1"
 
-[dependencies.fxhash]
-version = "0.2.1"
-
-[dependencies.indexmap]
-version = "1.8"
-features = ["serde"]
-
-[dependencies.serde]
-version = "1.0.133"
-features = [ "derive", "rc" ]
-
-[dependencies.scoped-tls]
-version = "1.0.0"
+[dependencies]
+fxhash = "0.2.1"
+indexmap = { version = "1.8", features = ["serde"] }
+serde = { version = "1.0.133", features = [ "derive", "rc" ] }
+scoped-tls = { version = "1.0.0" }
diff --git a/leo/span/src/lib.rs b/leo/span/src/lib.rs
index 6851878fbe..4b306b8191 100644
--- a/leo/span/src/lib.rs
+++ b/leo/span/src/lib.rs
@@ -23,3 +23,5 @@ pub mod span;
 pub use span::Span;
 
 pub mod span_json;
+
+pub mod source_map;
diff --git a/leo/span/src/source_map.rs b/leo/span/src/source_map.rs
new file mode 100644
index 0000000000..5e5bc6deb3
--- /dev/null
+++ b/leo/span/src/source_map.rs
@@ -0,0 +1,441 @@
+use crate::span::{BytePos, CharPos, Pos, Span};
+use std::{
+    cell::RefCell,
+    fmt, fs, io,
+    path::{Path, PathBuf},
+    rc::Rc,
+};
+
+/// The source map containing all recorded sources,
+/// methods to register new ones,
+/// and methods to query about spans in relation to recorded sources.
+#[derive(Default)]
+pub struct SourceMap {
+    /// The actual source map data.
+    inner: RefCell<SourceMapInner>,
+}
+
+/// Actual data of the source map.
+/// We use this setup for purposes of interior mutability.
+#[derive(Default)]
+struct SourceMapInner {
+    /// The address space below this value is currently used by the files in the source map.
+    used_address_space: u32,
+
+    /// All the source files recorded thus far.
+    ///
+    /// The list is append-only with mappings from the start byte position
+    /// for fast lookup from a `Span` to its `SourceFile`.
+    source_files: Vec<Rc<SourceFile>>,
+}
+
+impl SourceMap {
+    /// Loads the given `path` and returns a `SourceFile` for it.
+    pub fn load_file(&self, path: &Path) -> io::Result<Rc<SourceFile>> {
+        Ok(self.new_source(&fs::read_to_string(path)?, FileName::Real(path.to_owned())))
+    }
+
+    /// Registers `source` under the given file `name`, returning a `SourceFile` back.
+    pub fn new_source(&self, source: &str, name: FileName) -> Rc<SourceFile> {
+        let len = u32::try_from(source.len()).unwrap();
+        let mut inner = self.inner.borrow_mut();
+        let start_pos = inner.try_allocate_address_space(len).unwrap();
+        let source_file = Rc::new(SourceFile::new(name, source.to_owned(), start_pos));
+        inner.source_files.push(source_file.clone());
+        source_file
+    }
+
+    /// Find the index for the source file containing `pos`.
+    fn find_source_file_index(&self, pos: BytePos) -> Option<usize> {
+        self.inner
+            .borrow()
+            .source_files
+            .binary_search_by_key(&pos, |file| file.start_pos)
+            .map_or_else(|p| p.checked_sub(1), Some)
+    }
+
+    /// Find the source file containing `pos`.
+    fn find_source_file(&self, pos: BytePos) -> Option<Rc<SourceFile>> {
+        Some(self.inner.borrow().source_files[self.find_source_file_index(pos)?].clone())
+    }
+
+    /// Finds line column info about a given `pos`.
+    fn find_line_col(&self, pos: BytePos) -> Option<LineCol> {
+        let source_file = self.find_source_file(pos)?;
+        let (line, col) = source_file.lookup_file_pos(pos);
+        Some(LineCol { source_file, line, col })
+    }
+
+    /// Retrives the location (source file, line, col) on the given span.
+    pub fn span_to_location(&self, sp: Span) -> Option<SpanLocation> {
+        let lo = self.find_line_col(sp.lo)?;
+        let hi = self.find_line_col(sp.hi)?;
+        Some(SpanLocation {
+            source_file: lo.source_file,
+            line_start: lo.line,
+            line_stop: hi.line,
+            col_start: lo.col.to_usize() + 1,
+            col_stop: hi.col.to_usize() + 1,
+        })
+    }
+
+    /// Returns a displayable representation of the `span` as a string.
+    pub fn span_to_string(&self, span: Span) -> String {
+        let loc = match self.span_to_location(span) {
+            None => return "no-location".to_string(),
+            Some(l) => l,
+        };
+
+        if loc.line_start == loc.line_stop {
+            format!("{}:{}-{}", loc.line_start, loc.col_start, loc.col_stop)
+        } else {
+            format!(
+                "{}:{}-{}:{}",
+                loc.line_start, loc.col_start, loc.line_stop, loc.col_stop
+            )
+        }
+    }
+
+    /// Returns the source contents that is spanned by `span`.
+    pub fn contents_of_span(&self, span: Span) -> Option<String> {
+        let begin = self.find_source_file(span.lo)?;
+        let end = self.find_source_file(span.hi)?;
+        assert_eq!(begin.start_pos, end.start_pos);
+        Some(begin.contents_of_span(span))
+    }
+
+    /// Returns the source contents of the lines that `span` is within.
+    ///
+    /// That is, if the span refers to `x = 4` in the source code:
+    ///
+    /// > ```text
+    /// > // Line 1
+    /// > let x
+    /// >     = 4;
+    /// > // Line 4
+    /// > ```
+    ///
+    /// then the contents on lines 2 and 3 are returned.
+    pub fn line_contents_of_span(&self, span: Span) -> Option<String> {
+        let begin = self.find_source_file(span.lo)?;
+        let end = self.find_source_file(span.hi)?;
+        assert_eq!(begin.start_pos, end.start_pos);
+
+        let idx_lo = begin.lookup_line(span.lo).unwrap_or(0);
+        let idx_hi = begin.lookup_line(span.hi).unwrap_or(0) + 1;
+        let lo_line_pos = begin.lines[idx_lo];
+        let hi_line_pos = if idx_hi < begin.lines.len() {
+            begin.lines[idx_hi]
+        } else {
+            begin.end_pos
+        };
+        Some(begin.contents_of_span(Span::new(lo_line_pos, hi_line_pos)))
+    }
+}
+
+impl SourceMapInner {
+    /// Attempt reserving address space for `size` number of bytes.
+    fn try_allocate_address_space(&mut self, size: u32) -> Option<BytePos> {
+        let current = self.used_address_space;
+        // By adding one, we can distinguish between files, even when they are empty.
+        self.used_address_space = current.checked_add(size)?.checked_add(1)?;
+        Some(BytePos(current))
+    }
+}
+
+/// A file name.
+///
+/// For now it's simply a wrapper around `PathBuf`,
+/// but may become more complicated in the future.
+#[derive(Clone)]
+pub enum FileName {
+    /// A real file.
+    Real(PathBuf),
+    /// Any sort of description for a source.
+    Custom(String),
+}
+
+impl fmt::Display for FileName {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        match self {
+            Self::Real(x) if is_not_test_framework() => x.display().fmt(f),
+            Self::Real(_) => Ok(()),
+            Self::Custom(x) => f.write_str(x),
+        }
+    }
+}
+
+/// Is the env var `LEO_TESTFRAMEWORK` not enabled?
+pub fn is_not_test_framework() -> bool {
+    std::env::var("LEO_TESTFRAMEWORK")
+        .unwrap_or_default()
+        .trim()
+        .to_owned()
+        .is_empty()
+}
+
+/// A single source in the [`SourceMap`].
+pub struct SourceFile {
+    /// The name of the file that the source came from.
+    pub name: FileName,
+    /// The complete source code.
+    pub src: String,
+    /// The start position of this source in the `SourceMap`.
+    pub start_pos: BytePos,
+    /// The end position of this source in the `SourceMap`.
+    pub end_pos: BytePos,
+    /// Locations of line beginnings in the source code.
+    lines: Vec<BytePos>,
+    /// Locations of multi-byte characters in the source code.
+    multibyte_chars: Vec<MultiByteChar>,
+}
+
+impl SourceFile {
+    /// Creates a new `SourceMap` given the file `name`,
+    /// source contents, and the `start_pos`ition.
+    ///
+    /// This position is used for analysis purposes.
+    fn new(name: FileName, mut src: String, start_pos: BytePos) -> Self {
+        normalize_src(&mut src);
+        let end_pos = start_pos + BytePos::from_usize(src.len());
+        let (lines, multibyte_chars) = analyze_source_file(&src, start_pos);
+        Self {
+            name,
+            src,
+            start_pos,
+            end_pos,
+            lines,
+            multibyte_chars,
+        }
+    }
+
+    /// Converts an absolute `BytePos` to a `CharPos` relative to the `SourceFile`.
+    fn bytepos_to_file_charpos(&self, bpos: BytePos) -> CharPos {
+        // The number of extra bytes due to multibyte chars in the `SourceFile`.
+        let mut total_extra_bytes = 0;
+
+        for mbc in self.multibyte_chars.iter() {
+            if mbc.pos < bpos {
+                // Every character is at least one byte, so we only
+                // count the actual extra bytes.
+                total_extra_bytes += mbc.bytes as u32 - 1;
+                // We should never see a byte position in the middle of a
+                // character.
+                assert!(bpos.to_u32() >= mbc.pos.to_u32() + mbc.bytes as u32);
+            } else {
+                break;
+            }
+        }
+
+        assert!(self.start_pos.to_u32() + total_extra_bytes <= bpos.to_u32());
+        CharPos(bpos.to_usize() - self.start_pos.to_usize() - total_extra_bytes as usize)
+    }
+
+    /// Finds the line containing the given position. The return value is the
+    /// index into the `lines` array of this `SourceFile`, not the 1-based line
+    /// number. If the source_file is empty or the position is located before the
+    /// first line, `None` is returned.
+    fn lookup_line(&self, pos: BytePos) -> Option<usize> {
+        match self.lines.binary_search(&pos) {
+            Ok(idx) => Some(idx),
+            Err(0) => None,
+            Err(idx) => Some(idx - 1),
+        }
+    }
+
+    /// Looks up the file's (1-based) line number and (0-based `CharPos`) column offset, for a
+    /// given `BytePos`.
+    fn lookup_file_pos(&self, pos: BytePos) -> (usize, CharPos) {
+        let chpos = self.bytepos_to_file_charpos(pos);
+        match self.lookup_line(pos) {
+            Some(a) => {
+                let line = a + 1; // Line numbers start at 1
+                let linebpos = self.lines[a];
+                let linechpos = self.bytepos_to_file_charpos(linebpos);
+                let col = chpos - linechpos;
+                assert!(chpos >= linechpos);
+                (line, col)
+            }
+            None => (0, chpos),
+        }
+    }
+
+    /// Returns contents of a `span` assumed to be within the given file.
+    fn contents_of_span(&self, span: Span) -> String {
+        let begin_pos = self.bytepos_to_file_charpos(span.lo).to_usize();
+        let end_pos = self.bytepos_to_file_charpos(span.hi).to_usize();
+        String::from_utf8_lossy(&self.src.as_bytes()[begin_pos..end_pos]).into_owned()
+    }
+}
+
+/// Detailed information on a `Span`.
+pub struct SpanLocation {
+    pub source_file: Rc<SourceFile>,
+    pub line_start: usize,
+    pub line_stop: usize,
+    pub col_start: usize,
+    pub col_stop: usize,
+}
+
+impl SpanLocation {
+    /// Returns a dummy location.
+    pub fn dummy() -> Self {
+        let dummy = "<dummy>".to_owned();
+        let span = Span::dummy();
+        Self {
+            source_file: Rc::new(SourceFile {
+                name: FileName::Custom(dummy.clone()),
+                src: dummy,
+                start_pos: span.lo,
+                end_pos: span.hi,
+                lines: Vec::new(),
+                multibyte_chars: Vec::new(),
+            }),
+            line_start: 0,
+            line_stop: 0,
+            col_start: 0,
+            col_stop: 0,
+        }
+    }
+}
+
+/// File / Line / Column information on a `BytePos`.
+pub struct LineCol {
+    /// Information on the original source.
+    pub source_file: Rc<SourceFile>,
+    /// The 1-based line number.
+    pub line: usize,
+    /// The (0-based) column offset into the line.
+    pub col: CharPos,
+}
+
+/// Normalizes the source code and records the normalizations.
+fn normalize_src(src: &mut String) {
+    remove_bom(src);
+    normalize_newlines(src);
+}
+
+/// Removes UTF-8 BOM, if any.
+fn remove_bom(src: &mut String) {
+    if src.starts_with('\u{feff}') {
+        src.drain(..3);
+    }
+}
+
+/// Replaces `\r\n` with `\n` in-place in `src`.
+///
+/// Returns error if there's a lone `\r` in the string.
+fn normalize_newlines(src: &mut String) {
+    if !src.as_bytes().contains(&b'\r') {
+        return;
+    }
+
+    // We replace `\r\n` with `\n` in-place, which doesn't break utf-8 encoding.
+    // While we *can* call `as_mut_vec` and do surgery on the live string
+    // directly, let's rather steal the contents of `src`. This makes the code
+    // safe even if a panic occurs.
+
+    let mut buf = std::mem::take(src).into_bytes();
+    let mut gap_len = 0;
+    let mut tail = buf.as_mut_slice();
+    loop {
+        let idx = match find_crlf(&tail[gap_len..]) {
+            None => tail.len(),
+            Some(idx) => idx + gap_len,
+        };
+        tail.copy_within(gap_len..idx, 0);
+        tail = &mut tail[idx - gap_len..];
+        if tail.len() == gap_len {
+            break;
+        }
+        gap_len += 1;
+    }
+
+    // Account for removed `\r`.
+    // After `set_len`, `buf` is guaranteed to contain utf-8 again.
+    let new_len = buf.len() - gap_len;
+    unsafe {
+        buf.set_len(new_len);
+        *src = String::from_utf8_unchecked(buf);
+    }
+
+    fn find_crlf(src: &[u8]) -> Option<usize> {
+        let mut search_idx = 0;
+        while let Some(idx) = find_cr(&src[search_idx..]) {
+            if src[search_idx..].get(idx + 1) != Some(&b'\n') {
+                search_idx += idx + 1;
+                continue;
+            }
+            return Some(search_idx + idx);
+        }
+        None
+    }
+
+    fn find_cr(src: &[u8]) -> Option<usize> {
+        src.iter().position(|&b| b == b'\r')
+    }
+}
+
+/// Identifies an offset of a multi-byte character in a `SourceFile`.
+#[derive(Copy, Clone, Eq, PartialEq, Debug)]
+struct MultiByteChar {
+    /// The absolute offset of the character in the `SourceMap`.
+    pub pos: BytePos,
+    /// The number of bytes, `>= 2`.
+    pub bytes: u8,
+}
+
+/// Finds all newlines, multi-byte characters, and non-narrow characters in a
+/// SourceFile.
+///
+/// This function will use an SSE2 enhanced implementation if hardware support
+/// is detected at runtime.
+fn analyze_source_file(src: &str, source_file_start_pos: BytePos) -> (Vec<BytePos>, Vec<MultiByteChar>) {
+    let mut lines = vec![source_file_start_pos];
+    let mut multi_byte_chars = vec![];
+
+    let mut i = 0;
+    let src_bytes = src.as_bytes();
+
+    while i < src.len() {
+        // SAFETY: We verified that i < src.len().
+        let i_usize = i as usize;
+        let byte = unsafe { *src_bytes.get_unchecked(i_usize) };
+
+        // How much to advance to get to the next UTF-8 char in the string.
+        let mut char_len = 1;
+
+        let pos = BytePos::from_usize(i) + source_file_start_pos;
+
+        if let b'\n' = byte {
+            lines.push(pos + BytePos(1));
+        } else if byte >= 127 {
+            // The slow path:
+            // This is either ASCII control character "DEL" or the beginning of
+            // a multibyte char. Just decode to `char`.
+            let c = (&src[i..]).chars().next().unwrap();
+            char_len = c.len_utf8();
+
+            if char_len > 1 {
+                assert!((2..=4).contains(&char_len));
+                let bytes = char_len as u8;
+                let mbc = MultiByteChar { pos, bytes };
+                multi_byte_chars.push(mbc);
+            }
+        }
+
+        i += char_len;
+    }
+
+    // The code above optimistically registers a new line *after* each \n it encounters.
+    // If that point is already outside the source_file, remove it again.
+    if let Some(&last_line_start) = lines.last() {
+        let source_file_end = source_file_start_pos + BytePos::from_usize(src.len());
+        assert!(source_file_end >= last_line_start);
+        if last_line_start == source_file_end {
+            lines.pop();
+        }
+    }
+
+    (lines, multi_byte_chars)
+}
diff --git a/leo/span/src/span.rs b/leo/span/src/span.rs
index a2e1758715..7dff0ce0dc 100644
--- a/leo/span/src/span.rs
+++ b/leo/span/src/span.rs
@@ -16,103 +16,47 @@
 
 //! Defines the `Span` type used to track where code comes from.
 
-use std::{fmt, sync::Arc, usize};
+use core::ops::{Add, Sub};
+use serde::{Deserialize, Serialize};
+use std::{fmt, usize};
 
-use serde::ser::{Serialize, SerializeStruct, Serializer};
-use serde::Deserialize;
+use crate::symbol::with_session_globals;
 
 /// The span type which tracks where formatted errors originate from in a Leo file.
 /// This is used in many spots throughout the rest of the Leo crates.
-#[derive(Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq)]
+#[derive(Copy, Clone, Debug, Default, Deserialize, Eq, Hash, PartialEq, Serialize)]
 pub struct Span {
-    // TODO(Centril): All of could be optimized to just `{ lo: u32, hi: u32 }`,
-    // i.e. 8 bytes by indexing into a global source map of all files concatenated.
-    // That would also give us `Copy` which is quite nice!
-    /// The line number where the error started.
-    pub line_start: usize,
-    /// The line number where the error stopped.
-    pub line_stop: usize,
-    /// The column number where the error started.
-    pub col_start: usize,
-    /// The column number where the error stopped.
-    pub col_stop: usize,
-    /// The path to the Leo file containing the error.
-    pub path: Arc<String>,
-    /// The content of the line(s) that the span is found on.
-    pub content: String,
+    /// The start position of the span.
+    pub lo: BytePos,
+    /// The end position of the span.
+    /// The length is simply `end - start`.
+    pub hi: BytePos,
 }
 
 impl Span {
-    /// Generate a new span from:
-    /// - Where the Leo line starts.
-    /// - Where the Leo line stops.
-    /// - Where the Leo column starts.
-    /// - Where the Leo column stops.
-    /// - The path to the Leo file.
-    /// - The content of those specified bounds.
-    pub fn new(
-        line_start: usize,
-        line_stop: usize,
-        col_start: usize,
-        col_stop: usize,
-        path: Arc<String>,
-        content: String,
-    ) -> Self {
-        Self {
-            line_start,
-            line_stop,
-            col_start,
-            col_stop,
-            path,
-            content,
-        }
+    /// Generate a new span from the `start`ing and `end`ing positions.
+    pub fn new(start: BytePos, end: BytePos) -> Self {
+        Self { lo: start, hi: end }
     }
 
     /// Generates a dummy span with all defaults.
     /// Should only be used in temporary situations.
-    pub fn dummy() -> Self {
-        Self::new(0, 0, 0, 0, <_>::default(), <_>::default())
-    }
-}
-
-impl Serialize for Span {
-    /// Custom serialization for testing purposes.
-    fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
-    where
-        S: Serializer,
-    {
-        let mut state = serializer.serialize_struct("Color", 3)?;
-        state.serialize_field("line_start", &self.line_start)?;
-        state.serialize_field("line_stop", &self.line_stop)?;
-        state.serialize_field("col_start", &self.col_start)?;
-        state.serialize_field("col_stop", &self.col_stop)?;
-        // This is for testing purposes since the tests are run on a variety of OSes.
-        if std::env::var("LEO_TESTFRAMEWORK")
-            .unwrap_or_default()
-            .trim()
-            .to_owned()
-            .is_empty()
-        {
-            state.serialize_field("path", &self.path)?;
-        } else {
-            state.serialize_field("path", "")?;
+    pub const fn dummy() -> Self {
+        Self {
+            lo: BytePos(0),
+            hi: BytePos(0),
         }
-        state.serialize_field("content", &self.content)?;
-        state.end()
+    }
+
+    /// Is the span a dummy?
+    pub fn is_dummy(&self) -> bool {
+        self == &Self::dummy()
     }
 }
 
 impl fmt::Display for Span {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
-        if self.line_start == self.line_stop {
-            write!(f, "{}:{}-{}", self.line_start, self.col_start, self.col_stop)
-        } else {
-            write!(
-                f,
-                "{}:{}-{}:{}",
-                self.line_start, self.col_start, self.line_stop, self.col_stop
-            )
-        }
+        with_session_globals(|s| write!(f, "{}", s.source_map.span_to_string(*self)))
     }
 }
 
@@ -120,69 +64,95 @@ impl std::ops::Add for &Span {
     type Output = Span;
 
     fn add(self, other: &Span) -> Span {
-        self.clone() + other.clone()
+        *self + *other
     }
 }
 
 impl std::ops::Add for Span {
     type Output = Self;
 
-    #[allow(clippy::comparison_chain)]
     fn add(self, other: Self) -> Self {
-        if self.line_start == other.line_stop {
-            Span {
-                line_start: self.line_start,
-                line_stop: self.line_stop,
-                col_start: self.col_start.min(other.col_start),
-                col_stop: self.col_stop.max(other.col_stop),
-                path: self.path,
-                content: self.content,
-            }
-        } else {
-            let mut new_content = vec![];
-            let self_lines = self.content.lines().collect::<Vec<_>>();
-            let other_lines = other.content.lines().collect::<Vec<_>>();
-            for line in self.line_start.min(other.line_start)..self.line_stop.max(other.line_stop) + 1 {
-                if line >= self.line_start && line <= self.line_stop {
-                    new_content.push(
-                        self_lines
-                            .get(line - self.line_start)
-                            .copied()
-                            .unwrap_or_default()
-                            .to_string(),
-                    );
-                } else if line >= other.line_start && line <= other.line_stop {
-                    new_content.push(
-                        other_lines
-                            .get(line - other.line_start)
-                            .copied()
-                            .unwrap_or_default()
-                            .to_string(),
-                    );
-                } else if new_content.last().map(|x| *x != "...").unwrap_or(true) {
-                    new_content.push(format!("{:<1$}...", " ", other.col_start + 4));
-                }
-            }
-            let new_content = new_content.join("\n");
-            if self.line_start < other.line_stop {
-                Span {
-                    line_start: self.line_start,
-                    line_stop: other.line_stop,
-                    col_start: self.col_start,
-                    col_stop: other.col_stop,
-                    path: self.path,
-                    content: new_content,
-                }
-            } else {
-                Span {
-                    line_start: other.line_start,
-                    line_stop: self.line_stop,
-                    col_start: other.col_start,
-                    col_stop: self.col_stop,
-                    path: self.path,
-                    content: new_content,
-                }
-            }
-        }
+        let lo = self.lo.min(other.lo);
+        let hi = self.hi.max(other.hi);
+        Self::new(lo, hi)
     }
 }
+
+// _____________________________________________________________________________
+// Pos, BytePos, CharPos
+//
+
+pub trait Pos {
+    fn from_usize(n: usize) -> Self;
+    fn to_usize(&self) -> usize;
+    fn from_u32(n: u32) -> Self;
+    fn to_u32(&self) -> u32;
+}
+
+macro_rules! impl_pos {
+    (
+        $(
+            $(#[$attr:meta])*
+            $vis:vis struct $ident:ident($inner_vis:vis $inner_ty:ty);
+        )*
+    ) => {
+        $(
+            $(#[$attr])*
+            $vis struct $ident($inner_vis $inner_ty);
+
+            impl Pos for $ident {
+                #[inline(always)]
+                fn from_usize(n: usize) -> $ident {
+                    $ident(n as $inner_ty)
+                }
+
+                #[inline(always)]
+                fn to_usize(&self) -> usize {
+                    self.0 as usize
+                }
+
+                #[inline(always)]
+                fn from_u32(n: u32) -> $ident {
+                    $ident(n as $inner_ty)
+                }
+
+                #[inline(always)]
+                fn to_u32(&self) -> u32 {
+                    self.0 as u32
+                }
+            }
+
+            impl Add for $ident {
+                type Output = $ident;
+
+                #[inline(always)]
+                fn add(self, rhs: $ident) -> $ident {
+                    $ident(self.0 + rhs.0)
+                }
+            }
+
+            impl Sub for $ident {
+                type Output = $ident;
+
+                #[inline(always)]
+                fn sub(self, rhs: $ident) -> $ident {
+                    $ident(self.0 - rhs.0)
+                }
+            }
+        )*
+    };
+}
+
+impl_pos! {
+    /// A byte offset.
+    #[derive(Clone, Copy, PartialEq, Eq, Hash, PartialOrd, Ord, Debug, Serialize, Deserialize, Default)]
+    pub struct BytePos(pub u32);
+
+    /// A character offset.
+    ///
+    /// Because of multibyte UTF-8 characters,
+    /// a byte offset is not equivalent to a character offset.
+    /// The [`SourceMap`] will convert [`BytePos`] values to `CharPos` values as necessary.
+    #[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
+    pub struct CharPos(pub usize);
+}
diff --git a/leo/span/src/symbol.rs b/leo/span/src/symbol.rs
index c9a30ed80b..645cad57d3 100644
--- a/leo/span/src/symbol.rs
+++ b/leo/span/src/symbol.rs
@@ -15,6 +15,7 @@
 // along with the Leo library. If not, see <https://www.gnu.org/licenses/>.
 
 use crate::dropless::DroplessArena;
+use crate::source_map::SourceMap;
 
 use core::cmp::PartialEq;
 use core::convert::AsRef;
@@ -287,12 +288,15 @@ impl fmt::Display for SymbolStr {
 pub struct SessionGlobals {
     /// The interner for `Symbol`s used in the compiler.
     symbol_interner: Interner,
+    /// The source map used in the compiler.
+    pub source_map: SourceMap,
 }
 
 impl SessionGlobals {
     fn new() -> Self {
         Self {
             symbol_interner: Interner::prefilled(),
+            source_map: SourceMap::default(),
         }
     }
 }
diff --git a/tests/expectations/compiler/compiler/address/branch.leo.out b/tests/expectations/compiler/compiler/address/branch.leo.out
index a8fa137b42..ea8c36af1e 100644
--- a/tests/expectations/compiler/compiler/address/branch.leo.out
+++ b/tests/expectations/compiler/compiler/address/branch.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: bbe973798ab14152165455260924a0de60131d31da32d2e223228954365dc609
-    initial_ast: fa5f2ab70ae04bbd7684fc630de6cd5d6d85e791ccf9f06e65b7ae6a03e2ec48
+      - initial_input_ast: c7315faf1ac3ceeb90260e64e4a411a27a8aa732892a64c15f49e81adf464beb
+    initial_ast: b80eed2960509f11bce6294687558fb7b907f1d83455287f944dfa981ebe1ec8
     symbol_table: 9d42b1d8f167826635e5169bc3a50c14f722fba8e5ce2480fbde3b8cf2e75237
diff --git a/tests/expectations/compiler/compiler/address/equal.leo.out b/tests/expectations/compiler/compiler/address/equal.leo.out
index 075795fcab..1502c75a07 100644
--- a/tests/expectations/compiler/compiler/address/equal.leo.out
+++ b/tests/expectations/compiler/compiler/address/equal.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 98da6a76f2370e9311042851dde02ebaa4e64528d9461a5e722858f394d25f93
-      - initial_input_ast: 85307a4f16278d38b746d321756e41c3cf48bbb2dc5bad2f0e9a7b8c4dd2541e
-    initial_ast: 998b6e02af1be3c649cecd0129810b237f33289b801d24a90c38260561cc0318
+      - initial_input_ast: dc6b4b00185dd6c1f2b83a1bfae619c1d6e3f68ac0f1d3d87ae3bd0ed5caf083
+      - initial_input_ast: 73a38568160c3d2be402043d04ccdc2290abe27647bc81c4bd50367834c206cf
+    initial_ast: 6514080a9452d6e193510250dec3b87081e0741d05cc59ca456f2b2f3f36ec72
     symbol_table: 7ec407fabcae0eeef889009b8ba99beac3d18b2d79cc49e7760261d80bd59728
diff --git a/tests/expectations/compiler/compiler/address/ternary.leo.out b/tests/expectations/compiler/compiler/address/ternary.leo.out
index 27ca307b7c..9c8eff1233 100644
--- a/tests/expectations/compiler/compiler/address/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/address/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 98da6a76f2370e9311042851dde02ebaa4e64528d9461a5e722858f394d25f93
-      - initial_input_ast: 85307a4f16278d38b746d321756e41c3cf48bbb2dc5bad2f0e9a7b8c4dd2541e
-    initial_ast: c1865cfe898ea72b3f411b63364f3643ad452860c6d1db92e843f2c61094eec9
+      - initial_input_ast: b6371958e735320861c84ed514f258ae8a9858b34615364b2f9ebbaa2aaadd8c
+      - initial_input_ast: d384cfea1a36220e9ea4e246ece89d8fffa320f90aeeb85660bc445ab62a0829
+    initial_ast: 7085f8bf0a01a4fd7b73b5e3fc1c2c812d0cd459a5b6ea85791fc3c01118c7a0
     symbol_table: 5a12f141aef86a7a00b86650e23cfd9af657d6f418df7b1ee9eab06714305d31
diff --git a/tests/expectations/compiler/compiler/boolean/and.leo.out b/tests/expectations/compiler/compiler/boolean/and.leo.out
index 3a2a390d85..09283a275d 100644
--- a/tests/expectations/compiler/compiler/boolean/and.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/and.leo.out
@@ -3,9 +3,9 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 51b03881ad0ef3af7d105c163071fb69fb38048bea44c4bc380fd17367ce94e0
-      - initial_input_ast: 59b58754cc7667404c6bba5d90a9e53b7f9f36b6d7c9783e5b88d12728127e66
-      - initial_input_ast: 55ff7a9a3f210ea871c438a89f07da6c54ca1b8129e7344593017d22305297b4
-      - initial_input_ast: c89564770d1984e4e8c0c17c6c50b66b4a5d4ade85899562f506afc22e50496d
-    initial_ast: 30050aaa080b73f03ccc9a5fda9bdb9fcba0aea90171b8cdf39c50c5eb8ac7ab
+      - initial_input_ast: e6457724e4c3bb27eca30df861f711f962ac47fb0e7d0b9dc959be0feaeb7763
+      - initial_input_ast: c8d27a86795a6d56815a681066b7f462f5476be6d56ec910b74d90c60d8b3cc9
+      - initial_input_ast: 4ff2fb01e2d10a59bf4fcd1ed3b510c6860167dbd3bd4d099c6b8a78d2a767af
+      - initial_input_ast: 96ddbb84cba723df65571d6537a303189e6274389593980996fd7ee50eab996e
+    initial_ast: e17f5c2d253ffc1e8e3389253f89feca418b429eb912840a21172d63d117c7ec
     symbol_table: f36863240edb9fb5fb852c212a9ae1db491ee8243d0469fc155592964595e7d0
diff --git a/tests/expectations/compiler/compiler/boolean/conditional.leo.out b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
index 3078da4956..7ad35316bd 100644
--- a/tests/expectations/compiler/compiler/boolean/conditional.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/conditional.leo.out
@@ -3,9 +3,9 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 51b03881ad0ef3af7d105c163071fb69fb38048bea44c4bc380fd17367ce94e0
-      - initial_input_ast: 59b58754cc7667404c6bba5d90a9e53b7f9f36b6d7c9783e5b88d12728127e66
-      - initial_input_ast: 55ff7a9a3f210ea871c438a89f07da6c54ca1b8129e7344593017d22305297b4
-      - initial_input_ast: c89564770d1984e4e8c0c17c6c50b66b4a5d4ade85899562f506afc22e50496d
-    initial_ast: 73e2d3f95cac34a231f20df1de3c53fd08ae3d9e604ee28557c1098299e8170c
+      - initial_input_ast: e7e9fd77647ac56ed68e547bfb8d0c767313030072a510ec138027ffb62fc368
+      - initial_input_ast: e43c024d6fad8a7a04672fa318936703a4798699283f7b66d9383d52acc104a0
+      - initial_input_ast: 695d879ad212b23fb3e91fae782c701c5f0469bbcaabdcfc6e5dcadc5b7e6c9a
+      - initial_input_ast: 390e951d2b90cf150acd9bc6eeeffbc3a8d7af3ce3781f14ebdce3f1054de4c8
+    initial_ast: adb3d21c4da2e7538a95ba689373f870d370001c8fb60e38a96ed6e6cf87ae6c
     symbol_table: 4fd4e476609947028fbffe357ffb9d962e96c30a9abe3677d75675ae37b12587
diff --git a/tests/expectations/compiler/compiler/boolean/equal.leo.out b/tests/expectations/compiler/compiler/boolean/equal.leo.out
index 095b7a4f0f..2ac5dd2c56 100644
--- a/tests/expectations/compiler/compiler/boolean/equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/equal.leo.out
@@ -3,9 +3,9 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 51b03881ad0ef3af7d105c163071fb69fb38048bea44c4bc380fd17367ce94e0
-      - initial_input_ast: 59b58754cc7667404c6bba5d90a9e53b7f9f36b6d7c9783e5b88d12728127e66
-      - initial_input_ast: 55ff7a9a3f210ea871c438a89f07da6c54ca1b8129e7344593017d22305297b4
-      - initial_input_ast: c89564770d1984e4e8c0c17c6c50b66b4a5d4ade85899562f506afc22e50496d
-    initial_ast: 3c8d1d820525dc4e77214dfa0628a8fb73890ee1b90cfd443a4a736e6506bbad
+      - initial_input_ast: e6457724e4c3bb27eca30df861f711f962ac47fb0e7d0b9dc959be0feaeb7763
+      - initial_input_ast: c8d27a86795a6d56815a681066b7f462f5476be6d56ec910b74d90c60d8b3cc9
+      - initial_input_ast: 4ff2fb01e2d10a59bf4fcd1ed3b510c6860167dbd3bd4d099c6b8a78d2a767af
+      - initial_input_ast: 96ddbb84cba723df65571d6537a303189e6274389593980996fd7ee50eab996e
+    initial_ast: 487ec91d706447fafcff6e448723fa41dd02e6d8ea1b3b8670460ef9a7931c90
     symbol_table: c8dd46774e298ef70fc87f89ecb8b5f23f63b1f2401f337fc97ad83b54e85871
diff --git a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
index 51fb1b1d9a..5fa8c74308 100644
--- a/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/not_equal.leo.out
@@ -3,9 +3,9 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 51b03881ad0ef3af7d105c163071fb69fb38048bea44c4bc380fd17367ce94e0
-      - initial_input_ast: 59b58754cc7667404c6bba5d90a9e53b7f9f36b6d7c9783e5b88d12728127e66
-      - initial_input_ast: 55ff7a9a3f210ea871c438a89f07da6c54ca1b8129e7344593017d22305297b4
-      - initial_input_ast: c89564770d1984e4e8c0c17c6c50b66b4a5d4ade85899562f506afc22e50496d
-    initial_ast: f94ce8212b4164b85de34920f7da472033fbafe03e8e1d00a0ec7f9bae692b6c
+      - initial_input_ast: e6457724e4c3bb27eca30df861f711f962ac47fb0e7d0b9dc959be0feaeb7763
+      - initial_input_ast: c8d27a86795a6d56815a681066b7f462f5476be6d56ec910b74d90c60d8b3cc9
+      - initial_input_ast: 4ff2fb01e2d10a59bf4fcd1ed3b510c6860167dbd3bd4d099c6b8a78d2a767af
+      - initial_input_ast: 96ddbb84cba723df65571d6537a303189e6274389593980996fd7ee50eab996e
+    initial_ast: 4c24b2ad645f55d42b011b1173fc756330dfa1df4734c2c3275ff53a364ba28c
     symbol_table: 8ed9a73e996562abfe75837cfbf2103a4d9213291298206f4f63a7dac808cbc1
diff --git a/tests/expectations/compiler/compiler/boolean/or.leo.out b/tests/expectations/compiler/compiler/boolean/or.leo.out
index f8f140ac59..c67ddad7de 100644
--- a/tests/expectations/compiler/compiler/boolean/or.leo.out
+++ b/tests/expectations/compiler/compiler/boolean/or.leo.out
@@ -3,9 +3,9 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 51b03881ad0ef3af7d105c163071fb69fb38048bea44c4bc380fd17367ce94e0
-      - initial_input_ast: 59b58754cc7667404c6bba5d90a9e53b7f9f36b6d7c9783e5b88d12728127e66
-      - initial_input_ast: 55ff7a9a3f210ea871c438a89f07da6c54ca1b8129e7344593017d22305297b4
-      - initial_input_ast: c89564770d1984e4e8c0c17c6c50b66b4a5d4ade85899562f506afc22e50496d
-    initial_ast: ceac1c88ce7915eb171fef59cf7788b1d83cb53d313e0325b4b6e7ca7c0b0eea
+      - initial_input_ast: e6457724e4c3bb27eca30df861f711f962ac47fb0e7d0b9dc959be0feaeb7763
+      - initial_input_ast: c8d27a86795a6d56815a681066b7f462f5476be6d56ec910b74d90c60d8b3cc9
+      - initial_input_ast: 4ff2fb01e2d10a59bf4fcd1ed3b510c6860167dbd3bd4d099c6b8a78d2a767af
+      - initial_input_ast: 96ddbb84cba723df65571d6537a303189e6274389593980996fd7ee50eab996e
+    initial_ast: 69f7732147079d749ad863cb4442be4722f1b7eb16f26b7f972beed0d006044c
     symbol_table: 91630eda77eaf1e355744e663ceba26a0c3f860d3f69e8e46b03f5464d16950f
diff --git a/tests/expectations/compiler/compiler/char/neq.leo.out b/tests/expectations/compiler/compiler/char/neq.leo.out
index 01af1b1a7d..d01fddf671 100644
--- a/tests/expectations/compiler/compiler/char/neq.leo.out
+++ b/tests/expectations/compiler/compiler/char/neq.leo.out
@@ -3,20 +3,20 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: c5014ebe0b04ecf0cfca9befc3cad1725daf451b4a926741ef909fe396007891
-      - initial_input_ast: e754ce377bf760178cf72cf8b0e1597c94eb833bf18e3524c99cd86c6ac4b003
-      - initial_input_ast: ff9ecea579f37e0abbac30d7065f5293b0bf8affc53cfd627e0e1e43227e9b27
-      - initial_input_ast: 72a3e3befe5feac1a922a42ce7fa7f1bc495eeeab43b3be86df09db770c93e73
-      - initial_input_ast: 45237feb75335b96d98682c743ededad68167fcc6ad151eca3caa55b1625b647
-      - initial_input_ast: c14a6deb2a1f0f60320260b189fea801ee942e3e44e0d6334067d6d7972eb4be
-      - initial_input_ast: 38431bcff38b26387d2f41af68d2a6e22d184be6d44dbcdc6e5eda62ae822d40
-      - initial_input_ast: 767918cd56f1bc8a9c6b64cc0e92dab97698e500588a0cf480e0b5838e7067f0
-      - initial_input_ast: c7ba648f22d3b30d4f62a1093a2dcab8def815aa9f7083ee4fe9236dd63b1c0e
-      - initial_input_ast: d6acd30374e64196b072f5a1c68ba379cce1eb5e866afac4acd98643f68d1c03
-      - initial_input_ast: 2aa446f52a535b7918039280d90d098deea58ae0d84445dd31a8c66f05f52449
-      - initial_input_ast: 69a6b4dcd3e363cce68ccdae93f77ead9319af6886aecf775a09a0ed535bb02b
-      - initial_input_ast: c2f4b8b92cb0ee71de7fd532b483c2fb2c9ebcc8a59249a763fc30d05eb5d38e
-      - initial_input_ast: 9196de328711651e75edb7ffba6b85b37ca468d509b0e96e6b5271d6d0785949
-      - initial_input_ast: 012468d79c66ea8de1b7357678f0dd4f12a4188b384ed38696934add946dc72f
-    initial_ast: 5ee529ed9657976f562ba09ffbd0c642283ac523a4ed4df18520a26b3769e408
+      - initial_input_ast: 1a59d72ff9c08c97f0faa7d32e701487abce48630c3da2ec76dee451ed806c3b
+      - initial_input_ast: 8c79c9fa5fa8422d837bd092a848293d1772fdc97b80c7394146fc759768c868
+      - initial_input_ast: cbf3cfc28c6c396dd5dd24ec3cb59121d2d6615feb4aa9a452ea310248dfb238
+      - initial_input_ast: 8a914ea590d1b978e7f0da8feeebcbe195e925a20424fe0a6611b2115b072c90
+      - initial_input_ast: f37e2792fd64626a0270041c37d587d4929ac2afe6b3b9a576c3ec400271f0db
+      - initial_input_ast: d9a2bd44fa3b8e850b79be10ab046af8d61b5e781cc991250969555eaccf9d23
+      - initial_input_ast: c10a3ffcb8bbbaaa3028e8037fc183214933291d5ecf8ec0354df1b27a83c99a
+      - initial_input_ast: 32628105ebaaed3207a26402f2f7a5075f2d7d865d51e56f2e8f0bade905058c
+      - initial_input_ast: 2bc88f79d4b48e6321c08ba4a6cfeb2a7363b238d79b3a558dbc4383c14a3ebc
+      - initial_input_ast: 5d6794f9c9406df4df4673433c806588bb9ed72992bb58cc62fa63a3a872e153
+      - initial_input_ast: 833c67bb4946711a01be5f564905d83eaf4c4fbc72ff77599ff3b8dd5a5c8691
+      - initial_input_ast: 2a4441d425a2e35c929d92256601e3713c870ef3c9c6206dccb238e42be532cb
+      - initial_input_ast: 3edf030ed195c3ab8278af07fa1592314e2e3f9ad1e6c0ca3e27856be5e6f72c
+      - initial_input_ast: f3dcb662ae0facb7afdd7cee9416261a48d37baa8a4d5d7f09d81e4621b53f3f
+      - initial_input_ast: aebc549a2d2d87e1cca5e6d814b1b6dfdc4c32bb21045ad967bc67978a8ef871
+    initial_ast: 8c9ec5e2c1544bc45c6d4dd9f21caa3121c2ba61c44fb66d8148883460b20820
     symbol_table: cf3569155d9961e6cab441ea9a60f5c92d2b18e6cd2ecaa64b1529d1774d3585
diff --git a/tests/expectations/compiler/compiler/char/out.leo.out b/tests/expectations/compiler/compiler/char/out.leo.out
index 514b3aac5d..e292e48968 100644
--- a/tests/expectations/compiler/compiler/char/out.leo.out
+++ b/tests/expectations/compiler/compiler/char/out.leo.out
@@ -3,20 +3,20 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: c5014ebe0b04ecf0cfca9befc3cad1725daf451b4a926741ef909fe396007891
-      - initial_input_ast: e754ce377bf760178cf72cf8b0e1597c94eb833bf18e3524c99cd86c6ac4b003
-      - initial_input_ast: ff9ecea579f37e0abbac30d7065f5293b0bf8affc53cfd627e0e1e43227e9b27
-      - initial_input_ast: 72a3e3befe5feac1a922a42ce7fa7f1bc495eeeab43b3be86df09db770c93e73
-      - initial_input_ast: 45237feb75335b96d98682c743ededad68167fcc6ad151eca3caa55b1625b647
-      - initial_input_ast: c14a6deb2a1f0f60320260b189fea801ee942e3e44e0d6334067d6d7972eb4be
-      - initial_input_ast: 38431bcff38b26387d2f41af68d2a6e22d184be6d44dbcdc6e5eda62ae822d40
-      - initial_input_ast: 767918cd56f1bc8a9c6b64cc0e92dab97698e500588a0cf480e0b5838e7067f0
-      - initial_input_ast: c7ba648f22d3b30d4f62a1093a2dcab8def815aa9f7083ee4fe9236dd63b1c0e
-      - initial_input_ast: d6acd30374e64196b072f5a1c68ba379cce1eb5e866afac4acd98643f68d1c03
-      - initial_input_ast: 2aa446f52a535b7918039280d90d098deea58ae0d84445dd31a8c66f05f52449
-      - initial_input_ast: 69a6b4dcd3e363cce68ccdae93f77ead9319af6886aecf775a09a0ed535bb02b
-      - initial_input_ast: c2f4b8b92cb0ee71de7fd532b483c2fb2c9ebcc8a59249a763fc30d05eb5d38e
-      - initial_input_ast: 9196de328711651e75edb7ffba6b85b37ca468d509b0e96e6b5271d6d0785949
-      - initial_input_ast: 012468d79c66ea8de1b7357678f0dd4f12a4188b384ed38696934add946dc72f
-    initial_ast: 3965395dcb477379853989110bf621aefc6a052ee39e06b9e1d15dbe0f0de184
+      - initial_input_ast: 44e0b05b0da70ab554408e1fa7a8578282522b358320cde13231c2136e4df5b1
+      - initial_input_ast: fa8ef1a0d3743224c55ca78079611c87374266313d2254c5b18a99443e038d51
+      - initial_input_ast: 6aa65f48c47c0a70326ee6034a46c38ed25116b02b748827fde3a4a46cb9cb95
+      - initial_input_ast: de106cf7de15ce9b35d00a97dccf6b90077303e8bfcec568d65352107c2a81f8
+      - initial_input_ast: a6badf7eba50a21d6ebc1c82eb70cd4081e37680dd8d4b597ea04192ccbf4e5a
+      - initial_input_ast: 72e2f6ef3f3cb3135dbb46dd1c5808c206cfa762a708a8d5483b6bc2958a33ba
+      - initial_input_ast: 0a5209868d802596f6094912deb7adaef5f21e0ee269eeaa3a661d403a64701e
+      - initial_input_ast: be71fcee4adbb8c7de279825c5fd87d8c55597a97f57f9af28d88e3f51781c79
+      - initial_input_ast: 55aae45600898144d628c1211e2de07794ce4784eef21a6b978aa064d3fa89f4
+      - initial_input_ast: 8f73004838aee69e847d99ab0b284d99c61a8283b91227e1dd890994220da8e1
+      - initial_input_ast: 6de398471c245e863855e68b0b672bcda53467f638ccf2ded60930a930f3de25
+      - initial_input_ast: 1d22c4edd4f3fec707b8cb6e60bf57b4e278913fbb6c15c4fa2bce0e318de232
+      - initial_input_ast: 7642187a32f44ae4d5743ae8f46bb669937490ff926c46cf8af8b36b5bc747c5
+      - initial_input_ast: 4d7b20c6c94064e08e0f19b0f45cbdd740f668fefcafd361865226c5af087440
+      - initial_input_ast: 9de9e1877e523f5aa44d019bba11e7bb58ad1f9952aae3254908e8b151b3ae55
+    initial_ast: 526f77f4386ed6b5dd40f7e352f48e43c04655123bf329dbed9f6dadd43a4963
     symbol_table: 1cad55eef598e4d05af7c5f88119636a2e6d23d81213bbaad908d66a32906780
diff --git a/tests/expectations/compiler/compiler/console/assert.leo.out b/tests/expectations/compiler/compiler/console/assert.leo.out
index 5a4087ee5b..5624f3cc49 100644
--- a/tests/expectations/compiler/compiler/console/assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 204a90b23ba88927aabdc72aed02effa556d73742caf7d370527f79f0b30f621
-    initial_ast: 10539810602f7b65e0ac424d7e92b4565c965fdbe139b267f5fd4aae4c67d470
+      - initial_input_ast: 9698e866b0330be095c65ca93f17ed5fe3d31c61d5622eaf54c774d79d3b6950
+    initial_ast: d771cc51e9c822faf8cb1ca6f80d19c22379ac37c9ae9e357010e79029c6baf2
     symbol_table: f8c971e501487f7a368a50fd1941c3fb70684b041478fe615a91f088796e301b
diff --git a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
index 1996ea3f70..fd8bb71f70 100644
--- a/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
+++ b/tests/expectations/compiler/compiler/console/conditional_assert.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 204a90b23ba88927aabdc72aed02effa556d73742caf7d370527f79f0b30f621
-      - initial_input_ast: cbc36a842b21e80aee167b65bd1a59861d59a43e27915b785410f032ae19a570
-    initial_ast: 1e37339f631e947b4f85cf4f43ba4c1a26439ab565dc559f27c4923afc3ef34a
+      - initial_input_ast: e9253dc5764d8870dc6842860993ce0b2495925b3bdb18891b7c4aa67fe0a81d
+      - initial_input_ast: 3153e33ab1630d74ad221b5ce6d5e50c17fb86d91a2aae4ce67b46fec12c1ef4
+    initial_ast: 8fdb85c9c133687f89fe5c2ca9b177a4a777269eab425f9008ab330cce85542e
     symbol_table: f4e056be00b25dfd854a5be8197aeb205436bb0ee11cfe06701531ea086e038c
diff --git a/tests/expectations/compiler/compiler/console/error.leo.out b/tests/expectations/compiler/compiler/console/error.leo.out
index 4271b5f36e..2ce54190cf 100644
--- a/tests/expectations/compiler/compiler/console/error.leo.out
+++ b/tests/expectations/compiler/compiler/console/error.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 38e6b369397fcf11fa921808be61baf33a705d4509bc15a46ec69e1a0aaa5031
-    initial_ast: d1d00796ff928991e5c898877a2f6e540dc744807d696b3b14af935e380eafb4
+      - initial_input_ast: 6b9e5227fdce9f916cd2398ea85c2d7e7b2f7d706bfa730b8cd1acdeb3f168cd
+    initial_ast: e3b69d0b4355afd331edf8c572b64746bc763a714626043a9edc8eba42b08ec8
     symbol_table: d46f6eb98259f34d32a60788aa178efa34166bcc6ba1058e2ff5f8327a129b9c
diff --git a/tests/expectations/compiler/compiler/console/log.leo.out b/tests/expectations/compiler/compiler/console/log.leo.out
index 951ba01393..7fa5f4bdca 100644
--- a/tests/expectations/compiler/compiler/console/log.leo.out
+++ b/tests/expectations/compiler/compiler/console/log.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 38e6b369397fcf11fa921808be61baf33a705d4509bc15a46ec69e1a0aaa5031
-    initial_ast: a2e9492d07dd4600eb79386662e4fd1f56b5c95fe4b05ef149a346e1b935f908
+      - initial_input_ast: 89959164cbf734ac0d261c7459b9c1214eb2f4b3ab9ec57a0b22db487d6537e4
+    initial_ast: cb79b9db64a7e92b85706e517b586b4fe9cd591850e7130cc7bfad6dd92b4d3f
     symbol_table: 559484bc163178bf54b169f5dd573167771566aa993055b6a28f0c1a759339bc
diff --git a/tests/expectations/compiler/compiler/console/log_conditional.leo.out b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
index 738f68bb81..479df480d2 100644
--- a/tests/expectations/compiler/compiler/console/log_conditional.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_conditional.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b9ca1f9e4746ba9f99375205e309b977a522109054d058039197767b39fa6833
-      - initial_input_ast: 398a847f3f6c8826a10942c856b67d9acf37a51bf4ec9109be549b24b2dfff94
-    initial_ast: a80b061288d4070d42ab6f4b37404004faab51e8a58cd301632c88bf940e9630
+      - initial_input_ast: 4132cf36ac66f6b23e249f81b5c2aafa58e4e5e945920cc29752edc5d6d8057f
+      - initial_input_ast: 586ed72429932a1aafcd0f8eed983a4babff8eada9c028b88bbeef24dab1cbc0
+    initial_ast: 0360f7fba87784c290f73693b81ca1b71e3259794f0fb3d3cbe39cc143e92d82
     symbol_table: 560afbb790df70bfc770d5c2f966428a37baf94a5c0f5312ad445456d33a2cd9
diff --git a/tests/expectations/compiler/compiler/console/log_input.leo.out b/tests/expectations/compiler/compiler/console/log_input.leo.out
index e70584d630..ec01248f24 100644
--- a/tests/expectations/compiler/compiler/console/log_input.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_input.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 38e6b369397fcf11fa921808be61baf33a705d4509bc15a46ec69e1a0aaa5031
-    initial_ast: fd62f417968d0212bd96f8069d2afafeb1f6f44e3270d1b729687cb82d882a12
+      - initial_input_ast: 5411bd17943bb0aa7b0bb27e8b38f57fd27f06f2080b13a32eee50c53de66f6c
+    initial_ast: ab02de15b37b07d52d385468d72b03f8f9ecff3c9f130b8a3985be326f9f6edf
     symbol_table: 720c2aafae77c261ed1640d4080f9a73657638baa30e54a5e10e2323b6f6eca0
diff --git a/tests/expectations/compiler/compiler/console/log_parameter.leo.out b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
index fbd69c8791..2985e69ae9 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 38e6b369397fcf11fa921808be61baf33a705d4509bc15a46ec69e1a0aaa5031
-    initial_ast: d95ed89ada21401d204e86326c24904a1155dce3b2c9189741152f2b0c0d2f2b
+      - initial_input_ast: 18e8a4118829470d3150268bbf8d298954e1f566ea2d42ed9f3660dc25c23fcc
+    initial_ast: 4fa505d3542f2df2abcdbbf7d487ff65e1e311366fc2eaee286f8ba253876883
     symbol_table: e5159343ab03573032873783b28058a482dd401d534a0d3af03790a5286ba470
diff --git a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
index 2398d97482..7f8a52b671 100644
--- a/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
+++ b/tests/expectations/compiler/compiler/console/log_parameter_many.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 38e6b369397fcf11fa921808be61baf33a705d4509bc15a46ec69e1a0aaa5031
-    initial_ast: 916cd6ab87496b67555c23de086a4a309a9a7630c4d1e198f04d3eb591fabecf
+      - initial_input_ast: caa45de3b412d749048b9be732a4593f3094c671701093103f580817a741acbb
+    initial_ast: 8dc13a9cb4d48b8a5e33d4e16a3071869a6ac7034962af5baf8f5f19a2b218dd
     symbol_table: 757bb967973b87466c01be1a9dc78d30701964e0d234e0e65d1bbcbd3072370f
diff --git a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
index 79e703b8d3..5f0a0b97d5 100644
--- a/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
+++ b/tests/expectations/compiler/compiler/definition/out_of_order.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: ea05e8a68b86c5cd7189870b309bb5a4107dd6f84c9ccd359aacbfee82045242
+      - initial_input_ast: 4a7171bfd4cb5b69729e26e4c6b0915f261d3f51b2937d8de5009069f56abfc1
+    initial_ast: 8b6fdc73a1397af850bcb47a623f82ff773919308fec52eeb890c8b4a2e686e7
     symbol_table: 66779461e33acc9c5c732509637db91bd72aff3e9dae6aee0c137d0537446878
diff --git a/tests/expectations/compiler/compiler/field/add.leo.out b/tests/expectations/compiler/compiler/field/add.leo.out
index 2d6ee96e68..ec3ec44457 100644
--- a/tests/expectations/compiler/compiler/field/add.leo.out
+++ b/tests/expectations/compiler/compiler/field/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: e0c7874ac5b43acb60bfb111cfafba0b5151b202f86c459913a9d4dd8ca151b0
+      - initial_input_ast: 770cad45d17364fd3acd19fb67c66ea8f58ea54c5c42386d1a0fe02f241e9f2b
+    initial_ast: 5c6f3087ccb1ce8c559638d4a4308a784a1a69735fd3a4cbd7eccdcb6b76aeb7
     symbol_table: d666098c1c0d7c670730cfa6548d47fa89d9a1dd33642f8021b0622f9abc0e5e
diff --git a/tests/expectations/compiler/compiler/field/div.leo.out b/tests/expectations/compiler/compiler/field/div.leo.out
index 16f07d5ad5..87f011706d 100644
--- a/tests/expectations/compiler/compiler/field/div.leo.out
+++ b/tests/expectations/compiler/compiler/field/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: 149443378c6b75f71b33ad90306cf4b01616284ddfa2136fc19fe41e23c73178
+      - initial_input_ast: 3b1682d80f44da8eb1ea0d1236b5b9be15f7d4792fe7f31139a4362b2952d6a0
+    initial_ast: cda0e01cadbcd6488f11d1a79fd9e4d132560ff75dad986cb4502d74f3e464be
     symbol_table: 38cbfecf35fb5189618a9767d3245d02e133d59ce2a0fc0f3aba37a8fa14fe8e
diff --git a/tests/expectations/compiler/compiler/field/eq.leo.out b/tests/expectations/compiler/compiler/field/eq.leo.out
index c9e60b3af4..b164203f4b 100644
--- a/tests/expectations/compiler/compiler/field/eq.leo.out
+++ b/tests/expectations/compiler/compiler/field/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: 51eba8b00503b23218feec128cda498464acd2a9459fc717795d4137495a9820
+      - initial_input_ast: 1d6d705c0d5363431af8b58173f1061d4315c4ffe9ae175d6dd1c7ea2a01488f
+    initial_ast: fa376065aea93f4819afe923b978fd8addc4565c13b33cef8416cdd599f331b2
     symbol_table: 0879cd6e4cc609ecdbdfc87ff0f08b4f3ae54367e0a1c02116304eb1411d2c23
diff --git a/tests/expectations/compiler/compiler/field/field.leo.out b/tests/expectations/compiler/compiler/field/field.leo.out
index d37a0ba27c..9913f5e9ea 100644
--- a/tests/expectations/compiler/compiler/field/field.leo.out
+++ b/tests/expectations/compiler/compiler/field/field.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: d8d9ee6d763397372e62451e15980cde07796859d8ce319e4de5955d310f0cf6
+      - initial_input_ast: ccecfe74d5a1f89e892c982f5bf5bb59e094ade3b745b615ab1dcdc31b43dcd7
+    initial_ast: 15c31493b92dfe33d788f1259cc4208e47b050ed23a78febaf1611a89bea18a1
     symbol_table: 879c99134415a9bae5a26b0d2dccfab01b9374218b810853c86bcf36a76d979c
diff --git a/tests/expectations/compiler/compiler/field/mul.leo.out b/tests/expectations/compiler/compiler/field/mul.leo.out
index e92558481d..7c8f204b33 100644
--- a/tests/expectations/compiler/compiler/field/mul.leo.out
+++ b/tests/expectations/compiler/compiler/field/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: d95922ca56dfdffdea1e8c9668d67b17755ca66ff1c5387f034ecfb2ba961df6
+      - initial_input_ast: 770cad45d17364fd3acd19fb67c66ea8f58ea54c5c42386d1a0fe02f241e9f2b
+    initial_ast: 85b903cc00f43ea3e7c890d66ac568daded94a6c215028ef28d454e42bd6a25a
     symbol_table: 47782aad84b54a835bead341b6113b471712ddd6d19005040d16c5d199a0920a
diff --git a/tests/expectations/compiler/compiler/field/negate.leo.out b/tests/expectations/compiler/compiler/field/negate.leo.out
index 7d7a8f1fb7..2d3a2ac41d 100644
--- a/tests/expectations/compiler/compiler/field/negate.leo.out
+++ b/tests/expectations/compiler/compiler/field/negate.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: 31535a250bbc7eaedc9a40720b2668544615862297f229f633f51b3311d0ac0e
+      - initial_input_ast: a2440344211fa1dec9858bba8ae80c44b17dcf10d6d75bf639bd9019de97a843
+    initial_ast: f0f1be1e9efbb5455c0188bb7e646379eb2094914382378767d90d2deecb533b
     symbol_table: e20aa1c0f5d1b64b310c0e6d6bb306713f8696f092d080eab4031eacc0dcb798
diff --git a/tests/expectations/compiler/compiler/field/pow_signed.leo.out b/tests/expectations/compiler/compiler/field/pow_signed.leo.out
index 85b3044426..fe0425c4fe 100644
--- a/tests/expectations/compiler/compiler/field/pow_signed.leo.out
+++ b/tests/expectations/compiler/compiler/field/pow_signed.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: 7b7c0226a27a7655fd6e4780fdfcf5d2bc923d2aa48585954b47b8cd852bc998
+      - initial_input_ast: 195a6921720db473ae0b5093da0353391308e0e31a698e5ef105127e94113ff6
+    initial_ast: 66e17dd0b33e9a4f2e4312c5d6605a5d63e5bdf537df5f08f1a2fdc30f24c3f5
     symbol_table: c04c06d2f689387637bac27fff30cdaa87ec9b49fc03e1fe56b1e04029b6f925
diff --git a/tests/expectations/compiler/compiler/field/pow_unsigned.leo.out b/tests/expectations/compiler/compiler/field/pow_unsigned.leo.out
index 93ef5b3e39..d0905f3306 100644
--- a/tests/expectations/compiler/compiler/field/pow_unsigned.leo.out
+++ b/tests/expectations/compiler/compiler/field/pow_unsigned.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: 586028215ccf26abab187d6bff25c5dd332f1397be5474c468ca1411abec89a0
+      - initial_input_ast: 195a6921720db473ae0b5093da0353391308e0e31a698e5ef105127e94113ff6
+    initial_ast: b4e5d9d62d4ed1e5f963b0d957c9be73b8ebe09e749d1658396672ea7d938454
     symbol_table: 5527b2434b61b94d365ba1e8bd1c2173b9feef5aa21c99440920259fb7df2052
diff --git a/tests/expectations/compiler/compiler/field/sub.leo.out b/tests/expectations/compiler/compiler/field/sub.leo.out
index 5dfd371105..edb512785f 100644
--- a/tests/expectations/compiler/compiler/field/sub.leo.out
+++ b/tests/expectations/compiler/compiler/field/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: a9df57a8047f8562e1c08ac89cc25997590cb3759d7cc930714de57e8ac30624
+      - initial_input_ast: 3b1682d80f44da8eb1ea0d1236b5b9be15f7d4792fe7f31139a4362b2952d6a0
+    initial_ast: fa1fdad66c8c909e5820c04faa4709ef8c13d92933bf2d310202293b6851ac01
     symbol_table: f601b6a1652f79ac2853737ecf09f4e5f23c05873e2bb3967137a7b2b0085b04
diff --git a/tests/expectations/compiler/compiler/field/ternary.leo.out b/tests/expectations/compiler/compiler/field/ternary.leo.out
index a017d9a30e..afa35f1c41 100644
--- a/tests/expectations/compiler/compiler/field/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/field/ternary.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a50bcc0c4416f93de77861848ac00cd1b40e17f4c023ab3faea0fc0c332f148
-    initial_ast: 3cec4b6f5256f2e9299abbc632cc999d268bfaad48790abeb6efaad6f8081b2f
+      - initial_input_ast: c3b606138d1dc5f4dc541ddc113fb7d6e07cad4cbd1f382fcc0f9b8517077448
+    initial_ast: 3bf00992729530c37d6bd18b45096638d49ae243d31d52d633f065844f2523a4
     symbol_table: 5bb0a34e488683807eef29093f204fb2f1cfe8da3c2e2370d61e427a109a2d4a
diff --git a/tests/expectations/compiler/compiler/function/conditional_return.leo.out b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
index 678d598820..7321308b9c 100644
--- a/tests/expectations/compiler/compiler/function/conditional_return.leo.out
+++ b/tests/expectations/compiler/compiler/function/conditional_return.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 26679d48a4f878012c9f9cacccf9d2d1ef568126030a21abf74a5a4d8e5116d4
-    initial_ast: cc14440f67a0aecc81bc6e1aac0b5571fa1b9937af6ff3dde20addfce27be9e4
+      - initial_input_ast: 138147dfed32a1089f1d6a4ce19ef4f5278dcdbc2012c432ab460bc0601aaa11
+    initial_ast: 8ab7c0eefb3da8ee71f77391565e5d0ee349e690d8cb6f8d8cda9e6582b9d3c5
     symbol_table: 577abb859b2f33b9e81c5e94c82b559601f44025143fa7a6757561b47e78efa5
diff --git a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
index 3a6791e0f2..4a8184cba0 100644
--- a/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/duplicate_definition_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372014]: function `main` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function main(y: bool) -> bool {\n   4 |      ...\n   5 |      ...\n   6 | }\n     | ^\nError [EAST0372014]: function `main` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function main(y: bool) -> bool {\n   4 |      ...\n   5 |      ...\n   6 | }\n     | ^"
+  - "Error [EAST0372014]: function `main` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function main(y: bool) -> bool {\n   4 |     console.log(\"{}\", 1u8);\n   5 |     return y;\n   6 | }\n     | ^\nError [EAST0372014]: function `main` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function main(y: bool) -> bool {\n   4 |     console.log(\"{}\", 1u8);\n   5 |     return y;\n   6 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/function/iteration.leo.out b/tests/expectations/compiler/compiler/function/iteration.leo.out
index c1793df982..9f48bf3493 100644
--- a/tests/expectations/compiler/compiler/function/iteration.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e518f4721bb7a7b6c63e380710a5a8cf4e489ccf66461bf9a68dc4b369e16445
-    initial_ast: d350d059ac4c8b9d1ed1ea39e7345770d9587f8c77ca9f9a5debb1d6ef41038c
+      - initial_input_ast: 78b65cde248c05f4abfe2d3cf794fbd44de082303631db7e3002aa724099fee1
+    initial_ast: b9c41b81bba799989ce6abcae9ea82f5ba0564a66709c675db033456ac1ef862
     symbol_table: 6754c028b1d3793f022a7da93be8510a6844da8a2e45f5dcaa9566252e418ee2
diff --git a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
index 25572a0e79..2a1cb4b924 100644
--- a/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/iteration_repeated.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e518f4721bb7a7b6c63e380710a5a8cf4e489ccf66461bf9a68dc4b369e16445
-    initial_ast: 58d1ae0bbcc2c4cf4fa16dc074a64a7a0c4bedef9b0a4230968211edf9b81b26
+      - initial_input_ast: 14d0aff05a3b8673ac44d18a969bd03157e19a724ebe2b6e805fdc82aa1e070d
+    initial_ast: 7266dc80dc8dc35c544868574e0c7654debd2e16f791a9a5ce711685950219a1
     symbol_table: c45d23aa877641cbf1853709cc103d389f3e3105b5c873f8bb90c3a0c48bd2ff
diff --git a/tests/expectations/compiler/compiler/function/repeated.leo.out b/tests/expectations/compiler/compiler/function/repeated.leo.out
index 1e93f22696..d17f66b447 100644
--- a/tests/expectations/compiler/compiler/function/repeated.leo.out
+++ b/tests/expectations/compiler/compiler/function/repeated.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e518f4721bb7a7b6c63e380710a5a8cf4e489ccf66461bf9a68dc4b369e16445
-    initial_ast: 0bc692fc558896d4c90a4826d54ed1c6d41ce578ee930c3546d1d9d4169b4844
+      - initial_input_ast: 5b2906e1b93966fe1b141bb06b4aa45f7a6e60ae0c0895b96cf870eb246e98b4
+    initial_ast: 07480168f37e751b264e4de7e4ef66cea4db7fb1893de65accc9d1da3435f917
     symbol_table: 7c82d098d4b483b968c5b928f68a4a6f040bf961bbf5192bf323ddabbe592da8
diff --git a/tests/expectations/compiler/compiler/function/return.leo.out b/tests/expectations/compiler/compiler/function/return.leo.out
index 3ffc6c77e2..d7af45e0db 100644
--- a/tests/expectations/compiler/compiler/function/return.leo.out
+++ b/tests/expectations/compiler/compiler/function/return.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e518f4721bb7a7b6c63e380710a5a8cf4e489ccf66461bf9a68dc4b369e16445
-    initial_ast: 8e4af69e677c1eb3afc851864e57fc88768d97bbfbd96b1680b263ba3a24ed98
+      - initial_input_ast: 1ee96076151487dc5e1988331d53506585dd380909cbeab8c32d3f6e6913456d
+    initial_ast: c45cde3ccb382a43e8920b48605cbd571b113a699bfa53adfc986e7ce3ab46eb
     symbol_table: 8bddbedba52c66dc7a86530a2df470eb3222992c10b75842431a82afc7e936d4
diff --git a/tests/expectations/compiler/compiler/function/shadow_function_with_input_fail.leo.out b/tests/expectations/compiler/compiler/function/shadow_function_with_input_fail.leo.out
index 3276ba7de3..da95173122 100644
--- a/tests/expectations/compiler/compiler/function/shadow_function_with_input_fail.leo.out
+++ b/tests/expectations/compiler/compiler/function/shadow_function_with_input_fail.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EAST0372014]: function `hi` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function hi() -> u8 {\n   4 |      ...\n   5 | }\n     | ^\nError [EAST0372014]: function `hi` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function hi() -> u8 {\n   4 |      ...\n   5 | }\n     | ^"
+  - "Error [EAST0372014]: function `hi` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function hi() -> u8 {\n   4 |     return 0u8;\n   5 | }\n     | ^\nError [EAST0372014]: function `hi` shadowed\n    --> compiler-test:3:1\n     |\n   3 | function hi() -> u8 {\n   4 |     return 0u8;\n   5 | }\n     | ^"
diff --git a/tests/expectations/compiler/compiler/group/add.leo.out b/tests/expectations/compiler/compiler/group/add.leo.out
index d8aa929f0a..f1143d27c8 100644
--- a/tests/expectations/compiler/compiler/group/add.leo.out
+++ b/tests/expectations/compiler/compiler/group/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ee823464d3be14662261697b47c73a67a47c47558987333869ea6e72d6e34ebf
-    initial_ast: 9be3781304a8515dd1a5e35ce3a23574d3b73d5403a46dbd33bb698c7f5f235a
+      - initial_input_ast: f4e1b23f37abb9bcb386ddfd37ee066395d8e84f8ace0f4eb467264131e89fb0
+    initial_ast: 526ba2fdb0342e958bc77572fab3680301af8e1f576a462bb7d94a348fa5f45e
     symbol_table: b10964224747af7f8ba12f1b3c0dfa228842b3e08b9b82d785b71def31387144
diff --git a/tests/expectations/compiler/compiler/group/assert_eq.leo.out b/tests/expectations/compiler/compiler/group/assert_eq.leo.out
index 1acc9c89fb..2b85d1be0e 100644
--- a/tests/expectations/compiler/compiler/group/assert_eq.leo.out
+++ b/tests/expectations/compiler/compiler/group/assert_eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ecd9a5086d5d85f1794e023ff6c06e68cc0b4ae67e3f9abc88cd1354ed8fdfad
-    initial_ast: bd47ab2f7c4c1013c5d401a6e1d6af4f28117203c9decaf9864cb0cc7806efaf
+      - initial_input_ast: a183384b085186e92efdf0ccd221ba0f3de6e75cffc5610ed583ccd95aa4adcb
+    initial_ast: bdee31d5ffcb2f4a27fb4b9deb14fea6a514d72323d827a0c0f8f44cd96aa4b6
     symbol_table: 584d3ba9f7908f1b2e0c918710e78d0a483c12aa3f4644edada2eac31ac689ca
diff --git a/tests/expectations/compiler/compiler/group/both_sign_high.leo.out b/tests/expectations/compiler/compiler/group/both_sign_high.leo.out
index eae982cd61..eb82d09b0c 100644
--- a/tests/expectations/compiler/compiler/group/both_sign_high.leo.out
+++ b/tests/expectations/compiler/compiler/group/both_sign_high.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 640119c4e45f3df44391fe0e08e45a44dfac3a996610e10590666400ceebaff8
+    initial_ast: a5068b93a19a2a1062918085bd20112cf08451b84508236869220df920fefb0a
     symbol_table: 9a61702119ebc681917d7cb7e40ecafa00354849326bf1182635f27a28da35e9
diff --git a/tests/expectations/compiler/compiler/group/both_sign_inferred.leo.out b/tests/expectations/compiler/compiler/group/both_sign_inferred.leo.out
index 4494b71773..aafa83dd2e 100644
--- a/tests/expectations/compiler/compiler/group/both_sign_inferred.leo.out
+++ b/tests/expectations/compiler/compiler/group/both_sign_inferred.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: d1df1007245f08ea1398244ba810f689c018c288a85307aabb1632a6a8044de4
+    initial_ast: 11ac6a7372ddf4362cd7eb5a1823c0393db61def4f16c7f6185c4048462e3846
     symbol_table: e4a96223c049893c904a90f24d069592b33fc137de0f4816cf92089e63663693
diff --git a/tests/expectations/compiler/compiler/group/both_sign_low.leo.out b/tests/expectations/compiler/compiler/group/both_sign_low.leo.out
index 5c3931dd53..7d1b20965c 100644
--- a/tests/expectations/compiler/compiler/group/both_sign_low.leo.out
+++ b/tests/expectations/compiler/compiler/group/both_sign_low.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 36e2dac16d3b386145e585988c6dbd41890556deaa10e6776d0bb2e5de8654e3
+    initial_ast: cae7822867b84b0eaedc184a5f5824b45b5a9f2fa3d3262f463b89fd2932de33
     symbol_table: 1817d91b99941ddc2590c6a2777ad8f7d4ba26a8b2a3baa3932f1a08eb540206
diff --git a/tests/expectations/compiler/compiler/group/eq.leo.out b/tests/expectations/compiler/compiler/group/eq.leo.out
index 1acc9c89fb..2b85d1be0e 100644
--- a/tests/expectations/compiler/compiler/group/eq.leo.out
+++ b/tests/expectations/compiler/compiler/group/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ecd9a5086d5d85f1794e023ff6c06e68cc0b4ae67e3f9abc88cd1354ed8fdfad
-    initial_ast: bd47ab2f7c4c1013c5d401a6e1d6af4f28117203c9decaf9864cb0cc7806efaf
+      - initial_input_ast: a183384b085186e92efdf0ccd221ba0f3de6e75cffc5610ed583ccd95aa4adcb
+    initial_ast: bdee31d5ffcb2f4a27fb4b9deb14fea6a514d72323d827a0c0f8f44cd96aa4b6
     symbol_table: 584d3ba9f7908f1b2e0c918710e78d0a483c12aa3f4644edada2eac31ac689ca
diff --git a/tests/expectations/compiler/compiler/group/input.leo.out b/tests/expectations/compiler/compiler/group/input.leo.out
index 8237b1c509..e2e2806352 100644
--- a/tests/expectations/compiler/compiler/group/input.leo.out
+++ b/tests/expectations/compiler/compiler/group/input.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 5cce2653606494bd949a7631bb7fe6ab255fbcb1618e5e099875e4f1e9c082aa
-    initial_ast: bd47ab2f7c4c1013c5d401a6e1d6af4f28117203c9decaf9864cb0cc7806efaf
+      - initial_input_ast: eed84b746db9633cd5314c8b23def7c95672f4696824e7504877baa8f62b52ac
+    initial_ast: bdee31d5ffcb2f4a27fb4b9deb14fea6a514d72323d827a0c0f8f44cd96aa4b6
     symbol_table: 584d3ba9f7908f1b2e0c918710e78d0a483c12aa3f4644edada2eac31ac689ca
diff --git a/tests/expectations/compiler/compiler/group/mult_by_scalar.leo.out b/tests/expectations/compiler/compiler/group/mult_by_scalar.leo.out
index 9606b0e494..48cfd0cdab 100644
--- a/tests/expectations/compiler/compiler/group/mult_by_scalar.leo.out
+++ b/tests/expectations/compiler/compiler/group/mult_by_scalar.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e765a6e8209951902a890e711b0ebb6b22dfd84149ae1a69bce43530008c17c3
-    initial_ast: 3294e6793786a931be07b6b76eaef2c70ae3fb6e93e0d4eee531d97f69d66158
+      - initial_input_ast: 4a7d722c26d55d9c1c3067f6d2ef891b2afde9cee26a1043ac78ae2f6ce2e8c1
+    initial_ast: 0c31dfc043a0f27d955558a8c97370a490309e59c4de6f228b491a02475b6384
     symbol_table: 8e39b2bdad6276a42437b673faa0d1dd4f762a9778de1a1e2c8f8edbe5002be4
diff --git a/tests/expectations/compiler/compiler/group/negate.leo.out b/tests/expectations/compiler/compiler/group/negate.leo.out
index e0daa9d7f6..87d0e65bf5 100644
--- a/tests/expectations/compiler/compiler/group/negate.leo.out
+++ b/tests/expectations/compiler/compiler/group/negate.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ecd9a5086d5d85f1794e023ff6c06e68cc0b4ae67e3f9abc88cd1354ed8fdfad
-    initial_ast: 3d34068de05401d87f683cae8d8fd4bfd70a036c11504ec8cd870f152f73d590
+      - initial_input_ast: c1a7cb2ec07ebfdcd1f7c0785b389e30ed16055a766d036354e52574a21fa8d9
+    initial_ast: ca9753c3fab4e6189cbbfdcdff9d324c99b0a1dda1ad2a4db5b4fb1864bb0861
     symbol_table: efa845f46b76b7927005e6e7b8ba6353db6f3a783ec1a8b74993ccc97738eadc
diff --git a/tests/expectations/compiler/compiler/group/no_space_between_literal.leo.out b/tests/expectations/compiler/compiler/group/no_space_between_literal.leo.out
index 4a09044a4a..42c6c5e8cd 100644
--- a/tests/expectations/compiler/compiler/group/no_space_between_literal.leo.out
+++ b/tests/expectations/compiler/compiler/group/no_space_between_literal.leo.out
@@ -2,4 +2,4 @@
 namespace: Compile
 expectation: Fail
 outputs:
-  - "Error [EPAR0370004]: Unexpected white space between terms (0,1) and group\n    --> compiler-test:4:24\n     |\n   4 |   const g: group = (0,1) group;\n     |                        ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms (0,1) and group\n    --> compiler-test:4:25\n     |\n   4 |   const g: group = (0,1) group;\n     |                         ^"
diff --git a/tests/expectations/compiler/compiler/group/one.leo.out b/tests/expectations/compiler/compiler/group/one.leo.out
index e9dfccfb6b..ff89284012 100644
--- a/tests/expectations/compiler/compiler/group/one.leo.out
+++ b/tests/expectations/compiler/compiler/group/one.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: fcd535c8ebb98650da052ad840712e95af09550a9a00dda1788c2873fa50494f
+    initial_ast: 358ae36c6a14cf236645485eb7284757ceb66125d704cd5121e681e417c0e5bb
     symbol_table: 1459210791fd0aae2827b2b7c3fd438e7a8315b290e23cbfe365b4214d5cd284
diff --git a/tests/expectations/compiler/compiler/group/point.leo.out b/tests/expectations/compiler/compiler/group/point.leo.out
index 7cf2fd33de..27fdac1769 100644
--- a/tests/expectations/compiler/compiler/group/point.leo.out
+++ b/tests/expectations/compiler/compiler/group/point.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: d4c0ad5e399b065700d6c8c18c07527ccee14e318b7bb583f7db4709daa53cb7
+    initial_ast: e65d8726f872aacbb712efeda83e69ef0f123f7047ca4c8e839dd3a933400d9d
     symbol_table: ac8c4425959cf548f2f0edc8aa637b1d827394f11fe2c10ecef366a803fe30a2
diff --git a/tests/expectations/compiler/compiler/group/point_input.leo.out b/tests/expectations/compiler/compiler/group/point_input.leo.out
index 94bfa2dfda..5bbf608ad7 100644
--- a/tests/expectations/compiler/compiler/group/point_input.leo.out
+++ b/tests/expectations/compiler/compiler/group/point_input.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e03c4a2ba40d2e844353081fc62efae967d074fb34a08bd30c99dff1387bd3fd
-    initial_ast: d6bd8a2fd0cd668196c62c8677e2ab436c232904fb2aa2c2991ffe2c22cae3ca
+      - initial_input_ast: 2d76ce81281d5077442c5e6c12b13e536a037f0bb469492ecf0b77191b3ded14
+    initial_ast: e03e381be4b91baad7297381a8d64e1a839a357fe28a6683d18a1bb261f47f7a
     symbol_table: 0db35c4a8548b1c37607ad3a7d67be41b7949f6219107f4d5ef8442a75dd2a7a
diff --git a/tests/expectations/compiler/compiler/group/positive_and_negative.leo.out b/tests/expectations/compiler/compiler/group/positive_and_negative.leo.out
index 666c39f52b..4955c51cf2 100644
--- a/tests/expectations/compiler/compiler/group/positive_and_negative.leo.out
+++ b/tests/expectations/compiler/compiler/group/positive_and_negative.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 990e4e100ad723d6442328b57d7d77dad65bcc5ecd722b0cdc96239903751656
+    initial_ast: 3db663928afd1ed1616347a7a606020b0f920face30903a41534da9d2bc9c457
     symbol_table: 877713c611c84057862de19fa49429efb7c57a29ed3ef686b59c1ab3696c4117
diff --git a/tests/expectations/compiler/compiler/group/sub.leo.out b/tests/expectations/compiler/compiler/group/sub.leo.out
index 5bda4981d5..a2a9317ba4 100644
--- a/tests/expectations/compiler/compiler/group/sub.leo.out
+++ b/tests/expectations/compiler/compiler/group/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ee823464d3be14662261697b47c73a67a47c47558987333869ea6e72d6e34ebf
-    initial_ast: 9e93c5e9559bc6597db2a9aa67a287f040d0aba86ca612073f6effc030dfedb6
+      - initial_input_ast: f4e1b23f37abb9bcb386ddfd37ee066395d8e84f8ace0f4eb467264131e89fb0
+    initial_ast: 9cdb1badd73802c1134e8d94dbbacca8bfbb34f70a61886ce6f55ccbc029c525
     symbol_table: 8d7179908ac5272f4892b2e374ad5c5401332d4d12d7d0505ba1e51a98ef0d6d
diff --git a/tests/expectations/compiler/compiler/group/ternary.leo.out b/tests/expectations/compiler/compiler/group/ternary.leo.out
index f4ef580e5c..90fc3d3550 100644
--- a/tests/expectations/compiler/compiler/group/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/group/ternary.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e03c4a2ba40d2e844353081fc62efae967d074fb34a08bd30c99dff1387bd3fd
-    initial_ast: 98ea1b0f102523381afe48d75b4d340ac9020147d1ee0281200611c85cd354b2
+      - initial_input_ast: abe58c662f85737a1bdb4b3e55c3e455e128ff543cbee00637b5b33aee554202
+    initial_ast: d75014d735c603b442bf7e21a9c0c40880a44bc4a2b47d99d87b1c396290f814
     symbol_table: 5e96e4138e5643222224de143ab32b6716c4dbaf965318b48eaf9e4ba63f8586
diff --git a/tests/expectations/compiler/compiler/group/x_sign_high.leo.out b/tests/expectations/compiler/compiler/group/x_sign_high.leo.out
index 93bf7ffd58..c8f51db779 100644
--- a/tests/expectations/compiler/compiler/group/x_sign_high.leo.out
+++ b/tests/expectations/compiler/compiler/group/x_sign_high.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: ac3df9e6585030525d6a239804547b3bddbfa868a718bed7346809d6c237323f
+    initial_ast: 01b83b6b40e30e1c409d1b1621a69c278901f44cb87377b5e232857fd410016e
     symbol_table: 2d0db26fa84f8daad71afd4420718043de1c97757ae4fe4fa78e9874891d1d80
diff --git a/tests/expectations/compiler/compiler/group/x_sign_inferred.leo.out b/tests/expectations/compiler/compiler/group/x_sign_inferred.leo.out
index a52a3efd39..9e257df948 100644
--- a/tests/expectations/compiler/compiler/group/x_sign_inferred.leo.out
+++ b/tests/expectations/compiler/compiler/group/x_sign_inferred.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: bc5d6bd28dc6b91827d8a47119e0a967641b48fc846195a2640a239ad3d3b999
+    initial_ast: 929abdfa3a41fcdf316b11d4c85fa9a62dc2c4c4814ab96c6e64d97ca2fe14cf
     symbol_table: c20979f64468655131a488980c1de31384fd7ff35561ed569c3db6f2d0bc19cc
diff --git a/tests/expectations/compiler/compiler/group/x_sign_low.leo.out b/tests/expectations/compiler/compiler/group/x_sign_low.leo.out
index 2c69011ed2..3888e05202 100644
--- a/tests/expectations/compiler/compiler/group/x_sign_low.leo.out
+++ b/tests/expectations/compiler/compiler/group/x_sign_low.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: dad8ac7c90d3f7c819b89bbd605e9d75511a986b131aceae7c49679f1abf52c4
+    initial_ast: 5e9eb2833c5921c31740f8a98d8c96043b386e846052f2384b0dee4765718d91
     symbol_table: f450d14b0bb862b0bec4a5f8d41eb92f7cf951dee469505fb20dbfa25972eb7b
diff --git a/tests/expectations/compiler/compiler/group/y_sign_high.leo.out b/tests/expectations/compiler/compiler/group/y_sign_high.leo.out
index bf3eacef63..23d5968abe 100644
--- a/tests/expectations/compiler/compiler/group/y_sign_high.leo.out
+++ b/tests/expectations/compiler/compiler/group/y_sign_high.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: ea56c82e2bb78e844189f3edfe72d4146e0668a8799ab1fe81b40af70cfce0a8
+    initial_ast: 7c442d2a9b6f3772bd7a1ae070368b7327441e216f2f73e1a81f4d696c96ce05
     symbol_table: 52760622da95d189f6e707df97fc6bba4216fa59022a4ae79d840b9c05fdf5b1
diff --git a/tests/expectations/compiler/compiler/group/y_sign_inferred.leo.out b/tests/expectations/compiler/compiler/group/y_sign_inferred.leo.out
index b92042e6e2..7abc119cf8 100644
--- a/tests/expectations/compiler/compiler/group/y_sign_inferred.leo.out
+++ b/tests/expectations/compiler/compiler/group/y_sign_inferred.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: c7ea9a8601a4823e6ffae4c4d0850ef35b7d7780f02e3beb3dda32e460c3a4d0
+    initial_ast: 265e47c26910b5bfd5f775ef3c559bffa66f4790ad2d8c730eeec4088aade505
     symbol_table: d3bf69e78619e63bc1c56c1efe49712b226f5d477e1c42491d0b31e24d5a98a7
diff --git a/tests/expectations/compiler/compiler/group/y_sign_low.leo.out b/tests/expectations/compiler/compiler/group/y_sign_low.leo.out
index cf8ff68e43..b5c7d76ad5 100644
--- a/tests/expectations/compiler/compiler/group/y_sign_low.leo.out
+++ b/tests/expectations/compiler/compiler/group/y_sign_low.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 44b026a078f6f146b69faa0c3ef8bccc58155f4e0dd881eb49e37e9065d41dcf
+    initial_ast: 11a6f8f5c1d6500f810c16eaee613f87b52fbd1476378a811767f6ac8a4a0710
     symbol_table: 026430e928e2236167d6587cb1885784f30bbc916f75d3a0f42fa7a3f2c6978b
diff --git a/tests/expectations/compiler/compiler/group/zero.leo.out b/tests/expectations/compiler/compiler/group/zero.leo.out
index e36f55156c..ad07caed73 100644
--- a/tests/expectations/compiler/compiler/group/zero.leo.out
+++ b/tests/expectations/compiler/compiler/group/zero.leo.out
@@ -4,5 +4,5 @@ expectation: Pass
 outputs:
   - output:
       - initial_input_ast: no input
-    initial_ast: 641d4cd14081d30f12865f50c6c1ab1acfaeece382f03d9bb82c73efa1518766
+    initial_ast: dec9c3d59962521ff0dc46c1b66293856d0ffbad30b68eb7f391ace47e3b5eae
     symbol_table: b181fa2d3c50419dbdaadbe2e91aa4a3e17baa614b0635f9ce6fa7367ead48eb
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
index e75d1f7efd..d84f6c6dad 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: dcc83a9319d9784c4bed7596d95f4bb19e2f5db1122e17bfa37e3458ed69c4fd
-    initial_ast: 9884537ac9d91278f53bca357c89bcb9fcd3e73bb94d9db8eeae8af373e47764
+      - initial_input_ast: 14d3cbbf97803da5b6c304e7b5ec5adcbb1583db29ba46aef485df97e7d54aaa
+    initial_ast: 160907d0f277fbcc876921a00dd1daa878fe5bf4716686d47cf0f790dc40898f
     symbol_table: 00f652a7b8e969478d433c749951ee63b97343691ff9ade7e1e9288757814ef6
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
index 884a728afd..5014d464c0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_field.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0c1be8e106149f3dbe5d151e6372f7d6acf3d0986643537ed9610c2f89eb9ed4
-    initial_ast: 3d7e874a9a015c0ce76f63ee8dfaa0b7d090919baca39e58cf545f0c81a4475e
+      - initial_input_ast: 922bd957ea990634b596ed7a33bf2394d3aaa138be4bfd3882085cdf66ae1da9
+    initial_ast: cce7570723f40bd60042a7f4d691db9862b3a8b9180bfa5d8630ed07eb1bbb62
     symbol_table: a3dad989c81fa120b3092919ca6bd0cc90221424459f5691b7f172e5564ba1ae
diff --git a/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out b/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
index 69431b0427..4344961255 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input/main_group.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 723e9ab87822d7d8d793ca1611eabcebc684097a64f37a4cd246ff9e506a4865
-    initial_ast: 89442f5bc5d415d22f6a22b3641734b1e0c453f1822c7f9fb0d6d3072d047a8c
+      - initial_input_ast: a610c3b16aefb8d1dcf55aa316fadd3da191a4045279d74de5667b795a079ba4
+    initial_ast: 14b47cd09e5cca03ce44fe3f038294840fb2259aef8c912ed8e9f41494d62338
     symbol_table: 3b68eff86b45e4f940b0a1031e19a64178b0bf802acb59f3b743e664f3010876
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
index 892e5ae848..20be92ae74 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ce38ef1ec7bdaaf35b68d011803255589ed870002583000a76f137d7682bc3d6
-    initial_ast: 10403bb15edbbbd8cf3f22b812c04f723609c8ea33be44b4943c1f392e4e3c2e
+      - initial_input_ast: b26b209013041060043f6269635f9af934cc06c0f8384a8b0e6b10df0d3f5cb9
+    initial_ast: 66ae45c15c3f26615d40f25b904599180fbc7fb8f38c20b1249abb1e8d3dd2a1
     symbol_table: 031a91bf50d051b6ffb92f6853fa4bece1f5f8f0aa145a28abed6bd1d4cf7bdd
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
index 57ac5d3bba..fcd9ed924e 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_field.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3273de56f5b29e324e4f4ef3cc7c0c8d468962214728d611aeb4b788fd73aefb
-    initial_ast: 42c8a84d865a9a964326fb4833c82c633adf3e85bc98b7a9995b3544b17683d1
+      - initial_input_ast: 0aad54fd47d9c5f87dc0559e8c7cde742e1f6ea554f26d00367cf5b03921495e
+    initial_ast: 56cb9d299b0ad0d22a31929f017aebc28ca23d2217f5a5b8fd247548d5b39a3a
     symbol_table: ec750d5d5f4a1e5b31a63e0bc8e12944eef200f2d71efcdb0fd85811ac6e2d31
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
index 2e65759104..3e97178ef9 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_group.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: eebcd00b27aba004420d4f00da025325da9ff86d29162e54401fa55b5758ae39
-    initial_ast: 5fc06cd70dd3d4298f68efc459395ba391fb5845d4839586df0b6260094c5846
+      - initial_input_ast: ab788992b0e08b3ba20bde1db2c473a4e006f06adefcddca936b148efff76b89
+    initial_ast: 3558d89ef38d1a8f0f2b458b79c0b50aa9736d9c3d1af04435ac5f2253df2f44
     symbol_table: 14140f05d5fb8a85352940a67860fd36ed597f93ac882fdb76ef3d1ed89b5031
diff --git a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
index 71ed5e57ff..7657825de0 100644
--- a/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
+++ b/tests/expectations/compiler/compiler/input_files/program_input_constants/main_multiple.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 81306ba48e4ea08106311612bfd5c1bce79242ca08695fda8584780329266063
-    initial_ast: 4a249f544fc369103704f26be6d6d8b6642b9f76be6f89c43439c9219ad1dd3f
+      - initial_input_ast: b9e3c34f642651adf69796a7619a504427dcc3ff7733e5a8925dd31bb1677e9a
+    initial_ast: c4eadb0618a6696d4c4bc807bf3a3ceebd2ba8f8a09af15c8a8dbb6882c9286c
     symbol_table: 9674d1e094af108a21c9a8f2e9c5b911f76504d728866f9b57b6e38318c52741
diff --git a/tests/expectations/compiler/compiler/integers/i128/add.leo.out b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
index ee8c6948df..0f90915173 100644
--- a/tests/expectations/compiler/compiler/integers/i128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0eb1ad9d13a2a11ba96f8ae311f1f91922abd5316ec123f92be78864c33464b4
-    initial_ast: e57eedde564d152e87415ebe4d0034b72ed2c094853c2df80d782e43e7dd85f7
+      - initial_input_ast: bc7b8f4d7b989dc43d4fd55b9682cc77d2984e841678f57fdf605ff2c168861e
+    initial_ast: 6c64e056b0e3ea6cf3056c72b6afddca5a7a69c8a613374af458609132c5121d
     symbol_table: 26e29ab43161625435a7de57fba18feffa2ca86b908d3720a652c8fabc1a6adf
diff --git a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
index e6a8a4bfe6..4c4d4ab2d1 100644
--- a/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
-    initial_ast: 24b3e77bc04174e1bbf31ec0909da2e4bd16b0b7f23ca7259cb08c8ea8d3951c
+      - initial_input_ast: 539ffcc6201d34ff3e699671d520e5fd6344a2ca8268c8351d7e9c707d8339d2
+    initial_ast: ce1dd4af976d6f5bdc38ef13ad06cc04b2d1e97aa610b59c30bc24bf5a54ca07
     symbol_table: 6f25f2987af24695b2fb70fb856a108c3d185a98289e796f5af4cb60c0de946a
diff --git a/tests/expectations/compiler/compiler/integers/i128/div.leo.out b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
index fa08ae0059..bdc27be55c 100644
--- a/tests/expectations/compiler/compiler/integers/i128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a8d3b28b557b2c19b8bb0083c015f5f217971e856d0a5c2462e956bf55b68126
-    initial_ast: 26e7559cdaef975b7b805f7cff6a7aaabcae77753c4c9613a746f1c490bc89e4
+      - initial_input_ast: ee172614c7f65202cea0ef58ece4a000d22ff2ecca413bf31ad38683c9b4d85e
+    initial_ast: a82840110989a3ca02913febd64b38e9944e461a11a0418f32eb7dde12f41832
     symbol_table: 13298cf22dc30ccc0e18f787e657068fd0531e71e9b29155541503bf7209801b
diff --git a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
index d88448b015..1923927372 100644
--- a/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
-    initial_ast: ce9145527b105baf75ed6b5be8dcdd3161aadc05d312bf05306de5d4990c56bc
+      - initial_input_ast: d849a1509e204680cd676c85564c4945549b5b758969f13fd54c0829f6c7e1c0
+    initial_ast: 2013456984c7e8d66bbeba2262c1c9aa93ebfa4a7cba48143adc172bc0a5fad3
     symbol_table: e354ff29052ba6cf646dc2a940fb2489c740245554aa81f4a9b71c314f431618
diff --git a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
index 86fe5d2f10..0c54b08923 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
-      - initial_input_ast: 9dd6bd7a655947faefb64c288a9e9411b81148989543a4766fbad39a957dc8eb
-    initial_ast: 2ce3977afce2bb7a1c362793d8651945754d20d73a8d499be086aa1116ae347c
+      - initial_input_ast: 5482379ffdd5eb5f96e55e91bc41680d9730b22b7c3930a08ac0695578c9a1db
+      - initial_input_ast: 0e7fa8784578e26d2c0f05a8aee2f23d7930078ab97dd2252832450ca9cd50eb
+    initial_ast: c16640e8adc00348847a0a48e7a80668cad4b15582277057b9326eedc225178e
     symbol_table: a0b9f85aee4a145dd4f5a8f6488b4d50a627e317601a523b63b13cc969325401
diff --git a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
index 8d7346d754..a675bdca04 100644
--- a/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
-      - initial_input_ast: cc80ffa5e25d4c0dcaf6154575b54f85ff5c2f86f50830a966e51bdd8f2274d0
-    initial_ast: 61cc3ea902ea0f09089df912d1e5f195f53e37673e17f25faae0dff5dd90ed09
+      - initial_input_ast: c7a69306fb22539be155f8c31e9d1d0cfaefb35c6d6fe447316421408d126d82
+      - initial_input_ast: f06eb33da0612e0927563d34af8823d655c5f033ebb2426d7d2a5fb2c7691cee
+    initial_ast: 2b54d4799d58745c1d9822b371d4231fd8d24505929397c51ab784d82fcdefa6
     symbol_table: 96ff00c92d164363ceb1fee06485b451062e76798f4381afa4141d60b2e88c96
diff --git a/tests/expectations/compiler/compiler/integers/i128/le.leo.out b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
index b97247d9b7..a3da91372f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
-      - initial_input_ast: 2bc5e353d29b75113a1b8976eddb617e0476110a0396b0dfc2dd48481803017c
-    initial_ast: ef3fba23ee70ce1bc7b3b5f75d32c61402b69f6ab95e8e315d56948037a1089a
+      - initial_input_ast: 5482379ffdd5eb5f96e55e91bc41680d9730b22b7c3930a08ac0695578c9a1db
+      - initial_input_ast: 586889c97fa271198358a40227efffae06f141c9f79f3479e03dd01a99003fad
+    initial_ast: 9fb1b4e33ca9d46c1c709c1ff79fd8f5f107a6ec8bbd52df9afba0d9669857f9
     symbol_table: 4beca34f91e3bb4fbb997a1851b3fefb933c47d1e24f6a2e6258d4075c01918a
diff --git a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
index e1acc02134..7a056eecea 100644
--- a/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
-      - initial_input_ast: 5c8741c117817e7996c0add338f5d29437be59d7b7e3f7a68a2e575871c57824
-    initial_ast: aee5bb2b3a8c8c28bb69cda45ef7fac4ac3b7e2474ce82464eba446a7db6e0c6
+      - initial_input_ast: 70eaacd52d656c1871fb3fc2e0fa9427ba1c677c0e66a99596c3b223b76b36e7
+      - initial_input_ast: 126c75bc526b0ae168cccc25e3794140aba4d4962cf3b5561d6d510dc0f15d4c
+    initial_ast: df5aff77b41456a12c8296e8ed08d58d73a7d9e7e37550692e0ff89729c556b0
     symbol_table: ad21c0cb65fd2f4f2360ed81da1bf608b83a0865801d2b569035eb1e36a7676a
diff --git a/tests/expectations/compiler/compiler/integers/i128/max.leo.out b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
index ad225de7c7..34e2a420c4 100644
--- a/tests/expectations/compiler/compiler/integers/i128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 68e5c01d40ca62a3206904b472ec80d1209b8744d441e281c978d7216e3cebd8
+      - initial_input_ast: a74c1b7af568d593690e7ba3823c660f7163e5d90d8bbace6f742eb7da1ae6ff
+    initial_ast: 8c2467e2b9c1ce3e01f796c633f85bf8e786e57ebc4152b594834e5ffffe9735
     symbol_table: b9f23cb88072c4321465b95ec69bba96f8fb225616244266e05a9e6eeb99da5b
diff --git a/tests/expectations/compiler/compiler/integers/i128/min.leo.out b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
index 55160d7940..1513567e79 100644
--- a/tests/expectations/compiler/compiler/integers/i128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 663e59cc593d0eeac44f2497c059d9f6d8fb879939b2557cc45f908840550e48
+      - initial_input_ast: f96b60255571f1dfe682e966e680fd3b250f9b1f7ec99ee0834357e7674e8e28
+    initial_ast: 0cf689ce997b9c05d83bfcd527145365624af6af769d4e63121ec3549d549658
     symbol_table: 6b54f07ea0046f948e794781960eb3df9271e7e2d10be3e278e2b02d4d810da7
diff --git a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
index df5e22d048..44e60b771f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a0f0026c304d73c93060f61ad3a55094eb1fafaf8663a0e1972275be45d759e6
-    initial_ast: b5ed54eaddf90307658356a3722c6c11abb79e7f7f59e850fd7b34733db7432d
+      - initial_input_ast: 51a13bfc8843ca3425062e8bca777961536fb9e73ecdf2ea5729b78ae288c3db
+    initial_ast: 54e6e433db28a00fba0dcfc7d3e4917a32d6eb4c0f085cea9d76874e5bade9a1
     symbol_table: c0c0cbcbbb0b8aa5351b8c74dec4bc556103902ca0f1ebcee2067768c553fd83
diff --git a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
index a40358e95b..354b9edacc 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2b35d182059f5f8aea05705b54c7446011ee78919bbda9f163927613f924f100
-      - initial_input_ast: b75ce6366bf607ddeebbfb8a7d491528a89ed4f3d5c4e57fb1480cfec43930e5
-    initial_ast: b82476f35c3cb4385d9381a54ca19c42a3a9f648a40c94aba96d45f720224300
+      - initial_input_ast: dcde1df8d9dcebf8e74fbefaf3a97441be64d6e7bf7eaf11a326a22d2a2510ee
+      - initial_input_ast: 43c4dedc8b3f4521c214c77f25fadbf5b7f7c699a202d0a5f7f50a147fcfba74
+    initial_ast: 5a11b78171fbed087281986d8dec211127188aee46cbde12ec8c438949485c8b
     symbol_table: ee72f930a06f9409bfa70e2c08cb9453f255bd8ecf13470383dd7592fada8a93
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
index fc18a298a3..d54a304e0f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 5204f7264d13dc737097c1b0a1c707e19767854e922ba5571e902d23eb6847f4
-      - initial_input_ast: 6c496394ee585ef0d7dc4bb8e1ef5a05656999502f8f466747e4044c439c3aed
-    initial_ast: 2ae2d8df3abe76076d795a88793186dc18776f7208e6443177da1b5b4c086aaa
+      - initial_input_ast: 8069c236c0c35a3547c7dcaa9b49534f9464b002af7876de63765ad4de43f3b3
+      - initial_input_ast: d54ee1fad231ca1c3ed6be769e3cdc439b5af391e565d460482cde536f17a858
+    initial_ast: a37cedd7b3bb9949088b0e71bd658d1d6ddf4434b6b5da70159a96cb734aec5e
     symbol_table: dbad7f718a950b554310d0eec61a2a595d5232be21ff783f0c8bd647d6275dcb
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
index 13b25d1133..0df2faf6fd 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 1944c18852cf66a6e30adb6f92012fbf0b13b2f28d02672b6c7dbbb0b2f0b950
+      - initial_input_ast: a7f4916705593c961ac55adbd9fedfaf9014ff51d6abe44601d6612958da8385
+    initial_ast: e5d4c1480515b53ce68939423c9ad90fbb646f13961bb6e65f5fe8e565873c95
     symbol_table: 49a0f7957853abe54b078bb95a1091e5262b58ecc5ff8b8e546ff1fe82547e1f
diff --git a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
index f83bba0a3e..8d038b6b2f 100644
--- a/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/negate_zero.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 47786a6bfb6598f7e0847dfca1f2014ba4ead1d3f677f5a9da0ceace3fbcecf4
+      - initial_input_ast: 923ee3c36de197882fb5f42ba7f9c9cf7678bd1fde528dd2e0c7d5e82baf2658
+    initial_ast: 4b0dcb44448879d50fc2f7b555db2fbaa2708e47da06d1b5462bcb540d776ba0
     symbol_table: 7e7d4d32ae1e112e3ca3a14420225132520abf3f8dc327879b7f8f23f85a8b0d
diff --git a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
index e2c881120f..238e168a93 100644
--- a/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a3dbcd20f9c1d5bce5a3667831f3cf05667a4b0253bdda31d99d47951ad98259
-    initial_ast: 8189cf6052fd9388350277deb7b988205f8250e9174900d5d77e567c05f5e76b
+      - initial_input_ast: e46079b8a7a9057a5ca358833d1e96586051b7f38040f7f967113a3c6dcd0483
+    initial_ast: 13f7304150ada6b004b2127e2f1e87501c90feb60d561235c0fcb0248357b03d
     symbol_table: e071ae07079f92ae418d648b75b982c8294698178699e138c3abfe2341d5b3fc
diff --git a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
index fe0fefbe1d..a34372e9f7 100644
--- a/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i128/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 40139f0e5c57dd40f292eb3eb9857b869d131d69050280f412c8bacf3c2be0a5
-      - initial_input_ast: 83772cf3d3bec2e16e513bf37ebc6df2558ecefe79f9b00232cba49bfee7a866
-    initial_ast: 682689aedac278bb189d2925ffe7e4c2ff5a9df382820d3bf189e65335fd83f6
+      - initial_input_ast: 65fdcdff7ecde6f2dbce288006719080aab352a975e52c12f9585eecea975686
+      - initial_input_ast: 11ddda7e55d53afd56bd90f309df6cee97180791c7e0580641f49dca0f3ad7a7
+    initial_ast: d0f65fedea3f747519039ac8b1d7c4165187bba7130ca61c4b83ee89ca21c78d
     symbol_table: 940d5266f13724648ceb54c883bd73b737d83b14d2925fed8b0fcdaa6d77294b
diff --git a/tests/expectations/compiler/compiler/integers/i16/add.leo.out b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
index d33202bf3a..f52e694f4a 100644
--- a/tests/expectations/compiler/compiler/integers/i16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 52a0e922c0ada1f3302f3d4d7feb758ff3937a8615a2fd23325cffcb0c50cf45
-    initial_ast: 09474258703fb94fef7eb4c8dc0001872bd598a616802639c3ea21fff9e63af8
+      - initial_input_ast: 8f8a36339feb052e94e5c5d0bc21e9591c972c331794a9b5ce050d66f9e8ac08
+    initial_ast: 3a66591d7d68c3fd95acd3383949e55d5a4ad89b9af1ca5d649755742054e760
     symbol_table: c0f4ce3ef2a4953e653c50d9adbccfc069c2047c6adda1830646d92934d66726
diff --git a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
index 959135312b..d92797f4b7 100644
--- a/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
-    initial_ast: e34b90def31e29b13527a23faa6799d987dae3b6e6c72ea439786120e30da427
+      - initial_input_ast: 7488816e883b21a7361468f10e16daf54396b1c8f21847c4183d0c91c8c79953
+    initial_ast: 4aef6c5bf7d5faa3924be99b474546500da6d412ccf0729b31711b4480a8f6b7
     symbol_table: 4ba20f16852ff2fe7616b71c2d07aeadaed53777e2f304ded7c449948fe2f853
diff --git a/tests/expectations/compiler/compiler/integers/i16/div.leo.out b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
index fc257dc6fb..2d0094a847 100644
--- a/tests/expectations/compiler/compiler/integers/i16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: d60a59011ffd9b722482df1f60fecf4035905e7991faf3509dc956204e26dbdb
-    initial_ast: 159eb8ee20ea48c33283f7bbccab7689ee51fe7973f1ea6511e02452dc53f287
+      - initial_input_ast: 0a56eb124ccbb44e24efb84366e46da6f80cece6c44beabec729d956530d9779
+    initial_ast: 1e4c81da6077b2720bf1e98bd3a8e6b17a0ab21f628412a59391ed5d8d671c8b
     symbol_table: 0e193ca48f95a41e91fe8b791ba0bcee677e3fb5edf1af8659aaa4f16607c122
diff --git a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
index ebe14313c0..382dd5c80b 100644
--- a/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
-    initial_ast: 14f3d2c3a06044f14bf15fb1d1445c8e83abb2640315595811e96559311370d8
+      - initial_input_ast: 31360e58a25738afe090a468da05bc2824ee26f0a113e65291b4d4da08a284f0
+    initial_ast: 754ae723fe724a9d42501598cc05fdbaa72d40ed0627004111199d496147d497
     symbol_table: 8f43f463b85046218c11afbd5aa39021ba131f2b7474f2f9e1743e5b4b617d49
diff --git a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
index da5643d8fe..a567f6ccf7 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
-      - initial_input_ast: 0ed5ac4e8e800b411f402e7957dbdfa4f421798943462089d15eaabc08c9cbf9
-    initial_ast: 3816584b18492351dedca9ea4970ae1a194c6df5802683deaa7e05878f4c78ef
+      - initial_input_ast: 8ffeb6aa4bf6fec72f6bee744173313e59093d1325083a5549434b45dacbedb3
+      - initial_input_ast: 8608dad228214cc298c100dea03a3d522b3be83f4bc48d4e16b0588beeedeec4
+    initial_ast: 8d8a1026c8c4fca9d5678d0369718e51566133529e7b58b56a72324ac3c12669
     symbol_table: 23916724e149d291045330b89d96b60889a0fc778c31ae92c3a39b8ac7453285
diff --git a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
index 0d9cdbb101..2253f1fe56 100644
--- a/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
-      - initial_input_ast: 60eab1c75b42a247473a1589e677e7270c77e15fc60b3a3081a267b27b550f9f
-    initial_ast: 1b1c22e46a098708bdc44082f29b03722b923346cf91253c40fbcb6036b60345
+      - initial_input_ast: f53474a073061d1429ed995aafe5c1d4dc325543fe7481e8aed52d3e0165472c
+      - initial_input_ast: f904aa987360b0d6555f20a23ada29316b0f5dabc5fe324bc63ad370c8184d73
+    initial_ast: 9efa69e20f3acb9f724eb4cff8bb6a93ba35e983f2608e67a24de703ab39df99
     symbol_table: 78d0d78e216325ced3f912e92935818dc7e24065690b5d9d560b7997ca29eacd
diff --git a/tests/expectations/compiler/compiler/integers/i16/le.leo.out b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
index 3b7e6c375e..8d77cf9493 100644
--- a/tests/expectations/compiler/compiler/integers/i16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
-      - initial_input_ast: 61e14cdfb7cfc0eda6361c3dfe1c8b0435e69fe5dec14fd78d57631fb155ad3a
-    initial_ast: 00b1c33db54d406008f248e5b2a5580a5f9d0b65d05d90bc560421fbbed025ab
+      - initial_input_ast: 8ffeb6aa4bf6fec72f6bee744173313e59093d1325083a5549434b45dacbedb3
+      - initial_input_ast: 57ab274d7e52398c67da9e5076dfc654b542af684256f11c9b320f36d219142e
+    initial_ast: 2453b8f869c77113230df7a6fbda153bfe7166fe23504498fad5736a6f93fc06
     symbol_table: bf2a96b0ab9d2587f3b5bd9b6a4b33d2839e61219f68828a79fb40788190ca1a
diff --git a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
index 2eaaf2cb4f..0acb094f4f 100644
--- a/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
-      - initial_input_ast: c56154a57fdc267eda5faf0b93fe3a124c52f9dbd9f1a46063018300138c474f
-    initial_ast: baf572befe4afa6fa0cff0a944a69d61b28c0c4dd4f24fb9d88f85dada1e306d
+      - initial_input_ast: 384dd543940ee38ba7cb7a6eedbb9e0366070c8909f3e858f628da4a8e7f4795
+      - initial_input_ast: 6681e8c849aebf1cc4ba413fed280d197acea129dbb1df8a9768925546fedf70
+    initial_ast: f91c5b189e128d0697777ea5c9f41b2b76c114eb549cad1da7b327cf607a9a30
     symbol_table: 7b9a0a38448dc4a3bc8670c59d350d3ef11176a8965827ff5e7cac73afe4b7ad
diff --git a/tests/expectations/compiler/compiler/integers/i16/max.leo.out b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
index 3e4ced07a8..a262612009 100644
--- a/tests/expectations/compiler/compiler/integers/i16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: c36a9c8998a60ab0613b286be0b6f7b567188a98a4c9271356fc22675fb0177c
+      - initial_input_ast: 94dbdf6d3728d65315d6266b74115f89ce260941099e81fd3518e03b31e76c24
+    initial_ast: 5a2c8f6303e0cb8ff7ff071e659a829665696932cf0b242ae09b15adb20eab80
     symbol_table: bff54d1345b964af7d0d8caa2e69b103810988c8acdd599f7843498255b52d69
diff --git a/tests/expectations/compiler/compiler/integers/i16/min.leo.out b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
index 22860542f8..6c2f7e5ff3 100644
--- a/tests/expectations/compiler/compiler/integers/i16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 6ba1365fb0c43cf8dda656e1648bf65420be8f84ae397fb21d45cb770a7a97bf
+      - initial_input_ast: a0a37fb9e4072a9bbc28be29894a9f0a3ed0ac123990819f30460a83b52100c5
+    initial_ast: 9042cfd3da08562c66bce2991f593d58e8e546b78f4507cb57b90aada7c8a7f8
     symbol_table: 9f669ef27076d235af9438e4a4732be0d93854a67b7e3df0e3a99f62bc9db684
diff --git a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
index 1c926e6299..9999128440 100644
--- a/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 80f618589bf50616df17ffbcc676f151b17416a702f14774d3441e457a4157b5
-    initial_ast: c713b1dbdd370474ea5c2cb553eb80f1776b2fd2c343c215f86dc1d94b68a20e
+      - initial_input_ast: eb572e984fd7ec4b4430b960f1f8a8eb359ff308ae010f8aead5175c19f48a37
+    initial_ast: 02c242f6249fa3aa34d66ab5eeaf317158b252fe201679032c22a5d2c815482c
     symbol_table: 6ef3c6f53b59ccfacd7d3590250bf4f383dead38eb6403e278dced621c9a924c
diff --git a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
index 76aae6c353..1c33813eba 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b12ba1759e7600fe50376c2dc04f2cc908cae643be6693583c167493b8b5064e
-      - initial_input_ast: 4ac2084a873258d0f5b18c4936ddd323509944d808e66efe91c44593d2c2bbe1
-    initial_ast: 6d2447bbc531fc7a2391bc460c6a7db4876d61a8fb49680fdb86bac5ca6a848f
+      - initial_input_ast: 746c39ffb4c9ea811eee070ac2350aa68db0a111566de31b02c39cc7f458da53
+      - initial_input_ast: b7ee1e3384f0916b931f72ce83b830d328511263210ea42d89d3f264d33e741f
+    initial_ast: cb712f6b4adfd98ed0129f4ae508546cfa06278b427d39321cecc870e61523dc
     symbol_table: d06cab633083be51c77f53df2cfe0bce8137fcb17aac03346d885adc9c4b9be3
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
index e9d16f1a60..81c88dc082 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e3239b93c2572ba5c5e7cf2edaa4d8045bb11212607af1a441eb351677f49087
-      - initial_input_ast: 9da893ef2702d495a685100ea83f84397cdcc3716f4e9fa23736bb57a750d861
-    initial_ast: 9ccda1920de403f670a51d341e3f538e8896fced58384f81b2d51e7274f22cce
+      - initial_input_ast: 2bbc445c8553edb58168dbb6a7fb8da1eaa53c23f46b093b83c8cffb76227f8f
+      - initial_input_ast: 3fff8f7254b3685f80cbf8312ef7d976bf3ab0896167211b573bc4917c2ad284
+    initial_ast: 2827ea7f5318b9ad9756f92b815d86343f74590e3055952094573c8085bac0cf
     symbol_table: b693277ecb38a66fd37fc9482e73a650bf448aa84e0f2d60baf85e504ececdba
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_min_fail.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate_min_fail.leo.out
index a1fac14d38..27ac952344 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_min_fail.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_min_fail.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: f8beea948d8769e04b08bf5059ffa3c084854ecea30fc8a1ceaf8bcc8214175b
+      - initial_input_ast: 88296c4e90c80b248fea96e1a816d21a81e0b97574c79a9e8bb60667070877e4
+    initial_ast: 99f2584036b64d4745573cdfcd897e8defda47586b26161f200bca99a473ca7b
     symbol_table: cc902d05b8e7171b94fb0335b85ef2147427d0840e15360f6a88c4906ebceaa2
diff --git a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
index 71152213a0..f6f2bc8667 100644
--- a/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/negate_zero.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 23ee38fdea594d9b998c357b927c3a6c6a26e7e42f9eed8b8bc563fdd5cb749e
+      - initial_input_ast: b6d101397f4a313cffd45a3c4f0e1fce6e2bc1a9c7a7c5e632e9be21d6d6bc85
+    initial_ast: 664bdb342af107ee2996f9b7fef01514894eda8bbdf40957c462d34988b03893
     symbol_table: d4d0d37668745d3e6320eb7f08a3b4e32e276177c75600b3fe8742d6b42e308e
diff --git a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
index 799a48a8db..3bc03a23d2 100644
--- a/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a614a0d50bb1fdac14773ff4bc9e6e73cadf7577f704bd022d228f8012c5b82d
-    initial_ast: 32dade0a85c4f199e6122e42fab9f07c572734ed14717a5f595fac3065724b8e
+      - initial_input_ast: e590410e9bcefb525919ae70dcfb5cab7bd007fb04f3baf5af6d353db78c0b1c
+    initial_ast: 08823fab2fe25b4d68240fdb23ec3be94fbe2405ecb208651a0f7654a15528f5
     symbol_table: b04bbcf2084fb6c4abf70b9c36361dfac8cc78ac8f1004453b3020f7106b8378
diff --git a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
index 10cbd9b472..39cf5382c9 100644
--- a/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i16/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b7e009a9242724e5b46c82c07ec09ceb37bd229e726aa7b10cf654222849047b
-      - initial_input_ast: c58e80ea1edcaef89fe15d96be15c8285fa4cdd94fe5a4d89e86037b95d81f2b
-    initial_ast: 3171680296fd00d15d07108b282bb8abecef40b9a78600897fe371a1a9f65523
+      - initial_input_ast: beb4a3127afdb6dbd476619f923b1059d526074724d61f6334632b453c5bd37f
+      - initial_input_ast: 7b6668fe8ed063667a4855817e510453df6d54975455644beefb447815d9aa92
+    initial_ast: 5a2cc3b073e66a769b753927610a6bc7284117af92697c795175bef850a881c9
     symbol_table: b92b41fc1f57be0e19b7ae98c07f01811e2400472c7577bd2facabfe011b2418
diff --git a/tests/expectations/compiler/compiler/integers/i32/add.leo.out b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
index 63def67d7b..652ecdae7d 100644
--- a/tests/expectations/compiler/compiler/integers/i32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 187821d38d4d6bee83ad16df121b4cd61453c250259cc88b5224cde2cb0f81bd
-    initial_ast: 7f47a762b501ddb7827d34cf8f897322dfebac7554b59d9554a7feb59f6dfa64
+      - initial_input_ast: eb41a21f5a0b0cea9589243a858fdc66f91774a1e30f9769384c5ffcc82d3748
+    initial_ast: d4bfcbe1c26f251583096c534722632bc4352726dd2154912aac0179b701b9ac
     symbol_table: ae5ef5cfb1044cbd8c7efa5be8935eb1742fc65c72b7f8aba9d9f7fb72f8556b
diff --git a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
index 18ad2f2901..3f57b358e0 100644
--- a/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
-    initial_ast: cee523f739c2e3929f93cc0b1646db1e71ec143476dfae03c31e0de5506c8a92
+      - initial_input_ast: bf70b57faa2b489aaeacd736fdb3400e70b9d81554bd7a63679fc072086c9cfd
+    initial_ast: 36de86494fa0385dc3667993d6ab5e7181641197b2d64aad9054bf43b3f746c1
     symbol_table: e7e8be510bca7adc0598527ef337c1938d3f5c8666448cafe2831594e553d39e
diff --git a/tests/expectations/compiler/compiler/integers/i32/div.leo.out b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
index 22ee69f51d..c11356da0c 100644
--- a/tests/expectations/compiler/compiler/integers/i32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 5c4c17182ebea3e67d0b4f30c4c5541f039ff6d44914806b5358ae789fde1576
-    initial_ast: f35bcae22884780c9b89c8ae1c1b5ccf1879f3380a5f3126bcd7c7235e0d4386
+      - initial_input_ast: 651ad255513e0a0213b92027c0e5d1172a786583f9b70844a95793b72c7944e3
+    initial_ast: 4ae8e94f616abe5f2cc518119d4583a2e9200dcfa8e64d9823e311e29c521d39
     symbol_table: 088e7adb11ab06a554256c44b806f86c2c1f13273e00be2a80b8c8e797e51eb2
diff --git a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
index 9337b8f7a8..01e3823db8 100644
--- a/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
-    initial_ast: 56fd1c1dce40dbd576aa518fe53d6f42ce776057387be5058acce284e15c2c4f
+      - initial_input_ast: 7b7095a0091c987107da507db19783551e50a6fb1db32edb6a068299fbb14fa1
+    initial_ast: a8bfb50b7dfb85f7d826621a33bdec2674c423d6047c4a39520965214d846a50
     symbol_table: 7a2619dfcf2d5f5132253f84196ad0d3ab6ee0ab95df55062240dd92cca23e0b
diff --git a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
index d2964f75c7..cf425a8f06 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
-      - initial_input_ast: 6e2f4bca097cdfd636afe4221883da452290354178f85de45f1033dc3d99caf5
-    initial_ast: 95f1346bdb68ce73d0bbbcde5d8119c298115417c0c02133ef9a2856dc649862
+      - initial_input_ast: 192f63078564083f0311df6bec7fa365ad3a59bc4c07dd1800171f2f98ddb681
+      - initial_input_ast: 5b9dda05b3fdec7482acc81549abe8559e6e25fd81846af005db746ae4138f32
+    initial_ast: 459da7f27b3f6507904b16d3c207c280c85b250ed8ffee8fc50a6f5dc0799365
     symbol_table: b599133b42cb178b6ecc71beee98b33229ba1bbb58282ace5b20faef31637bbb
diff --git a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
index 41d1235cec..b1fad875a8 100644
--- a/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
-      - initial_input_ast: c0ba73ee8b61ed89f99395a94f23a5aa3a84f9345a4c4020460303b540c33c6c
-    initial_ast: 45c32d7a136b3b48d35d790ef7f0d85715cea41d52a35ff791fba9894dfcfa29
+      - initial_input_ast: 54c8ae21ad089e47320e859b21f7e3de702ea5aa8cd557348a5ce67927ec41c5
+      - initial_input_ast: 7312c2718325680c9e882679e97da29e696d0eba505d481dd646f0ab95e8c837
+    initial_ast: 7997c889e1073b31510fba614dacc3f91afd1bbaf185e66d08a7eca36e261ba4
     symbol_table: 547e049dec4bad4d2e354d568151fc102474caffb82551bb5630c0b8906230c2
diff --git a/tests/expectations/compiler/compiler/integers/i32/le.leo.out b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
index 724d057906..64fc6b611c 100644
--- a/tests/expectations/compiler/compiler/integers/i32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
-      - initial_input_ast: f7bd61dab4f2768d6b2f631a06f5f33307a77755b1b640ebec2a187c3f9d0bb1
-    initial_ast: 7b327120681dbf21fe3556210c45dcd1bc46b4528fd43c7c1947db55dce84d1f
+      - initial_input_ast: 192f63078564083f0311df6bec7fa365ad3a59bc4c07dd1800171f2f98ddb681
+      - initial_input_ast: 4d033520bc6b5cbebcbde0c94098bd216eb9407dab6fe88ba6ffb37fd5855729
+    initial_ast: a794f848fb1809ae6838c5bcff24cd81c07ff654bc0edcad30f492b2f5c3feb6
     symbol_table: 2471d7a0f956f30747d5bd8c5d03e8a47c628ac64766d2f19caaf3dadd7f1c06
diff --git a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
index aef3636e7c..305575b8b7 100644
--- a/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
-      - initial_input_ast: cc79bd922f3afc54250b7e7a60628a58b17ba8e7db58091349f13b67297ea1f5
-    initial_ast: 3dddac99f473a213e6e9c0157635392ce74651d094b7703602ac70ae7bbf64e3
+      - initial_input_ast: 58ba8b6fc401bd9170e7a6e9a065961624c460c6d2fc733da54b06476f43f4c9
+      - initial_input_ast: f327282e227c7f902489b632a71a6372b653de6e073042569341ada771ccd7af
+    initial_ast: a75c961d8aa319d4d05aaea8b9266778b91ba2069069df396fe6a181df94f7aa
     symbol_table: 688fa40d541217369a9c952f52de9be090829cb3c6d08e98d6312fcdfbd90d63
diff --git a/tests/expectations/compiler/compiler/integers/i32/max.leo.out b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
index 349e07d906..f5e883b76d 100644
--- a/tests/expectations/compiler/compiler/integers/i32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 204dfbbf244912ad9d11c9ec397d65995eb80bfc428c36118890bb92f76e158f
+      - initial_input_ast: b6d101397f4a313cffd45a3c4f0e1fce6e2bc1a9c7a7c5e632e9be21d6d6bc85
+    initial_ast: fa8be6ca00552d5f1331b4182799fd0ddfe4cb79f4aeeea5e1fba82911b25b1e
     symbol_table: e4eff856d1f884c746d9549c80e05a6d7ef3c23cab40a056f6be96cedcf093b5
diff --git a/tests/expectations/compiler/compiler/integers/i32/min.leo.out b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
index fd9a778a01..4d251c79af 100644
--- a/tests/expectations/compiler/compiler/integers/i32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 3faee019ae168917ee4acd6ccb87aa4209dc93c3213327788c05f01b0e3dae47
+      - initial_input_ast: 601cd2adf1b53f979c684cc500985ba9ca3b519f3233640f93fe79736af8da7d
+    initial_ast: ab260c8691434cc67633ef318b240e044771fcf194bee22bdcf2eb3c9dd0cc22
     symbol_table: fe289642ca33db01ce62474ee358f4cff826e221724cc5b4d28f0e878d4f08e6
diff --git a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
index 08ff49e806..c95a44e167 100644
--- a/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: c767df287dda6925591fbdb496ed122c17e2e0b963f0f2819a03493e8f57656e
-    initial_ast: e66dc6bebe6a96dbde3a09633d58c0ee56bda544ef8d4b91c61b8172209411b1
+      - initial_input_ast: 49426986c17f3bccf413ac24ebcdb82ec1dcd6f627db9c48726e0ecce535279c
+    initial_ast: f5b18eec4d4581b2fbe74474db613cdd09906d14054ef00d29665378fa1a1dde
     symbol_table: 7c31808962cf3c6fa13611d89e6edc2a3b6c5d1fb7c1913a337f436412cc5a34
diff --git a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
index 1ce18f49f4..16d7e3e4b7 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a139a8bae62ab18b9235331f7dde3acb349c1445e807293c71235fd149b12c7a
-      - initial_input_ast: 3eb74ab23e5409471a8cddbdef932be85f95ab0027ad95caff181f26ef3f8e9d
-    initial_ast: 7cd655faeb60491a7450f04fc44df47097be23ca8dd63d031031c0c7b2b49e03
+      - initial_input_ast: 13961fc39086263249d3eb299c3bb62af742ef855f8498c36f72ee9b97da1586
+      - initial_input_ast: 64d526f0dc86f21ad3da514fe2a1ec9456d5a75f04d2e3d30ca831dc8c974abb
+    initial_ast: 9321a9af00de47b3f6d3ad0e0b8d5620ada2034ca0b13b6652b70789c52bbcf4
     symbol_table: 86eb824aa5a8d1e3d8f4c4682aaabc503e02680c5c4ab6ab6500ff971ae21879
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
index e398c6f3b7..447dbcb16f 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 8016712e5cadc085ec477fe3261d863ed258f15bbcee3c229280a4434dc87bb6
-      - initial_input_ast: 7d83894bd97920d10bbdcbba5a40cffdd1c2ec823cc2af89a3cdf48376c5c554
-    initial_ast: 6c09a13c117b129a261ac296984a5e1981820833e5b21acdafd02c05d3351e3e
+      - initial_input_ast: 3961a8fc47bced2b995d144945194d154f56a48ebdbbc7a722f33f90a0b7d3d8
+      - initial_input_ast: 44e89074dc26156aefaa66bbb58bb545b397f3f9aaa5e4a1be603bbbd00c1359
+    initial_ast: 55c28f556a5a7ee07c6a224b615b00722d2e9390fdf2b16df256fc16df9aa73d
     symbol_table: ff59dc483d6da2f11e881ea60ccd3534ab7c1655e2e1e8c2ca99c1d670c77a19
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
index 4fac29e557..805f3166a6 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: d3cba4377a95bb0a2e228539828114ecc180e4d1525bcc29249f90acabee7d9f
+      - initial_input_ast: a21868246c36e4325607d5efb14d1f8b85fac3cca07e97a27849863fe3c0ca1e
+    initial_ast: e5690d45ea2690f973afcd01c758fbcc059bb29e3fdf0dbdcce30ab4955b212b
     symbol_table: 4316835ec95347cdf02c020035e9cb3416318c71618d710108c716ae1554d139
diff --git a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
index 34e4baa4be..ee6ba91f41 100644
--- a/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/negate_zero.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 8ff48ba0a09dd32b531f3782faf3c93a043ba4e2955bd11f9bf898b274182dc6
+      - initial_input_ast: b6d101397f4a313cffd45a3c4f0e1fce6e2bc1a9c7a7c5e632e9be21d6d6bc85
+    initial_ast: 043f34d3ba298730da74a93ddca68a15dafd8f4566de4a83b27663863a69271a
     symbol_table: f03df27663cd6b55538ab7319ad179ba7be6e962fdc193c79365a684ef004c16
diff --git a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
index 81b6e445b6..83ae21cc95 100644
--- a/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b0ba0dceefb39938d6365a1af8aff5b1ab305a264e70489cbf4ad244bb9642f7
-    initial_ast: af8beb65fd10670b4a407b8a5e41b765e64e08fe5688419d5307a2a79c4886cc
+      - initial_input_ast: 4642ab7923c76f506d1685ef8fce26e07a718982d2a213379e31b4fb2c9f67e1
+    initial_ast: 50d50720f93209f2aa4ced9ffbed505526aa6c7fe7207691f3b0e208ff7f65bc
     symbol_table: 5b6a8a1708a2047863f813b4b029c22fd49de20abf5a16bb667954c4c5ee2a23
diff --git a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
index f5e2845c99..7b17ad0115 100644
--- a/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i32/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 541a92e4449861bc8a77cd1e3e0641ec8581ea2156adbb71a8805eb76b981535
-      - initial_input_ast: c0d707f8e705919c847736cd72c601642fc57cb205eab2b81bedf7cce768f18f
-    initial_ast: fea8e5d8e237bf19a2310917bd90478c2fbfb5339d580557095287bde9632df0
+      - initial_input_ast: b02494fb9cbcfda522792af1577860dfadf3754503bf184247787616cc684b3f
+      - initial_input_ast: 6aa84d0b1271ee10aa5fd3d2123f793c8d3663e1ef5bc8bd709602a5f7f2bb05
+    initial_ast: 3524971adadb7f7ffc63cc3ea117e48b800c4f52306536a8bc42261656188ed7
     symbol_table: d69acacea66b05b7cb30053a47a32453810be97b933908e014f68d8cb046ee6d
diff --git a/tests/expectations/compiler/compiler/integers/i64/add.leo.out b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
index 1f10901869..565b5bbbc7 100644
--- a/tests/expectations/compiler/compiler/integers/i64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 4487891a65166322700df8b88e062dd55ba1ba1eab41086faeecb89866ce6353
-    initial_ast: c07459e21796b714d812de884eaf71ac1eb756b2fc786662b188cd5b26cefed2
+      - initial_input_ast: 6e966811e2bf235a62319227398ea147c7a5f92fbbf2bee2393d245e6567d269
+    initial_ast: a38ca5c5b3250176a320f77c698e5001cba211ad3d74b5952ac1664874109cf2
     symbol_table: d819410bf10134f81bb62eb4e11ff16ef2ee5d3aed52c328514db13cc79c9385
diff --git a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
index 5083032d71..601a515a91 100644
--- a/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
-    initial_ast: 8d3a22f5a92b3543294d463ddd69f739559ee2c45b74f38ab906e26ff3593584
+      - initial_input_ast: a5253584ea13138ed5d9be29fae36fdb0fa4a954af387aa33abd8b105fdc9220
+    initial_ast: 460a836c1751cd34ce9239ba09c996e55a28b5067ee44875d87ef4da21e0ece4
     symbol_table: fbeac8715fd60fea0f3ef8db7373e8ec195887ff4ba92bb7af7346181db2164d
diff --git a/tests/expectations/compiler/compiler/integers/i64/div.leo.out b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
index 3eff496c62..183a32029c 100644
--- a/tests/expectations/compiler/compiler/integers/i64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0a764dba657d55d3997cad318c763d1bc29b3bd68e720c29bdb329e31544cfa2
-    initial_ast: c26e26793fd744748b6d73e988dc01aa42847ddbded67eefcc7a209514fbf44b
+      - initial_input_ast: c6b9ef1a1b814c2f7f531a829e698704764f028fc5a54c353ccad0cbc9879be6
+    initial_ast: f19558e8b8b2df85f7787ca5557dd7deb699f195375794a3303369af225adff7
     symbol_table: 00f270ed9ebe98ec0543be83c941aef7d465c6c79780eacac64a8b09120dd09b
diff --git a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
index f9a1d43d12..b57f6151b1 100644
--- a/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
-    initial_ast: 3816b90d0691fed125080abe118763eca3bc6a6f956c55fb32bbf28d1bc7a1ab
+      - initial_input_ast: 902cab6e2595a4adf8d852f1b821d4722fa0f577b4484a9f3520802fe8e7f9da
+    initial_ast: f22cb45cefef871b49dc2e2962d4c31b7832dd5d61cfaf58e7e0f42719567cb0
     symbol_table: fe562696dece608fab527d7894d61a1bbccbcdd2ddf7fcb5cc52a0d596fcaff3
diff --git a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
index 7a13c957fb..42df00094a 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
-      - initial_input_ast: 6f2114abcc9ce0070e464adfbafdd625d2027563630b920462ae44cf648d10c3
-    initial_ast: e3d948403639f83d67f7af93728a058a6ec3078cd103cd18839340f2e736ad62
+      - initial_input_ast: 8ef54decac5d24c7e13a879378b5dd3b647158161d2f61338fb50126b83aaf48
+      - initial_input_ast: cb1c35c7526c112ed10db7e151429758bbf70503600abfcd04a721be78d602dd
+    initial_ast: 092ba01522a8e92615116b0e3475a793043125ea6040c7363e89e705f21c345c
     symbol_table: ecc8f2f906379f321b5babf4982047f1a42f03456c2624eeeafe8d0a9198e3d5
diff --git a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
index 6b17e20935..68fe8fece9 100644
--- a/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
-      - initial_input_ast: 77947a385da3cc07fb78bfd9d6d32f614be877f10e664addc4010f44dfd494fa
-    initial_ast: 36fef416121f22a24701d940670ceaee231a83028d07f6ae35da9b7af305cf0a
+      - initial_input_ast: 2b8713d208c969d37a63f66f5c7ada885a64c858ef3bb2845c60c6aaf365044d
+      - initial_input_ast: 5ac01e6c15dc0c065b0954824c76badc94b79ad2fa95a63a5d9f938d37f97b77
+    initial_ast: d5128c35484882c88a4c79c5e1452af3775aaafe41b787a656ffa7c018bddb11
     symbol_table: e089bc1a3f005ed33b1f676a2ffff71fa6ec2f119f23e2537ca763bad3d56837
diff --git a/tests/expectations/compiler/compiler/integers/i64/le.leo.out b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
index 13d566e93c..cecefac400 100644
--- a/tests/expectations/compiler/compiler/integers/i64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
-      - initial_input_ast: 4d3d28e791b2bc01cc08f84e9c521c25de2cb9f1159c0810e18288ceade9384e
-    initial_ast: a0ef3f88f00d454d6aad4d7931e231eed0a2319cf3d5c43e283fc1f23a0a8f52
+      - initial_input_ast: 8ef54decac5d24c7e13a879378b5dd3b647158161d2f61338fb50126b83aaf48
+      - initial_input_ast: e351ef4a54f11045f91c0805889a6f4582013d349e43e1892ee09cbecd44a9f6
+    initial_ast: f7eb5633bfc7188fc513b7476423a99e57dcee3d3ce8c6ee7a0ef0d3dd783c84
     symbol_table: b186c6e3067b7544d334caa51380a5ddfcfb4d5a2efc6dc1acbe42282ef4cc60
diff --git a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
index 6f8fd57be4..9a1afd2ea3 100644
--- a/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
-      - initial_input_ast: 67194a693cde1f31bb02a14e2ee4e5cc686b33d59d3b7449e9dc7bf74fbd0bf8
-    initial_ast: 564eeb1186e117b9e1882292a9eb3e947c37ee5187c9d45eb56c21668aa656e7
+      - initial_input_ast: 135191eed617a62ebba5ffd81f1ec98e3346e87a612222678e4cb6c06fb99fd4
+      - initial_input_ast: 8bfb062c39e51d49e0676139a4eef60ab1c00de89f067fe14d048ffac52c5252
+    initial_ast: 79599e2a57d88e3623285d887ab8d5968b0f2640ae90cf061f54e6adcea6adce
     symbol_table: 40cf3641e69402664d36e3da2fc574fb909d73cb15a7a253c678d61076da6d1d
diff --git a/tests/expectations/compiler/compiler/integers/i64/max.leo.out b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
index df870c4501..80d2b66664 100644
--- a/tests/expectations/compiler/compiler/integers/i64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 32263f220678e5aadc1958ef0592ab4848f0f6f7791389f414bd038b19294e40
+      - initial_input_ast: d86c902c588b89aa397e434ba690bf12ab7b0b459fd7e140f082689456f87b48
+    initial_ast: f5d9a0fc44b88693db42f28ee8a9b8cf4ac339c9fbad411cb6fbd111a532f419
     symbol_table: d7d7a90af5b30ced5d014e0f7539fe023299e3050aac61c26ebfbffd00997991
diff --git a/tests/expectations/compiler/compiler/integers/i64/min.leo.out b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
index a4477d5134..b6a2ca0615 100644
--- a/tests/expectations/compiler/compiler/integers/i64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 7f8ac510672bc82d54d6dd33a22a86e986bef5ddf4bcdde81ccccb964676b151
+      - initial_input_ast: 4be495421ace98fff4d408986b837383a54ca42ce4ac7b0448fc568496e70993
+    initial_ast: b255e2438e3dd804da12daf7085030f7f85d904ece28c87dac6ad7ba76a1dad0
     symbol_table: ac8a22d4c2415f3853d5d7220433fab10c5f91eab939302666a2224601209d19
diff --git a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
index 74e50f8df0..49325ee602 100644
--- a/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: d53c1c3a0b1c6aad2bddba6e4b5194ed04f76992c93301b9a5fdf71d0c6e12fb
-    initial_ast: 2a819057aba25ab9d5ef4b419fb190ea918947595f3f4366fb329b6dcc2e740c
+      - initial_input_ast: cf837d4f210c65db52ce917dcc4eb738c3d3a5c34f632584a5f0590bcffc84ab
+    initial_ast: 375eb3d5d880810de681e75d3f8580473f2ec86452d8896a4166083b1b3804b0
     symbol_table: e10e8f60976d59b92f39cb8402580330f13bf9d04cd7afdbf844c0c718897ecb
diff --git a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
index 53b593185d..cd361143bf 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9ac72a16994c4f4145cf0eaa23f0d58de951926f8b9cb500bc33644cc242d288
-      - initial_input_ast: a2ebbe7590f5035c9115e7e885e6cecd7c4f07d3567fbe34d464027f73e7ece2
-    initial_ast: 1b709842cb0e0f6893a5377d7d2a41e2ae3633292d978e2b8d29e4b0dcf88954
+      - initial_input_ast: df435ccd83d57635f2c18108dbb6dd1617567ff9e6a12a47302d6424f4c3540a
+      - initial_input_ast: 5fa964d108baa06301a9d7784da6d1a9d567036987c7207bb500a1f0ec945409
+    initial_ast: 6c0d946828377c66aa6d17d18a86f29433c017af027d5a8a47158aff87ae5fab
     symbol_table: cf15aab8ab6a6a35f3a7ae1c3827b7a1dd32be924cb0ea6b7febc46b60d5b449
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
index c363fa75db..76e34c05f2 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: c2099c29aa512efefc2f4b24dfec851416921200642fdfc282c1c71b9d8e4fd3
-      - initial_input_ast: 60c2c4f5a8213dffdf7b02b324ba11327d7dd89d22bdd8f73032e9eb8aa7da90
-    initial_ast: 223b12273586e56f88417ea3bad2dc753616f34a8c64ce42989ae60609f95912
+      - initial_input_ast: f669160a44ed7cb5414883cc11295b940cb83993a3af5bff8f8589b07983eec5
+      - initial_input_ast: 6e391bf9c08c81ad2d70f594d770e499ae6cfee6bf3a33ce3eef67cb2a9f7ef2
+    initial_ast: f5529438d864d710bc894c8781ffd7cf7ffd23398ac34812849f250d6866a20b
     symbol_table: bc4883071e65ae85896379b2b51c6637ee6159ce84d85d38b6e44c90bb7f9b3d
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
index 7a10ebfb99..19d2f242b6 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 798f253e2a52fea294b6a622c0e72d631cf72341935d5a14758bf05433efd3dd
+      - initial_input_ast: 6021d4e9a4c181bf4e44518f5e8693ae49e79a36cd5e7dae4ca1fce383753ccb
+    initial_ast: 1a2a89ddf37c730dc9beaaa55a8b22a1ab596ac0ef3682553129c24edb9a8270
     symbol_table: 927e4c4f2b53eb922fd507cb7faa00e94d47ccdbf16a2a0afe83b57e31873cb2
diff --git a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
index f9300c1e1e..90fcc99db0 100644
--- a/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/negate_zero.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: a1485024b9efc9ca0dd542319261c34d27a6211104b04f9e2be31eace95a59ce
+      - initial_input_ast: b6d101397f4a313cffd45a3c4f0e1fce6e2bc1a9c7a7c5e632e9be21d6d6bc85
+    initial_ast: 726fee78e80997ca748d1fd9e5988e9b343a90bd5fa84456357ad25cccb396fe
     symbol_table: a456668190df24a0290cdc207ed29668d614565d90d9380187e371ea7cffc2b2
diff --git a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
index d6dc968d9f..b8186dde28 100644
--- a/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b58e6dd8d55347cdad90608837dfd6dee3d002202044f63844bfcfb764e4770d
-    initial_ast: 79958786b273fbc3d0cd3c8b05566f983a1763845ae688275359cc8d5ce37fc6
+      - initial_input_ast: e0fcc321608132d125da191fa74c5082b446791519e2f91c120495a1b440a77e
+    initial_ast: d5d678501da90d4a07c667e65fcc934df7819a50c2848fa4e2c3aa07c6b9d330
     symbol_table: fdaa2856fba7667905480b9477e3aa08c41c722ec9c51b5f75209420f502ae0d
diff --git a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
index f7f36f64d4..f11d077207 100644
--- a/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i64/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 482e1a5ff8edd8d08f8a4e686f4b9bdd46f6c09fd6a45a91d80817d2792379c4
-      - initial_input_ast: 9f06a756fd85b99ad71c8815e6d2e0988933eb8ff5f58cd3b25c797a99ae68ec
-    initial_ast: 7c6df373ff5ffd386e27030f922e4e0dcf1024d3262b54dec7b4a42c60bde1e5
+      - initial_input_ast: 3db1b5e7c052de07edad033e19f5ade259245f161f7a0763951c8bd364109838
+      - initial_input_ast: 0710684ef40ef026329f2be234b12c7e7f76522b637d70db656b208038eac255
+    initial_ast: 2bc0438d5c64bbdf14d0a751d27f6f766207b5e2af887b7eba4e8222c6b10051
     symbol_table: c4cb362b056cea8c44ef71fbd260c067c8025b66d9000f1bfd72a0a2caf34b8f
diff --git a/tests/expectations/compiler/compiler/integers/i8/add.leo.out b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
index 6889a3960c..d092325f7e 100644
--- a/tests/expectations/compiler/compiler/integers/i8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a4cac5c153aca7bfef6dabb6cbf703d96938699bebce6f063d39011de78a5bd4
-    initial_ast: 575d55695796c7e9f375a95cc760dee4d42a09c0583812c7b700afcaa1f4aa20
+      - initial_input_ast: 0a6f670f5dabbe16296ccdfb83366c2ae59432059003c64d1e6141e658f49cc3
+    initial_ast: 3d7ca64850f1ada49a3a48e0dd85904d4038e708d10b976f41f26e4a55a9394f
     symbol_table: 0d30cbd5adc20ac5b03559dcd90334ac82572a3d5a195325d49ee681b4597089
diff --git a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
index 37b21a15b7..2773469e22 100644
--- a/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
-    initial_ast: aca72aa77831d092de1fcfbb470a0b30498b26ec78def084fa9d87437f735c4f
+      - initial_input_ast: 0a96b86454464bac33e281e58220559a8898407b3e77df33c85f893a9f57e311
+    initial_ast: 4b161f6f3921372ddfe6d04624078541650f0e9cf9f1db59c4232f1b46b10578
     symbol_table: 94888e7a3878be6164b483f223840d704e815d8f29e1d90d04130e0f363c21d0
diff --git a/tests/expectations/compiler/compiler/integers/i8/div.leo.out b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
index d76175e195..6e6b9f3c8d 100644
--- a/tests/expectations/compiler/compiler/integers/i8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 2bb926ee08666d2f770b02d22884fb353d718b57ffd34c156dd70431c16b713c
-    initial_ast: 5078bb1c9667027ef21780af5b4269c6f3fcaf2584f0bdaada261993b5aa8c3c
+      - initial_input_ast: e54db1c81e133456e3ca9ec637af6b43feb2ffad5303e4fe2601db67c14b6b6e
+    initial_ast: c43b52ff3f907f5164e4e9923b687ad5f10b1e7322ec01d37400e62d3b2aa8f2
     symbol_table: 856843c2915ab5599b921ca4c73e2be480e792d719ba89f86425195ece44a654
diff --git a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
index bcbbac419b..a985c9c84c 100644
--- a/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
-    initial_ast: 67f555cb3130203c8f5a6f3f890a27d1eeeb2830d91f55097c8218c72ecd1861
+      - initial_input_ast: caf602f1b070dbb80e9d81ac86ac39a35fa7139fcf0f1e3f2da0e47e20707b0d
+    initial_ast: ba261340408f8c9263b260337bbd77fbd86ff819bdc4e25e4c53f91450c21176
     symbol_table: 7814b27104ef5de9ad3357bc67b519cf5642a0960e054e7419d46786fa6b4f08
diff --git a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
index fcb980b139..d1169e4ea7 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
-      - initial_input_ast: 2d8fb2c6466da29059eb6cc1d233fc87acbe4159c7e9f42783ac1900d4652bab
-    initial_ast: b3b414b2f71d925097fea6ab4d8e524e7204ef66d5d8eb82c2601a39805c89b4
+      - initial_input_ast: b533768f01841786b29407eab6e42a5e411946db785d8ed9e0f966ef7fd34585
+      - initial_input_ast: f2a4aa40dd036ec6a49cfed7d3f8e483a3e246911042c7df246be8f13305e964
+    initial_ast: d2bd292b3f6979e6af99805ec7706cb4035978651c77ad41a8bae5b8677a9eba
     symbol_table: 653d6411a2d15feb4fce54c8f2ca038d0a5cc0e09226aa59d0a991228a438ec7
diff --git a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
index 7aea5c1a68..71dde592c2 100644
--- a/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
-      - initial_input_ast: 795ae933e75a19aa21efbe4f8deb0931a0ae5b62c8a730df05b676190de5a70a
-    initial_ast: 6ed5d0dc1e729b9861f487e39348037dc59ff7976572e4566286c51539ef782a
+      - initial_input_ast: afd14aec5238a40d23d04973fc349ac44078961215925cb5fc4e117d5905009d
+      - initial_input_ast: a7fed0d6bb9e7f2ae8eb9adf002dd8471358eb16eacd360bbb64460b58e434ea
+    initial_ast: fe439b8439d2414e6034ef6f78e9f966d4f01b8c8b91b8d9bfc3ac5cf2854cff
     symbol_table: 93a2e7caea996e9ab13b40a775adc500eba4f3a329b617cc2e0759179b783ab1
diff --git a/tests/expectations/compiler/compiler/integers/i8/le.leo.out b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
index adf1c9fb0e..720b770366 100644
--- a/tests/expectations/compiler/compiler/integers/i8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
-      - initial_input_ast: 14894f63af1f3e81f95caf62f8ffae47096064cddd59e55a96b85c9436c6ecf3
-    initial_ast: 082a25a48d7ca194fb611bcac75ecc562f2a6977cf705992474131b2529f0a02
+      - initial_input_ast: b533768f01841786b29407eab6e42a5e411946db785d8ed9e0f966ef7fd34585
+      - initial_input_ast: 937737713bbd867255242e9f460c841d66e7e5ca2c7b120d528a5583e98e692f
+    initial_ast: d2375acfe1829f01e02eedc8bb03cfa621d14f26d0f88ffd545b07f6aec49f69
     symbol_table: be6d3bc2c850155455878c8f4faa8089372643e126a5241892437882cadbc7cc
diff --git a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
index 41283b85e2..d45370cad6 100644
--- a/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
-      - initial_input_ast: ec93c97f4993d2553199eaa4494be32270e7e60428374cc3a78b3c467458a24c
-    initial_ast: 25dd81b56ded5248f01f17a127d80b9e4bbd3de7ac546c62bbf59a3bd8eb158f
+      - initial_input_ast: ed78d395f6f9689f0a471394946c3bcd9b655b506f45ce9fce08467c6f331a3c
+      - initial_input_ast: b3e2d6964ad5de72559310f5329debaba34b99dba72c59c6b3b26089c0ea80c4
+    initial_ast: 15cef894be5723a5124bea3f4061aced98fa4ba64cf83e967e4922ca3c755b5a
     symbol_table: 4728ccd7dbbdc653e78c0ccfce8ad81762caf0ba516da7b9603a2543f0b89498
diff --git a/tests/expectations/compiler/compiler/integers/i8/max.leo.out b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
index 587b534306..6fa38dd692 100644
--- a/tests/expectations/compiler/compiler/integers/i8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: a4fd3d6e1af170d2f7c29ac77dd37eb02a03c67836e6fa46c93fecf010371101
+      - initial_input_ast: 4d739a3dcbeb1880f45f4fbdf7d12b3949dce64ce617ddaa61c64a674b5aacdf
+    initial_ast: 9d0d79c5c4351672f52660439609f4c9d22614be260a999f9a63b4eb5ed1f41c
     symbol_table: 66106e69fbd949ea2dbfd4416f5d1c9227684eff438d1625c93d6bb4f8573ce9
diff --git a/tests/expectations/compiler/compiler/integers/i8/min.leo.out b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
index 1f9907287e..a7522c55e7 100644
--- a/tests/expectations/compiler/compiler/integers/i8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 4f0ced5e7f9f4cba2d7806cb5010c5fbb29d0646e831143ebacf1d8ed9088572
+      - initial_input_ast: 43adaa31f572639c8ac2fc8547f0f3792c051b0c20e1806a11c549431afa749a
+    initial_ast: b2f87cded036964dbfdedee647b26b7e6e9f600da79e28d97e0bb37989d626dd
     symbol_table: 98cceb8df5e7a49587ca9cd0c728a7ae7d31f69b41541d3f2463315c75d825eb
diff --git a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
index 1874026270..2a7703f5ff 100644
--- a/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b22a779f02dd4aac1d2c90081aa815018712cc8e9208e9b56251456c1d0fc989
-    initial_ast: 6048a6b9e643c16d0adf4d99ff836fa4dff4c344311b4cc7314c8f3ec4325dae
+      - initial_input_ast: c4e9bc98fd41124cd37e99fc914f83c55de76e88601f41d50862e5c22d06938f
+    initial_ast: b62054e07553c79f20361a7471b2a34a806789a001d7642258b2da32cadfc044
     symbol_table: a5a3bb7ed8ca56503ecd767a1ca1a997d5f5b3a06106dedfbe78d04700d70052
diff --git a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
index 849b8efbd0..4a7667c352 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 387087e4e03168d09782d693bd8b288dd097f978e8470bf2d0fae6a18b0a5dba
-      - initial_input_ast: 4a3a1f1b5a3ec22bcd0cc41eff2473442e5d1650661fc9aaf0f08dda58d062e2
-    initial_ast: f884eddeb994378c8b1d41084e8cb854dd935ad700ea939a3d440cfa0e16344d
+      - initial_input_ast: 3e3a27bc51a1c91cf0e77efc6f809a2e445865780e94dccaa3a5d7b3f45acbe7
+      - initial_input_ast: 5e97882034266467e3d0352b8309c47372f6758e2f0aa30e3d106b1080b762b8
+    initial_ast: 6cc36f8aa26971aac563505f767f35976ec9fbc0cc10947be07931efa3a20795
     symbol_table: 4fb6658a07bb0a63f1da45790682548f3a9eea88a6453f4dc12971d80766f89c
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
index fbec634b15..e9dfab48b6 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 48011eb662fd0ab14d0bb1c77ee319c30114fb378809c0a880751cba5f721cc4
-      - initial_input_ast: a81bc9a08945b82a022ae53773d357f3d1f8786309c073cb17fb087562b042a4
-    initial_ast: fabd983b60159a49115383bafb538e9c4083f80ff9a0126a1d5ef3ffd2a9f38f
+      - initial_input_ast: 3325e7bb83be51ba81b47be1c68c9730a6bcd8d5f764a8d2b5ed430c4c79d083
+      - initial_input_ast: e425a00397c65401c7927fdb05af6a3db69ce0140fb53929b4c6818fcfa99377
+    initial_ast: 520f8dddf79b0245367205c92e9462876836bebda0ed8c18701d92f89c904a89
     symbol_table: 22bc9cc7565226e1ad3280c58cd06f4035bf064b80496bf97989bf6519f81937
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
index a2e32410df..3bbfd2f82e 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: b42963ba3a80c8c3f63fce57dba1f6c67a38a5e158f89f25c81bb3eca8965857
+      - initial_input_ast: 60a5926c63405ce80b2deb5c51e9d8305570aed0f043917b5685f77c85fa16dd
+    initial_ast: 220feb50b46b75b73710328a350a1aa83769d700318968d4f0f35c04e8fa7dec
     symbol_table: 480e1058cba976845e762dbcc1568635f4940fb87dc8e89da28b568f16febfac
diff --git a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
index a5ba165c0f..2bffaa3adf 100644
--- a/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/negate_zero.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: a1c4308377480eda081a896acd28ca3bb2c1afad13b7323364bf9ce869c84e2c
+      - initial_input_ast: de3b3bff02357cc2f7ea8960c3b5cabad44b9d5b76ed52853cb48d738e317a2c
+    initial_ast: ae7105a2ca2fec5d886d59bbd4874dbce3cba68fb29a752b87c862873c960957
     symbol_table: dbe838d51c4237ebc843ac704d38d151682d6df925b8c46e681c3dde92b33f07
diff --git a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
index 1b71520366..dc421849b7 100644
--- a/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e493649c1e8d82f8080eb428d5006045e1cc91e91ccf16fa9a67f5f78b29f568
-    initial_ast: 31d85c43e39c50a69902d288ad03a0d14d284878bd19578be63cf551ff6e895a
+      - initial_input_ast: 25b989133d671e0d2f347dcd43945109311f953c48cc3e1be853c1bc98a24fff
+    initial_ast: 4051856105a22a632c12131718539c0173c108fa2836fe6a7a8bac07ecd98e12
     symbol_table: 49ac09363ff46f225d86ff3aa73dc48ee921cf2f4c096ce111832903da6a9e97
diff --git a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
index 6dc75ce407..ac60324add 100644
--- a/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/i8/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 626d0af88ad79f131c83f117a6a78faf8414bbf4fe80326c298934ba49565bc1
-      - initial_input_ast: 3838e2a3b3a7d4e9c0ac478113dfc08b2cc43c8692615ded04677a956104b542
-    initial_ast: c13d17f4ed21aabd7c1cbbcf8d85096e2c76682524ac2d006af3fd133ce4a978
+      - initial_input_ast: 22cfc698012ee82429331a3fa5dacc1b1ebeaff10bfcae6319c776b1aa0b6782
+      - initial_input_ast: 7ee17954911170639a00313738078bdc6d3801a2325b6f633fec7d664c65bcad
+    initial_ast: 89b23408cc36f08b8d5f7337f91e348dae53457c808a0932f079fbc271340cd6
     symbol_table: 64f5be13cd1e5bad65c85910f051acff84a21cc1483dc8d013a70d4f274fd419
diff --git a/tests/expectations/compiler/compiler/integers/u128/add.leo.out b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
index 33823716ab..059cd75ed2 100644
--- a/tests/expectations/compiler/compiler/integers/u128/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: d3082b5edd6d814cd5eba97f5cfee8cd6ac7c859b0bd6345152d07ff71c77704
-    initial_ast: bf4608895b7bc9dabc8c40ae050f161836cafa9114df13a102f62e556db4f7b6
+      - initial_input_ast: bd72282f194aa1e65c9cdbd5d50e314383be002be40a8254a9c5c1a798f2d159
+    initial_ast: 0d9bde03940b7541d0ac07fffde65025229d7da7fa16b611d0726e439da1778e
     symbol_table: 94c3952749ff384b298cc1bddaae404acf571029e7f6489b4eef469f19f62238
diff --git a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
index b57fe23a95..c4f644e655 100644
--- a/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
-    initial_ast: 9535113b7886c8cebe6d0423d559c1107bfb2f5d560b41ab51eb68afc4180fa8
+      - initial_input_ast: 9d55efa3b9383877b5a28fff6f1101ea56dd8af3f809d54fc6974ffe95bed947
+    initial_ast: ec907d2bd106e1f13cce1937f64d60c97aa746b8864a7294937e3aa05664f814
     symbol_table: 505948f27498d87c22e63417f71cf1f3047085a4cdb257ef7aedf3c86b238ebe
diff --git a/tests/expectations/compiler/compiler/integers/u128/div.leo.out b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
index f31e2bf793..cdf8d1ff3f 100644
--- a/tests/expectations/compiler/compiler/integers/u128/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 55766cfb9cd3036356494aed386f6369a46eaa459e732b4b125adc71cc9487de
-    initial_ast: d77ba4c656d396e762cc7b652f854735edcb9019de3fa5800165d1476b5929ca
+      - initial_input_ast: 3a2aac10cbfcb7399625d6f0f380f13b0abe94d71ed072b587964ceb2a863d40
+    initial_ast: 7bb1e13892ce2800f78c0fab337db94eadbfb411367b1b09e5bbce4a47232974
     symbol_table: 678f356035aea39bec07a37d127fab99dfb8f8aaa118bf1454f3fb40e2943c2c
diff --git a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
index 2cb2586af3..ac92b8baf8 100644
--- a/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
-    initial_ast: 4632cfe04631709c795c39b8fc63ee1db825726e02347f15f589fee687fdc791
+      - initial_input_ast: f768e04f532c319e4c531815c0dac450c51d31ed63c449993cce42ba00040367
+    initial_ast: 180bbd4dcbf288b2c697c2a7ad61dc4cee39bebef8efd7e65a1f57d6e7e84265
     symbol_table: 59a92879cd9e8632b6ad1780ce4f687f9b9b0b142c38b31586578918c41690e7
diff --git a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
index d102c6ce04..f4445e7b00 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
-      - initial_input_ast: 75784559839daa43fb68b6c0cb92764cbd5c8f1240b91c92d85a28f514020833
-    initial_ast: 2578fe60f8d9f8283e1f9b7b8c1b64b16b25fe4ad484bb83991fc40705e4744b
+      - initial_input_ast: 561e304e0f9a5ebc095880ecb455d1200481c4b92ef7d7eec6d1eeb5211a353f
+      - initial_input_ast: 90218d80d335370205075be1bb0e6610c1e1ba283df48176d11eb4c424006dd8
+    initial_ast: 788514e595d2109d9e6c1723896e997648dd911fc4ae0bb30a9f686f1799bdc8
     symbol_table: d62e5ca69883dfd4f502dd4b8ab0436e677a9871322a3cc33c0d51f3138760be
diff --git a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
index fcc6a54ec9..b4a584526d 100644
--- a/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
-      - initial_input_ast: 1d133b7dd2d597ec021f43ae433fa5ff220337500455acd2265714eee6381ad2
-    initial_ast: 76f90700688faba8a549e6dde713d0e261ad7d63f7168391a17b3338c8b2868b
+      - initial_input_ast: f26a3acc7d1fb7f6e1ba2f88c421456f7f862a8e12842127a341e4622a961306
+      - initial_input_ast: a45a7e10846c3592e194cd775d4c3540d150c1df49355cd8fb5039f4f614a3a5
+    initial_ast: 451d0f81d80c31209e072cf27c2cfc4dce6b7dc0992078582f1504288e3d0f39
     symbol_table: 4b855a9a384880ddddc5d93d16ae4e34c5b85a506426f89f3c545314cd58d86f
diff --git a/tests/expectations/compiler/compiler/integers/u128/le.leo.out b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
index 8e987e7a1c..d4c6830ee1 100644
--- a/tests/expectations/compiler/compiler/integers/u128/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
-      - initial_input_ast: 2065df069397c90cd8c969b938bdca0867d1df06a37f8a7d7a49af96ea38019d
-    initial_ast: 553b327ace11338792481c03e210473142f5be02d5589f13ac802808f3c020e4
+      - initial_input_ast: 561e304e0f9a5ebc095880ecb455d1200481c4b92ef7d7eec6d1eeb5211a353f
+      - initial_input_ast: 5db4586f26dd0d2c6db446422a4570b30fc7569371f370e0ea25029289648ced
+    initial_ast: 8988c9a47a4cc4e98d45f7a6ed9649bee3a96c507b3b8aee8cd598b70a3391de
     symbol_table: 3d7f361f2ce4e99acbc47dfef2480dec0ce298a27a34769ddb8c1813b6581024
diff --git a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
index 4807854423..bf435e3722 100644
--- a/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
-      - initial_input_ast: 0c9b9da62df2b51ef9ebb33821a7ec04e9652ce4e9c21c5153d48f5855af806e
-    initial_ast: 393f184a4aa1f02ffd77e578ed33f5f46dc59a7650594f834df1d6fe63bddd4b
+      - initial_input_ast: 195112b9fe49ffec2be945b5c78349859ed1d4f24a6e4ff6cebf16036f99f63e
+      - initial_input_ast: 5ac31b19fe9b441970482a3adacf4e8449404e97f8401a7a293008cd8dcccc27
+    initial_ast: 4fd7a8189f82e146d7ce2f4daa5c81eaf4f0a47aea4c730600166ca0da101067
     symbol_table: 3209a6ec1b0ac01f379965c80861af6d65fae8dfa0f20a726dfaf89e0ccb1cf5
diff --git a/tests/expectations/compiler/compiler/integers/u128/max.leo.out b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
index e03c926f73..e823747873 100644
--- a/tests/expectations/compiler/compiler/integers/u128/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 96408434c5346b281d71c5ed7c9879b40054e19d067d73315db40b4564457d8d
+      - initial_input_ast: a74c1b7af568d593690e7ba3823c660f7163e5d90d8bbace6f742eb7da1ae6ff
+    initial_ast: e0d57365fd4c00ef17c5fd27b892f7312d2bcf04b28b6f00eb2d4b9500c85076
     symbol_table: 4edd22a9c1a03a2c2bd62bb1d7d907e8afe5cdae6dbe0f8ac4711fd69bb5407b
diff --git a/tests/expectations/compiler/compiler/integers/u128/min.leo.out b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
index c34bf55d32..3a73796342 100644
--- a/tests/expectations/compiler/compiler/integers/u128/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 8e7935566d2178a01bbb3b0cb8b69299be6794c7f50c949273f3cde1af78a41a
+      - initial_input_ast: 43adaa31f572639c8ac2fc8547f0f3792c051b0c20e1806a11c549431afa749a
+    initial_ast: 1ae082ffb9394bbbdc3e3b1bc484bedea3113770b55171f16a143c7b669ee265
     symbol_table: bf6b5da28a9adbc7dfb1b3b5aef006a6c040bb8eb94e142262611a131fcbec5e
diff --git a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
index e674e6707f..e85a09e366 100644
--- a/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ca8e32e5d6116b1dcb308c569c4584297586cd605efe92b41ccad1975151eff4
-    initial_ast: 16b3f86011be837f91504200bd833ad60e299341e7265b25d3b5927ff5e194ae
+      - initial_input_ast: 84503f3186fbc5830cc93ea35041e520e5e4caea2f3cfa0e822b9e0b0335de72
+    initial_ast: f206ac82e26d29fbd7b1f9f0e8bc4c539108b071e438c8610680bdd08e3fb9ac
     symbol_table: dd0098712d873cf92c367f89af907dad778d2b2b2f2e251d0eda2237be727c6c
diff --git a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
index 7f49829311..9d788777bc 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: b5c6120ae963f4518dfbcf01566c85e1414ed347b18ca65dcbc03ff3addfb8ea
-      - initial_input_ast: a31b59bfd025f5562ede8f5e6f01ba3724dc9340e1798beaded0aee94682956b
-    initial_ast: 79cb672a44ebd3117df916f3f7c1c2071373c5f4c00cdf7a70a841d95715099a
+      - initial_input_ast: 38a38271514b3840ec8ac687a9a32d9334241e93328860c2a2f85e4b68f2f1dc
+      - initial_input_ast: 07fe09d916ba8ac1adbdc7924a312fc2677ebab8f0443d8d5382645b3e7ffef7
+    initial_ast: c2f400f97f7994bb1a0f873efb16fcb7801df558438f7a4b4f62df09d971b92f
     symbol_table: b6d4ce61a5c1ee27261f3609a47c6b27daa5b5206e1bff4d50fa5d53c283aad4
diff --git a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
index a5a048e477..f4ff76aa9a 100644
--- a/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ca31f79f44f6f99c64ba44c0e727428d042eb9368e222e1cd182db88cca34d09
-    initial_ast: c33c431b0790078ddc42936202998d235ae5565e6342cfe78735a2d671a11a74
+      - initial_input_ast: 3a9d9c7b09713b67a091ecbf03451fcb86513dc8eb63c96bcc21d8eaa090c3cb
+    initial_ast: a44326148a9e666ebcb4c9164a79aac8c678ea5cdfba1f0319ffa33c35f21c59
     symbol_table: f5fc54506951419ceced5b81e17531ffe879b8665f340165ce00ee93a6375b0f
diff --git a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
index 7c226c7a8b..25cb9d69be 100644
--- a/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u128/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 8e68c80562642f5f107fb42876a1a0bed112f771860a69222d65bd374ec8c7d6
-      - initial_input_ast: d4fbdc7ebdf3ab8e4f3e42172cb039bd4fec87dc2ed0218e756b59af6334e3dc
-    initial_ast: 48ce4d88c11aa33d4501e3c1d5f2afcc8828142be4e47f6d56aa82581feba35d
+      - initial_input_ast: a0180507083657db4fc21b0e1f2e7824da8eeb7c8cb6e6481bae9bfca63eaf6d
+      - initial_input_ast: e7cfd66acc54d54cd7f9cba535b240973b73b0a9db9803d45344abf62e776adc
+    initial_ast: df29e3f0546c7adaa5aecb8d0c4183c1bd91ebee2add92d4b286697600f14a39
     symbol_table: c9775810bca18ac5d6894681231f4bdf595c637c970dbc90a23d32c8407ccd5f
diff --git a/tests/expectations/compiler/compiler/integers/u16/add.leo.out b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
index 01dd193790..f6bdb6f72e 100644
--- a/tests/expectations/compiler/compiler/integers/u16/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 6f6d6764c925433e3966deefe74381d0fdd560c52a5cc48713e3c4dfb1c6c3a1
-    initial_ast: d13ad9523d58746231fe88277baf3895e5015f376addd1cd168604c97d070ea3
+      - initial_input_ast: 2c4fbe74ef1df386b47eaf5b4718c33fc6702684839494bec4c37df973c8842b
+    initial_ast: efd917edf9df024df209c09b5007375871cdceca192f34a076360b84eaad3b60
     symbol_table: b773a3747693ac625d3346f79cc3787d155e81da2eef74e8961fa5c0b6beda9c
diff --git a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
index 351c56c276..2ca220c631 100644
--- a/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
-    initial_ast: e02364ca582a731c515f0e377e520aa98a1d03af26343198649964a58a83b552
+      - initial_input_ast: 6df4c6afdf97be14a81c2ec172376013f76aae8aafbae708abfbc58b2316225e
+    initial_ast: 25d5133058bdf0f623eb3ba5845df24679575193000c956d87d69ae6725fba6d
     symbol_table: 31ea54152de57df0f234b406c8f78d84cc20dc9b998f4712ce4ac733f22b9a45
diff --git a/tests/expectations/compiler/compiler/integers/u16/div.leo.out b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
index 402d298221..cc55e404f5 100644
--- a/tests/expectations/compiler/compiler/integers/u16/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 366c095f1dc13d5327fec0236867df3dd4efed80fefc990b402455be221ae3ae
-    initial_ast: 035fd685b9a72d17e87bf2fcd663fd88b33bea34b49e4701ff5faf2b07888bec
+      - initial_input_ast: 80d283b0a50f4786632ec4351150e9171b6f8286113f8a5b3085716e4d9c68e1
+    initial_ast: 36a12763aa5d1ed5d68d19b16012aa8e8a61d0a77c085fd439925ccfe1bb1983
     symbol_table: 52e163bd2142999e83b8c807c5f05d8f6dcff305472c4a4ad16c82d78be9823a
diff --git a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
index 869a6285ef..71f231a6d7 100644
--- a/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
-    initial_ast: bde68b439b6a035933de7565d24218cc0328fecccc5ac4a76ab5cfe39da20bdb
+      - initial_input_ast: b2261594bcbde7cbe6e66017a3bf0a18a54bbda7d51e49a7657285bbe92d4325
+    initial_ast: 2694235ef103f11bbcb3e461d08548ad5bcfe09c020d297aeab92f2949c56117
     symbol_table: 2f35e5aa4269f54adddaa53477d4bd09d1e4a5d81068e61f5b6b5db001f5e316
diff --git a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
index b69ee237bb..11aa62f0d3 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
-      - initial_input_ast: 3af712fb74fec6f2a6a3025f447b4097ac848a663b809869684dd4e7c67cee94
-    initial_ast: ca057147767fd087fff9bc9a45673ae6f0e0b64069cdcdbb092775f61b2e8cc9
+      - initial_input_ast: e16165588c68a274dd50dcbb783a306da86850306c39310be000f6b429b3f3af
+      - initial_input_ast: a91b5eb325ef6b75934a7f5650223d346a7c10b853e5d6b47f7eed4e5d16ee3f
+    initial_ast: 6dd7db21c37f05b5721099d2098538e7b7a6b983f8963188ce4b495d8502fc53
     symbol_table: 19060c1c44e418ecc282948f304fd19959c49857d1cd93dcd2d9bf423e250f2f
diff --git a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
index c90af668bd..5a5bfa4273 100644
--- a/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
-      - initial_input_ast: c5aaeea8372b4a20f0224a169e17873ce833ff051f2822638e96e0e5fae152b7
-    initial_ast: 861532687b12413e75cf248217296ab942a86034a4f672d80c8a98fae44d3e6f
+      - initial_input_ast: fadfc9ea6fe2bde382276e48f43bdf535341620002df585386279a409ae4f96e
+      - initial_input_ast: 7785693c3d1d42da7e04b9df87174f596106f9bf3fb55f7725d31a7f350d37a0
+    initial_ast: dce1712de97b5c8063513e0708f65b1ba936679ed5d39cc62d4e376034a1c61d
     symbol_table: e832ccf84a5e5dd9881b57a5c31de1d81ccd04e6d5c260db71d7f951ce57bc55
diff --git a/tests/expectations/compiler/compiler/integers/u16/le.leo.out b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
index d8d9c0e791..da160654de 100644
--- a/tests/expectations/compiler/compiler/integers/u16/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
-      - initial_input_ast: 5e4ddfaff750bb3594818726ec94c8bfbef36dfecfbfc9b5e7ae9e08ff5b5739
-    initial_ast: a717c24acfb48e555df10ae78e1cf474bd93f08ccc12ed393c7f7fdde273eddf
+      - initial_input_ast: e16165588c68a274dd50dcbb783a306da86850306c39310be000f6b429b3f3af
+      - initial_input_ast: beec34a631e62b9fc6978b0ae014a85785cf863b4fa2313af21dd9e66db05789
+    initial_ast: 950108c010a78ad6af012c6e51f5d82c9d643aadf3640368763daf7f6a8d6e87
     symbol_table: 25b8f9d647642615b54428c2f0ce4e483459712ca7d82329a680b49e4ae7f22f
diff --git a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
index ef204e99a8..cae0bc2a1b 100644
--- a/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
-      - initial_input_ast: 2042ed00f53e2028130ec5d2d04f4138cddae139face997cd49342b7dd79614f
-    initial_ast: 09beaea09f53d5695a181ddcd3c6966561f7e0d454ac6d47b3c312ad0a964532
+      - initial_input_ast: fe8bfdc145a7b6048ee718f7d2ef78554cf000e5ac34f6980ae1a099ba7c58bc
+      - initial_input_ast: 8ea162708073bd279d476f4b1fc7a39a68f3f32649c78b15f3fb070f52de5127
+    initial_ast: 084d3ab163a25745de7fc9249b5e817c1947848977fd30aa78994c2205e1d61d
     symbol_table: ef70c4f5b504ad5c38821e26a2d6be275e2de4148dfec29b73d3b1eaba5044b1
diff --git a/tests/expectations/compiler/compiler/integers/u16/max.leo.out b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
index ea83892f82..41c2dda131 100644
--- a/tests/expectations/compiler/compiler/integers/u16/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 6f930396aed880d8f11754bd50dc386886b1bb8e365adcfb7d392b9f8b6a8486
+      - initial_input_ast: 94dbdf6d3728d65315d6266b74115f89ce260941099e81fd3518e03b31e76c24
+    initial_ast: 8d4adfab5108233e31297abeb700bdf9f5204403e534269dd5633de1b880df50
     symbol_table: 69f776332dcb4ed2daf222bb7796116d60df76d7bba3686891fa352fcfbe1fcc
diff --git a/tests/expectations/compiler/compiler/integers/u16/min.leo.out b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
index 95f99922e1..f8372ed8de 100644
--- a/tests/expectations/compiler/compiler/integers/u16/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 1f23f738842dea366da04b00afbb13d03dd697a5e5002a735de03426c18a4477
+      - initial_input_ast: 4d739a3dcbeb1880f45f4fbdf7d12b3949dce64ce617ddaa61c64a674b5aacdf
+    initial_ast: b81caabd16ebe8e3bb99b7cadc134975648c0f9ab058fd6b365d6a29c3c5e444
     symbol_table: 406df287bf9772b5916e8effb291efe4c4c7b182f25e9ffdc8d8a99abcd96d85
diff --git a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
index e57de8368f..a910cc212a 100644
--- a/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 27db318ee991561d9cebe27f27dceeec5c9c8a63ab462313e344e3c1158aa758
-    initial_ast: 94853b2f87472d206ee46e6b201f46687d6f62edf9e9820d52bbb0f82f3d0473
+      - initial_input_ast: ce3789aa86cbbfc361e81eda7152de12cb5ea67fcad9517246dc361cca3264ee
+    initial_ast: d6de1cd3764bf7578d4c9c895befede26c1e01b11e253e7b199c5080037dd315
     symbol_table: f7142c34960bdd46528d63022dc60428b00ff0183d2c480ef72a8c8b61a13127
diff --git a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
index a261a42b5a..3dc3d1794c 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: cb0e4f51087e3221ca9d60ad25194233446b1827dcbd3af17206be357599915b
-      - initial_input_ast: 5e74a501b8e15c71c521d8a3d838bfe91ce8f37fa9bdaf79342c755564ea086a
-    initial_ast: da385165a8eab1398a32e2f13a9f8d5432418a1865081095ac6f5dfb70c14a81
+      - initial_input_ast: d0b575e8ccb61c3b564ac36956a47078c08701707a8a03b7b7e91fa6e56915a0
+      - initial_input_ast: 5fcbe24ecb89070dcace669f7d9b88eb93c8c6e57709dad1518995aaee0be5b4
+    initial_ast: e7e5ad30f4749d2a884031e2f9a853f38431ab97f573d743024771926b6b2e9f
     symbol_table: 1d5a378efa184ef720922e0431978a779b5258838d7daaa4447d773de74b5726
diff --git a/tests/expectations/compiler/compiler/integers/u16/pow.leo.out b/tests/expectations/compiler/compiler/integers/u16/pow.leo.out
index af284fab50..3e757255e7 100644
--- a/tests/expectations/compiler/compiler/integers/u16/pow.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/pow.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3454670db4ae2ae2274a879a456ea7b2ff6b89d119686417577495d5bc7a2d1a
-    initial_ast: 8056d04b69ac0a9b1ac37b958a0e870e90d51c3504c91b02d0d11764719314ee
+      - initial_input_ast: 0fc24d373b31b114b4798569c7cc9312cb7978ebb6520b4d1b53cd6e379ddca3
+    initial_ast: 8984990a951b4b733fa75f9b72a6d8c98bc211002d6ca2498f4a50a8964303d3
     symbol_table: 615d122bb3c4eabb96bb46044fde38d0ea81d56fe4ea0db9adbcdb74fab95258
diff --git a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
index e403eab726..6518245dc8 100644
--- a/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 1e4b846165f77f1b45c8340f097596100a0513f2e09fb7847143c693dc4ab378
-    initial_ast: 59710b3c4ec87ec2daf9f50fcc9db3de897e67fa48b1c22c87974a03fe091dba
+      - initial_input_ast: ec06725d558678d7a9a0859173c817a582796d0b4cfeadc1518538812b5cab08
+    initial_ast: 147192f26c8aad9e16288ba321a3c78e61ccdf345a89426e97eab5d6c9129f18
     symbol_table: bc40ab38ded0949abbd0d2b28ad41957043f09fadcd1522424674bc795fc4027
diff --git a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
index ed93e1a0d0..e0e36c91b4 100644
--- a/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u16/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: a6d199a58056771f9b6da733f16030fe0b68f0d974ed0dcd093bec41a98063d4
-      - initial_input_ast: c91db248acde5649f26d3d94264f944c1988fbecd352c71419f0021adc3c46f3
-    initial_ast: 04034ba297a82f21f48a25276fa6d5c9106d3eac72b299e5093f177290af4731
+      - initial_input_ast: 6d2849784b279a45e81f8478276149a0009d5b011e3406b73d82fba7f21352cb
+      - initial_input_ast: 89fe5eeb95cea5e4f43b2730e5d7bd8060d5f3f5104290e020b52b137cad0fd1
+    initial_ast: 119fd8ec3add6e54d6544ae7ca1d9f4224e9a641c92defe6aad2eb99840777d5
     symbol_table: df9448449a94c3bc09affc5870c1749d4826072037d1fbe156feab39438a7bec
diff --git a/tests/expectations/compiler/compiler/integers/u32/add.leo.out b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
index 336dd0eb0e..5fed75a8c8 100644
--- a/tests/expectations/compiler/compiler/integers/u32/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7900982a0b59b180658c9c973f14c0f43f64e6c26ccf3dc72ccabbe97e6f7c1c
-    initial_ast: 3318610a645697ba0cf76b91802555e91cb10a899bfb5d5d60be8d2dbe33f417
+      - initial_input_ast: 5a66314f73ac7bda280528133158cf040e9c4c49628ddf12007cc03a1bb2be53
+    initial_ast: 0a7477ac0dc3fef801d664d777227166a92991392e7a57f29f2dcc7d1426c70f
     symbol_table: 25778e3ab23f629380da9c2cdb6f1e865643e9361fd650eabdf6768375fc0717
diff --git a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
index f26634ad1e..4ad4c696bc 100644
--- a/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
-    initial_ast: 4bb9dc7b5c0aba166b674ce6a12db07285f50a3f95f62f3aad2555ff4f28d00c
+      - initial_input_ast: 36134ed864d14e77d444738cd1ca5c3c46405779603b13a2dafe2c6068dc8336
+    initial_ast: 0afdb2e1cd4a2dac8dc46e1ae48b278520530402257d20244fd5a568a69e9835
     symbol_table: 8f03b54e860293c2c5fd9b3bb1199e1691e582712f7f5e5f462c1f7a2fb0d5d1
diff --git a/tests/expectations/compiler/compiler/integers/u32/div.leo.out b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
index e332e9d39a..5ee9a4fd4d 100644
--- a/tests/expectations/compiler/compiler/integers/u32/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 1899a411753778ecc51ee4565405c95f5dc93e7dfc084268332a034da1a4e22a
-    initial_ast: b8eacde2fa3ba5a1387a57c44e8d01f0d3c3ea7f7bcfdce1c8bfc6ae54c6b873
+      - initial_input_ast: 6de7866e0cf457f10ba17b526a039f29d50cc6428f3ea30a7a15dcab23d6bdce
+    initial_ast: b39b2998b8c906c561446d0c7c8bddc92a980892b7a9f9c0227870add0a06c2d
     symbol_table: 48c50aee2e6f9f2e525cb743866ce2fc9119566076cd63d30cdb0398f328a4ba
diff --git a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
index 8b634b4ded..74cdc1ba88 100644
--- a/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
-    initial_ast: dfaa1ceed27d3270ba2cbf898a8a58eecacc2b03b0686a3a70a969baa0b5657e
+      - initial_input_ast: 59ef85c3b74f2470556f96bb807465b378d087d89a4ae9f22e7b39c43ead8e43
+    initial_ast: dfa85843e6ad130d48ab792d04e52c1abd1528c4bdd3c3f4c445ddeedc75c29f
     symbol_table: e081f2d0bc92a375a18466c9298d728d8d2ae35a67fbedeb733ea4cd5a12409d
diff --git a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
index 129cd29e5f..1ef920abd8 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
-      - initial_input_ast: 13faf6aa4d9e76c04acb1872465f0691ef01d8d604a1931bcef5a0f3337347ea
-    initial_ast: 1ae2161a3bc0764fb1d86a79a104ca1b3b8841735e6ed3c84f590c4824413b4f
+      - initial_input_ast: 6927b659a0e726ba11f57c25eaad7d42bd241d23029339a9ec372f07c7f8d8ab
+      - initial_input_ast: ae79e4d6fd859aa4dc80889c8bac25c13d039babf3ea2311cb13e50185b6705e
+    initial_ast: 9579b1288b453a0317fde1cc36989131e5c870cc67046119f4400e5041a155b1
     symbol_table: 5ad082f22aed2d221d142cb3538a67c5814214bdd549b3514a369dec0b8b7922
diff --git a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
index 291e2bb39b..c185c878c8 100644
--- a/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
-      - initial_input_ast: 15be215647f18a1a931f198ce7d30f6805f9bac29a2b24bf7e4abff24e5d20be
-    initial_ast: a05820f5543534af493453036aba2b39c0ba535c363e886b2ee4a5f36843063b
+      - initial_input_ast: fc48a70dd6ca5fa22b3fa8295020273faf9994c21db2dfa37738c4a36de2a981
+      - initial_input_ast: c91b35902b7f3b5cbf124f43f300266b21613798c14c92d636a2429884bc698c
+    initial_ast: 732eba86a7945f6ebf7c9924dd26ff2bf8f78b0cbc39be8229ca048381beaffa
     symbol_table: 6a754bcc8e62a2b8e6e27fbe48a36cb72c99d81ce09e594ebc3125e402f08d0c
diff --git a/tests/expectations/compiler/compiler/integers/u32/le.leo.out b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
index d8cf465da4..c75fc9c848 100644
--- a/tests/expectations/compiler/compiler/integers/u32/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
-      - initial_input_ast: ba4710f02a41fe30785f0bed4ef61b919be8233d0397a57e6bec110a83e7bae7
-    initial_ast: c3b0397f6fd052ec4f5e45eb456e2dcb8857b9866a9621fc45c7ccca500dedde
+      - initial_input_ast: 6927b659a0e726ba11f57c25eaad7d42bd241d23029339a9ec372f07c7f8d8ab
+      - initial_input_ast: b0a12b88d61841e618f5025d311b6267f95d86d203e5bc1244071ba7a76ef576
+    initial_ast: 6348b42db1e3a301ed0c748406b6651668f52284d2d041f8915333d0337faa8a
     symbol_table: e621662548365800e2cad034bcad6541940af5f5acc36dfa477554c1e72acc4f
diff --git a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
index 986e60e9d6..1913cfe47d 100644
--- a/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
-      - initial_input_ast: ea18893ff821300d48c4a7bafc0bf0b3091db8d0afa6a6061f4da66c9230befd
-    initial_ast: 963529b8cbbcf6b77de50868626364c8bd9905ea7f1b5b90fad6ccc6db39b60c
+      - initial_input_ast: 0cd6cfd8b391c00f2fde15729053be0517945c6d041c65c3d62f5cc0aedbf406
+      - initial_input_ast: 5b46926339784405028421bb262dee94dbfbaa3d6ede5977171b4e873019c42e
+    initial_ast: 9ccc4f6fbc6dd65282aa9f6b45118c4ac2b21624b9fd529194e84f42f1e587ef
     symbol_table: 92fe7f7727a3bd4d14e36b28ec549f7348b898845534e872faaba4e362902f0b
diff --git a/tests/expectations/compiler/compiler/integers/u32/max.leo.out b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
index 121cfe07e6..dd9dfdb0e0 100644
--- a/tests/expectations/compiler/compiler/integers/u32/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 87a88714a25f9124bc32febded200de6008ba9ba740f1b9d0c1279051ec4f59e
+      - initial_input_ast: b6d101397f4a313cffd45a3c4f0e1fce6e2bc1a9c7a7c5e632e9be21d6d6bc85
+    initial_ast: a7c94a9eefb6f5f996abc70d92d206d51ce5c70629280c432bab738f93bfe3f7
     symbol_table: 6cb33ae7380c96471000854378fc11a0ac0986e2f0cc82d0b67157ea1f66375e
diff --git a/tests/expectations/compiler/compiler/integers/u32/min.leo.out b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
index a20008b5a5..f443a1e533 100644
--- a/tests/expectations/compiler/compiler/integers/u32/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: fb19403af76e535fb7f5e475e7ed33597f50119a29b4862935acc3127ea7d592
+      - initial_input_ast: 4d739a3dcbeb1880f45f4fbdf7d12b3949dce64ce617ddaa61c64a674b5aacdf
+    initial_ast: 6485611cfbd47f10890b00b391feab16fe577e7c1590fd00a0e20c5421dd90cb
     symbol_table: ae53f8e2991eb6e1c5411e9323fe1f0a0362ed74ded446743ac7cc7b6472c685
diff --git a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
index 84f5b43266..41dcf253b0 100644
--- a/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3a833192a9e0c041f1f7064d4d270e04bf2b178a2e656fd8c6f8cf5d391057a7
-    initial_ast: 2da58b37514a928fee21a587d11025b9c75fdaad16e58df3f27768da3c917318
+      - initial_input_ast: d76ccf685db8ba14d7269d926382477cf9bd43e2b7951abd1b377771857c3398
+    initial_ast: 062ad271b39930f96ad7966a5fd87ee505292920c4c7c7eda010e7052ac7bcc8
     symbol_table: a361156a49b7611d0e4b3e231b073210bc8a19a6255b966c59d3b5e1d2f51f06
diff --git a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
index 3ae8929f71..2b2d44632e 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0d8bd4140882c8076fc6f31339195bd136210fa8468de7232564be89d208c570
-      - initial_input_ast: e729164124bc010537c8d2b51bc78e5de23cca4b79b56fa12845fdbf6e9fdf2b
-    initial_ast: ef066fe73ba5e22e864aed454160ba983886569dc644505f482a877539139059
+      - initial_input_ast: 9cd2ec5c5fb4116831171d5edea7a6ec500fe1b6d6689752f830478e3c2341d9
+      - initial_input_ast: b6f90bf531a7d0d6e2fa3fe7011c4e75f8afd8503c28d86cce2bbc4285f48702
+    initial_ast: 959bad5fd204fe921f9844b12814cae289de951ae9c80d9f1a09af71a7022398
     symbol_table: 737d38e0113d508ac46829d2233125443e36a78e22ff8614769821b64eb16227
diff --git a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
index 867c914bf6..ab2305b3f7 100644
--- a/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7a916ba3711c3e422e5a57af380dc8768fd68e0c407d6737a5848e83432fa2a4
-    initial_ast: ea36165792c1165971a8baf444a9404eeb60df76ae4c901e6e28bf09a06854be
+      - initial_input_ast: e9ec948d02f25436c3149be5eccbe74520a0a15d87e717855e39cb9520479a94
+    initial_ast: 9014e2df59aaed581bc089489382acd297139327f2d2ac1f9aed5f086eeb7dbc
     symbol_table: 7b6d3ffaf2dba4eb24b64929c9a2c756e966e822f3d3f45a05113963f22d76fd
diff --git a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
index 8831dd7a33..9a690a9ddc 100644
--- a/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u32/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3cac85ec032e1af74a50f0be52f121512d2548e0db2971b227f7d286935968cd
-      - initial_input_ast: 31df4f8912365b8afba7a0bde5d29aa2d8ceb4d2aff5ac1e3b230777f124adbb
-    initial_ast: 086a87186287cb4b59a4ceda10fdc27c2ac03763928173798f6b6777b7bcc7d3
+      - initial_input_ast: 73796507af8bba1934f98937b8a82b92df5d2031639b6092c62bc4fde940381c
+      - initial_input_ast: 448710837514daeaceb54d63fdde57d5a09b06a74d71b62e85073e5dc235896f
+    initial_ast: 61fc2663184a2b1a8e2e339d2c3fa04b8548c35036a58fe57fd11e7c5fd57e31
     symbol_table: 2f27d6dc05c17715b3c45e9ee6e501bfaec046241110fee1209904c92b2aa434
diff --git a/tests/expectations/compiler/compiler/integers/u64/add.leo.out b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
index 4521f003a5..1185359a80 100644
--- a/tests/expectations/compiler/compiler/integers/u64/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e716ba579037b58227d1e433d4304f99f2b2eef51f88fdc8b3086a482ee7771e
-    initial_ast: c905bc723dd52e21cf1decee3e4a3621ff8c44ea2c26aa082d9b3b1b7598af92
+      - initial_input_ast: d93ab26059e10b206e200fd34ec7df2c003ae0d456f7cc1cc4c7dcc55584b789
+    initial_ast: 05df0e053461ad7061056aca4cf3124bdc29771ca9df3f8729a42d81324204b3
     symbol_table: c1c13f861658664abf92e0a1fc7bdc65c51458a53b7bc3810fd624bc3893d5ff
diff --git a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
index aad4b15160..52e62bd873 100644
--- a/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
-    initial_ast: 5adb404fde2d01013900ecc47b94cd73f5e419b9ba5e9aefb8125b47a086b7b4
+      - initial_input_ast: 4678bf3cf8ed344bc84b440dd2df2b9175f49f3ce9e98b8ff3fba98baed9082d
+    initial_ast: 3f8a7560a87f0bb6dc4d049f7fc478f4557a46db87cbfd0580c2635bed99776a
     symbol_table: 7753ab45670bf14beb7642f47b735da9c08b49839bc42ea6827bcdf965cfe1ed
diff --git a/tests/expectations/compiler/compiler/integers/u64/div.leo.out b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
index 0220fc532a..c0e503d101 100644
--- a/tests/expectations/compiler/compiler/integers/u64/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 9f6987350c5148b7587ed453e96e575bb967b5115a1f0648764bce5b4d977c46
-    initial_ast: 5f4f6989dedd2a939916cc41d2f7fa48359dd4fb41afb1b16225c4b076afd83f
+      - initial_input_ast: 5afa17bed3b275ecb1125e703148c21ab4afe4f2615e689b89c7bc2bfbb9a434
+    initial_ast: 037365c7f5f7e43f583bda7ec5010e30b24bfa345a71045a1a8ab76ae730316a
     symbol_table: 96d922c665c2723cb7ca22f4f416dbf9d2d76f07ce2d4ce7b3c1becc41ebc9b6
diff --git a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
index 5027c3dbe5..589f8fc21f 100644
--- a/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
-    initial_ast: 187b0249add901020f6c088c9cef3e50d40caf51f324f20c99e0b5a5f282558e
+      - initial_input_ast: d9eaba478f38e0a3f2e3ca17c5311c03ad096b289ad19b4220c90e39b57f8b67
+    initial_ast: 8f8ff7542bdadd8d796297e9f7b8476296433837402e7aef5ca5ce16f745f715
     symbol_table: 89b3e14b1880e4d3ce547087df3229f7c0b20a40c6c55130b9af3f17af90fc01
diff --git a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
index 51b1a556ed..509686bc57 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
-      - initial_input_ast: 835fabf6828b0a76d3cef59ec709a9e084e7d05950a2307f51af0c4a7749c401
-    initial_ast: 2f422e340e46c0ff819893aba777706c140b248fa90522e97588a3877cf33cf2
+      - initial_input_ast: ad6ec2dee4863ab0708b1a51877bea9e1e1ecc0725bc2dec8afd3f7f8a9c9777
+      - initial_input_ast: 8610bc83c4598c14f8c3be04205548b1bebfe825c08cf82464e581f106184b15
+    initial_ast: bfd07fef93b1b670dbae829e3e6d75de901d539190b90f98ecf5b96c7e071190
     symbol_table: 8f6927e31fdde67cc1f67d8f2d214bf456a1fce6ebee106656b33f717aa770f7
diff --git a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
index 99a3b57180..3235dac5fe 100644
--- a/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
-      - initial_input_ast: 7677cedf6c5a32b8a4618cce2a2b2cd638b72a527fdce50167e73e1eee416861
-    initial_ast: 85015420fced390da41a0e75a8e5467c6b9fe3f4ea58175ff10a7d92805a2d28
+      - initial_input_ast: 78dba6c245045aa8656239dc36953ae4f49e188bd11538034cb3e31a907979fe
+      - initial_input_ast: ce564bfbcf6cb3f716f60fb119e823e7b26d1d0c4a167d9957a811dffb486316
+    initial_ast: 5b4f5ad1e8c5ed68ebd9e0d0335471561827fa620d53d7b3e48cf0f9e8125968
     symbol_table: d3fbb159afcf5d889f310c0b277b588def80246861c318632d9416532c84901e
diff --git a/tests/expectations/compiler/compiler/integers/u64/le.leo.out b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
index 515ed7e30d..c35292c3ba 100644
--- a/tests/expectations/compiler/compiler/integers/u64/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
-      - initial_input_ast: cf12465991469b1b836b27e59ea32d80211248e0514092b5971b6622b19d513e
-    initial_ast: 7330b49553577b98618db8ca3d76164ce0da3adce00419a34e420f91b76f07c9
+      - initial_input_ast: ad6ec2dee4863ab0708b1a51877bea9e1e1ecc0725bc2dec8afd3f7f8a9c9777
+      - initial_input_ast: 3e83829fce723e877e914064238f609a7d7a978e46d2af4ee37b459001c08934
+    initial_ast: 80d8cdd5b477b60af046a1e22bc1a86b62cfb736f1dd7e0ed8acb4b1179a26a9
     symbol_table: 9c75212ccddfab209e82ced0636610b9c0b225af3a17badeb6d12b03200f9aa0
diff --git a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
index 686b74d420..026689f15f 100644
--- a/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
-      - initial_input_ast: 4d94a5cd71d7a286a523db4c023a5cd8550750e443e930448d09e115aaa279a2
-    initial_ast: 16f06a1c6eb5bb58e68d2fd9371307d9968b3317954fba7f9606ae7579cb4d6a
+      - initial_input_ast: f182c4405f0d02b2f0da3eac41754653c9f715688088291c1342f4fa6d0a3b62
+      - initial_input_ast: abd02eda108527425d98a30d5bcdc5cdbdf11a6e0e791442604e9cbb196bb4ab
+    initial_ast: b775a02f62d7f0cd98dc169d7873c65e0b81f759e51513c09816804632ac6b23
     symbol_table: 22be10247e5c5f58c07b5ea7ed1dd2093561a57ef3a0c54e26799398d2dd8740
diff --git a/tests/expectations/compiler/compiler/integers/u64/max.leo.out b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
index 7bc871e7d4..2dea1287bb 100644
--- a/tests/expectations/compiler/compiler/integers/u64/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: 9a68721c6237689ac5745f64daa1ae94d5b1c09d32fbd9bcb3f6c1e4214388a1
+      - initial_input_ast: 4be495421ace98fff4d408986b837383a54ca42ce4ac7b0448fc568496e70993
+    initial_ast: 1ec4dee3972d9a0e898f56eb24644f5567175671da619da1396fd9a890a06dcb
     symbol_table: a7e47aec9a839e089b64e17d3dac5e110bccdf3b97b69d5e8a1a64e4a32138b2
diff --git a/tests/expectations/compiler/compiler/integers/u64/min.leo.out b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
index 97e643c4a5..1b8d4e5adf 100644
--- a/tests/expectations/compiler/compiler/integers/u64/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: af5763b7506cd518f2ed516b901e9ab21872ec6a8bf0e99fee590f840945c4e8
+      - initial_input_ast: 4d739a3dcbeb1880f45f4fbdf7d12b3949dce64ce617ddaa61c64a674b5aacdf
+    initial_ast: 91546c9ad54d8e0309ffa29c6900768afa28c9894aaed12b5dcfd8ec039acd18
     symbol_table: 9579cc0870b2c20e1ce3e47deecb81a0925d4e883403626870b125c10eceb59c
diff --git a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
index e040242905..a13840013b 100644
--- a/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 48c6ce857f2c1b7e105743975c53672d2d53dac5d48b006fbb7b98b7542dd5bb
-    initial_ast: e500900d39be1d224c09bda69a24c7a5a0ca142337b0b2766f345bff34ba8ef3
+      - initial_input_ast: 77481f608c0bff5f9fed1779e0bb782155cf4001dcfdbecccf6efa21d57044c8
+    initial_ast: a784f8228e43940ac3ab8bec90ffc461d3341393e4d29e30d674f53587d4c82b
     symbol_table: 77c0adeb4d9f6bb7562a9eaf09c84d5fb4459ac432fffb77c71510cb77991662
diff --git a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
index fb479e2062..424567984a 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0293b081f0efa060d6d6be2a41792af71a74b1a894832aef14166c5bbd242e2e
-      - initial_input_ast: 96b7d29d08b195d28c72abc7cda1febaf19b1a2d1ae660f786f3e5e66041ec5e
-    initial_ast: b79b4fa4926e05c046a626e77313cf719ddaf7f0f0f5dd7cabbb2ed7bb882129
+      - initial_input_ast: 314acd63c110442cd0ae45414e911762ee002cd3cd712943ee5ba7a545c2895d
+      - initial_input_ast: 2720aa6be62eeb6b3f7dcf06456c57038cb483504c7c0d24330a0019b35846e8
+    initial_ast: 9a84b6c9173d10de17bc6176622e50af7d8aa783ae8e92f782dd988dab4ba9de
     symbol_table: 3243923d5a69e9bd20a247e6749255adaca834c5277061df09a8777ae0f34d2d
diff --git a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
index fb75583729..5b73b81a38 100644
--- a/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 945f0553365bda391e02276a38539f1361f6d5edadcb1673832b551528214ce9
-    initial_ast: 58f6291468df71255888576a2f9e2354e6a2273bb5f8ea786b885b3d55f7f148
+      - initial_input_ast: 02c2e867b74dfd2680a64211d30368e9432d10223e7450476a0375f0e443c1fe
+    initial_ast: 6c4361f1b75cc4e89fa76963eb6fbd1eea19cbcddfd983b7a478b87d05d3e19d
     symbol_table: 48f44fca9b490df0387ccac24c8e4805e634896b968559d35645288cdd720562
diff --git a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
index 5798cc5287..8b1cc2f3c2 100644
--- a/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u64/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 02c22a2532fd696c3f0b5e59efff10fb7f423129f2d238a845ab20e296516b1c
-      - initial_input_ast: 11c83531b97e6863b4dd609246fc11e071538831bd7f875d83c576068832da5f
-    initial_ast: e35c3f6afcb80b84ed83a5dc67aec189b652b8e0bacf3a30e0a79ddfcb5d1155
+      - initial_input_ast: b7625fbdf4652004132e112b4a0de0d38090f1a1e02788c99e4323e073f04338
+      - initial_input_ast: 0c043ec5f860a0696c4fbe6cbf110ddfb2ce7fc6bed62936e65d9ebc60e21da0
+    initial_ast: 72db68a169e2c39083777c66a40ccabc2df2fa66eb0fed231dc37cd0adaff296
     symbol_table: 3e3b389b28b166b85423e398f80698529dbb1174326b121bb67ca4921c714aa4
diff --git a/tests/expectations/compiler/compiler/integers/u8/add.leo.out b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
index 874184ac40..099e3c3582 100644
--- a/tests/expectations/compiler/compiler/integers/u8/add.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/add.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: bec6adce6675e69f58bd54bfd2d89ed483f5e6bb722ba9ba3889f200aaf830d1
-    initial_ast: d3e9d0c07376358387b51e3315d1a39af5bfb1abb404c48eaa7d52efb18b47b9
+      - initial_input_ast: abd4649ea1f9d2960c57f7fb8642eb89a379d26391180e415c4bd696fc6f734a
+    initial_ast: 2ad25727d9329776b894c103d3281c309a1c3a5d2a346fb028b846797fcc2321
     symbol_table: b49bebf927e5e92ff081f5c76a421532e86ac349fe85391e838879928e58c9e7
diff --git a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
index 680fe61342..e63a023f42 100644
--- a/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/console_assert.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
-    initial_ast: 20751dfe430a597c866badfaed7b2921a904ab826b8aa66b26d458ada65d8451
+      - initial_input_ast: 48971cb0014a813c10f25796c99546258f3aa166111c25fb8c8fa1b6c0bf8cf8
+    initial_ast: b5f376d18ff2d94e84c13d0ba0a0470fa4a0bfab96836e3e057c471b0e26a901
     symbol_table: c57bb0b106be07bd5f495f1623ebeb3c455437f59d583d3790cf036253a8e363
diff --git a/tests/expectations/compiler/compiler/integers/u8/div.leo.out b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
index e0334ad023..f186f46de1 100644
--- a/tests/expectations/compiler/compiler/integers/u8/div.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/div.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: e03a50836125b20c3b6f5c0616054b65a694fb183a135db8c600cc84a4e07636
-    initial_ast: ca1cd6be979919fe71cbea8cdf24a961438753ad5993224c0637055fb151253f
+      - initial_input_ast: a008878cd077d67dcec792f1b2a4571ef4f9902912e59a86d2f21be17c608424
+    initial_ast: 46a8bead6336d74a9e49d2da01d971332b3486c43a5ddae9b4113073f8323fe5
     symbol_table: 8f1027beea373169e2bb06491736fd4099425a4f4d3f8fcb612462982cdb0d05
diff --git a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
index 2feab12fd0..f90633950d 100644
--- a/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/eq.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
-    initial_ast: 30d885ad0543fccbf232d1d71696db00a27c27a62b22355512c63b14dc875b10
+      - initial_input_ast: e130fcca4de4ddb61b0104caf36c93db6fe67dbacd14f44d09d41379bdbd3ae0
+    initial_ast: 10d6656d2acc8b1059ca9cf078ec9211020da039f00cfaf582e5d7d1da839973
     symbol_table: 16076a22d3c0df71ab90df94e1ecb26ad330c02fe2536f0b5a5d1fc8a11e05c5
diff --git a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
index a515b2a8f5..576f9a7f71 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ge.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
-      - initial_input_ast: 182fd9244fdf4702346b84168c32db25759624daa7904c9ea6b081564864e53b
-    initial_ast: 5da93630bbc4d14d1b1c3058d4f8b4eb7613894cee11b5f44017c2f7645580b9
+      - initial_input_ast: 1035b1ea733f44ff0e59a744a6bd19fd24a03c67e2d5ef368cc03a7fab2cfb90
+      - initial_input_ast: b1b78c013e815a6b8e9bd79b8d3c75fe79f16fe2e0ff397c858ab7e6e5f6c14f
+    initial_ast: 43171ad847ab64573635f49b28cd18b1271ff5099c9e1b139645093ca51992c7
     symbol_table: 1cf9efe37c13b89e2528c0257225192259dabdbb7df99c98d4ae31e74681eefe
diff --git a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
index d234270dfb..39adba6d4b 100644
--- a/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/gt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
-      - initial_input_ast: c63bf7f9f9b98ca445f4a3fd4a419ea5f40041977aad5ff111f8319d90c25e2c
-    initial_ast: b92c2884a85f3142ecf972a9ea6176be505e73680b1b65710ecf56c6569019bd
+      - initial_input_ast: 4c5c8a2a613aeabb07b8c0b69ab85bb30da97f3df68e1771c9ccf83331f3d307
+      - initial_input_ast: fc92836efbfa551891818770e342f87e1460e4599c99541cbaedb5fd9221d36e
+    initial_ast: d72524537bebbb9664b42cef39799f2f8826bf04eb56aafbb38988dba5ec11db
     symbol_table: 0f19f2bdf03fa3f98d3b1b849195dee1ee2e23c968c8beab1d1106e2be74da19
diff --git a/tests/expectations/compiler/compiler/integers/u8/le.leo.out b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
index 7f3e47d3e7..122b0ec4de 100644
--- a/tests/expectations/compiler/compiler/integers/u8/le.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/le.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
-      - initial_input_ast: 9794cb4036879a54fc3a9cc80507c19267ed41731b2faa7a7bea8ba9226a8452
-    initial_ast: ceafb55c23c6e63b2f3ad7925407f25de0be79158df464b7c0c1922a532d0a6a
+      - initial_input_ast: 1035b1ea733f44ff0e59a744a6bd19fd24a03c67e2d5ef368cc03a7fab2cfb90
+      - initial_input_ast: 5e49a83e9253b30583c87a9697c013d01f3666daf66ffd6d78514642985a6d2a
+    initial_ast: f4d23acecb42aad46225b272caf2e35b84d9c68267b357fc68f1b1897f86b4c5
     symbol_table: 23d6582231481f7fe9071618585c6e81ff6f7571059cc4a2fc6deab71292ed43
diff --git a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
index bca0649d02..cee92b785e 100644
--- a/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/lt.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
-      - initial_input_ast: 9a836e6f97b932a81455f105d6db0165d862ed190631b806e364f954b7d771f4
-    initial_ast: abba8d388219467b05e37755b44b935d2c15918a8744f2406df19440a5547b57
+      - initial_input_ast: e48d68126449f737bc223c61f23c98a38cd8400c99fe72dc069157c7da19f0d9
+      - initial_input_ast: 1910f19ef72f38b32305d7f6fdfb60f0915139dafdc59fc9b2db32da7254b9a2
+    initial_ast: 5ab95e06ec9b96635a46247189bcd9bdb4847724226a1f370a6a75b7442903f2
     symbol_table: 929c17fba43bfee01ec4b836cbbd8bd610e30bdf4294ececb75f247fdc8f2bcc
diff --git a/tests/expectations/compiler/compiler/integers/u8/max.leo.out b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
index 6609721666..cd22e1f2dd 100644
--- a/tests/expectations/compiler/compiler/integers/u8/max.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/max.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: c5ee0072a1dc27a68f357ba6230dd33a4933adc49e595118dc5201f1da65c2ca
+      - initial_input_ast: 4d739a3dcbeb1880f45f4fbdf7d12b3949dce64ce617ddaa61c64a674b5aacdf
+    initial_ast: 3fb31a876e4940fdcd3db9a130deac9f0d27a6186e82ed9655573595f798de87
     symbol_table: 9ff7adccc170c1428f3844c390027a8f9641c9f8a76ce5f0024b2c9140f45d93
diff --git a/tests/expectations/compiler/compiler/integers/u8/min.leo.out b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
index 58c73f4a23..0f79c9b337 100644
--- a/tests/expectations/compiler/compiler/integers/u8/min.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/min.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3674d8249023145121ff35eb4d9e59b0ce79cda7e17f9f98b5dbaa6ba4f80cf2
-    initial_ast: e6a6ed433ba124f0b7c7bb8e981b281d1e686ed818aab364f1292a6a382e417d
+      - initial_input_ast: 05e7bafca93c93da1462135dbb09318ab46f29cbe9ae88b8a42be6682ad50bb9
+    initial_ast: 614110451660058902c289bb516fc566b912c72704d3fbd5826c760ea87e93d7
     symbol_table: 2dd055524a0d6eefa18c3248f40c0b7934080c4ea0f8052c2da2191408d2fea1
diff --git a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
index 4b5c6fbc93..13c74f7319 100644
--- a/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/mul.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: df3fa1351cbc1798f527ff81eeefbd149fc841f2ee50695e5215cac690af7f1a
-    initial_ast: f2798ebc7f2ae2e2aa68e367e099adf45df6b23bed02937891ba65b3a07e8037
+      - initial_input_ast: 4b0efd0da6cb5b74e64c3fca9ca00140fd7e5a8fcf343b7b420313171e28b209
+    initial_ast: 44cfec52d89ba33365be2a301ae101fcde054c78311051a9fa28bec8800eff8c
     symbol_table: 89129eab1ef21cc91784b4c5d81e68012f35800778eac358efb24d56c20ef295
diff --git a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
index 2c5ea20b51..c853dfe4cc 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ne.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 3e4fef1af04fd43972dc710e4b0e67e1b5f3b03cf0e8d1373cedfb0426b5adb7
-      - initial_input_ast: a6fd523cd4910b0a48a62b6ec8935805f10fbc041cfd5a8aed6899bcb3911788
-    initial_ast: 6ebe8d376313ee6600097cd995a6a9add3cd274fa6b07b7171ba207ed492507e
+      - initial_input_ast: 60cc5bbcb84aa0d7a107a8000ee91a95ecbb07ccf8b61b629e48cac3c935d8f1
+      - initial_input_ast: b158beb3f4d8c6292e11cff334590bc37fc632eec336016057b48bd6d9ab0034
+    initial_ast: 2cbf3a05989a66d844e5fe1b8edfcf74a9f9e5af2fcc91630e3f22d504222ed1
     symbol_table: 299fff014274a3fef18437e73adb0f912b453399e6149db11763f4495c735b23
diff --git a/tests/expectations/compiler/compiler/integers/u8/pow.leo.out b/tests/expectations/compiler/compiler/integers/u8/pow.leo.out
index f2904de631..95e5bace7a 100644
--- a/tests/expectations/compiler/compiler/integers/u8/pow.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/pow.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: ec515007a1c2cbe83aff0029932fe56e397a4ca82f99095abcc7fc25f4e0723f
-    initial_ast: df407bf5ddb9530abd7a93893785832547af32aeed789e849554c5e5c6001f5e
+      - initial_input_ast: cd3e477685a41ff749bf03ddcd0de7c2ac32a2cf1ce991451e760fc48d0dd7d5
+    initial_ast: a2c9b57c25d6f0d20d08f896b53f37614dc9e45e47afbe774c68b7c866b567e9
     symbol_table: 73fe24ea2c931a693a817e2b4606430192bc0214fdb762f6db260add7ddb22d4
diff --git a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
index d703798956..63f4529bd9 100644
--- a/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/sub.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 74c3de795f0d6a8948600e20913d0798ed2017e11c2dd7bcbf2b363a9a384325
-    initial_ast: 8824772363e6839d9c8c51c1a6b06769b3167c90de72d64dd45c7bd702666463
+      - initial_input_ast: 45bf8029b261e39d3d861e8eb8975e88c0aebb680a7276a6d52ea30089323614
+    initial_ast: 420bfd968cb3e9c62ce960138522d23d10db80d8b10d1ee7ee9071f4eec880a7
     symbol_table: ebe63398d3809fedaa38f4ada4fe18022296680cdc7d30fbcd16aa491134749c
diff --git a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
index cfe62023b8..a0c628bda6 100644
--- a/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
+++ b/tests/expectations/compiler/compiler/integers/u8/ternary.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7362a319261fbc9de1aec131fdd81c6c720a27871817ce18155e8c767f9f615d
-      - initial_input_ast: d71995f6949dab10ec87aec16bf99544c4dc9f5a492fceaef1d171f87229a2bc
-    initial_ast: 1e8cd8f3a6e4bdf4807dae3b416761a612be94b4c589ea5eed309c08fb8d332f
+      - initial_input_ast: 1b06c222c8e4f2c38a3e066de4028e1b6b101cd531ce30137c78024a7c0e7188
+      - initial_input_ast: c228e4c7abd9c5646a6afdb95ac21270838ad19f31c89ca6c98d126db9638832
+    initial_ast: 9a0b0f15e0a75a407785a34103d018a29abb8422e9bc68744e0f9fc8bf27fe9b
     symbol_table: e80a26d28a4f36e79f1a113fc74cfc7bcf32cd54e21ba5af553b738a906de381
diff --git a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
index 5f005c3370..ffd132e0e4 100644
--- a/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/cond_mut.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 534a7a2cf337da1dc9ea3d25dacec6390f4cdbf6b5961b481564abc44fff1442
-    initial_ast: 321b2121ae376af8c6a96c8ec5999553494ad78c86897a4fd6653822b0a12cd0
+      - initial_input_ast: 1a264346d38ad228560df0abaa869c0bf4953b5deda0a93f02bd9697700489e3
+    initial_ast: 5d370262b3d2eb0329036d4e4d60221a07547e9e63fe215435072ad46d5f2e2a
     symbol_table: 2945f5477f1985cd91fc0238eda0d96ee5b5e064b5579af5e37cb8d676dbc3cb
diff --git a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
index d6e8d26838..6371f58ac7 100644
--- a/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/function_input_mut.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 534a7a2cf337da1dc9ea3d25dacec6390f4cdbf6b5961b481564abc44fff1442
-    initial_ast: 146d0b07b14bda98cc11542a18811f44d5b9d4523ed413e70b4b8165b0abdc5e
+      - initial_input_ast: 8b963717b41902e9ddd2d065137feca7555aaaafbd1591905ee890aab534f304
+    initial_ast: 41c8990dc1cf6afb70f2fbc8f17ba4e64d63ea696d9989e5d1f9a554393a232c
     symbol_table: 27a1e162691d8e54a3c88d50628e4d865bba598acdc5916aed7edf60d79e68d1
diff --git a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
index 20e531d459..0e55b49f7a 100644
--- a/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
+++ b/tests/expectations/compiler/compiler/mutability/let_mut_nested.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 534a7a2cf337da1dc9ea3d25dacec6390f4cdbf6b5961b481564abc44fff1442
-    initial_ast: 0a8a5a62c45326f3f82c478a3f656df52708620d0734d4c5f7bd03d37009a88a
+      - initial_input_ast: 4b50b065f8b16a41d0a73a2fe91e4f305d541f516afe031b185bffcd51fbc7c3
+    initial_ast: f846c4df5a06632e712568aa1765f2580632477b5ad81377a09bc2de8d2a8e5c
     symbol_table: 31926a79e803f137c80e1ee8698b50261c831ee6e83f1b09895e3d2c2b09113f
diff --git a/tests/expectations/compiler/compiler/statements/all_loops.leo.out b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
index 64353cdba5..2d8cb99122 100644
--- a/tests/expectations/compiler/compiler/statements/all_loops.leo.out
+++ b/tests/expectations/compiler/compiler/statements/all_loops.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 0431e7bfd2506632ab038adc1a10c45951fc1f90f1b61930228ed3022006d315
-    initial_ast: 1f09245fe378b972c3f2d7242c719d8bf3c163faf0578ef0e6202913f99e15c8
+      - initial_input_ast: bddb7d656b6cfdeadae66e437c61090a2f14112e48fe4e23ea0e39e1ce03fed0
+    initial_ast: 66baa9f7e32bb00b0c047250c97ff2710a128e9db63d0a7c0459f7673147e124
     symbol_table: 3f85b29e75222f03e70b83cbc2399746f23dbbeabd857acaa486db9e8076c03c
diff --git a/tests/expectations/compiler/compiler/statements/block.leo.out b/tests/expectations/compiler/compiler/statements/block.leo.out
index f1ea63dfaa..6b61e1eba2 100644
--- a/tests/expectations/compiler/compiler/statements/block.leo.out
+++ b/tests/expectations/compiler/compiler/statements/block.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7f5eb67955fff9556d758dea428c97687be661cf6ef33f8acf736e3e77d487f8
-    initial_ast: b059d98aa32559b42c21d0671bdfbc6c1dfd87646479c5216e5d6db8b5f74b32
+      - initial_input_ast: 555a602a6e176c37483e18f7fcc4abf1103c14642114729913b7c8433c76a667
+    initial_ast: bd58adf86143b15551d5f17e61826f3d434f50e4fc5caeea7f65d9457f6abf83
     symbol_table: ce729d406fca8cbf2bc8fea55010b163168705232be0ce9edaeff1c187269d54
diff --git a/tests/expectations/compiler/compiler/statements/chain.leo.out b/tests/expectations/compiler/compiler/statements/chain.leo.out
index 602e5b41f0..bcb6d75583 100644
--- a/tests/expectations/compiler/compiler/statements/chain.leo.out
+++ b/tests/expectations/compiler/compiler/statements/chain.leo.out
@@ -3,8 +3,8 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7f5eb67955fff9556d758dea428c97687be661cf6ef33f8acf736e3e77d487f8
-      - initial_input_ast: 15ea6655d9cdaca2e4e57a62d0959b832e56ca7139e38bc3e3c16ad8965ee681
-      - initial_input_ast: 184db3c907c6636bf2bfe0499706c93c40901d50567d9c36bfc0219fd16c0e69
-    initial_ast: ed75cf6495043612c80cef662d2daf7b4c79edc5598e18226eb2212ba0315bd9
+      - initial_input_ast: 45904271733998b2b56d16f1fd4b035cd13f072ff6972108d90bd92d16e9266c
+      - initial_input_ast: 0d9c06667774ccec1cab8dca077b5021ff514b5384b72263f730a0a1bfd6469f
+      - initial_input_ast: a2d7fe3407284c9e88d8dd2e35a8d69f6ff51b1b25a8dfa53f0926416e1bfd3f
+    initial_ast: a152633f7bc700757ae04570f13eead69e1dcde5f33817cb967d7312a5bdbc1a
     symbol_table: 68eae40307674c0cfac9f10f03becf84fbfe9da68c0cac435d54b775e0c4618a
diff --git a/tests/expectations/compiler/compiler/statements/for_loop.leo.out b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
index bc2acd8ab7..2870cd0a74 100644
--- a/tests/expectations/compiler/compiler/statements/for_loop.leo.out
+++ b/tests/expectations/compiler/compiler/statements/for_loop.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7f5eb67955fff9556d758dea428c97687be661cf6ef33f8acf736e3e77d487f8
-    initial_ast: 7daf228c4faa18fca25d18cb1750d1a4abb51a0dea1c9f7132afb05cf4c14f60
+      - initial_input_ast: 0a10c88a8cdd61a9e3572466c6b5ea5536c6cfdcf79c52cfa9fb9b925ef356b5
+    initial_ast: eee1d7262ccc295fc07e9bfb2724c8a886300f02a0aaa2e6dc417fd7917088fd
     symbol_table: 69da3b565e7a6a957b957fa0726be3d3f849cd1c71d5d1d5bbbcf1c5620b1c07
diff --git a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
index 8c0e805b9d..fac6159c03 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_basic.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7f5eb67955fff9556d758dea428c97687be661cf6ef33f8acf736e3e77d487f8
-    initial_ast: 75e3fab6f6e2b55e17ad215dfba18dad5ff64e38cb2b10b8c834dc9541d681c3
+      - initial_input_ast: 2b08bca229cdf35a458353644c99931c266045ecfa23da55518e7542c6de4f55
+    initial_ast: 76ba9ebfe385646a3b3138612e28cb7759b6d7a3ed737710821f44deda4106fe
     symbol_table: 210a8b745bd95b8350226242f6b51656f817fadb90c768564b0c6f4f8dcfa706
diff --git a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
index 6603d6c391..292fe84d4b 100644
--- a/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
+++ b/tests/expectations/compiler/compiler/statements/iteration_variable.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7f5eb67955fff9556d758dea428c97687be661cf6ef33f8acf736e3e77d487f8
-    initial_ast: adca9295640ce34397d6c7514215aadc1bf9bdede3ce7c958064b99e5258979c
+      - initial_input_ast: 54d447941be9647956ebb571b94203d24e695cc95b97a8e2405d4515f8f394ff
+    initial_ast: 493f140a615e3012493d1c4bde2b1574bd46e9893913cf31394f6d6b9b0bf31c
     symbol_table: 8b6313fa019dfc473aea778b67ecf00f38110f339c9c0fb416b221994f8f9c7b
diff --git a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
index 5074bd0c27..0085f4da26 100644
--- a/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
+++ b/tests/expectations/compiler/compiler/statements/multiple_returns.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7f5eb67955fff9556d758dea428c97687be661cf6ef33f8acf736e3e77d487f8
-      - initial_input_ast: 15ea6655d9cdaca2e4e57a62d0959b832e56ca7139e38bc3e3c16ad8965ee681
-    initial_ast: 6d3eff91e33e52aaed89dc8bdb928d8438f09c89ac4ddbd86615f34a27547800
+      - initial_input_ast: 555a602a6e176c37483e18f7fcc4abf1103c14642114729913b7c8433c76a667
+      - initial_input_ast: 66064ed6d78bcadc1f415a472484e279a04411febdb78c7a99d8aa57fea41c09
+    initial_ast: c0d29ec188faf25f88328787497ed99a2994bc011486f7eb621d8a4f440d2db7
     symbol_table: a57230e14da3882433b1b2f0cfa8abd32f38a6b4bd207fd87fdfbea34fc5e71d
diff --git a/tests/expectations/compiler/compiler/statements/mutate.leo.out b/tests/expectations/compiler/compiler/statements/mutate.leo.out
index 6dc28b3269..eeb6e7324c 100644
--- a/tests/expectations/compiler/compiler/statements/mutate.leo.out
+++ b/tests/expectations/compiler/compiler/statements/mutate.leo.out
@@ -3,7 +3,7 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 7f5eb67955fff9556d758dea428c97687be661cf6ef33f8acf736e3e77d487f8
-      - initial_input_ast: 15ea6655d9cdaca2e4e57a62d0959b832e56ca7139e38bc3e3c16ad8965ee681
-    initial_ast: 7a77fe2048f6c8af53d5374bb8267aa7dc7ea4c5f960a0f5a2d56009fb99abc3
+      - initial_input_ast: 30e94504f0b96c93e8bc80d3a3fcdc1f01515be7f2c1d925a76429050c5cfcb5
+      - initial_input_ast: 926d9b29f33bf919b80281c18201806e190051d5a3dcef78d7be2cf634128099
+    initial_ast: bd4d486e1a5a76a57fedd99206cda8b55f3c8c1cbad27c2d17bc96255622cb8a
     symbol_table: 6d82dfb1fcb0a50b6b18e771919dad3622d102b53b63ffa2186bc50bc0aa743c
diff --git a/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out b/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out
index 7df4892c64..56a17a103f 100644
--- a/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out
+++ b/tests/expectations/compiler/compiler/statements/ternary_explicit_and_implicit.leo.out
@@ -3,6 +3,6 @@ namespace: Compile
 expectation: Pass
 outputs:
   - output:
-      - initial_input_ast: 86fdb64f9c593c85f97a5aae6c5e602840e5b403b1994211f280a1bc99a8ccf4
-    initial_ast: e663c5c15b916eeccb03ae377d77c8ce82af4c3c666551a0dd235c79744a7428
+      - initial_input_ast: b69ef69db5b876c322baae6ca63d825f9702a7cbb25ae5598f206301825cead1
+    initial_ast: 2c6c7efcd9a92b7e31d6bd2a63d614773d20c0d461b6612eebd8391db68eb957
     symbol_table: ea61603fdb0d2d3f9ed43f0b8fd044438c4f662ae0cfb97e95505b741a82ce0b
diff --git a/tests/expectations/parser/parser/expression/access/call.leo.out b/tests/expectations/parser/parser/expression/access/call.leo.out
index 51bf44b889..b01f617737 100644
--- a/tests/expectations/parser/parser/expression/access/call.leo.out
+++ b/tests/expectations/parser/parser/expression/access/call.leo.out
@@ -4,62 +4,42 @@ expectation: Pass
 outputs:
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x()\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments: []
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: x()
+        lo: 0
+        hi: 3
   - Call:
       function:
-        Identifier: "{\"name\":\"X\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"X()\\\"}\"}"
+        Identifier: "{\"name\":\"X\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments: []
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: X()
+        lo: 0
+        hi: 3
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(y)\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments:
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(y)\\\"}\"}"
+        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x(y)
+        lo: 0
+        hi: 4
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(y, z)\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments:
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(y, z)\\\"}\"}"
-        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(y, z)\\\"}\"}"
+        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: "x(y, z)"
+        lo: 0
+        hi: 7
   - Call:
       function:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(x, y, z)\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       arguments:
-        - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(x, y, z)\\\"}\"}"
-        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(x, y, z)\\\"}\"}"
-        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":9,\\\"col_stop\\\":10,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x(x, y, z)\\\"}\"}"
+        - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
+        - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
+        - Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: "x(x, y, z)"
+        lo: 0
+        hi: 10
diff --git a/tests/expectations/parser/parser/expression/binary/add.leo.out b/tests/expectations/parser/parser/expression/binary/add.leo.out
index 03df36998e..71ab19c8db 100644
--- a/tests/expectations/parser/parser/expression/binary/add.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/add.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 + 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 7
-                col_stop: 10
-                path: ""
-                content: 1u8 + 1u8
+                lo: 6
+                hi: 9
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 1u8 + 1u8
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8+3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 5
-                col_stop: 8
-                path: ""
-                content: 2u8+3u8
+                lo: 4
+                hi: 7
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: 2u8+3u8
+        lo: 0
+        hi: 7
   - Binary:
       left:
         Binary:
@@ -77,52 +53,32 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 + 2u8 + 3u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 + 2u8 + 3u8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 + 2u8 + 3u8
+            lo: 0
+            hi: 9
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 16
-                path: ""
-                content: 1u8 + 2u8 + 3u8
+                lo: 12
+                hi: 15
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: 1u8 + 2u8 + 3u8
+        lo: 0
+        hi: 15
   - Binary:
       left:
         Binary:
@@ -132,32 +88,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 6
+                    hi: 9
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -166,40 +110,24 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 13
-                    col_stop: 16
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 12
+                    hi: 15
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 19
-                    col_stop: 22
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 18
+                    hi: 21
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 22
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8
+            lo: 12
+            hi: 21
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 22
-        path: ""
-        content: 1u8 * 2u8 + 3u8 * 4u8
+        lo: 0
+        hi: 21
   - Binary:
       left:
         Binary:
@@ -209,52 +137,32 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 + 2u8 - 3u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 + 2u8 - 3u8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 + 2u8 - 3u8
+            lo: 0
+            hi: 9
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 16
-                path: ""
-                content: 1u8 + 2u8 - 3u8
+                lo: 12
+                hi: 15
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: 1u8 + 2u8 - 3u8
+        lo: 0
+        hi: 15
   - Binary:
       left:
         Binary:
@@ -266,32 +174,20 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 1
-                        col_stop: 4
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 0
+                        hi: 3
               right:
                 Value:
                   Integer:
                     - U8
                     - "2"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 7
-                        col_stop: 10
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 6
+                        hi: 9
               op: Mul
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 10
-                path: ""
-                content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                lo: 0
+                hi: 9
           right:
             Binary:
               left:
@@ -300,40 +196,24 @@ outputs:
                     - U8
                     - "3"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 13
-                        col_stop: 16
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 12
+                        hi: 15
               right:
                 Value:
                   Integer:
                     - U8
                     - "4"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 19
-                        col_stop: 22
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 18
+                        hi: 21
               op: Mul
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 22
-                path: ""
-                content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                lo: 12
+                hi: 21
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 22
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+            lo: 0
+            hi: 21
       right:
         Binary:
           left:
@@ -342,37 +222,21 @@ outputs:
                 - U8
                 - "5"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 25
-                    col_stop: 28
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                    lo: 24
+                    hi: 27
           right:
             Value:
               Integer:
                 - U8
                 - "6"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 31
-                    col_stop: 34
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                    lo: 30
+                    hi: 33
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 25
-            col_stop: 34
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+            lo: 24
+            hi: 33
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 34
-        path: ""
-        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+        lo: 0
+        hi: 33
diff --git a/tests/expectations/parser/parser/expression/binary/and.leo.out b/tests/expectations/parser/parser/expression/binary/and.leo.out
index 54b86ce6b0..89a8d1500e 100644
--- a/tests/expectations/parser/parser/expression/binary/and.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/and.leo.out
@@ -8,62 +8,38 @@ outputs:
           Boolean:
             - "true"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 5
-                path: ""
-                content: true && false
+                lo: 0
+                hi: 4
       right:
         Value:
           Boolean:
             - "false"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 9
-                col_stop: 14
-                path: ""
-                content: true && false
+                lo: 8
+                hi: 13
       op: And
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 14
-        path: ""
-        content: true && false
+        lo: 0
+        hi: 13
   - Binary:
       left:
         Value:
           Boolean:
             - "false"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 6
-                path: ""
-                content: false&&true
+                lo: 0
+                hi: 5
       right:
         Value:
           Boolean:
             - "true"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 12
-                path: ""
-                content: false&&true
+                lo: 7
+                hi: 11
       op: And
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 12
-        path: ""
-        content: false&&true
+        lo: 0
+        hi: 11
   - Binary:
       left:
         Binary:
@@ -72,47 +48,27 @@ outputs:
               Boolean:
                 - "true"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 5
-                    path: ""
-                    content: true&&false&&true
+                    lo: 0
+                    hi: 4
           right:
             Value:
               Boolean:
                 - "false"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 12
-                    path: ""
-                    content: true&&false&&true
+                    lo: 6
+                    hi: 11
           op: And
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: true&&false&&true
+            lo: 0
+            hi: 11
       right:
         Value:
           Boolean:
             - "true"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 14
-                col_stop: 18
-                path: ""
-                content: true&&false&&true
+                lo: 13
+                hi: 17
       op: And
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: true&&false&&true
+        lo: 0
+        hi: 17
diff --git a/tests/expectations/parser/parser/expression/binary/div.leo.out b/tests/expectations/parser/parser/expression/binary/div.leo.out
index b889847d4f..4b5f6a19dd 100644
--- a/tests/expectations/parser/parser/expression/binary/div.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/div.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 / 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 7
-                col_stop: 10
-                path: ""
-                content: 1u8 / 1u8
+                lo: 6
+                hi: 9
       op: Div
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 1u8 / 1u8
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8/3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 5
-                col_stop: 8
-                path: ""
-                content: 2u8/3u8
+                lo: 4
+                hi: 7
       op: Div
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: 2u8/3u8
+        lo: 0
+        hi: 7
   - Binary:
       left:
         Binary:
@@ -77,52 +53,32 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 / 2u8 / 3u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 / 2u8 / 3u8
+                    lo: 6
+                    hi: 9
           op: Div
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 / 2u8 / 3u8
+            lo: 0
+            hi: 9
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 16
-                path: ""
-                content: 1u8 / 2u8 / 3u8
+                lo: 12
+                hi: 15
       op: Div
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: 1u8 / 2u8 / 3u8
+        lo: 0
+        hi: 15
   - Binary:
       left:
         Binary:
@@ -132,32 +88,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 ** 2u8 / 3u8 ** 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 8
-                    col_stop: 11
-                    path: ""
-                    content: 1u8 ** 2u8 / 3u8 ** 4u8
+                    lo: 7
+                    hi: 10
           op: Pow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 1u8 ** 2u8 / 3u8 ** 4u8
+            lo: 0
+            hi: 10
       right:
         Binary:
           left:
@@ -166,37 +110,21 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 14
-                    col_stop: 17
-                    path: ""
-                    content: 1u8 ** 2u8 / 3u8 ** 4u8
+                    lo: 13
+                    hi: 16
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 21
-                    col_stop: 24
-                    path: ""
-                    content: 1u8 ** 2u8 / 3u8 ** 4u8
+                    lo: 20
+                    hi: 23
           op: Pow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 24
-            path: ""
-            content: 1u8 ** 2u8 / 3u8 ** 4u8
+            lo: 13
+            hi: 23
       op: Div
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 24
-        path: ""
-        content: 1u8 ** 2u8 / 3u8 ** 4u8
+        lo: 0
+        hi: 23
diff --git a/tests/expectations/parser/parser/expression/binary/eq.leo.out b/tests/expectations/parser/parser/expression/binary/eq.leo.out
index 883e31c09f..408c1c0541 100644
--- a/tests/expectations/parser/parser/expression/binary/eq.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/eq.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 == 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 11
-                path: ""
-                content: 1u8 == 1u8
+                lo: 7
+                hi: 10
       op: Eq
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: 1u8 == 1u8
+        lo: 0
+        hi: 10
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8==3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 6
-                col_stop: 9
-                path: ""
-                content: 2u8==3u8
+                lo: 5
+                hi: 8
       op: Eq
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 9
-        path: ""
-        content: 2u8==3u8
+        lo: 0
+        hi: 8
   - Binary:
       left:
         Binary:
@@ -77,32 +53,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 < 2u8 == 3u8 < 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 < 2u8 == 3u8 < 4u8
+                    lo: 6
+                    hi: 9
           op: Lt
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 < 2u8 == 3u8 < 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -111,40 +75,24 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 14
-                    col_stop: 17
-                    path: ""
-                    content: 1u8 < 2u8 == 3u8 < 4u8
+                    lo: 13
+                    hi: 16
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 20
-                    col_stop: 23
-                    path: ""
-                    content: 1u8 < 2u8 == 3u8 < 4u8
+                    lo: 19
+                    hi: 22
           op: Lt
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 23
-            path: ""
-            content: 1u8 < 2u8 == 3u8 < 4u8
+            lo: 13
+            hi: 22
       op: Eq
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 23
-        path: ""
-        content: 1u8 < 2u8 == 3u8 < 4u8
+        lo: 0
+        hi: 22
   - Binary:
       left:
         Binary:
@@ -156,32 +104,20 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 1
-                        col_stop: 4
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 0
+                        hi: 3
               right:
                 Value:
                   Integer:
                     - U8
                     - "2"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 7
-                        col_stop: 10
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 6
+                        hi: 9
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 10
-                path: ""
-                content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                lo: 0
+                hi: 9
           right:
             Binary:
               left:
@@ -190,40 +126,24 @@ outputs:
                     - U8
                     - "3"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 14
-                        col_stop: 17
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 13
+                        hi: 16
               right:
                 Value:
                   Integer:
                     - U8
                     - "4"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 20
-                        col_stop: 23
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 19
+                        hi: 22
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 14
-                col_stop: 23
-                path: ""
-                content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                lo: 13
+                hi: 22
           op: Eq
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 23
-            path: ""
-            content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+            lo: 0
+            hi: 22
       right:
         Binary:
           left:
@@ -234,32 +154,20 @@ outputs:
                     - U8
                     - "3"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 27
-                        col_stop: 30
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 26
+                        hi: 29
               right:
                 Value:
                   Integer:
                     - U8
                     - "4"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 33
-                        col_stop: 36
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 32
+                        hi: 35
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 27
-                col_stop: 36
-                path: ""
-                content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                lo: 26
+                hi: 35
           right:
             Binary:
               left:
@@ -268,45 +176,25 @@ outputs:
                     - U8
                     - "5"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 40
-                        col_stop: 43
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 39
+                        hi: 42
               right:
                 Value:
                   Integer:
                     - U8
                     - "6"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 46
-                        col_stop: 49
-                        path: ""
-                        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                        lo: 45
+                        hi: 48
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 40
-                col_stop: 49
-                path: ""
-                content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+                lo: 39
+                hi: 48
           op: Eq
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 27
-            col_stop: 49
-            path: ""
-            content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+            lo: 26
+            hi: 48
       op: And
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 49
-        path: ""
-        content: 1u8 < 2u8 == 3u8 < 4u8 && 3u8 < 4u8 == 5u8 < 6u8
+        lo: 0
+        hi: 48
diff --git a/tests/expectations/parser/parser/expression/binary/exp.leo.out b/tests/expectations/parser/parser/expression/binary/exp.leo.out
index 1bcf4d306b..b6204be6a4 100644
--- a/tests/expectations/parser/parser/expression/binary/exp.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/exp.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 ** 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 11
-                path: ""
-                content: 1u8 ** 1u8
+                lo: 7
+                hi: 10
       op: Pow
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: 1u8 ** 1u8
+        lo: 0
+        hi: 10
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8**3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 6
-                col_stop: 9
-                path: ""
-                content: 2u8**3u8
+                lo: 5
+                hi: 8
       op: Pow
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 9
-        path: ""
-        content: 2u8**3u8
+        lo: 0
+        hi: 8
   - Binary:
       left:
         Value:
@@ -75,12 +51,8 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 ** 2u8 ** 3u8
+                lo: 0
+                hi: 3
       right:
         Binary:
           left:
@@ -89,37 +61,21 @@ outputs:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 8
-                    col_stop: 11
-                    path: ""
-                    content: 1u8 ** 2u8 ** 3u8
+                    lo: 7
+                    hi: 10
           right:
             Value:
               Integer:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 15
-                    col_stop: 18
-                    path: ""
-                    content: 1u8 ** 2u8 ** 3u8
+                    lo: 14
+                    hi: 17
           op: Pow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 8
-            col_stop: 18
-            path: ""
-            content: 1u8 ** 2u8 ** 3u8
+            lo: 7
+            hi: 17
       op: Pow
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: 1u8 ** 2u8 ** 3u8
+        lo: 0
+        hi: 17
diff --git a/tests/expectations/parser/parser/expression/binary/gt.leo.out b/tests/expectations/parser/parser/expression/binary/gt.leo.out
index 110f04c78e..75751a693e 100644
--- a/tests/expectations/parser/parser/expression/binary/gt.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/gt.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 > 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 7
-                col_stop: 10
-                path: ""
-                content: 1u8 > 1u8
+                lo: 6
+                hi: 9
       op: Gt
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 1u8 > 1u8
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8>3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 5
-                col_stop: 8
-                path: ""
-                content: 2u8>3u8
+                lo: 4
+                hi: 7
       op: Gt
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: 2u8>3u8
+        lo: 0
+        hi: 7
   - Binary:
       left:
         Binary:
@@ -77,32 +53,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 + 2u8 > 3u8 + 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 + 2u8 > 3u8 + 4u8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 + 2u8 > 3u8 + 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -111,37 +75,21 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 13
-                    col_stop: 16
-                    path: ""
-                    content: 1u8 + 2u8 > 3u8 + 4u8
+                    lo: 12
+                    hi: 15
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 19
-                    col_stop: 22
-                    path: ""
-                    content: 1u8 + 2u8 > 3u8 + 4u8
+                    lo: 18
+                    hi: 21
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 22
-            path: ""
-            content: 1u8 + 2u8 > 3u8 + 4u8
+            lo: 12
+            hi: 21
       op: Gt
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 22
-        path: ""
-        content: 1u8 + 2u8 > 3u8 + 4u8
+        lo: 0
+        hi: 21
diff --git a/tests/expectations/parser/parser/expression/binary/gte.leo.out b/tests/expectations/parser/parser/expression/binary/gte.leo.out
index 788f4f850c..9d5605c449 100644
--- a/tests/expectations/parser/parser/expression/binary/gte.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/gte.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 >= 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 11
-                path: ""
-                content: 1u8 >= 1u8
+                lo: 7
+                hi: 10
       op: Ge
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: 1u8 >= 1u8
+        lo: 0
+        hi: 10
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8 >= 3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 11
-                path: ""
-                content: 2u8 >= 3u8
+                lo: 7
+                hi: 10
       op: Ge
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: 2u8 >= 3u8
+        lo: 0
+        hi: 10
   - Binary:
       left:
         Binary:
@@ -77,32 +53,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 + 2u8 >= 3u8 + 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 + 2u8 >= 3u8 + 4u8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 + 2u8 >= 3u8 + 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -111,37 +75,21 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 14
-                    col_stop: 17
-                    path: ""
-                    content: 1u8 + 2u8 >= 3u8 + 4u8
+                    lo: 13
+                    hi: 16
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 20
-                    col_stop: 23
-                    path: ""
-                    content: 1u8 + 2u8 >= 3u8 + 4u8
+                    lo: 19
+                    hi: 22
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 23
-            path: ""
-            content: 1u8 + 2u8 >= 3u8 + 4u8
+            lo: 13
+            hi: 22
       op: Ge
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 23
-        path: ""
-        content: 1u8 + 2u8 >= 3u8 + 4u8
+        lo: 0
+        hi: 22
diff --git a/tests/expectations/parser/parser/expression/binary/lt.leo.out b/tests/expectations/parser/parser/expression/binary/lt.leo.out
index 93a304f1ba..1bca128da0 100644
--- a/tests/expectations/parser/parser/expression/binary/lt.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/lt.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 < 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 7
-                col_stop: 10
-                path: ""
-                content: 1u8 < 1u8
+                lo: 6
+                hi: 9
       op: Lt
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 1u8 < 1u8
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8<3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 5
-                col_stop: 8
-                path: ""
-                content: 2u8<3u8
+                lo: 4
+                hi: 7
       op: Lt
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: 2u8<3u8
+        lo: 0
+        hi: 7
   - Binary:
       left:
         Binary:
@@ -77,32 +53,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 + 2u8 < 3u8 + 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 + 2u8 < 3u8 + 4u8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 + 2u8 < 3u8 + 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -111,37 +75,21 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 13
-                    col_stop: 16
-                    path: ""
-                    content: 1u8 + 2u8 < 3u8 + 4u8
+                    lo: 12
+                    hi: 15
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 19
-                    col_stop: 22
-                    path: ""
-                    content: 1u8 + 2u8 < 3u8 + 4u8
+                    lo: 18
+                    hi: 21
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 22
-            path: ""
-            content: 1u8 + 2u8 < 3u8 + 4u8
+            lo: 12
+            hi: 21
       op: Lt
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 22
-        path: ""
-        content: 1u8 + 2u8 < 3u8 + 4u8
+        lo: 0
+        hi: 21
diff --git a/tests/expectations/parser/parser/expression/binary/lte.leo.out b/tests/expectations/parser/parser/expression/binary/lte.leo.out
index d5734a50fc..def6beb966 100644
--- a/tests/expectations/parser/parser/expression/binary/lte.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/lte.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 <= 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 11
-                path: ""
-                content: 1u8 <= 1u8
+                lo: 7
+                hi: 10
       op: Le
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: 1u8 <= 1u8
+        lo: 0
+        hi: 10
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8 <= 3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 11
-                path: ""
-                content: 2u8 <= 3u8
+                lo: 7
+                hi: 10
       op: Le
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: 2u8 <= 3u8
+        lo: 0
+        hi: 10
   - Binary:
       left:
         Binary:
@@ -77,32 +53,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 + 2u8 <= 3u8 + 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 + 2u8 <= 3u8 + 4u8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 + 2u8 <= 3u8 + 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -111,37 +75,21 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 14
-                    col_stop: 17
-                    path: ""
-                    content: 1u8 + 2u8 <= 3u8 + 4u8
+                    lo: 13
+                    hi: 16
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 20
-                    col_stop: 23
-                    path: ""
-                    content: 1u8 + 2u8 <= 3u8 + 4u8
+                    lo: 19
+                    hi: 22
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 23
-            path: ""
-            content: 1u8 + 2u8 <= 3u8 + 4u8
+            lo: 13
+            hi: 22
       op: Le
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 23
-        path: ""
-        content: 1u8 + 2u8 <= 3u8 + 4u8
+        lo: 0
+        hi: 22
diff --git a/tests/expectations/parser/parser/expression/binary/mul.leo.out b/tests/expectations/parser/parser/expression/binary/mul.leo.out
index 355bfcbd1f..96fdc78684 100644
--- a/tests/expectations/parser/parser/expression/binary/mul.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/mul.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 * 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 7
-                col_stop: 10
-                path: ""
-                content: 1u8 * 1u8
+                lo: 6
+                hi: 9
       op: Mul
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 1u8 * 1u8
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8*3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 5
-                col_stop: 8
-                path: ""
-                content: 2u8*3u8
+                lo: 4
+                hi: 7
       op: Mul
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: 2u8*3u8
+        lo: 0
+        hi: 7
   - Binary:
       left:
         Binary:
@@ -77,52 +53,32 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 * 2u8 * 3u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 * 2u8 * 3u8
+                    lo: 6
+                    hi: 9
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 * 2u8 * 3u8
+            lo: 0
+            hi: 9
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 16
-                path: ""
-                content: 1u8 * 2u8 * 3u8
+                lo: 12
+                hi: 15
       op: Mul
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: 1u8 * 2u8 * 3u8
+        lo: 0
+        hi: 15
   - Binary:
       left:
         Binary:
@@ -132,32 +88,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 ** 2u8 * 3u8 ** 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 8
-                    col_stop: 11
-                    path: ""
-                    content: 1u8 ** 2u8 * 3u8 ** 4u8
+                    lo: 7
+                    hi: 10
           op: Pow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 1u8 ** 2u8 * 3u8 ** 4u8
+            lo: 0
+            hi: 10
       right:
         Binary:
           left:
@@ -166,40 +110,24 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 14
-                    col_stop: 17
-                    path: ""
-                    content: 1u8 ** 2u8 * 3u8 ** 4u8
+                    lo: 13
+                    hi: 16
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 21
-                    col_stop: 24
-                    path: ""
-                    content: 1u8 ** 2u8 * 3u8 ** 4u8
+                    lo: 20
+                    hi: 23
           op: Pow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 24
-            path: ""
-            content: 1u8 ** 2u8 * 3u8 ** 4u8
+            lo: 13
+            hi: 23
       op: Mul
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 24
-        path: ""
-        content: 1u8 ** 2u8 * 3u8 ** 4u8
+        lo: 0
+        hi: 23
   - Binary:
       left:
         Binary:
@@ -211,32 +139,20 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 1
-                        col_stop: 4
-                        path: ""
-                        content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                        lo: 0
+                        hi: 3
               right:
                 Value:
                   Integer:
                     - U8
                     - "2"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 8
-                        col_stop: 11
-                        path: ""
-                        content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                        lo: 7
+                        hi: 10
               op: Pow
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 11
-                path: ""
-                content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                lo: 0
+                hi: 10
           right:
             Binary:
               left:
@@ -245,40 +161,24 @@ outputs:
                     - U8
                     - "3"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 14
-                        col_stop: 17
-                        path: ""
-                        content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                        lo: 13
+                        hi: 16
               right:
                 Value:
                   Integer:
                     - U8
                     - "4"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 21
-                        col_stop: 24
-                        path: ""
-                        content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                        lo: 20
+                        hi: 23
               op: Pow
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 14
-                col_stop: 24
-                path: ""
-                content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                lo: 13
+                hi: 23
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 24
-            path: ""
-            content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+            lo: 0
+            hi: 23
       right:
         Binary:
           left:
@@ -287,37 +187,21 @@ outputs:
                 - U8
                 - "5"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 27
-                    col_stop: 30
-                    path: ""
-                    content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                    lo: 26
+                    hi: 29
           right:
             Value:
               Integer:
                 - U8
                 - "6"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 34
-                    col_stop: 37
-                    path: ""
-                    content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+                    lo: 33
+                    hi: 36
           op: Pow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 27
-            col_stop: 37
-            path: ""
-            content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+            lo: 26
+            hi: 36
       op: Div
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 37
-        path: ""
-        content: 1u8 ** 2u8 * 3u8 ** 4u8 / 5u8 ** 6u8
+        lo: 0
+        hi: 36
diff --git a/tests/expectations/parser/parser/expression/binary/ne.leo.out b/tests/expectations/parser/parser/expression/binary/ne.leo.out
index 8de4fc40c6..1e969d9ccd 100644
--- a/tests/expectations/parser/parser/expression/binary/ne.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/ne.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 != 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 8
-                col_stop: 11
-                path: ""
-                content: 1u8 != 1u8
+                lo: 7
+                hi: 10
       op: Ne
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: 1u8 != 1u8
+        lo: 0
+        hi: 10
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8!=3u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 6
-                col_stop: 9
-                path: ""
-                content: 2u8!=3u8
+                lo: 5
+                hi: 8
       op: Ne
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 9
-        path: ""
-        content: 2u8!=3u8
+        lo: 0
+        hi: 8
   - Binary:
       left:
         Binary:
@@ -77,32 +53,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 < 2u8 != 3u8 < 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 < 2u8 != 3u8 < 4u8
+                    lo: 6
+                    hi: 9
           op: Lt
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 < 2u8 != 3u8 < 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -111,40 +75,24 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 14
-                    col_stop: 17
-                    path: ""
-                    content: 1u8 < 2u8 != 3u8 < 4u8
+                    lo: 13
+                    hi: 16
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 20
-                    col_stop: 23
-                    path: ""
-                    content: 1u8 < 2u8 != 3u8 < 4u8
+                    lo: 19
+                    hi: 22
           op: Lt
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 23
-            path: ""
-            content: 1u8 < 2u8 != 3u8 < 4u8
+            lo: 13
+            hi: 22
       op: Ne
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 23
-        path: ""
-        content: 1u8 < 2u8 != 3u8 < 4u8
+        lo: 0
+        hi: 22
   - Binary:
       left:
         Binary:
@@ -156,32 +104,20 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 1
-                        col_stop: 4
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 0
+                        hi: 3
               right:
                 Value:
                   Integer:
                     - U8
                     - "2"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 7
-                        col_stop: 10
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 6
+                        hi: 9
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 10
-                path: ""
-                content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                lo: 0
+                hi: 9
           right:
             Binary:
               left:
@@ -190,40 +126,24 @@ outputs:
                     - U8
                     - "3"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 14
-                        col_stop: 17
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 13
+                        hi: 16
               right:
                 Value:
                   Integer:
                     - U8
                     - "4"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 20
-                        col_stop: 23
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 19
+                        hi: 22
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 14
-                col_stop: 23
-                path: ""
-                content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                lo: 13
+                hi: 22
           op: Ne
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 23
-            path: ""
-            content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+            lo: 0
+            hi: 22
       right:
         Binary:
           left:
@@ -234,32 +154,20 @@ outputs:
                     - U8
                     - "3"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 27
-                        col_stop: 30
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 26
+                        hi: 29
               right:
                 Value:
                   Integer:
                     - U8
                     - "4"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 33
-                        col_stop: 36
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 32
+                        hi: 35
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 27
-                col_stop: 36
-                path: ""
-                content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                lo: 26
+                hi: 35
           right:
             Binary:
               left:
@@ -268,45 +176,25 @@ outputs:
                     - U8
                     - "5"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 40
-                        col_stop: 43
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 39
+                        hi: 42
               right:
                 Value:
                   Integer:
                     - U8
                     - "6"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 46
-                        col_stop: 49
-                        path: ""
-                        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                        lo: 45
+                        hi: 48
               op: Lt
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 40
-                col_stop: 49
-                path: ""
-                content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+                lo: 39
+                hi: 48
           op: Ne
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 27
-            col_stop: 49
-            path: ""
-            content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+            lo: 26
+            hi: 48
       op: Or
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 49
-        path: ""
-        content: 1u8 < 2u8 != 3u8 < 4u8 || 3u8 < 4u8 != 5u8 < 6u8
+        lo: 0
+        hi: 48
diff --git a/tests/expectations/parser/parser/expression/binary/or.leo.out b/tests/expectations/parser/parser/expression/binary/or.leo.out
index 4ec15c8941..8c9e33ae3e 100644
--- a/tests/expectations/parser/parser/expression/binary/or.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/or.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 + 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 7
-                col_stop: 10
-                path: ""
-                content: 1u8 + 1u8
+                lo: 6
+                hi: 9
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 1u8 + 1u8
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U8
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 2u8+3u16
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U16
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 5
-                col_stop: 9
-                path: ""
-                content: 2u8+3u16
+                lo: 4
+                hi: 8
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 9
-        path: ""
-        content: 2u8+3u16
+        lo: 0
+        hi: 8
   - Binary:
       left:
         Binary:
@@ -77,52 +53,32 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 + 2u8 + 3u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 + 2u8 + 3u8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 + 2u8 + 3u8
+            lo: 0
+            hi: 9
       right:
         Value:
           Integer:
             - U8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 16
-                path: ""
-                content: 1u8 + 2u8 + 3u8
+                lo: 12
+                hi: 15
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: 1u8 + 2u8 + 3u8
+        lo: 0
+        hi: 15
   - Binary:
       left:
         Binary:
@@ -132,32 +88,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 6
+                    hi: 9
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8
+            lo: 0
+            hi: 9
       right:
         Binary:
           left:
@@ -166,40 +110,24 @@ outputs:
                 - U8
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 13
-                    col_stop: 16
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 12
+                    hi: 15
           right:
             Value:
               Integer:
                 - U8
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 19
-                    col_stop: 22
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8
+                    lo: 18
+                    hi: 21
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 22
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8
+            lo: 12
+            hi: 21
       op: Add
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 22
-        path: ""
-        content: 1u8 * 2u8 + 3u8 * 4u8
+        lo: 0
+        hi: 21
   - Binary:
       left:
         Binary:
@@ -209,52 +137,32 @@ outputs:
                 - I8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1i8 + 2i8 - 3i8
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - I8
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 10
-                    path: ""
-                    content: 1i8 + 2i8 - 3i8
+                    lo: 6
+                    hi: 9
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 1i8 + 2i8 - 3i8
+            lo: 0
+            hi: 9
       right:
         Value:
           Integer:
             - I8
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 16
-                path: ""
-                content: 1i8 + 2i8 - 3i8
+                lo: 12
+                hi: 15
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: 1i8 + 2i8 - 3i8
+        lo: 0
+        hi: 15
   - Binary:
       left:
         Binary:
@@ -266,32 +174,20 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 1
-                        col_stop: 4
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 0
+                        hi: 3
               right:
                 Value:
                   Integer:
                     - U8
                     - "2"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 7
-                        col_stop: 10
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 6
+                        hi: 9
               op: Mul
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 10
-                path: ""
-                content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                lo: 0
+                hi: 9
           right:
             Binary:
               left:
@@ -300,40 +196,24 @@ outputs:
                     - U8
                     - "3"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 13
-                        col_stop: 16
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 12
+                        hi: 15
               right:
                 Value:
                   Integer:
                     - U8
                     - "4"
                     - span:
-                        line_start: 1
-                        line_stop: 1
-                        col_start: 19
-                        col_stop: 22
-                        path: ""
-                        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                        lo: 18
+                        hi: 21
               op: Mul
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 13
-                col_stop: 22
-                path: ""
-                content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                lo: 12
+                hi: 21
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 22
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+            lo: 0
+            hi: 21
       right:
         Binary:
           left:
@@ -342,37 +222,21 @@ outputs:
                 - U8
                 - "5"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 25
-                    col_stop: 28
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                    lo: 24
+                    hi: 27
           right:
             Value:
               Integer:
                 - U8
                 - "6"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 31
-                    col_stop: 34
-                    path: ""
-                    content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+                    lo: 30
+                    hi: 33
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 25
-            col_stop: 34
-            path: ""
-            content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+            lo: 24
+            hi: 33
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 34
-        path: ""
-        content: 1u8 * 2u8 + 3u8 * 4u8 - 5u8 * 6u8
+        lo: 0
+        hi: 33
diff --git a/tests/expectations/parser/parser/expression/binary/sub.leo.out b/tests/expectations/parser/parser/expression/binary/sub.leo.out
index 00a4a02c8c..66ece742d6 100644
--- a/tests/expectations/parser/parser/expression/binary/sub.leo.out
+++ b/tests/expectations/parser/parser/expression/binary/sub.leo.out
@@ -9,32 +9,20 @@ outputs:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 1u8 - 1u8
+                lo: 0
+                hi: 3
       right:
         Value:
           Integer:
             - U8
             - "1"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 7
-                col_stop: 10
-                path: ""
-                content: 1u8 - 1u8
+                lo: 6
+                hi: 9
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 1u8 - 1u8
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Value:
@@ -42,32 +30,20 @@ outputs:
             - U16
             - "2"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 1
-                col_stop: 5
-                path: ""
-                content: 2u16-3u64
+                lo: 0
+                hi: 4
       right:
         Value:
           Integer:
             - U64
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 6
-                col_stop: 10
-                path: ""
-                content: 2u16-3u64
+                lo: 5
+                hi: 9
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: 2u16-3u64
+        lo: 0
+        hi: 9
   - Binary:
       left:
         Binary:
@@ -77,52 +53,32 @@ outputs:
                 - U32
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 5
-                    path: ""
-                    content: 1u32 - 2u32 - 3u32
+                    lo: 0
+                    hi: 4
           right:
             Value:
               Integer:
                 - U32
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 8
-                    col_stop: 12
-                    path: ""
-                    content: 1u32 - 2u32 - 3u32
+                    lo: 7
+                    hi: 11
           op: Sub
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 1u32 - 2u32 - 3u32
+            lo: 0
+            hi: 11
       right:
         Value:
           Integer:
             - U32
             - "3"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 15
-                col_stop: 19
-                path: ""
-                content: 1u32 - 2u32 - 3u32
+                lo: 14
+                hi: 18
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: 1u32 - 2u32 - 3u32
+        lo: 0
+        hi: 18
   - Binary:
       left:
         Binary:
@@ -132,32 +88,20 @@ outputs:
                 - U8
                 - "1"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 1
-                    col_stop: 4
-                    path: ""
-                    content: 1u8 * 2u16 - 3u32 * 4i64
+                    lo: 0
+                    hi: 3
           right:
             Value:
               Integer:
                 - U16
                 - "2"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 7
-                    col_stop: 11
-                    path: ""
-                    content: 1u8 * 2u16 - 3u32 * 4i64
+                    lo: 6
+                    hi: 10
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 1u8 * 2u16 - 3u32 * 4i64
+            lo: 0
+            hi: 10
       right:
         Binary:
           left:
@@ -166,37 +110,21 @@ outputs:
                 - U32
                 - "3"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 14
-                    col_stop: 18
-                    path: ""
-                    content: 1u8 * 2u16 - 3u32 * 4i64
+                    lo: 13
+                    hi: 17
           right:
             Value:
               Integer:
                 - I64
                 - "4"
                 - span:
-                    line_start: 1
-                    line_stop: 1
-                    col_start: 21
-                    col_stop: 25
-                    path: ""
-                    content: 1u8 * 2u16 - 3u32 * 4i64
+                    lo: 20
+                    hi: 24
           op: Mul
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 25
-            path: ""
-            content: 1u8 * 2u16 - 3u32 * 4i64
+            lo: 13
+            hi: 24
       op: Sub
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 25
-        path: ""
-        content: 1u8 * 2u16 - 3u32 * 4i64
+        lo: 0
+        hi: 24
diff --git a/tests/expectations/parser/parser/expression/ident.leo.out b/tests/expectations/parser/parser/expression/ident.leo.out
index 329ca97a73..17dcc95565 100644
--- a/tests/expectations/parser/parser/expression/ident.leo.out
+++ b/tests/expectations/parser/parser/expression/ident.leo.out
@@ -2,22 +2,22 @@
 namespace: ParseExpression
 expectation: Pass
 outputs:
-  - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x\\\"}\"}"
-  - Identifier: "{\"name\":\"X\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"X\\\"}\"}"
-  - Identifier: "{\"name\":\"xxx\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xxx\\\"}\"}"
-  - Identifier: "{\"name\":\"XXX\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"XXX\\\"}\"}"
-  - Identifier: "{\"name\":\"x1\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x1\\\"}\"}"
-  - Identifier: "{\"name\":\"xu32\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu32\\\"}\"}"
-  - Identifier: "{\"name\":\"testx\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"testx\\\"}\"}"
-  - Identifier: "{\"name\":\"truex\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"truex\\\"}\"}"
-  - Identifier: "{\"name\":\"TRUE\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"TRUE\\\"}\"}"
-  - Identifier: "{\"name\":\"testX\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"testX\\\"}\"}"
-  - Identifier: "{\"name\":\"letX\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"letX\\\"}\"}"
-  - Identifier: "{\"name\":\"constX\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constX\\\"}\"}"
-  - Identifier: "{\"name\":\"test_test\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":10,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"test_test\\\"}\"}"
-  - Identifier: "{\"name\":\"self\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"self\\\"}\"}"
-  - Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"Self\\\"}\"}"
-  - Identifier: "{\"name\":\"input\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"input\\\"}\"}"
-  - Identifier: "{\"name\":\"selfX\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"selfX\\\"}\"}"
-  - Identifier: "{\"name\":\"SelfX\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"SelfX\\\"}\"}"
-  - Identifier: "{\"name\":\"inputX\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"inputX\\\"}\"}"
+  - 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}\"}"
diff --git a/tests/expectations/parser/parser/expression/literal/address_parse.leo.out b/tests/expectations/parser/parser/expression/literal/address_parse.leo.out
index ffb0b82fce..8d9918b1ee 100644
--- a/tests/expectations/parser/parser/expression/literal/address_parse.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/address_parse.leo.out
@@ -6,9 +6,5 @@ outputs:
       Address:
         - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8s7pyjh9
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 64
-            path: ""
-            content: aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8s7pyjh9
+            lo: 0
+            hi: 63
diff --git a/tests/expectations/parser/parser/expression/literal/bool_parse.leo.out b/tests/expectations/parser/parser/expression/literal/bool_parse.leo.out
index d629bc1ed6..77536cac20 100644
--- a/tests/expectations/parser/parser/expression/literal/bool_parse.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/bool_parse.leo.out
@@ -6,19 +6,11 @@ outputs:
       Boolean:
         - "true"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 5
-            path: ""
-            content: "true"
+            lo: 0
+            hi: 4
   - Value:
       Boolean:
         - "false"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 6
-            path: ""
-            content: "false"
+            lo: 0
+            hi: 5
diff --git a/tests/expectations/parser/parser/expression/literal/char.leo.out b/tests/expectations/parser/parser/expression/literal/char.leo.out
index 1555a1e74d..c529c5a7aa 100644
--- a/tests/expectations/parser/parser/expression/literal/char.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/char.leo.out
@@ -10,16 +10,16 @@ outputs:
   - "''\r'' @ 1:1-5"
   - "''\u0000'' @ 1:1-5"
   - "''\u000f'' @ 1:1-8"
-  - "'''' @ 1:1-6"
+  - "'''' @ 1:1-4"
   - "''å'' @ 1:1-9"
-  - "''å'' @ 1:1-5"
+  - "''å'' @ 1:1-4"
   - "''Ӡ'' @ 1:1-10"
-  - "''Ӡ'' @ 1:1-5"
+  - "''Ӡ'' @ 1:1-4"
   - "''D800'' @ 1:1-11"
   - "''❤'' @ 1:1-11"
-  - "''❤'' @ 1:1-6"
+  - "''❤'' @ 1:1-4"
   - "''😢'' @ 1:1-12"
-  - "''😭'' @ 1:1-7"
+  - "''😭'' @ 1:1-4"
   - "''􀀟'' @ 1:1-13"
   - "''*'' @ 1:1-7"
   - "''\u007f'' @ 1:1-7"
diff --git a/tests/expectations/parser/parser/expression/literal/char_parse.leo.out b/tests/expectations/parser/parser/expression/literal/char_parse.leo.out
index 3d84a2cece..bb4c75ada3 100644
--- a/tests/expectations/parser/parser/expression/literal/char_parse.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/char_parse.leo.out
@@ -9,15 +9,15 @@ outputs:
   - "''\r'' @ 1:1-5"
   - "''\u0000'' @ 1:1-5"
   - "''\u000f'' @ 1:1-8"
-  - "'''' @ 1:1-6"
+  - "'''' @ 1:1-4"
   - "''å'' @ 1:1-9"
-  - "''å'' @ 1:1-5"
+  - "''å'' @ 1:1-4"
   - "''Ӡ'' @ 1:1-10"
-  - "''Ӡ'' @ 1:1-5"
+  - "''Ӡ'' @ 1:1-4"
   - "''❤'' @ 1:1-11"
-  - "''❤'' @ 1:1-6"
+  - "''❤'' @ 1:1-4"
   - "''😢'' @ 1:1-12"
-  - "''😭'' @ 1:1-7"
+  - "''😭'' @ 1:1-4"
   - "''􀀟'' @ 1:1-13"
   - "''*'' @ 1:1-7"
   - "''\u007f'' @ 1:1-7"
diff --git a/tests/expectations/parser/parser/expression/literal/group.leo.out b/tests/expectations/parser/parser/expression/literal/group.leo.out
index 2f2957cf64..454c4ee778 100644
--- a/tests/expectations/parser/parser/expression/literal/group.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/group.leo.out
@@ -8,84 +8,56 @@ outputs:
           x: SignHigh
           y: Inferred
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: "(+, _)group"
+            lo: 0
+            hi: 11
   - Value:
       Group:
         Tuple:
           x: Inferred
           y: SignLow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: "(_, -)group"
+            lo: 0
+            hi: 11
   - Value:
       Group:
         Tuple:
           x: SignHigh
           y: SignLow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: "(+, -)group"
+            lo: 0
+            hi: 11
   - Value:
       Group:
         Tuple:
           x: SignLow
           y: SignHigh
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: "(-, +)group"
+            lo: 0
+            hi: 11
   - Value:
       Group:
         Tuple:
           x: SignHigh
           y: SignHigh
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: "(+, +)group"
+            lo: 0
+            hi: 11
   - Value:
       Group:
         Tuple:
           x: SignLow
           y: SignLow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: "(-, -)group"
+            lo: 0
+            hi: 11
   - Value:
       Group:
         Tuple:
           x: Inferred
           y: Inferred
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: "(_, _)group"
+            lo: 0
+            hi: 11
   - Value:
       Group:
         Tuple:
@@ -93,29 +65,17 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123,-456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "-456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123,-456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123,-456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -123,29 +83,17 @@ outputs:
             Number:
               - "-123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 3
-                  col_stop: 6
-                  path: ""
-                  content: "(-123,456)group"
+                  lo: 2
+                  hi: 5
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(-123,456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(-123,456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -153,29 +101,17 @@ outputs:
             Number:
               - "-123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 3
-                  col_stop: 6
-                  path: ""
-                  content: "(-123,456)group"
+                  lo: 2
+                  hi: 5
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(-123,456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(-123,456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -183,20 +119,12 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, _)group"
+                  lo: 1
+                  hi: 4
           y: Inferred
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(123, _)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -204,20 +132,12 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, -)group"
+                  lo: 1
+                  hi: 4
           y: SignLow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(123, -)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -225,20 +145,12 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, -)group"
+                  lo: 1
+                  hi: 4
           y: SignLow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(123, -)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -246,20 +158,12 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, +)group"
+                  lo: 1
+                  hi: 4
           y: SignHigh
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(123, +)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -267,20 +171,12 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, +)group"
+                  lo: 1
+                  hi: 4
           y: SignHigh
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(123, +)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -288,20 +184,12 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, -)group"
+                  lo: 1
+                  hi: 4
           y: SignLow
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(123, -)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -309,20 +197,12 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, _)group"
+                  lo: 1
+                  hi: 4
           y: Inferred
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(123, _)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -331,19 +211,11 @@ outputs:
             Number:
               - "345"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 5
-                  col_stop: 8
-                  path: ""
-                  content: "(+, 345)group"
+                  lo: 4
+                  hi: 7
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(+, 345)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -352,19 +224,11 @@ outputs:
             Number:
               - "345"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 5
-                  col_stop: 8
-                  path: ""
-                  content: "(_, 345)group"
+                  lo: 4
+                  hi: 7
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(_, 345)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -373,19 +237,11 @@ outputs:
             Number:
               - "345"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 5
-                  col_stop: 8
-                  path: ""
-                  content: "(+, 345)group"
+                  lo: 4
+                  hi: 7
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(+, 345)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -394,19 +250,11 @@ outputs:
             Number:
               - "345"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 5
-                  col_stop: 8
-                  path: ""
-                  content: "(-, 345)group"
+                  lo: 4
+                  hi: 7
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(-, 345)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -415,19 +263,11 @@ outputs:
             Number:
               - "345"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 5
-                  col_stop: 8
-                  path: ""
-                  content: "(+, 345)group"
+                  lo: 4
+                  hi: 7
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(+, 345)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -436,19 +276,11 @@ outputs:
             Number:
               - "345"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 5
-                  col_stop: 8
-                  path: ""
-                  content: "(-, 345)group"
+                  lo: 4
+                  hi: 7
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(-, 345)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -457,19 +289,11 @@ outputs:
             Number:
               - "345"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 5
-                  col_stop: 8
-                  path: ""
-                  content: "(_, 345)group"
+                  lo: 4
+                  hi: 7
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: "(_, 345)group"
+            lo: 0
+            hi: 13
   - Value:
       Group:
         Tuple:
@@ -477,29 +301,17 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123, 456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -507,29 +319,17 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123, 456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -537,29 +337,17 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123, 456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -567,29 +355,17 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123, 456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -597,29 +373,17 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123, 456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -627,29 +391,17 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123, 456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Tuple:
@@ -657,40 +409,24 @@ outputs:
             Number:
               - "123"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 5
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 1
+                  hi: 4
           y:
             Number:
               - "456"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 7
-                  col_stop: 10
-                  path: ""
-                  content: "(123, 456)group"
+                  lo: 6
+                  hi: 9
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 16
-            path: ""
-            content: "(123, 456)group"
+            lo: 0
+            hi: 15
   - Value:
       Group:
         Single:
           - "1"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 7
-              path: ""
-              content: 1group
+              lo: 0
+              hi: 6
   - Unary:
       inner:
         Value:
@@ -698,17 +434,9 @@ outputs:
             Single:
               - "1"
               - span:
-                  line_start: 1
-                  line_stop: 1
-                  col_start: 2
-                  col_stop: 8
-                  path: ""
-                  content: "-1group"
+                  lo: 1
+                  hi: 7
       op: Negate
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: "-1group"
+        lo: 0
+        hi: 7
diff --git a/tests/expectations/parser/parser/expression/literal/group_fail.leo.out b/tests/expectations/parser/parser/expression/literal/group_fail.leo.out
index bb68ddb14e..9475bfe15e 100644
--- a/tests/expectations/parser/parser/expression/literal/group_fail.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/group_fail.leo.out
@@ -10,7 +10,7 @@ outputs:
   - "Error [EPAR0370005]: expected A valid expression. -- got 'A tuple expression.'\n    --> test:1:1\n     |\n   1 | (x,y)group\n     | ^^^^^"
   - "Error [EPAR0370032]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123,456u8)group\n     |  ^^^"
   - "Error [EPAR0370032]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123,456field)group\n     |  ^^^"
-  - "Error [EPAR0370004]: Unexpected white space between terms (123,456) and group\n    --> test:1:10\n     |\n   1 | (123, 456) group\n     |          ^"
+  - "Error [EPAR0370004]: Unexpected white space between terms (123,456) and group\n    --> test:1:11\n     |\n   1 | (123, 456) group\n     |           ^"
   - "Error [EPAR0370032]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123, )group\n     |  ^^^"
   - "Error [EPAR0370032]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123, 456, 789)group\n     |  ^^^"
   - "Error [EPAR0370032]: Could not parse the implicit value: 123.\n    --> test:1:2\n     |\n   1 | (123, 456)bool\n     |  ^^^"
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out
index 2b86197922..50be2d4931 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/field.leo.out
@@ -6,1050 +6,630 @@ outputs:
       Field:
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 9
-            path: ""
-            content: 123field
+            lo: 0
+            hi: 8
   - Value:
       Field:
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 9
-            path: ""
-            content: 123field
+            lo: 0
+            hi: 8
   - Value:
       Field:
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 9
-            path: ""
-            content: 456field
+            lo: 0
+            hi: 8
   - ""
   - Value:
       Field:
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 86
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802field
+            lo: 0
+            hi: 85
   - Value:
       Field:
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 406
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802field
+            lo: 0
+            hi: 405
   - Value:
       Field:
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 340130024field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 158951116field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 155529659field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 642023166field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 228481736field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 469712960field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 929437719field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 721072814field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 363254789field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 906732565field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 288246391field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 724940549field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 487101620field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 261373583field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 891163927field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 743967544field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 8372586field
+            lo: 0
+            hi: 12
   - Value:
       Field:
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 461793278field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 806307045field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 122764546field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 356336181field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 158370903field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 774460877field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 557174131field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 492401267field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 893445620field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 957757048field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 721540649field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 390746493field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 211251725field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 938266114field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 156985870field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 703831126field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 729964155field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 988151305field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 320872435field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 719287167field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 152289486field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 740067975field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 728627816field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 385008978field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 553967635field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 71980713field
+            lo: 0
+            hi: 13
   - Value:
       Field:
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 519444716field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 116499965field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 717422268field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 18966279field
+            lo: 0
+            hi: 13
   - Value:
       Field:
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 22458638field
+            lo: 0
+            hi: 13
   - Value:
       Field:
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 857282620field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 920675898field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 762235516field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 469018377field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 199986521field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 536679358field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 591399452field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 83083158field
+            lo: 0
+            hi: 13
   - Value:
       Field:
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 599449051field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 445442318field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 585486590field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 209278800field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 873568117field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 664470940field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 465262783field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 605652874field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 376803940field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 965247040field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 598474509field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 845119918field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 648159133field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 669051032field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 800600261field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 434689764field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 520060080field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 804659385field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 537828058field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 716600292field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 387020273field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 199375617field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 680337189field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 818479931field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 893693281field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 87377802field
+            lo: 0
+            hi: 13
   - Value:
       Field:
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 84699261field
+            lo: 0
+            hi: 13
   - Value:
       Field:
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 292826090field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 569171405field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 387436237field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 150682190field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 888770419field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 824696431field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 765659803field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 270163693field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 427940240field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 504997332field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 337808338field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 907200008field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 757177889field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 696697188field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 41376051field
+            lo: 0
+            hi: 13
   - Value:
       Field:
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 496293518field
+            lo: 0
+            hi: 14
   - Value:
       Field:
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 15
-            path: ""
-            content: 251218820field
+            lo: 0
+            hi: 14
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out
index a6a0b6fd6e..a31d4df8f0 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i128.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - I128
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 8
-            path: ""
-            content: 123i128
+            lo: 0
+            hi: 7
   - Value:
       Integer:
         - I128
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 8
-            path: ""
-            content: 123i128
+            lo: 0
+            hi: 7
   - Value:
       Integer:
         - I128
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 8
-            path: ""
-            content: 456i128
+            lo: 0
+            hi: 7
   - Value:
       Integer:
         - I128
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 85
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802i128
+            lo: 0
+            hi: 84
   - Value:
       Integer:
         - I128
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 405
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i128
+            lo: 0
+            hi: 404
   - Value:
       Integer:
         - I128
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 340130024i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 158951116i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 155529659i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 642023166i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 228481736i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 469712960i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 929437719i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 721072814i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 363254789i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 906732565i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 288246391i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 724940549i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 487101620i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 261373583i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 891163927i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 743967544i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 8372586i128
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I128
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 461793278i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 806307045i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 122764546i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 356336181i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 158370903i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 774460877i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 557174131i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 492401267i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 893445620i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 957757048i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 721540649i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 390746493i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 211251725i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 938266114i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 156985870i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 703831126i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 729964155i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 988151305i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 320872435i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 719287167i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 152289486i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 740067975i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 728627816i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 385008978i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 553967635i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 71980713i128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I128
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 519444716i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 116499965i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 717422268i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 18966279i128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I128
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 22458638i128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I128
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 857282620i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 920675898i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 762235516i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 469018377i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 199986521i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 536679358i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 591399452i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 83083158i128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I128
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 599449051i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 445442318i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 585486590i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 209278800i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 873568117i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 664470940i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 465262783i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 605652874i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 376803940i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 965247040i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 598474509i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 845119918i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 648159133i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 669051032i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 800600261i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 434689764i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 520060080i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 804659385i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 537828058i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 716600292i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 387020273i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 199375617i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 680337189i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 818479931i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 893693281i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 87377802i128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I128
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 84699261i128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I128
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 292826090i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 569171405i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 387436237i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 150682190i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 888770419i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 824696431i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 765659803i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 270163693i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 427940240i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 504997332i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 337808338i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 907200008i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 757177889i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 696697188i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 41376051i128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I128
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 496293518i128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - I128
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 251218820i128
+            lo: 0
+            hi: 13
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out
index 9bb817e3fb..9258d3ab83 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i16.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - I16
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123i16
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I16
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123i16
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I16
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 456i16
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I16
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 84
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802i16
+            lo: 0
+            hi: 83
   - Value:
       Integer:
         - I16
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 404
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i16
+            lo: 0
+            hi: 403
   - Value:
       Integer:
         - I16
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 340130024i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158951116i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 155529659i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 642023166i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 228481736i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469712960i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 929437719i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721072814i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 363254789i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 906732565i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 288246391i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 724940549i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 487101620i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 261373583i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 891163927i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 743967544i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 8372586i16
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I16
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 461793278i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 806307045i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 122764546i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 356336181i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158370903i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 774460877i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 557174131i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 492401267i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893445620i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 957757048i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721540649i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 390746493i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 211251725i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 938266114i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 156985870i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 703831126i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 729964155i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 988151305i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 320872435i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 719287167i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 152289486i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 740067975i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 728627816i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 385008978i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 553967635i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 71980713i16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I16
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 519444716i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 116499965i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 717422268i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 18966279i16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I16
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 22458638i16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I16
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 857282620i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 920675898i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 762235516i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469018377i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199986521i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 536679358i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 591399452i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 83083158i16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I16
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 599449051i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 445442318i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 585486590i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 209278800i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 873568117i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 664470940i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 465262783i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 605652874i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 376803940i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 965247040i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 598474509i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 845119918i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 648159133i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 669051032i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 800600261i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 434689764i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 520060080i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 804659385i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 537828058i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 716600292i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387020273i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199375617i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 680337189i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 818479931i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893693281i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 87377802i16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I16
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 84699261i16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I16
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 292826090i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 569171405i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387436237i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 150682190i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 888770419i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 824696431i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 765659803i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 270163693i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 427940240i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 504997332i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 337808338i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 907200008i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 757177889i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 696697188i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 41376051i16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I16
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 496293518i16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I16
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 251218820i16
+            lo: 0
+            hi: 12
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out
index d1cd30c003..3265b57afe 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i32.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - I32
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123i32
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I32
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123i32
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I32
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 456i32
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I32
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 84
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802i32
+            lo: 0
+            hi: 83
   - Value:
       Integer:
         - I32
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 404
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i32
+            lo: 0
+            hi: 403
   - Value:
       Integer:
         - I32
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 340130024i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158951116i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 155529659i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 642023166i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 228481736i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469712960i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 929437719i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721072814i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 363254789i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 906732565i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 288246391i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 724940549i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 487101620i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 261373583i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 891163927i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 743967544i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 8372586i32
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I32
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 461793278i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 806307045i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 122764546i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 356336181i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158370903i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 774460877i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 557174131i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 492401267i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893445620i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 957757048i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721540649i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 390746493i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 211251725i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 938266114i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 156985870i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 703831126i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 729964155i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 988151305i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 320872435i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 719287167i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 152289486i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 740067975i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 728627816i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 385008978i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 553967635i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 71980713i32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I32
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 519444716i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 116499965i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 717422268i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 18966279i32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I32
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 22458638i32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I32
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 857282620i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 920675898i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 762235516i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469018377i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199986521i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 536679358i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 591399452i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 83083158i32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I32
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 599449051i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 445442318i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 585486590i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 209278800i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 873568117i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 664470940i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 465262783i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 605652874i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 376803940i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 965247040i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 598474509i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 845119918i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 648159133i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 669051032i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 800600261i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 434689764i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 520060080i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 804659385i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 537828058i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 716600292i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387020273i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199375617i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 680337189i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 818479931i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893693281i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 87377802i32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I32
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 84699261i32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I32
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 292826090i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 569171405i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387436237i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 150682190i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 888770419i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 824696431i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 765659803i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 270163693i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 427940240i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 504997332i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 337808338i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 907200008i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 757177889i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 696697188i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 41376051i32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I32
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 496293518i32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I32
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 251218820i32
+            lo: 0
+            hi: 12
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out
index 504aebf06e..919150c7ab 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i64.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - I64
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123i64
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I64
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123i64
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I64
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 456i64
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - I64
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 84
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802i64
+            lo: 0
+            hi: 83
   - Value:
       Integer:
         - I64
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 404
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i64
+            lo: 0
+            hi: 403
   - Value:
       Integer:
         - I64
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 340130024i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158951116i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 155529659i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 642023166i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 228481736i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469712960i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 929437719i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721072814i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 363254789i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 906732565i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 288246391i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 724940549i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 487101620i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 261373583i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 891163927i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 743967544i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 8372586i64
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I64
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 461793278i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 806307045i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 122764546i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 356336181i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158370903i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 774460877i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 557174131i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 492401267i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893445620i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 957757048i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721540649i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 390746493i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 211251725i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 938266114i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 156985870i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 703831126i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 729964155i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 988151305i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 320872435i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 719287167i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 152289486i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 740067975i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 728627816i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 385008978i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 553967635i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 71980713i64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I64
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 519444716i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 116499965i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 717422268i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 18966279i64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I64
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 22458638i64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I64
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 857282620i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 920675898i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 762235516i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469018377i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199986521i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 536679358i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 591399452i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 83083158i64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I64
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 599449051i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 445442318i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 585486590i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 209278800i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 873568117i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 664470940i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 465262783i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 605652874i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 376803940i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 965247040i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 598474509i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 845119918i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 648159133i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 669051032i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 800600261i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 434689764i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 520060080i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 804659385i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 537828058i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 716600292i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387020273i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199375617i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 680337189i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 818479931i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893693281i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 87377802i64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I64
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 84699261i64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I64
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 292826090i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 569171405i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387436237i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 150682190i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 888770419i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 824696431i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 765659803i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 270163693i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 427940240i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 504997332i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 337808338i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 907200008i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 757177889i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 696697188i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 41376051i64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I64
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 496293518i64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - I64
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 251218820i64
+            lo: 0
+            hi: 12
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out
index 89c2addd3e..8de15e95af 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/i8.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - I8
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 6
-            path: ""
-            content: 123i8
+            lo: 0
+            hi: 5
   - Value:
       Integer:
         - I8
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 6
-            path: ""
-            content: 123i8
+            lo: 0
+            hi: 5
   - Value:
       Integer:
         - I8
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 6
-            path: ""
-            content: 456i8
+            lo: 0
+            hi: 5
   - Value:
       Integer:
         - I8
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 83
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802i8
+            lo: 0
+            hi: 82
   - Value:
       Integer:
         - I8
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 403
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802i8
+            lo: 0
+            hi: 402
   - Value:
       Integer:
         - I8
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 340130024i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 158951116i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 155529659i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 642023166i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 228481736i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 469712960i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 929437719i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 721072814i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 363254789i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 906732565i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 288246391i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 724940549i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 487101620i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 261373583i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 891163927i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 743967544i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 8372586i8
+            lo: 0
+            hi: 9
   - Value:
       Integer:
         - I8
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 461793278i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 806307045i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 122764546i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 356336181i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 158370903i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 774460877i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 557174131i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 492401267i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 893445620i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 957757048i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 721540649i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 390746493i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 211251725i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 938266114i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 156985870i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 703831126i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 729964155i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 988151305i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 320872435i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 719287167i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 152289486i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 740067975i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 728627816i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 385008978i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 553967635i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 71980713i8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I8
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 519444716i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 116499965i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 717422268i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 18966279i8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I8
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 22458638i8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I8
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 857282620i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 920675898i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 762235516i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 469018377i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 199986521i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 536679358i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 591399452i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 83083158i8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I8
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 599449051i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 445442318i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 585486590i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 209278800i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 873568117i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 664470940i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 465262783i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 605652874i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 376803940i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 965247040i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 598474509i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 845119918i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 648159133i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 669051032i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 800600261i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 434689764i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 520060080i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 804659385i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 537828058i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 716600292i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 387020273i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 199375617i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 680337189i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 818479931i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 893693281i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 87377802i8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I8
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 84699261i8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I8
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 292826090i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 569171405i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 387436237i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 150682190i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 888770419i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 824696431i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 765659803i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 270163693i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 427940240i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 504997332i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 337808338i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 907200008i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 757177889i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 696697188i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 41376051i8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - I8
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 496293518i8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - I8
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 251218820i8
+            lo: 0
+            hi: 11
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out
index e472dd036a..085b12b84e 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/mono_group.leo.out
@@ -7,1153 +7,733 @@ outputs:
         Single:
           - "123"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 9
-              path: ""
-              content: 123group
+              lo: 0
+              hi: 8
   - Value:
       Group:
         Single:
           - "123"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 9
-              path: ""
-              content: 123group
+              lo: 0
+              hi: 8
   - Value:
       Group:
         Single:
           - "456"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 9
-              path: ""
-              content: 456group
+              lo: 0
+              hi: 8
   - Value:
       Group:
         Single:
           - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 86
-              path: ""
-              content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802group
+              lo: 0
+              hi: 85
   - Value:
       Group:
         Single:
           - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 406
-              path: ""
-              content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802group
+              lo: 0
+              hi: 405
   - Value:
       Group:
         Single:
           - "340130024"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 340130024group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "158951116"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 158951116group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "155529659"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 155529659group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "642023166"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 642023166group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "228481736"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 228481736group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "469712960"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 469712960group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "929437719"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 929437719group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "721072814"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 721072814group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "363254789"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 363254789group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "906732565"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 906732565group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "288246391"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 288246391group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "724940549"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 724940549group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "487101620"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 487101620group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "261373583"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 261373583group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "891163927"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 891163927group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "743967544"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 743967544group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "8372586"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 13
-              path: ""
-              content: 8372586group
+              lo: 0
+              hi: 12
   - Value:
       Group:
         Single:
           - "461793278"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 461793278group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "806307045"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 806307045group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "122764546"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 122764546group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "356336181"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 356336181group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "158370903"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 158370903group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "774460877"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 774460877group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "557174131"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 557174131group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "492401267"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 492401267group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "893445620"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 893445620group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "957757048"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 957757048group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "721540649"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 721540649group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "390746493"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 390746493group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "211251725"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 211251725group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "938266114"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 938266114group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "156985870"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 156985870group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "703831126"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 703831126group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "729964155"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 729964155group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "988151305"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 988151305group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "320872435"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 320872435group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "719287167"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 719287167group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "152289486"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 152289486group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "740067975"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 740067975group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "728627816"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 728627816group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "385008978"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 385008978group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "553967635"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 553967635group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "71980713"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 14
-              path: ""
-              content: 71980713group
+              lo: 0
+              hi: 13
   - Value:
       Group:
         Single:
           - "519444716"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 519444716group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "116499965"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 116499965group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "717422268"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 717422268group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "18966279"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 14
-              path: ""
-              content: 18966279group
+              lo: 0
+              hi: 13
   - Value:
       Group:
         Single:
           - "22458638"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 14
-              path: ""
-              content: 22458638group
+              lo: 0
+              hi: 13
   - Value:
       Group:
         Single:
           - "857282620"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 857282620group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "920675898"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 920675898group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "762235516"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 762235516group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "469018377"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 469018377group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "199986521"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 199986521group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "536679358"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 536679358group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "591399452"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 591399452group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "83083158"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 14
-              path: ""
-              content: 83083158group
+              lo: 0
+              hi: 13
   - Value:
       Group:
         Single:
           - "599449051"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 599449051group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "445442318"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 445442318group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "585486590"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 585486590group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "209278800"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 209278800group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "873568117"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 873568117group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "664470940"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 664470940group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "465262783"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 465262783group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "605652874"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 605652874group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "376803940"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 376803940group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "965247040"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 965247040group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "598474509"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 598474509group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "845119918"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 845119918group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "648159133"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 648159133group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "669051032"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 669051032group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "800600261"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 800600261group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "434689764"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 434689764group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "520060080"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 520060080group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "804659385"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 804659385group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "537828058"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 537828058group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "716600292"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 716600292group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "387020273"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 387020273group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "199375617"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 199375617group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "680337189"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 680337189group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "818479931"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 818479931group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "893693281"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 893693281group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "87377802"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 14
-              path: ""
-              content: 87377802group
+              lo: 0
+              hi: 13
   - Value:
       Group:
         Single:
           - "84699261"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 14
-              path: ""
-              content: 84699261group
+              lo: 0
+              hi: 13
   - Value:
       Group:
         Single:
           - "292826090"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 292826090group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "569171405"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 569171405group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "387436237"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 387436237group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "150682190"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 150682190group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "888770419"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 888770419group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "824696431"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 824696431group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "765659803"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 765659803group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "270163693"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 270163693group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "427940240"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 427940240group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "504997332"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 504997332group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "337808338"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 337808338group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "907200008"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 907200008group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "757177889"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 757177889group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "696697188"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 696697188group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "41376051"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 14
-              path: ""
-              content: 41376051group
+              lo: 0
+              hi: 13
   - Value:
       Group:
         Single:
           - "496293518"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 496293518group
+              lo: 0
+              hi: 14
   - Value:
       Group:
         Single:
           - "251218820"
           - span:
-              line_start: 1
-              line_stop: 1
-              col_start: 1
-              col_stop: 15
-              path: ""
-              content: 251218820group
+              lo: 0
+              hi: 14
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out
index 63ce5b7b2d..85ea769f24 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u128.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - U128
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 8
-            path: ""
-            content: 123u128
+            lo: 0
+            hi: 7
   - Value:
       Integer:
         - U128
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 8
-            path: ""
-            content: 123u128
+            lo: 0
+            hi: 7
   - Value:
       Integer:
         - U128
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 8
-            path: ""
-            content: 456u128
+            lo: 0
+            hi: 7
   - Value:
       Integer:
         - U128
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 85
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802u128
+            lo: 0
+            hi: 84
   - Value:
       Integer:
         - U128
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 405
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u128
+            lo: 0
+            hi: 404
   - Value:
       Integer:
         - U128
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 340130024u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 158951116u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 155529659u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 642023166u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 228481736u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 469712960u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 929437719u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 721072814u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 363254789u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 906732565u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 288246391u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 724940549u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 487101620u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 261373583u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 891163927u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 743967544u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 8372586u128
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U128
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 461793278u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 806307045u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 122764546u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 356336181u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 158370903u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 774460877u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 557174131u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 492401267u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 893445620u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 957757048u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 721540649u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 390746493u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 211251725u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 938266114u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 156985870u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 703831126u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 729964155u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 988151305u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 320872435u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 719287167u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 152289486u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 740067975u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 728627816u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 385008978u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 553967635u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 71980713u128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U128
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 519444716u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 116499965u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 717422268u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 18966279u128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U128
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 22458638u128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U128
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 857282620u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 920675898u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 762235516u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 469018377u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 199986521u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 536679358u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 591399452u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 83083158u128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U128
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 599449051u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 445442318u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 585486590u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 209278800u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 873568117u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 664470940u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 465262783u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 605652874u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 376803940u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 965247040u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 598474509u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 845119918u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 648159133u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 669051032u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 800600261u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 434689764u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 520060080u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 804659385u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 537828058u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 716600292u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 387020273u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 199375617u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 680337189u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 818479931u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 893693281u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 87377802u128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U128
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 84699261u128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U128
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 292826090u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 569171405u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 387436237u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 150682190u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 888770419u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 824696431u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 765659803u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 270163693u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 427940240u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 504997332u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 337808338u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 907200008u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 757177889u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 696697188u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 41376051u128
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U128
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 496293518u128
+            lo: 0
+            hi: 13
   - Value:
       Integer:
         - U128
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 14
-            path: ""
-            content: 251218820u128
+            lo: 0
+            hi: 13
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out
index 4202a4c6b8..c5d60575cc 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u16.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - U16
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123u16
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U16
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123u16
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U16
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 456u16
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U16
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 84
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802u16
+            lo: 0
+            hi: 83
   - Value:
       Integer:
         - U16
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 404
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u16
+            lo: 0
+            hi: 403
   - Value:
       Integer:
         - U16
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 340130024u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158951116u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 155529659u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 642023166u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 228481736u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469712960u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 929437719u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721072814u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 363254789u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 906732565u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 288246391u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 724940549u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 487101620u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 261373583u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 891163927u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 743967544u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 8372586u16
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U16
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 461793278u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 806307045u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 122764546u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 356336181u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158370903u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 774460877u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 557174131u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 492401267u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893445620u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 957757048u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721540649u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 390746493u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 211251725u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 938266114u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 156985870u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 703831126u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 729964155u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 988151305u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 320872435u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 719287167u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 152289486u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 740067975u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 728627816u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 385008978u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 553967635u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 71980713u16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U16
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 519444716u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 116499965u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 717422268u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 18966279u16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U16
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 22458638u16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U16
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 857282620u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 920675898u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 762235516u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469018377u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199986521u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 536679358u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 591399452u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 83083158u16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U16
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 599449051u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 445442318u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 585486590u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 209278800u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 873568117u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 664470940u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 465262783u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 605652874u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 376803940u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 965247040u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 598474509u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 845119918u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 648159133u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 669051032u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 800600261u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 434689764u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 520060080u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 804659385u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 537828058u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 716600292u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387020273u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199375617u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 680337189u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 818479931u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893693281u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 87377802u16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U16
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 84699261u16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U16
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 292826090u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 569171405u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387436237u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 150682190u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 888770419u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 824696431u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 765659803u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 270163693u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 427940240u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 504997332u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 337808338u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 907200008u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 757177889u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 696697188u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 41376051u16
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U16
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 496293518u16
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U16
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 251218820u16
+            lo: 0
+            hi: 12
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out
index aa6c30759b..4097818492 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u32.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - U32
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123u32
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U32
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123u32
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U32
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 456u32
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U32
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 84
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802u32
+            lo: 0
+            hi: 83
   - Value:
       Integer:
         - U32
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 404
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u32
+            lo: 0
+            hi: 403
   - Value:
       Integer:
         - U32
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 340130024u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158951116u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 155529659u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 642023166u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 228481736u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469712960u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 929437719u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721072814u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 363254789u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 906732565u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 288246391u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 724940549u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 487101620u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 261373583u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 891163927u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 743967544u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 8372586u32
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U32
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 461793278u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 806307045u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 122764546u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 356336181u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158370903u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 774460877u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 557174131u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 492401267u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893445620u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 957757048u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721540649u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 390746493u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 211251725u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 938266114u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 156985870u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 703831126u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 729964155u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 988151305u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 320872435u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 719287167u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 152289486u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 740067975u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 728627816u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 385008978u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 553967635u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 71980713u32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U32
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 519444716u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 116499965u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 717422268u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 18966279u32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U32
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 22458638u32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U32
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 857282620u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 920675898u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 762235516u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469018377u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199986521u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 536679358u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 591399452u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 83083158u32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U32
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 599449051u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 445442318u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 585486590u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 209278800u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 873568117u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 664470940u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 465262783u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 605652874u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 376803940u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 965247040u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 598474509u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 845119918u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 648159133u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 669051032u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 800600261u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 434689764u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 520060080u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 804659385u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 537828058u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 716600292u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387020273u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199375617u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 680337189u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 818479931u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893693281u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 87377802u32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U32
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 84699261u32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U32
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 292826090u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 569171405u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387436237u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 150682190u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 888770419u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 824696431u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 765659803u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 270163693u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 427940240u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 504997332u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 337808338u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 907200008u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 757177889u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 696697188u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 41376051u32
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U32
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 496293518u32
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U32
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 251218820u32
+            lo: 0
+            hi: 12
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out
index 7241032af4..1a9e13c611 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u64.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - U64
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123u64
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U64
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 123u64
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U64
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 7
-            path: ""
-            content: 456u64
+            lo: 0
+            hi: 6
   - Value:
       Integer:
         - U64
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 84
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802u64
+            lo: 0
+            hi: 83
   - Value:
       Integer:
         - U64
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 404
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u64
+            lo: 0
+            hi: 403
   - Value:
       Integer:
         - U64
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 340130024u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158951116u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 155529659u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 642023166u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 228481736u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469712960u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 929437719u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721072814u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 363254789u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 906732565u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 288246391u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 724940549u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 487101620u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 261373583u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 891163927u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 743967544u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 8372586u64
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U64
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 461793278u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 806307045u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 122764546u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 356336181u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 158370903u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 774460877u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 557174131u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 492401267u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893445620u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 957757048u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 721540649u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 390746493u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 211251725u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 938266114u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 156985870u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 703831126u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 729964155u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 988151305u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 320872435u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 719287167u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 152289486u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 740067975u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 728627816u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 385008978u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 553967635u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 71980713u64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U64
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 519444716u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 116499965u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 717422268u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 18966279u64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U64
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 22458638u64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U64
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 857282620u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 920675898u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 762235516u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 469018377u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199986521u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 536679358u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 591399452u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 83083158u64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U64
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 599449051u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 445442318u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 585486590u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 209278800u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 873568117u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 664470940u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 465262783u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 605652874u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 376803940u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 965247040u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 598474509u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 845119918u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 648159133u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 669051032u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 800600261u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 434689764u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 520060080u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 804659385u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 537828058u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 716600292u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387020273u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 199375617u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 680337189u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 818479931u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 893693281u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 87377802u64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U64
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 84699261u64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U64
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 292826090u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 569171405u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 387436237u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 150682190u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 888770419u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 824696431u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 765659803u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 270163693u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 427940240u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 504997332u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 337808338u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 907200008u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 757177889u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 696697188u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 41376051u64
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U64
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 496293518u64
+            lo: 0
+            hi: 12
   - Value:
       Integer:
         - U64
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 13
-            path: ""
-            content: 251218820u64
+            lo: 0
+            hi: 12
diff --git a/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out b/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out
index 89d2c66c27..da44d7da88 100644
--- a/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/int_parse/u8.leo.out
@@ -7,1153 +7,733 @@ outputs:
         - U8
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 6
-            path: ""
-            content: 123u8
+            lo: 0
+            hi: 5
   - Value:
       Integer:
         - U8
         - "123"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 6
-            path: ""
-            content: 123u8
+            lo: 0
+            hi: 5
   - Value:
       Integer:
         - U8
         - "456"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 6
-            path: ""
-            content: 456u8
+            lo: 0
+            hi: 5
   - Value:
       Integer:
         - U8
         - "87377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 83
-            path: ""
-            content: 87377802873778028737780287377802873778028737780287377802873778028737780287377802u8
+            lo: 0
+            hi: 82
   - Value:
       Integer:
         - U8
         - "8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 403
-            path: ""
-            content: 8737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802873778028737780287377802u8
+            lo: 0
+            hi: 402
   - Value:
       Integer:
         - U8
         - "340130024"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 340130024u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "158951116"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 158951116u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "155529659"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 155529659u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "642023166"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 642023166u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "228481736"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 228481736u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "469712960"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 469712960u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "929437719"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 929437719u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "721072814"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 721072814u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "363254789"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 363254789u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "906732565"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 906732565u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "288246391"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 288246391u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "724940549"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 724940549u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "487101620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 487101620u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "261373583"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 261373583u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "891163927"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 891163927u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "743967544"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 743967544u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "8372586"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 10
-            path: ""
-            content: 8372586u8
+            lo: 0
+            hi: 9
   - Value:
       Integer:
         - U8
         - "461793278"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 461793278u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "806307045"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 806307045u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "122764546"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 122764546u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "356336181"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 356336181u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "158370903"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 158370903u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "774460877"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 774460877u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "557174131"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 557174131u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "492401267"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 492401267u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "893445620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 893445620u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "957757048"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 957757048u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "721540649"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 721540649u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "390746493"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 390746493u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "211251725"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 211251725u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "938266114"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 938266114u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "156985870"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 156985870u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "703831126"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 703831126u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "729964155"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 729964155u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "988151305"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 988151305u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "320872435"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 320872435u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "719287167"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 719287167u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "152289486"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 152289486u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "740067975"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 740067975u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "728627816"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 728627816u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "385008978"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 385008978u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "553967635"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 553967635u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "71980713"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 71980713u8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U8
         - "519444716"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 519444716u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "116499965"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 116499965u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "717422268"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 717422268u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "18966279"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 18966279u8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U8
         - "22458638"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 22458638u8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U8
         - "857282620"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 857282620u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "920675898"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 920675898u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "762235516"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 762235516u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "469018377"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 469018377u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "199986521"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 199986521u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "536679358"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 536679358u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "591399452"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 591399452u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "83083158"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 83083158u8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U8
         - "599449051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 599449051u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "445442318"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 445442318u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "585486590"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 585486590u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "209278800"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 209278800u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "873568117"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 873568117u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "664470940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 664470940u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "465262783"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 465262783u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "605652874"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 605652874u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "376803940"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 376803940u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "965247040"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 965247040u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "598474509"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 598474509u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "845119918"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 845119918u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "648159133"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 648159133u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "669051032"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 669051032u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "800600261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 800600261u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "434689764"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 434689764u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "520060080"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 520060080u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "804659385"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 804659385u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "537828058"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 537828058u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "716600292"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 716600292u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "387020273"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 387020273u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "199375617"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 199375617u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "680337189"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 680337189u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "818479931"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 818479931u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "893693281"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 893693281u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "87377802"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 87377802u8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U8
         - "84699261"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 84699261u8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U8
         - "292826090"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 292826090u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "569171405"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 569171405u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "387436237"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 387436237u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "150682190"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 150682190u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "888770419"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 888770419u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "824696431"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 824696431u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "765659803"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 765659803u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "270163693"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 270163693u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "427940240"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 427940240u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "504997332"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 504997332u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "337808338"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 337808338u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "907200008"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 907200008u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "757177889"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 757177889u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "696697188"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 696697188u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "41376051"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 11
-            path: ""
-            content: 41376051u8
+            lo: 0
+            hi: 10
   - Value:
       Integer:
         - U8
         - "496293518"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 496293518u8
+            lo: 0
+            hi: 11
   - Value:
       Integer:
         - U8
         - "251218820"
         - span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 12
-            path: ""
-            content: 251218820u8
+            lo: 0
+            hi: 11
diff --git a/tests/expectations/parser/parser/expression/literal/string.leo.out b/tests/expectations/parser/parser/expression/literal/string.leo.out
index 83980319ab..611719e9dc 100644
--- a/tests/expectations/parser/parser/expression/literal/string.leo.out
+++ b/tests/expectations/parser/parser/expression/literal/string.leo.out
@@ -14,21 +14,21 @@ outputs:
   - "'\"\n\"' @ 1:1-7"
   - "'\"\u007f\"' @ 1:1-7"
   - "'\"aa \\ \" ' \n aa \t \r  \u0000\"' @ 1:1-30"
-  - "'\"test 😒€\"' @ 1:1-15"
-  - "'\"😭😂😘\"' @ 1:1-15"
-  - "'\"✋🏿\"' @ 1:1-10"
-  - "'\"🦀\"' @ 1:1-7"
-  - "'\"￿\"' @ 1:1-6"
-  - "'\"���\"' @ 1:1-12"
-  - "'\"（>３<）三\"' @ 1:1-17"
-  - "'\"ヽ༼ ಠ益ಠ ༽ﾉ\"' @ 1:1-26"
-  - "'\"(╯°□°）╯︵ ┻━┻\"' @ 1:1-33"
-  - "'\"┬─┬ ノ( ゜-゜ノ)\"' @ 1:1-29"
-  - "'\"( ͡° ͜ʖ ͡°)\"' @ 1:1-20"
+  - "'\"test 😒€\"' @ 1:1-10"
+  - "'\"😭😂😘\"' @ 1:1-6"
+  - "'\"✋🏿\"' @ 1:1-5"
+  - "'\"🦀\"' @ 1:1-4"
+  - "'\"￿\"' @ 1:1-4"
+  - "'\"���\"' @ 1:1-6"
+  - "'\"（>３<）三\"' @ 1:1-9"
+  - "'\"ヽ༼ ಠ益ಠ ༽ﾉ\"' @ 1:1-12"
+  - "'\"(╯°□°）╯︵ ┻━┻\"' @ 1:1-15"
+  - "'\"┬─┬ ノ( ゜-゜ノ)\"' @ 1:1-15"
+  - "'\"( ͡° ͜ʖ ͡°)\"' @ 1:1-14"
   - "'\"b\"' @ 1:1-4"
-  - "'\"ᕙ(▀̿ĺ̯▀̿ ̿)ᕗ\"' @ 1:1-28"
-  - "'\"♥╣[-_-]╠♥\"' @ 1:1-20"
+  - "'\"ᕙ(▀̿ĺ̯▀̿ ̿)ᕗ\"' @ 1:1-15"
+  - "'\"♥╣[-_-]╠♥\"' @ 1:1-12"
   - "'\"b\"' @ 1:1-4"
-  - "'\"(⑅∫°ਊ°)∫\"' @ 1:1-21"
+  - "'\"(⑅∫°ਊ°)∫\"' @ 1:1-11"
   - "'\"b\"' @ 1:1-4"
-  - "'\"🦀°1\"' @ 1:1-10"
+  - "'\"🦀°1\"' @ 1:1-6"
diff --git a/tests/expectations/parser/parser/expression/ternary.leo.out b/tests/expectations/parser/parser/expression/ternary.leo.out
index 9fef5ba769..07651c1b8f 100644
--- a/tests/expectations/parser/parser/expression/ternary.leo.out
+++ b/tests/expectations/parser/parser/expression/ternary.leo.out
@@ -4,69 +4,49 @@ expectation: Pass
 outputs:
   - Ternary:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : z\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       if_true:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : z\\\"}\"}"
+        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       if_false:
-        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":9,\\\"col_stop\\\":10,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : z\\\"}\"}"
+        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: "x ? y : z"
+        lo: 0
+        hi: 9
   - Ternary:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? a ? b : c : z\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       if_true:
         Ternary:
           condition:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? a ? b : c : z\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           if_true:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":9,\\\"col_stop\\\":10,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? a ? b : c : z\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           if_false:
-            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? a ? b : c : z\\\"}\"}"
+            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 14
-            path: ""
-            content: "x ? a ? b : c : z"
+            lo: 4
+            hi: 13
       if_false:
-        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":17,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? a ? b : c : z\\\"}\"}"
+        Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "x ? a ? b : c : z"
+        lo: 0
+        hi: 17
   - Ternary:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : a ? b : c\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
       if_true:
-        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : a ? b : c\\\"}\"}"
+        Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       if_false:
         Ternary:
           condition:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":9,\\\"col_stop\\\":10,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : a ? b : c\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
           if_true:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : a ? b : c\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           if_false:
-            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":17,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x ? y : a ? b : c\\\"}\"}"
+            Identifier: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 9
-            col_stop: 18
-            path: ""
-            content: "x ? y : a ? b : c"
+            lo: 8
+            hi: 17
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "x ? y : a ? b : c"
+        lo: 0
+        hi: 17
diff --git a/tests/expectations/parser/parser/expression/unary/negate.leo.out b/tests/expectations/parser/parser/expression/unary/negate.leo.out
index 5e31012d5e..d455f50a3b 100644
--- a/tests/expectations/parser/parser/expression/unary/negate.leo.out
+++ b/tests/expectations/parser/parser/expression/unary/negate.leo.out
@@ -4,78 +4,50 @@ expectation: Pass
 outputs:
   - Unary:
       inner:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":2,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"-x\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
       op: Negate
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 3
-        path: ""
-        content: "-x"
+        lo: 0
+        hi: 2
   - Unary:
       inner:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":2,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"-x()\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 2
-            col_stop: 5
-            path: ""
-            content: "-x()"
+            lo: 1
+            hi: 4
       op: Negate
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: "-x()"
+        lo: 0
+        hi: 4
   - Unary:
       inner:
         Unary:
           inner:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"--x\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 2
-            col_stop: 4
-            path: ""
-            content: "--x"
+            lo: 1
+            hi: 3
       op: Negate
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: "--x"
+        lo: 0
+        hi: 3
   - Unary:
       inner:
         Unary:
           inner:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"-!x\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 2
-            col_stop: 4
-            path: ""
-            content: "-!x"
+            lo: 1
+            hi: 3
       op: Negate
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: "-!x"
+        lo: 0
+        hi: 3
   - Unary:
       inner:
         Value:
@@ -83,17 +55,9 @@ outputs:
             - I8
             - "5"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 2
-                col_stop: 5
-                path: ""
-                content: "-5i8"
+                lo: 1
+                hi: 4
       op: Negate
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: "-5i8"
+        lo: 0
+        hi: 4
diff --git a/tests/expectations/parser/parser/expression/unary/not.leo.out b/tests/expectations/parser/parser/expression/unary/not.leo.out
index 221c8c8c35..4fb1006a4e 100644
--- a/tests/expectations/parser/parser/expression/unary/not.leo.out
+++ b/tests/expectations/parser/parser/expression/unary/not.leo.out
@@ -4,75 +4,47 @@ expectation: Pass
 outputs:
   - Unary:
       inner:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":2,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"!x\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
       op: Not
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 3
-        path: ""
-        content: "!x"
+        lo: 0
+        hi: 2
   - Unary:
       inner:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":2,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"!x()\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":1,\\\"hi\\\":2}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 2
-            col_stop: 5
-            path: ""
-            content: "!x()"
+            lo: 1
+            hi: 4
       op: Not
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: "!x()"
+        lo: 0
+        hi: 4
   - Unary:
       inner:
         Unary:
           inner:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"!!x\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Not
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 2
-            col_stop: 4
-            path: ""
-            content: "!!x"
+            lo: 1
+            hi: 3
       op: Not
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: "!!x"
+        lo: 0
+        hi: 3
   - Unary:
       inner:
         Unary:
           inner:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"!-x\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Negate
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 2
-            col_stop: 4
-            path: ""
-            content: "!-x"
+            lo: 1
+            hi: 3
       op: Not
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: "!-x"
+        lo: 0
+        hi: 3
diff --git a/tests/expectations/parser/parser/functions/bounded_recursion.leo.out b/tests/expectations/parser/parser/functions/bounded_recursion.leo.out
index 579dec9261..ae03128631 100644
--- a/tests/expectations/parser/parser/functions/bounded_recursion.leo.out
+++ b/tests/expectations/parser/parser/functions/bounded_recursion.leo.out
@@ -5,21 +5,17 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant y: u32) -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant y: u32) -> u8 {\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant y: u32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":22,\\\"hi\\\":23}\"}"
               mode: Constant
               type_:
                 IntegerType: U32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 21
-                col_stop: 22
-                path: ""
-                content: "function x(constant y: u32) -> u8 {"
+                lo: 22
+                hi: 23
         output:
           IntegerType: U8
         core_mapping: ~
@@ -29,115 +25,71 @@ outputs:
                 condition:
                   Binary:
                     left:
-                      Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":4,\\\"line_stop\\\":4,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    if y < 5u32 {\\\"}\"}"
+                      Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
                     right:
                       Value:
                         Integer:
                           - U32
                           - "5"
                           - span:
-                              line_start: 4
-                              line_stop: 4
-                              col_start: 12
-                              col_stop: 16
-                              path: ""
-                              content: "    if y < 5u32 {"
+                              lo: 49
+                              hi: 53
                     op: Lt
                     span:
-                      line_start: 4
-                      line_stop: 4
-                      col_start: 8
-                      col_stop: 16
-                      path: ""
-                      content: "    if y < 5u32 {"
+                      lo: 45
+                      hi: 53
                 block:
                   statements:
                     - Expression:
                         expression:
                           Call:
                             function:
-                              Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":9,\\\"col_stop\\\":10,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"        x(y+1u32);\\\"}\"}"
+                              Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":64,\\\"hi\\\":65}\"}"
                             arguments:
                               - Binary:
                                   left:
-                                    Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":11,\\\"col_stop\\\":12,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"        x(y+1u32);\\\"}\"}"
+                                    Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":66,\\\"hi\\\":67}\"}"
                                   right:
                                     Value:
                                       Integer:
                                         - U32
                                         - "1"
                                         - span:
-                                            line_start: 5
-                                            line_stop: 5
-                                            col_start: 13
-                                            col_stop: 17
-                                            path: ""
-                                            content: "        x(y+1u32);"
+                                            lo: 68
+                                            hi: 72
                                   op: Add
                                   span:
-                                    line_start: 5
-                                    line_stop: 5
-                                    col_start: 11
-                                    col_stop: 17
-                                    path: ""
-                                    content: "        x(y+1u32);"
+                                    lo: 66
+                                    hi: 72
                             span:
-                              line_start: 5
-                              line_stop: 5
-                              col_start: 9
-                              col_stop: 18
-                              path: ""
-                              content: "        x(y+1u32);"
+                              lo: 64
+                              hi: 73
                         span:
-                          line_start: 5
-                          line_stop: 5
-                          col_start: 9
-                          col_stop: 18
-                          path: ""
-                          content: "        x(y+1u32);"
+                          lo: 64
+                          hi: 73
                   span:
-                    line_start: 4
-                    line_stop: 6
-                    col_start: 17
-                    col_stop: 6
-                    path: ""
-                    content: "    if y < 5u32 {\n         ...\n    }"
+                    lo: 54
+                    hi: 80
                 next: ~
                 span:
-                  line_start: 4
-                  line_stop: 6
-                  col_start: 5
-                  col_stop: 6
-                  path: ""
-                  content: "    if y < 5u32 {\n         ...\n    }"
+                  lo: 42
+                  hi: 80
           span:
-            line_start: 3
-            line_stop: 7
-            col_start: 35
-            col_stop: 2
-            path: ""
-            content: "function x(constant y: u32) -> u8 {\n     ...\n     ...\n     ...\n}"
+            lo: 36
+            hi: 82
         span:
-          line_start: 3
-          line_stop: 7
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x(constant y: u32) -> u8 {\n     ...\n     ...\n     ...\n}"
-      "{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}":
-        identifier: "{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}"
+          lo: 2
+          hi: 82
+      "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":93,\\\"hi\\\":97}\"}":
+        identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":93,\\\"hi\\\":97}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":15,\\\"col_stop\\\":16,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":98,\\\"hi\\\":99}\"}"
               mode: Private
               type_: Boolean
               span:
-                line_start: 9
-                line_stop: 9
-                col_start: 15
-                col_stop: 16
-                path: ""
-                content: "function main(y: bool) -> bool {"
+                lo: 98
+                hi: 99
         output: Boolean
         core_mapping: ~
         block:
@@ -146,54 +98,30 @@ outputs:
                 expression:
                   Call:
                     function:
-                      Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":10,\\\"line_stop\\\":10,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    x(1u32);\\\"}\"}"
+                      Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":121,\\\"hi\\\":122}\"}"
                     arguments:
                       - Value:
                           Integer:
                             - U32
                             - "1"
                             - span:
-                                line_start: 10
-                                line_stop: 10
-                                col_start: 7
-                                col_stop: 11
-                                path: ""
-                                content: "    x(1u32);"
+                                lo: 123
+                                hi: 127
                     span:
-                      line_start: 10
-                      line_stop: 10
-                      col_start: 5
-                      col_stop: 12
-                      path: ""
-                      content: "    x(1u32);"
+                      lo: 121
+                      hi: 128
                 span:
-                  line_start: 10
-                  line_stop: 10
-                  col_start: 5
-                  col_stop: 12
-                  path: ""
-                  content: "    x(1u32);"
+                  lo: 121
+                  hi: 128
             - Return:
                 expression:
-                  Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":11,\\\"line_stop\\\":11,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    return y;\\\"}\"}"
+                  Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":141,\\\"hi\\\":142}\"}"
                 span:
-                  line_start: 11
-                  line_stop: 11
-                  col_start: 5
-                  col_stop: 13
-                  path: ""
-                  content: "    return y;"
+                  lo: 134
+                  hi: 142
           span:
-            line_start: 9
-            line_stop: 12
-            col_start: 32
-            col_stop: 2
-            path: ""
-            content: "function main(y: bool) -> bool {\n     ...\n     ...\n}"
+            lo: 115
+            hi: 145
         span:
-          line_start: 9
-          line_stop: 12
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function main(y: bool) -> bool {\n     ...\n     ...\n}"
+          lo: 84
+          hi: 145
diff --git a/tests/expectations/parser/parser/functions/const_input.leo.out b/tests/expectations/parser/parser/functions/const_input.leo.out
index 516ae45c62..1d6f0f3856 100644
--- a/tests/expectations/parser/parser/functions/const_input.leo.out
+++ b/tests/expectations/parser/parser/functions/const_input.leo.out
@@ -5,71 +5,47 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u8) -> u8 {}\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u8) -> u8 {}\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(const x: u8) -> u8 {}\\\"}\"}"
+              identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":19,\\\"hi\\\":20}\"}"
               mode: Constant
               type_:
                 IntegerType: U8
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 18
-                col_stop: 19
-                path: ""
-                content: "function x(const x: u8) -> u8 {}"
+                lo: 19
+                hi: 20
         output:
           IntegerType: U8
         core_mapping: ~
         block:
           statements: []
           span:
-            line_start: 3
-            line_stop: 3
-            col_start: 31
-            col_stop: 33
-            path: ""
-            content: "function x(const x: u8) -> u8 {}"
+            lo: 32
+            hi: 34
         span:
-          line_start: 3
-          line_stop: 3
-          col_start: 1
-          col_stop: 33
-          path: ""
-          content: "function x(const x: u8) -> u8 {}"
-      "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function y(constant y: u64) -> u8 {}\\\"}\"}":
-        identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function y(constant y: u64) -> u8 {}\\\"}\"}"
+          lo: 2
+          hi: 34
+      "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}":
+        identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":45,\\\"hi\\\":46}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function y(constant y: u64) -> u8 {}\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":56,\\\"hi\\\":57}\"}"
               mode: Constant
               type_:
                 IntegerType: U64
               span:
-                line_start: 5
-                line_stop: 5
-                col_start: 21
-                col_stop: 22
-                path: ""
-                content: "function y(constant y: u64) -> u8 {}"
+                lo: 56
+                hi: 57
         output:
           IntegerType: U8
         core_mapping: ~
         block:
           statements: []
           span:
-            line_start: 5
-            line_stop: 5
-            col_start: 35
-            col_stop: 37
-            path: ""
-            content: "function y(constant y: u64) -> u8 {}"
+            lo: 70
+            hi: 72
         span:
-          line_start: 5
-          line_stop: 5
-          col_start: 1
-          col_stop: 37
-          path: ""
-          content: "function y(constant y: u64) -> u8 {}"
+          lo: 36
+          hi: 72
diff --git a/tests/expectations/parser/parser/functions/const_param.leo.out b/tests/expectations/parser/parser/functions/const_param.leo.out
index c644507035..09dc4fab28 100644
--- a/tests/expectations/parser/parser/functions/const_param.leo.out
+++ b/tests/expectations/parser/parser/functions/const_param.leo.out
@@ -5,33 +5,25 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) -> u8 {\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               mode: Private
               type_:
                 IntegerType: U32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 12
-                col_stop: 13
-                path: ""
-                content: "function x(x: u32, constant y: i32) -> u8 {"
+                lo: 13
+                hi: 14
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":29,\\\"col_stop\\\":30,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, constant y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":30,\\\"hi\\\":31}\"}"
               mode: Constant
               type_:
                 IntegerType: I32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 29
-                col_stop: 30
-                path: ""
-                content: "function x(x: u32, constant y: i32) -> u8 {"
+                lo: 30
+                hi: 31
         output:
           IntegerType: U8
         core_mapping: ~
@@ -44,60 +36,36 @@ outputs:
                       - U8
                       - "0"
                       - span:
-                          line_start: 4
-                          line_stop: 4
-                          col_start: 12
-                          col_stop: 15
-                          path: ""
-                          content: "    return 0u8;"
+                          lo: 57
+                          hi: 60
                 span:
-                  line_start: 4
-                  line_stop: 4
-                  col_start: 5
-                  col_stop: 15
-                  path: ""
-                  content: "    return 0u8;"
+                  lo: 50
+                  hi: 60
           span:
-            line_start: 3
-            line_stop: 5
-            col_start: 43
-            col_stop: 2
-            path: ""
-            content: "function x(x: u32, constant y: i32) -> u8 {\n     ...\n}"
+            lo: 44
+            hi: 63
         span:
-          line_start: 3
-          line_stop: 5
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x(x: u32, constant y: i32) -> u8 {\n     ...\n}"
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) -> u8 {\\\"}\"}"
+          lo: 2
+          hi: 63
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":74,\\\"hi\\\":75}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":74,\\\"hi\\\":75}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
               mode: Constant
               type_:
                 IntegerType: U32
               span:
-                line_start: 7
-                line_stop: 7
-                col_start: 21
-                col_stop: 22
-                path: ""
-                content: "function x(constant x: u32, y: i32) -> u8 {"
+                lo: 85
+                hi: 86
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":29,\\\"col_stop\\\":30,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(constant x: u32, y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":93,\\\"hi\\\":94}\"}"
               mode: Private
               type_:
                 IntegerType: I32
               span:
-                line_start: 7
-                line_stop: 7
-                col_start: 29
-                col_stop: 30
-                path: ""
-                content: "function x(constant x: u32, y: i32) -> u8 {"
+                lo: 93
+                hi: 94
         output:
           IntegerType: U8
         core_mapping: ~
@@ -110,30 +78,14 @@ outputs:
                       - U8
                       - "0"
                       - span:
-                          line_start: 8
-                          line_stop: 8
-                          col_start: 12
-                          col_stop: 15
-                          path: ""
-                          content: "    return 0u8;"
+                          lo: 120
+                          hi: 123
                 span:
-                  line_start: 8
-                  line_stop: 8
-                  col_start: 5
-                  col_stop: 15
-                  path: ""
-                  content: "    return 0u8;"
+                  lo: 113
+                  hi: 123
           span:
-            line_start: 7
-            line_stop: 9
-            col_start: 43
-            col_stop: 2
-            path: ""
-            content: "function x(constant x: u32, y: i32) -> u8 {\n     ...\n}"
+            lo: 107
+            hi: 126
         span:
-          line_start: 7
-          line_stop: 9
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x(constant x: u32, y: i32) -> u8 {\n     ...\n}"
+          lo: 65
+          hi: 126
diff --git a/tests/expectations/parser/parser/functions/empty2.leo.out b/tests/expectations/parser/parser/functions/empty2.leo.out
index 7146daaa83..65330daead 100644
--- a/tests/expectations/parser/parser/functions/empty2.leo.out
+++ b/tests/expectations/parser/parser/functions/empty2.leo.out
@@ -5,8 +5,8 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x() -> u8 {}\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x() -> u8 {}\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input: []
         output:
           IntegerType: U8
@@ -14,16 +14,8 @@ outputs:
         block:
           statements: []
           span:
-            line_start: 3
-            line_stop: 3
-            col_start: 20
-            col_stop: 22
-            path: ""
-            content: "function x() -> u8 {}"
+            lo: 21
+            hi: 23
         span:
-          line_start: 3
-          line_stop: 3
-          col_start: 1
-          col_stop: 22
-          path: ""
-          content: "function x() -> u8 {}"
+          lo: 2
+          hi: 23
diff --git a/tests/expectations/parser/parser/functions/infinite_recursion.leo.out b/tests/expectations/parser/parser/functions/infinite_recursion.leo.out
index 85d0c4571e..9ebf08be58 100644
--- a/tests/expectations/parser/parser/functions/infinite_recursion.leo.out
+++ b/tests/expectations/parser/parser/functions/infinite_recursion.leo.out
@@ -5,8 +5,8 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"inf\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function inf() -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"inf\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function inf() -> u8 {\\\"}\"}"
+      "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":14}\"}":
+        identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":14}\"}"
         input: []
         output:
           IntegerType: U8
@@ -17,50 +17,30 @@ outputs:
                 expression:
                   Call:
                     function:
-                      Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"line_start\\\":4,\\\"line_stop\\\":4,\\\"col_start\\\":5,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    inf();\\\"}\"}"
+                      Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":29,\\\"hi\\\":32}\"}"
                     arguments: []
                     span:
-                      line_start: 4
-                      line_stop: 4
-                      col_start: 5
-                      col_stop: 10
-                      path: ""
-                      content: "    inf();"
+                      lo: 29
+                      hi: 34
                 span:
-                  line_start: 4
-                  line_stop: 4
-                  col_start: 5
-                  col_stop: 10
-                  path: ""
-                  content: "    inf();"
+                  lo: 29
+                  hi: 34
           span:
-            line_start: 3
-            line_stop: 5
-            col_start: 22
-            col_stop: 2
-            path: ""
-            content: "function inf() -> u8 {\n     ...\n}"
+            lo: 23
+            hi: 37
         span:
-          line_start: 3
-          line_stop: 5
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function inf() -> u8 {\n     ...\n}"
-      "{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}":
-        identifier: "{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}"
+          lo: 2
+          hi: 37
+      "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":48,\\\"hi\\\":52}\"}":
+        identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":48,\\\"hi\\\":52}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":15,\\\"col_stop\\\":16,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main(y: bool) -> bool {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":53,\\\"hi\\\":54}\"}"
               mode: Private
               type_: Boolean
               span:
-                line_start: 7
-                line_stop: 7
-                col_start: 15
-                col_stop: 16
-                path: ""
-                content: "function main(y: bool) -> bool {"
+                lo: 53
+                hi: 54
         output: Boolean
         core_mapping: ~
         block:
@@ -69,43 +49,23 @@ outputs:
                 expression:
                   Call:
                     function:
-                      Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"line_start\\\":8,\\\"line_stop\\\":8,\\\"col_start\\\":5,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    inf();\\\"}\"}"
+                      Identifier: "{\"name\":\"inf\",\"span\":\"{\\\"lo\\\":76,\\\"hi\\\":79}\"}"
                     arguments: []
                     span:
-                      line_start: 8
-                      line_stop: 8
-                      col_start: 5
-                      col_stop: 10
-                      path: ""
-                      content: "    inf();"
+                      lo: 76
+                      hi: 81
                 span:
-                  line_start: 8
-                  line_stop: 8
-                  col_start: 5
-                  col_stop: 10
-                  path: ""
-                  content: "    inf();"
+                  lo: 76
+                  hi: 81
             - Return:
                 expression:
-                  Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"    return y;\\\"}\"}"
+                  Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":94,\\\"hi\\\":95}\"}"
                 span:
-                  line_start: 9
-                  line_stop: 9
-                  col_start: 5
-                  col_stop: 13
-                  path: ""
-                  content: "    return y;"
+                  lo: 87
+                  hi: 95
           span:
-            line_start: 7
-            line_stop: 10
-            col_start: 32
-            col_stop: 2
-            path: ""
-            content: "function main(y: bool) -> bool {\n     ...\n     ...\n}"
+            lo: 70
+            hi: 98
         span:
-          line_start: 7
-          line_stop: 10
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function main(y: bool) -> bool {\n     ...\n     ...\n}"
+          lo: 39
+          hi: 98
diff --git a/tests/expectations/parser/parser/functions/params.leo.out b/tests/expectations/parser/parser/functions/params.leo.out
index ac1d46633e..309388d72a 100644
--- a/tests/expectations/parser/parser/functions/params.leo.out
+++ b/tests/expectations/parser/parser/functions/params.leo.out
@@ -5,33 +5,25 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u8 {\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               mode: Private
               type_:
                 IntegerType: U32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 12
-                col_stop: 13
-                path: ""
-                content: "function x(x: u32, y: i32) -> u8 {"
+                lo: 13
+                hi: 14
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":20,\\\"col_stop\\\":21,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
               mode: Private
               type_:
                 IntegerType: I32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 20
-                col_stop: 21
-                path: ""
-                content: "function x(x: u32, y: i32) -> u8 {"
+                lo: 21
+                hi: 22
         output:
           IntegerType: U8
         core_mapping: ~
@@ -44,30 +36,14 @@ outputs:
                       - U8
                       - "0"
                       - span:
-                          line_start: 4
-                          line_stop: 4
-                          col_start: 12
-                          col_stop: 15
-                          path: ""
-                          content: "    return 0u8;"
+                          lo: 48
+                          hi: 51
                 span:
-                  line_start: 4
-                  line_stop: 4
-                  col_start: 5
-                  col_stop: 15
-                  path: ""
-                  content: "    return 0u8;"
+                  lo: 41
+                  hi: 51
           span:
-            line_start: 3
-            line_stop: 5
-            col_start: 34
-            col_stop: 2
-            path: ""
-            content: "function x(x: u32, y: i32) -> u8 {\n     ...\n}"
+            lo: 35
+            hi: 54
         span:
-          line_start: 3
-          line_stop: 5
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x(x: u32, y: i32) -> u8 {\n     ...\n}"
+          lo: 2
+          hi: 54
diff --git a/tests/expectations/parser/parser/functions/params_return.leo.out b/tests/expectations/parser/parser/functions/params_return.leo.out
index 63e1f7fbdd..050907410c 100644
--- a/tests/expectations/parser/parser/functions/params_return.leo.out
+++ b/tests/expectations/parser/parser/functions/params_return.leo.out
@@ -5,33 +5,25 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u32 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u32 {\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u32 {\\\"}\"}"
+              identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               mode: Private
               type_:
                 IntegerType: U32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 12
-                col_stop: 13
-                path: ""
-                content: "function x(x: u32, y: i32) -> u32 {"
+                lo: 13
+                hi: 14
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":20,\\\"col_stop\\\":21,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, y: i32) -> u32 {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":21,\\\"hi\\\":22}\"}"
               mode: Private
               type_:
                 IntegerType: I32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 20
-                col_stop: 21
-                path: ""
-                content: "function x(x: u32, y: i32) -> u32 {"
+                lo: 21
+                hi: 22
         output:
           IntegerType: U32
         core_mapping: ~
@@ -44,30 +36,14 @@ outputs:
                       - U8
                       - "0"
                       - span:
-                          line_start: 4
-                          line_stop: 4
-                          col_start: 12
-                          col_stop: 15
-                          path: ""
-                          content: "    return 0u8;"
+                          lo: 49
+                          hi: 52
                 span:
-                  line_start: 4
-                  line_stop: 4
-                  col_start: 5
-                  col_stop: 15
-                  path: ""
-                  content: "    return 0u8;"
+                  lo: 42
+                  hi: 52
           span:
-            line_start: 3
-            line_stop: 5
-            col_start: 35
-            col_stop: 2
-            path: ""
-            content: "function x(x: u32, y: i32) -> u32 {\n     ...\n}"
+            lo: 36
+            hi: 55
         span:
-          line_start: 3
-          line_stop: 5
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x(x: u32, y: i32) -> u32 {\n     ...\n}"
+          lo: 2
+          hi: 55
diff --git a/tests/expectations/parser/parser/functions/public_param.leo.out b/tests/expectations/parser/parser/functions/public_param.leo.out
index 425e4f2594..aad817fe07 100644
--- a/tests/expectations/parser/parser/functions/public_param.leo.out
+++ b/tests/expectations/parser/parser/functions/public_param.leo.out
@@ -5,33 +5,25 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, public y: i32) -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, public y: i32) -> u8 {\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":12,\\\"col_stop\\\":13,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, public y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
               mode: Private
               type_:
                 IntegerType: U32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 12
-                col_stop: 13
-                path: ""
-                content: "function x(x: u32, public y: i32) -> u8 {"
+                lo: 13
+                hi: 14
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":27,\\\"col_stop\\\":28,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(x: u32, public y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":28,\\\"hi\\\":29}\"}"
               mode: Public
               type_:
                 IntegerType: I32
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 27
-                col_stop: 28
-                path: ""
-                content: "function x(x: u32, public y: i32) -> u8 {"
+                lo: 28
+                hi: 29
         output:
           IntegerType: U8
         core_mapping: ~
@@ -44,60 +36,36 @@ outputs:
                       - U8
                       - "0"
                       - span:
-                          line_start: 4
-                          line_stop: 4
-                          col_start: 12
-                          col_stop: 15
-                          path: ""
-                          content: "    return 0u8;"
+                          lo: 55
+                          hi: 58
                 span:
-                  line_start: 4
-                  line_stop: 4
-                  col_start: 5
-                  col_stop: 15
-                  path: ""
-                  content: "    return 0u8;"
+                  lo: 48
+                  hi: 58
           span:
-            line_start: 3
-            line_stop: 5
-            col_start: 41
-            col_stop: 2
-            path: ""
-            content: "function x(x: u32, public y: i32) -> u8 {\n     ...\n}"
+            lo: 42
+            hi: 61
         span:
-          line_start: 3
-          line_stop: 5
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x(x: u32, public y: i32) -> u8 {\n     ...\n}"
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(public x: u32, y: i32) -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(public x: u32, y: i32) -> u8 {\\\"}\"}"
+          lo: 2
+          hi: 61
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":72,\\\"hi\\\":73}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":72,\\\"hi\\\":73}\"}"
         input:
           - Variable:
-              identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":19,\\\"col_stop\\\":20,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(public x: u32, y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":81,\\\"hi\\\":82}\"}"
               mode: Public
               type_:
                 IntegerType: U32
               span:
-                line_start: 7
-                line_stop: 7
-                col_start: 19
-                col_stop: 20
-                path: ""
-                content: "function x(public x: u32, y: i32) -> u8 {"
+                lo: 81
+                hi: 82
           - Variable:
-              identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":27,\\\"col_stop\\\":28,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x(public x: u32, y: i32) -> u8 {\\\"}\"}"
+              identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":89,\\\"hi\\\":90}\"}"
               mode: Private
               type_:
                 IntegerType: I32
               span:
-                line_start: 7
-                line_stop: 7
-                col_start: 27
-                col_stop: 28
-                path: ""
-                content: "function x(public x: u32, y: i32) -> u8 {"
+                lo: 89
+                hi: 90
         output:
           IntegerType: U8
         core_mapping: ~
@@ -110,30 +78,14 @@ outputs:
                       - U8
                       - "0"
                       - span:
-                          line_start: 8
-                          line_stop: 8
-                          col_start: 12
-                          col_stop: 15
-                          path: ""
-                          content: "    return 0u8;"
+                          lo: 116
+                          hi: 119
                 span:
-                  line_start: 8
-                  line_stop: 8
-                  col_start: 5
-                  col_stop: 15
-                  path: ""
-                  content: "    return 0u8;"
+                  lo: 109
+                  hi: 119
           span:
-            line_start: 7
-            line_stop: 9
-            col_start: 41
-            col_stop: 2
-            path: ""
-            content: "function x(public x: u32, y: i32) -> u8 {\n     ...\n}"
+            lo: 103
+            hi: 122
         span:
-          line_start: 7
-          line_stop: 9
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x(public x: u32, y: i32) -> u8 {\n     ...\n}"
+          lo: 63
+          hi: 122
diff --git a/tests/expectations/parser/parser/functions/return.leo.out b/tests/expectations/parser/parser/functions/return.leo.out
index 8fd3f027c2..09f6e6d115 100644
--- a/tests/expectations/parser/parser/functions/return.leo.out
+++ b/tests/expectations/parser/parser/functions/return.leo.out
@@ -5,8 +5,8 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x() -> u32 {\\\"}\"}":
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function x() -> u32 {\\\"}\"}"
+      "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}":
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":12}\"}"
         input: []
         output:
           IntegerType: U32
@@ -20,30 +20,14 @@ outputs:
                       - U8
                       - "0"
                       - span:
-                          line_start: 4
-                          line_stop: 4
-                          col_start: 12
-                          col_stop: 15
-                          path: ""
-                          content: "    return 0u8;"
+                          lo: 35
+                          hi: 38
                 span:
-                  line_start: 4
-                  line_stop: 4
-                  col_start: 5
-                  col_stop: 15
-                  path: ""
-                  content: "    return 0u8;"
+                  lo: 28
+                  hi: 38
           span:
-            line_start: 3
-            line_stop: 5
-            col_start: 21
-            col_stop: 2
-            path: ""
-            content: "function x() -> u32 {\n     ...\n}"
+            lo: 22
+            hi: 41
         span:
-          line_start: 3
-          line_stop: 5
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: "function x() -> u32 {\n     ...\n}"
+          lo: 2
+          hi: 41
diff --git a/tests/expectations/parser/parser/inputs/input_const.leo.out b/tests/expectations/parser/parser/inputs/input_const.leo.out
index 724f69e2ec..1a0a4d6a30 100644
--- a/tests/expectations/parser/parser/inputs/input_const.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_const.leo.out
@@ -7,72 +7,48 @@ outputs:
         definitions:
           - mode: Constant
             type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":4,\\\"line_stop\\\":4,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const a: bool  = true;\\\"}\"}"
+            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
             value:
               Value:
                 Boolean:
                   - "true"
                   - span:
-                      line_start: 4
-                      line_stop: 4
-                      col_start: 18
-                      col_stop: 22
-                      path: ""
-                      content: "const a: bool  = true;"
+                      lo: 26
+                      hi: 30
             span:
-              line_start: 4
-              line_stop: 4
-              col_start: 10
-              col_stop: 14
-              path: ""
-              content: "const a: bool  = true;"
+              lo: 18
+              hi: 22
           - mode: Constant
             type_:
               IntegerType: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const b: u8    = 2u8;\\\"}\"}"
+            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":38,\\\"hi\\\":39}\"}"
             value:
               Value:
                 Integer:
                   - U8
                   - "2"
                   - span:
-                      line_start: 5
-                      line_stop: 5
-                      col_start: 18
-                      col_stop: 21
-                      path: ""
-                      content: "const b: u8    = 2u8;"
+                      lo: 49
+                      hi: 52
             span:
-              line_start: 5
-              line_stop: 5
-              col_start: 10
-              col_stop: 12
-              path: ""
-              content: "const b: u8    = 2u8;"
+              lo: 41
+              hi: 43
           - mode: Constant
             type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"line_start\\\":6,\\\"line_stop\\\":6,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const c: field = 0field;\\\"}\"}"
+            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":60,\\\"hi\\\":61}\"}"
             value:
               Value:
                 Field:
                   - "0"
                   - span:
-                      line_start: 6
-                      line_stop: 6
-                      col_start: 18
-                      col_stop: 24
-                      path: ""
-                      content: "const c: field = 0field;"
+                      lo: 71
+                      hi: 77
             span:
-              line_start: 6
-              line_stop: 6
-              col_start: 10
-              col_stop: 15
-              path: ""
-              content: "const c: field = 0field;"
+              lo: 63
+              hi: 68
           - mode: Constant
             type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const d: group = (0, 1)group;\\\"}\"}"
+            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":85,\\\"hi\\\":86}\"}"
             value:
               Value:
                 Group:
@@ -81,61 +57,37 @@ outputs:
                       Number:
                         - "0"
                         - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 19
-                            col_stop: 20
-                            path: ""
-                            content: "const d: group = (0, 1)group;"
+                            lo: 97
+                            hi: 98
                     y:
                       Number:
                         - "1"
                         - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 22
-                            col_stop: 23
-                            path: ""
-                            content: "const d: group = (0, 1)group;"
+                            lo: 100
+                            hi: 101
                     span:
-                      line_start: 7
-                      line_stop: 7
-                      col_start: 18
-                      col_stop: 29
-                      path: ""
-                      content: "const d: group = (0, 1)group;"
+                      lo: 96
+                      hi: 107
             span:
-              line_start: 7
-              line_stop: 7
-              col_start: 10
-              col_stop: 15
-              path: ""
-              content: "const d: group = (0, 1)group;"
+              lo: 88
+              hi: 93
           - mode: Constant
             type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"line_start\\\":8,\\\"line_stop\\\":8,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
+            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":115,\\\"hi\\\":116}\"}"
             value:
               Value:
                 Address:
                   - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
                   - span:
-                      line_start: 8
-                      line_stop: 8
-                      col_start: 20
-                      col_stop: 83
-                      path: ""
-                      content: "const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+                      lo: 128
+                      hi: 191
             span:
-              line_start: 8
-              line_stop: 8
-              col_start: 10
-              col_stop: 17
-              path: ""
-              content: "const e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+              lo: 118
+              hi: 125
           - mode: Constant
             type_:
               IntegerType: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const f: i8    = -2i8;\\\"}\"}"
+            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":199,\\\"hi\\\":200}\"}"
             value:
               Unary:
                 inner:
@@ -144,104 +96,64 @@ outputs:
                       - I8
                       - "2"
                       - span:
-                          line_start: 9
-                          line_stop: 9
-                          col_start: 19
-                          col_stop: 22
-                          path: ""
-                          content: "const f: i8    = -2i8;"
+                          lo: 211
+                          hi: 214
                 op: Negate
                 span:
-                  line_start: 9
-                  line_stop: 9
-                  col_start: 18
-                  col_stop: 22
-                  path: ""
-                  content: "const f: i8    = -2i8;"
+                  lo: 210
+                  hi: 214
             span:
-              line_start: 9
-              line_stop: 9
-              col_start: 10
-              col_stop: 12
-              path: ""
-              content: "const f: i8    = -2i8;"
+              lo: 202
+              hi: 204
         span:
-          line_start: 3
-          line_stop: 3
-          col_start: 2
-          col_stop: 6
-          path: ""
-          content: "[main]"
+          lo: 3
+          hi: 7
       - name: registers
         definitions:
           - mode: Private
             type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"line_start\\\":12,\\\"line_stop\\\":12,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r0: bool  = true;\\\"}\"}"
+            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":229,\\\"hi\\\":231}\"}"
             value:
               Value:
                 Boolean:
                   - "true"
                   - span:
-                      line_start: 12
-                      line_stop: 12
-                      col_start: 13
-                      col_stop: 17
-                      path: ""
-                      content: "r0: bool  = true;"
+                      lo: 241
+                      hi: 245
             span:
-              line_start: 12
-              line_stop: 12
-              col_start: 5
-              col_stop: 9
-              path: ""
-              content: "r0: bool  = true;"
+              lo: 233
+              hi: 237
           - mode: Private
             type_:
               IntegerType: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"line_start\\\":13,\\\"line_stop\\\":13,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r1: u8    = 2u8;\\\"}\"}"
+            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":247,\\\"hi\\\":249}\"}"
             value:
               Value:
                 Integer:
                   - U8
                   - "2"
                   - span:
-                      line_start: 13
-                      line_stop: 13
-                      col_start: 13
-                      col_stop: 16
-                      path: ""
-                      content: "r1: u8    = 2u8;"
+                      lo: 259
+                      hi: 262
             span:
-              line_start: 13
-              line_stop: 13
-              col_start: 5
-              col_stop: 7
-              path: ""
-              content: "r1: u8    = 2u8;"
+              lo: 251
+              hi: 253
           - mode: Private
             type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"line_start\\\":14,\\\"line_stop\\\":14,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r2: field = 0field;\\\"}\"}"
+            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":264,\\\"hi\\\":266}\"}"
             value:
               Value:
                 Field:
                   - "0"
                   - span:
-                      line_start: 14
-                      line_stop: 14
-                      col_start: 13
-                      col_stop: 19
-                      path: ""
-                      content: "r2: field = 0field;"
+                      lo: 276
+                      hi: 282
             span:
-              line_start: 14
-              line_stop: 14
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r2: field = 0field;"
+              lo: 268
+              hi: 273
           - mode: Private
             type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"line_start\\\":15,\\\"line_stop\\\":15,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r3: group = (0, 1)group;\\\"}\"}"
+            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":284,\\\"hi\\\":286}\"}"
             value:
               Value:
                 Group:
@@ -250,61 +162,37 @@ outputs:
                       Number:
                         - "0"
                         - span:
-                            line_start: 15
-                            line_stop: 15
-                            col_start: 14
-                            col_stop: 15
-                            path: ""
-                            content: "r3: group = (0, 1)group;"
+                            lo: 297
+                            hi: 298
                     y:
                       Number:
                         - "1"
                         - span:
-                            line_start: 15
-                            line_stop: 15
-                            col_start: 17
-                            col_stop: 18
-                            path: ""
-                            content: "r3: group = (0, 1)group;"
+                            lo: 300
+                            hi: 301
                     span:
-                      line_start: 15
-                      line_stop: 15
-                      col_start: 13
-                      col_stop: 24
-                      path: ""
-                      content: "r3: group = (0, 1)group;"
+                      lo: 296
+                      hi: 307
             span:
-              line_start: 15
-              line_stop: 15
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r3: group = (0, 1)group;"
+              lo: 288
+              hi: 293
           - mode: Private
             type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":16,\\\"line_stop\\\":16,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
+            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":309,\\\"hi\\\":311}\"}"
             value:
               Value:
                 Address:
                   - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
                   - span:
-                      line_start: 16
-                      line_stop: 16
-                      col_start: 15
-                      col_stop: 78
-                      path: ""
-                      content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+                      lo: 323
+                      hi: 386
             span:
-              line_start: 16
-              line_stop: 16
-              col_start: 5
-              col_stop: 12
-              path: ""
-              content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+              lo: 313
+              hi: 320
           - mode: Private
             type_:
               IntegerType: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":17,\\\"line_stop\\\":17,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: i8 = -1i8;\\\"}\"}"
+            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":388,\\\"hi\\\":390}\"}"
             value:
               Unary:
                 inner:
@@ -313,31 +201,15 @@ outputs:
                       - I8
                       - "1"
                       - span:
-                          line_start: 17
-                          line_stop: 17
-                          col_start: 11
-                          col_stop: 14
-                          path: ""
-                          content: "r4: i8 = -1i8;"
+                          lo: 398
+                          hi: 401
                 op: Negate
                 span:
-                  line_start: 17
-                  line_stop: 17
-                  col_start: 10
-                  col_stop: 14
-                  path: ""
-                  content: "r4: i8 = -1i8;"
+                  lo: 397
+                  hi: 401
             span:
-              line_start: 17
-              line_stop: 17
-              col_start: 5
-              col_stop: 7
-              path: ""
-              content: "r4: i8 = -1i8;"
+              lo: 392
+              hi: 394
         span:
-          line_start: 11
-          line_stop: 11
-          col_start: 2
-          col_stop: 11
-          path: ""
-          content: "[registers]"
+          lo: 218
+          hi: 227
diff --git a/tests/expectations/parser/parser/inputs/input_constant.leo.out b/tests/expectations/parser/parser/inputs/input_constant.leo.out
index 14bf25cf8a..08a7c22410 100644
--- a/tests/expectations/parser/parser/inputs/input_constant.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_constant.leo.out
@@ -7,72 +7,48 @@ outputs:
         definitions:
           - mode: Constant
             type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":4,\\\"line_stop\\\":4,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant a: bool  = true;\\\"}\"}"
+            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
             value:
               Value:
                 Boolean:
                   - "true"
                   - span:
-                      line_start: 4
-                      line_stop: 4
-                      col_start: 21
-                      col_stop: 25
-                      path: ""
-                      content: "constant a: bool  = true;"
+                      lo: 29
+                      hi: 33
             span:
-              line_start: 4
-              line_stop: 4
-              col_start: 13
-              col_stop: 17
-              path: ""
-              content: "constant a: bool  = true;"
+              lo: 21
+              hi: 25
           - mode: Constant
             type_:
               IntegerType: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant b: u8    = 2u8;\\\"}\"}"
+            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":44,\\\"hi\\\":45}\"}"
             value:
               Value:
                 Integer:
                   - U8
                   - "2"
                   - span:
-                      line_start: 5
-                      line_stop: 5
-                      col_start: 21
-                      col_stop: 24
-                      path: ""
-                      content: "constant b: u8    = 2u8;"
+                      lo: 55
+                      hi: 58
             span:
-              line_start: 5
-              line_stop: 5
-              col_start: 13
-              col_stop: 15
-              path: ""
-              content: "constant b: u8    = 2u8;"
+              lo: 47
+              hi: 49
           - mode: Constant
             type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"line_start\\\":6,\\\"line_stop\\\":6,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant c: field = 0field;\\\"}\"}"
+            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":69,\\\"hi\\\":70}\"}"
             value:
               Value:
                 Field:
                   - "0"
                   - span:
-                      line_start: 6
-                      line_stop: 6
-                      col_start: 21
-                      col_stop: 27
-                      path: ""
-                      content: "constant c: field = 0field;"
+                      lo: 80
+                      hi: 86
             span:
-              line_start: 6
-              line_stop: 6
-              col_start: 13
-              col_stop: 18
-              path: ""
-              content: "constant c: field = 0field;"
+              lo: 72
+              hi: 77
           - mode: Constant
             type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant d: group = (0, 1)group;\\\"}\"}"
+            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":97,\\\"hi\\\":98}\"}"
             value:
               Value:
                 Group:
@@ -81,61 +57,37 @@ outputs:
                       Number:
                         - "0"
                         - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 22
-                            col_stop: 23
-                            path: ""
-                            content: "constant d: group = (0, 1)group;"
+                            lo: 109
+                            hi: 110
                     y:
                       Number:
                         - "1"
                         - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 25
-                            col_stop: 26
-                            path: ""
-                            content: "constant d: group = (0, 1)group;"
+                            lo: 112
+                            hi: 113
                     span:
-                      line_start: 7
-                      line_stop: 7
-                      col_start: 21
-                      col_stop: 32
-                      path: ""
-                      content: "constant d: group = (0, 1)group;"
+                      lo: 108
+                      hi: 119
             span:
-              line_start: 7
-              line_stop: 7
-              col_start: 13
-              col_stop: 18
-              path: ""
-              content: "constant d: group = (0, 1)group;"
+              lo: 100
+              hi: 105
           - mode: Constant
             type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"line_start\\\":8,\\\"line_stop\\\":8,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
+            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":130,\\\"hi\\\":131}\"}"
             value:
               Value:
                 Address:
                   - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
                   - span:
-                      line_start: 8
-                      line_stop: 8
-                      col_start: 23
-                      col_stop: 86
-                      path: ""
-                      content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+                      lo: 143
+                      hi: 206
             span:
-              line_start: 8
-              line_stop: 8
-              col_start: 13
-              col_stop: 20
-              path: ""
-              content: "constant e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+              lo: 133
+              hi: 140
           - mode: Constant
             type_:
               IntegerType: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"constant f: i8    = -2i8;\\\"}\"}"
+            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":217,\\\"hi\\\":218}\"}"
             value:
               Unary:
                 inner:
@@ -144,104 +96,64 @@ outputs:
                       - I8
                       - "2"
                       - span:
-                          line_start: 9
-                          line_stop: 9
-                          col_start: 22
-                          col_stop: 25
-                          path: ""
-                          content: "constant f: i8    = -2i8;"
+                          lo: 229
+                          hi: 232
                 op: Negate
                 span:
-                  line_start: 9
-                  line_stop: 9
-                  col_start: 21
-                  col_stop: 25
-                  path: ""
-                  content: "constant f: i8    = -2i8;"
+                  lo: 228
+                  hi: 232
             span:
-              line_start: 9
-              line_stop: 9
-              col_start: 13
-              col_stop: 15
-              path: ""
-              content: "constant f: i8    = -2i8;"
+              lo: 220
+              hi: 222
         span:
-          line_start: 3
-          line_stop: 3
-          col_start: 2
-          col_stop: 6
-          path: ""
-          content: "[main]"
+          lo: 3
+          hi: 7
       - name: registers
         definitions:
           - mode: Private
             type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"line_start\\\":12,\\\"line_stop\\\":12,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r0: bool  = true;\\\"}\"}"
+            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":247,\\\"hi\\\":249}\"}"
             value:
               Value:
                 Boolean:
                   - "true"
                   - span:
-                      line_start: 12
-                      line_stop: 12
-                      col_start: 13
-                      col_stop: 17
-                      path: ""
-                      content: "r0: bool  = true;"
+                      lo: 259
+                      hi: 263
             span:
-              line_start: 12
-              line_stop: 12
-              col_start: 5
-              col_stop: 9
-              path: ""
-              content: "r0: bool  = true;"
+              lo: 251
+              hi: 255
           - mode: Private
             type_:
               IntegerType: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"line_start\\\":13,\\\"line_stop\\\":13,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r1: u8    = 2u8;\\\"}\"}"
+            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":265,\\\"hi\\\":267}\"}"
             value:
               Value:
                 Integer:
                   - U8
                   - "2"
                   - span:
-                      line_start: 13
-                      line_stop: 13
-                      col_start: 13
-                      col_stop: 16
-                      path: ""
-                      content: "r1: u8    = 2u8;"
+                      lo: 277
+                      hi: 280
             span:
-              line_start: 13
-              line_stop: 13
-              col_start: 5
-              col_stop: 7
-              path: ""
-              content: "r1: u8    = 2u8;"
+              lo: 269
+              hi: 271
           - mode: Private
             type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"line_start\\\":14,\\\"line_stop\\\":14,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r2: field = 0field;\\\"}\"}"
+            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":282,\\\"hi\\\":284}\"}"
             value:
               Value:
                 Field:
                   - "0"
                   - span:
-                      line_start: 14
-                      line_stop: 14
-                      col_start: 13
-                      col_stop: 19
-                      path: ""
-                      content: "r2: field = 0field;"
+                      lo: 294
+                      hi: 300
             span:
-              line_start: 14
-              line_stop: 14
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r2: field = 0field;"
+              lo: 286
+              hi: 291
           - mode: Private
             type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"line_start\\\":15,\\\"line_stop\\\":15,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r3: group = (0, 1)group;\\\"}\"}"
+            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
             value:
               Value:
                 Group:
@@ -250,61 +162,37 @@ outputs:
                       Number:
                         - "0"
                         - span:
-                            line_start: 15
-                            line_stop: 15
-                            col_start: 14
-                            col_stop: 15
-                            path: ""
-                            content: "r3: group = (0, 1)group;"
+                            lo: 315
+                            hi: 316
                     y:
                       Number:
                         - "1"
                         - span:
-                            line_start: 15
-                            line_stop: 15
-                            col_start: 17
-                            col_stop: 18
-                            path: ""
-                            content: "r3: group = (0, 1)group;"
+                            lo: 318
+                            hi: 319
                     span:
-                      line_start: 15
-                      line_stop: 15
-                      col_start: 13
-                      col_stop: 24
-                      path: ""
-                      content: "r3: group = (0, 1)group;"
+                      lo: 314
+                      hi: 325
             span:
-              line_start: 15
-              line_stop: 15
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r3: group = (0, 1)group;"
+              lo: 306
+              hi: 311
           - mode: Private
             type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":16,\\\"line_stop\\\":16,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
+            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":327,\\\"hi\\\":329}\"}"
             value:
               Value:
                 Address:
                   - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
                   - span:
-                      line_start: 16
-                      line_stop: 16
-                      col_start: 15
-                      col_stop: 78
-                      path: ""
-                      content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+                      lo: 341
+                      hi: 404
             span:
-              line_start: 16
-              line_stop: 16
-              col_start: 5
-              col_stop: 12
-              path: ""
-              content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+              lo: 331
+              hi: 338
           - mode: Private
             type_:
               IntegerType: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":17,\\\"line_stop\\\":17,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: i8 = -1i8;\\\"}\"}"
+            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":406,\\\"hi\\\":408}\"}"
             value:
               Unary:
                 inner:
@@ -313,31 +201,15 @@ outputs:
                       - I8
                       - "1"
                       - span:
-                          line_start: 17
-                          line_stop: 17
-                          col_start: 11
-                          col_stop: 14
-                          path: ""
-                          content: "r4: i8 = -1i8;"
+                          lo: 416
+                          hi: 419
                 op: Negate
                 span:
-                  line_start: 17
-                  line_stop: 17
-                  col_start: 10
-                  col_stop: 14
-                  path: ""
-                  content: "r4: i8 = -1i8;"
+                  lo: 415
+                  hi: 419
             span:
-              line_start: 17
-              line_stop: 17
-              col_start: 5
-              col_stop: 7
-              path: ""
-              content: "r4: i8 = -1i8;"
+              lo: 410
+              hi: 412
         span:
-          line_start: 11
-          line_stop: 11
-          col_start: 2
-          col_stop: 11
-          path: ""
-          content: "[registers]"
+          lo: 236
+          hi: 245
diff --git a/tests/expectations/parser/parser/inputs/input_public.leo.out b/tests/expectations/parser/parser/inputs/input_public.leo.out
index bc227b0b1c..15c2a521a1 100644
--- a/tests/expectations/parser/parser/inputs/input_public.leo.out
+++ b/tests/expectations/parser/parser/inputs/input_public.leo.out
@@ -7,72 +7,48 @@ outputs:
         definitions:
           - mode: Public
             type_: Boolean
-            name: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":4,\\\"line_stop\\\":4,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"public a: bool  = true;                 \\\"}\"}"
+            name: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
             value:
               Value:
                 Boolean:
                   - "true"
                   - span:
-                      line_start: 4
-                      line_stop: 4
-                      col_start: 19
-                      col_stop: 23
-                      path: ""
-                      content: "public a: bool  = true;                 "
+                      lo: 27
+                      hi: 31
             span:
-              line_start: 4
-              line_stop: 4
-              col_start: 11
-              col_stop: 15
-              path: ""
-              content: "public a: bool  = true;                 "
+              lo: 19
+              hi: 23
           - mode: Public
             type_:
               IntegerType: U8
-            name: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":5,\\\"line_stop\\\":5,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"public b: u8    = 2u8;                    \\\"}\"}"
+            name: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":57,\\\"hi\\\":58}\"}"
             value:
               Value:
                 Integer:
                   - U8
                   - "2"
                   - span:
-                      line_start: 5
-                      line_stop: 5
-                      col_start: 19
-                      col_stop: 22
-                      path: ""
-                      content: "public b: u8    = 2u8;                    "
+                      lo: 68
+                      hi: 71
             span:
-              line_start: 5
-              line_stop: 5
-              col_start: 11
-              col_stop: 13
-              path: ""
-              content: "public b: u8    = 2u8;                    "
+              lo: 60
+              hi: 62
           - mode: Public
             type_: Field
-            name: "{\"name\":\"c\",\"span\":\"{\\\"line_start\\\":6,\\\"line_stop\\\":6,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"public c: field = 0field;                    \\\"}\"}"
+            name: "{\"name\":\"c\",\"span\":\"{\\\"lo\\\":100,\\\"hi\\\":101}\"}"
             value:
               Value:
                 Field:
                   - "0"
                   - span:
-                      line_start: 6
-                      line_stop: 6
-                      col_start: 19
-                      col_stop: 25
-                      path: ""
-                      content: "public c: field = 0field;                    "
+                      lo: 111
+                      hi: 117
             span:
-              line_start: 6
-              line_stop: 6
-              col_start: 11
-              col_stop: 16
-              path: ""
-              content: "public c: field = 0field;                    "
+              lo: 103
+              hi: 108
           - mode: Public
             type_: Group
-            name: "{\"name\":\"d\",\"span\":\"{\\\"line_start\\\":7,\\\"line_stop\\\":7,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"public d: group = (0, 1)group;          \\\"}\"}"
+            name: "{\"name\":\"d\",\"span\":\"{\\\"lo\\\":146,\\\"hi\\\":147}\"}"
             value:
               Value:
                 Group:
@@ -81,61 +57,37 @@ outputs:
                       Number:
                         - "0"
                         - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 20
-                            col_stop: 21
-                            path: ""
-                            content: "public d: group = (0, 1)group;          "
+                            lo: 158
+                            hi: 159
                     y:
                       Number:
                         - "1"
                         - span:
-                            line_start: 7
-                            line_stop: 7
-                            col_start: 23
-                            col_stop: 24
-                            path: ""
-                            content: "public d: group = (0, 1)group;          "
+                            lo: 161
+                            hi: 162
                     span:
-                      line_start: 7
-                      line_stop: 7
-                      col_start: 19
-                      col_stop: 30
-                      path: ""
-                      content: "public d: group = (0, 1)group;          "
+                      lo: 157
+                      hi: 168
             span:
-              line_start: 7
-              line_stop: 7
-              col_start: 11
-              col_stop: 16
-              path: ""
-              content: "public d: group = (0, 1)group;          "
+              lo: 149
+              hi: 154
           - mode: Public
             type_: Address
-            name: "{\"name\":\"e\",\"span\":\"{\\\"line_start\\\":8,\\\"line_stop\\\":8,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"public e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
+            name: "{\"name\":\"e\",\"span\":\"{\\\"lo\\\":187,\\\"hi\\\":188}\"}"
             value:
               Value:
                 Address:
                   - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
                   - span:
-                      line_start: 8
-                      line_stop: 8
-                      col_start: 21
-                      col_stop: 84
-                      path: ""
-                      content: "public e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+                      lo: 200
+                      hi: 263
             span:
-              line_start: 8
-              line_stop: 8
-              col_start: 11
-              col_stop: 18
-              path: ""
-              content: "public e: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+              lo: 190
+              hi: 197
           - mode: Public
             type_:
               IntegerType: I8
-            name: "{\"name\":\"f\",\"span\":\"{\\\"line_start\\\":9,\\\"line_stop\\\":9,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"public f: i8    = -2i8;\\\"}\"}"
+            name: "{\"name\":\"f\",\"span\":\"{\\\"lo\\\":272,\\\"hi\\\":273}\"}"
             value:
               Unary:
                 inner:
@@ -144,104 +96,64 @@ outputs:
                       - I8
                       - "2"
                       - span:
-                          line_start: 9
-                          line_stop: 9
-                          col_start: 20
-                          col_stop: 23
-                          path: ""
-                          content: "public f: i8    = -2i8;"
+                          lo: 284
+                          hi: 287
                 op: Negate
                 span:
-                  line_start: 9
-                  line_stop: 9
-                  col_start: 19
-                  col_stop: 23
-                  path: ""
-                  content: "public f: i8    = -2i8;"
+                  lo: 283
+                  hi: 287
             span:
-              line_start: 9
-              line_stop: 9
-              col_start: 11
-              col_stop: 13
-              path: ""
-              content: "public f: i8    = -2i8;"
+              lo: 275
+              hi: 277
         span:
-          line_start: 3
-          line_stop: 3
-          col_start: 2
-          col_stop: 6
-          path: ""
-          content: "[main]"
+          lo: 3
+          hi: 7
       - name: registers
         definitions:
           - mode: Private
             type_: Boolean
-            name: "{\"name\":\"r0\",\"span\":\"{\\\"line_start\\\":12,\\\"line_stop\\\":12,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r0: bool  = true;                 \\\"}\"}"
+            name: "{\"name\":\"r0\",\"span\":\"{\\\"lo\\\":302,\\\"hi\\\":304}\"}"
             value:
               Value:
                 Boolean:
                   - "true"
                   - span:
-                      line_start: 12
-                      line_stop: 12
-                      col_start: 13
-                      col_stop: 17
-                      path: ""
-                      content: "r0: bool  = true;                 "
+                      lo: 314
+                      hi: 318
             span:
-              line_start: 12
-              line_stop: 12
-              col_start: 5
-              col_stop: 9
-              path: ""
-              content: "r0: bool  = true;                 "
+              lo: 306
+              hi: 310
           - mode: Private
             type_:
               IntegerType: U8
-            name: "{\"name\":\"r1\",\"span\":\"{\\\"line_start\\\":13,\\\"line_stop\\\":13,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r1: u8    = 2u8;                    \\\"}\"}"
+            name: "{\"name\":\"r1\",\"span\":\"{\\\"lo\\\":337,\\\"hi\\\":339}\"}"
             value:
               Value:
                 Integer:
                   - U8
                   - "2"
                   - span:
-                      line_start: 13
-                      line_stop: 13
-                      col_start: 13
-                      col_stop: 16
-                      path: ""
-                      content: "r1: u8    = 2u8;                    "
+                      lo: 349
+                      hi: 352
             span:
-              line_start: 13
-              line_stop: 13
-              col_start: 5
-              col_stop: 7
-              path: ""
-              content: "r1: u8    = 2u8;                    "
+              lo: 341
+              hi: 343
           - mode: Private
             type_: Field
-            name: "{\"name\":\"r2\",\"span\":\"{\\\"line_start\\\":14,\\\"line_stop\\\":14,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r2: field = 0field;                    \\\"}\"}"
+            name: "{\"name\":\"r2\",\"span\":\"{\\\"lo\\\":374,\\\"hi\\\":376}\"}"
             value:
               Value:
                 Field:
                   - "0"
                   - span:
-                      line_start: 14
-                      line_stop: 14
-                      col_start: 13
-                      col_stop: 19
-                      path: ""
-                      content: "r2: field = 0field;                    "
+                      lo: 386
+                      hi: 392
             span:
-              line_start: 14
-              line_stop: 14
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r2: field = 0field;                    "
+              lo: 378
+              hi: 383
           - mode: Private
             type_: Group
-            name: "{\"name\":\"r3\",\"span\":\"{\\\"line_start\\\":15,\\\"line_stop\\\":15,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r3: group = (0, 1)group;          \\\"}\"}"
+            name: "{\"name\":\"r3\",\"span\":\"{\\\"lo\\\":414,\\\"hi\\\":416}\"}"
             value:
               Value:
                 Group:
@@ -250,61 +162,37 @@ outputs:
                       Number:
                         - "0"
                         - span:
-                            line_start: 15
-                            line_stop: 15
-                            col_start: 14
-                            col_stop: 15
-                            path: ""
-                            content: "r3: group = (0, 1)group;          "
+                            lo: 427
+                            hi: 428
                     y:
                       Number:
                         - "1"
                         - span:
-                            line_start: 15
-                            line_stop: 15
-                            col_start: 17
-                            col_stop: 18
-                            path: ""
-                            content: "r3: group = (0, 1)group;          "
+                            lo: 430
+                            hi: 431
                     span:
-                      line_start: 15
-                      line_stop: 15
-                      col_start: 13
-                      col_stop: 24
-                      path: ""
-                      content: "r3: group = (0, 1)group;          "
+                      lo: 426
+                      hi: 437
             span:
-              line_start: 15
-              line_stop: 15
-              col_start: 5
-              col_stop: 10
-              path: ""
-              content: "r3: group = (0, 1)group;          "
+              lo: 418
+              hi: 423
           - mode: Private
             type_: Address
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":16,\\\"line_stop\\\":16,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;\\\"}\"}"
+            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":449,\\\"hi\\\":451}\"}"
             value:
               Value:
                 Address:
                   - aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8
                   - span:
-                      line_start: 16
-                      line_stop: 16
-                      col_start: 15
-                      col_stop: 78
-                      path: ""
-                      content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+                      lo: 463
+                      hi: 526
             span:
-              line_start: 16
-              line_stop: 16
-              col_start: 5
-              col_stop: 12
-              path: ""
-              content: "r4: address = aleo1qnr4dkkvkgfqph0vzc3y6z2eu975wnpz2925ntjccd5cfqxtyu8sta57j8;"
+              lo: 453
+              hi: 460
           - mode: Private
             type_:
               IntegerType: I8
-            name: "{\"name\":\"r4\",\"span\":\"{\\\"line_start\\\":17,\\\"line_stop\\\":17,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"r4: i8 = -1i8;\\\"}\"}"
+            name: "{\"name\":\"r4\",\"span\":\"{\\\"lo\\\":528,\\\"hi\\\":530}\"}"
             value:
               Unary:
                 inner:
@@ -313,31 +201,15 @@ outputs:
                       - I8
                       - "1"
                       - span:
-                          line_start: 17
-                          line_stop: 17
-                          col_start: 11
-                          col_stop: 14
-                          path: ""
-                          content: "r4: i8 = -1i8;"
+                          lo: 538
+                          hi: 541
                 op: Negate
                 span:
-                  line_start: 17
-                  line_stop: 17
-                  col_start: 10
-                  col_stop: 14
-                  path: ""
-                  content: "r4: i8 = -1i8;"
+                  lo: 537
+                  hi: 541
             span:
-              line_start: 17
-              line_stop: 17
-              col_start: 5
-              col_stop: 7
-              path: ""
-              content: "r4: i8 = -1i8;"
+              lo: 532
+              hi: 534
         span:
-          line_start: 11
-          line_stop: 11
-          col_start: 2
-          col_stop: 11
-          path: ""
-          content: "[registers]"
+          lo: 291
+          hi: 300
diff --git a/tests/expectations/parser/parser/serialize/one_plus_one.leo.out b/tests/expectations/parser/parser/serialize/one_plus_one.leo.out
index a03a921c9c..de36e29c29 100644
--- a/tests/expectations/parser/parser/serialize/one_plus_one.leo.out
+++ b/tests/expectations/parser/parser/serialize/one_plus_one.leo.out
@@ -5,8 +5,8 @@ outputs:
   - name: ""
     expected_input: []
     functions:
-      "{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main() -> u8 {\\\"}\"}":
-        identifier: "{\"name\":\"main\",\"span\":\"{\\\"line_start\\\":3,\\\"line_stop\\\":3,\\\"col_start\\\":10,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"function main() -> u8 {\\\"}\"}"
+      "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":15}\"}":
+        identifier: "{\"name\":\"main\",\"span\":\"{\\\"lo\\\":11,\\\"hi\\\":15}\"}"
         input: []
         output:
           IntegerType: U8
diff --git a/tests/expectations/parser/parser/statement/assign.leo.out b/tests/expectations/parser/parser/statement/assign.leo.out
index b87db92545..57fe826df0 100644
--- a/tests/expectations/parser/parser/statement/assign.leo.out
+++ b/tests/expectations/parser/parser/statement/assign.leo.out
@@ -5,85 +5,53 @@ outputs:
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x = expr;\\\"}\"}"
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: x = expr;
+          lo: 0
+          hi: 1
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x = expr;\\\"}\"}"
+        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":8}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 9
-        path: ""
-        content: x = expr;
+        lo: 0
+        hi: 8
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x = x+y;\\\"}\"}"
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: x = x+y;
+          lo: 0
+          hi: 1
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 8
-            path: ""
-            content: x = x+y;
+            lo: 4
+            hi: 7
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: x = x+y;
+        lo: 0
+        hi: 7
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x = x();\\\"}\"}"
+        identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 2
-          path: ""
-          content: x = x();
+          lo: 0
+          hi: 1
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x = x();\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 8
-            path: ""
-            content: x = x();
+            lo: 4
+            hi: 7
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: x = x();
+        lo: 0
+        hi: 7
diff --git a/tests/expectations/parser/parser/statement/block.leo.out b/tests/expectations/parser/parser/statement/block.leo.out
index c469fbdf47..9f8a28a964 100644
--- a/tests/expectations/parser/parser/statement/block.leo.out
+++ b/tests/expectations/parser/parser/statement/block.leo.out
@@ -5,12 +5,8 @@ outputs:
   - Block:
       statements: []
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 3
-        path: ""
-        content: "{}"
+        lo: 0
+        hi: 2
   - Block:
       statements:
         - Return:
@@ -20,44 +16,24 @@ outputs:
                   - U8
                   - "0"
                   - span:
-                      line_start: 2
-                      line_stop: 2
-                      col_start: 8
-                      col_stop: 11
-                      path: ""
-                      content: return 0u8;
+                      lo: 9
+                      hi: 12
             span:
-              line_start: 2
-              line_stop: 2
-              col_start: 1
-              col_stop: 11
-              path: ""
-              content: return 0u8;
+              lo: 2
+              hi: 12
       span:
-        line_start: 1
-        line_stop: 3
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "{\n     ...\n}"
+        lo: 0
+        hi: 15
   - Block:
       statements:
         - Block:
             statements: []
             span:
-              line_start: 1
-              line_stop: 1
-              col_start: 2
-              col_stop: 4
-              path: ""
-              content: "{{}}"
+              lo: 1
+              hi: 3
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: "{{}}"
+        lo: 0
+        hi: 4
   - Block:
       statements:
         - Block:
@@ -69,38 +45,22 @@ outputs:
                         - U8
                         - "0"
                         - span:
-                            line_start: 3
-                            line_stop: 3
-                            col_start: 8
-                            col_stop: 11
-                            path: ""
-                            content: return 0u8;
+                            lo: 11
+                            hi: 14
                   span:
-                    line_start: 3
-                    line_stop: 3
-                    col_start: 1
-                    col_stop: 11
-                    path: ""
-                    content: return 0u8;
+                    lo: 4
+                    hi: 14
             span:
-              line_start: 2
-              line_stop: 4
-              col_start: 1
-              col_stop: 2
-              path: ""
-              content: "{\n     ...\n}"
+              lo: 2
+              hi: 17
       span:
-        line_start: 1
-        line_stop: 5
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "{\n     ...\n     ...\n     ...\n}"
+        lo: 0
+        hi: 19
   - Block:
       statements:
         - Conditional:
             condition:
-              Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":2,\\\"line_stop\\\":2,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x {\\\"}\"}"
+              Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
             block:
               statements:
                 - Return:
@@ -110,38 +70,18 @@ outputs:
                           - U8
                           - "0"
                           - span:
-                              line_start: 3
-                              line_stop: 3
-                              col_start: 8
-                              col_stop: 11
-                              path: ""
-                              content: return 0u8;
+                              lo: 16
+                              hi: 19
                     span:
-                      line_start: 3
-                      line_stop: 3
-                      col_start: 1
-                      col_stop: 11
-                      path: ""
-                      content: return 0u8;
+                      lo: 9
+                      hi: 19
               span:
-                line_start: 2
-                line_stop: 4
-                col_start: 6
-                col_stop: 2
-                path: ""
-                content: "if x {\n     ...\n}"
+                lo: 7
+                hi: 22
             next: ~
             span:
-              line_start: 2
-              line_stop: 4
-              col_start: 1
-              col_stop: 2
-              path: ""
-              content: "if x {\n     ...\n}"
+              lo: 2
+              hi: 22
       span:
-        line_start: 1
-        line_stop: 5
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "{\n     ...\n     ...\n     ...\n}"
+        lo: 0
+        hi: 24
diff --git a/tests/expectations/parser/parser/statement/conditional.leo.out b/tests/expectations/parser/parser/statement/conditional.leo.out
index 2b4a24e511..43b664b90e 100644
--- a/tests/expectations/parser/parser/statement/conditional.leo.out
+++ b/tests/expectations/parser/parser/statement/conditional.leo.out
@@ -4,7 +4,7 @@ expectation: Pass
 outputs:
   - Conditional:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x {\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
       block:
         statements:
           - Return:
@@ -14,37 +14,21 @@ outputs:
                     - U8
                     - "0"
                     - span:
-                        line_start: 2
-                        line_stop: 2
-                        col_start: 8
-                        col_stop: 11
-                        path: ""
-                        content: return 0u8;
+                        lo: 14
+                        hi: 17
               span:
-                line_start: 2
-                line_stop: 2
-                col_start: 1
-                col_stop: 11
-                path: ""
-                content: return 0u8;
+                lo: 7
+                hi: 17
         span:
-          line_start: 1
-          line_stop: 3
-          col_start: 6
-          col_stop: 2
-          path: ""
-          content: "if x {\n     ...\n}"
+          lo: 5
+          hi: 20
       next: ~
       span:
-        line_start: 1
-        line_stop: 3
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "if x {\n     ...\n}"
+        lo: 0
+        hi: 20
   - Conditional:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if (x) {\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       block:
         statements:
           - Return:
@@ -54,163 +38,99 @@ outputs:
                     - U8
                     - "0"
                     - span:
-                        line_start: 2
-                        line_stop: 2
-                        col_start: 8
-                        col_stop: 11
-                        path: ""
-                        content: return 0u8;
+                        lo: 16
+                        hi: 19
               span:
-                line_start: 2
-                line_stop: 2
-                col_start: 1
-                col_stop: 11
-                path: ""
-                content: return 0u8;
+                lo: 9
+                hi: 19
         span:
-          line_start: 1
-          line_stop: 3
-          col_start: 8
-          col_stop: 2
-          path: ""
-          content: "if (x) {\n     ...\n}"
+          lo: 7
+          hi: 22
       next: ~
       span:
-        line_start: 1
-        line_stop: 3
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "if (x) {\n     ...\n}"
+        lo: 0
+        hi: 22
   - Conditional:
       condition:
-        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if (x) {} else {}\\\"}\"}"
+        Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       block:
         statements: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 8
-          col_stop: 10
-          path: ""
-          content: "if (x) {} else {}"
+          lo: 7
+          hi: 9
       next:
         Block:
           statements: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 16
-            col_stop: 18
-            path: ""
-            content: "if (x) {} else {}"
+            lo: 15
+            hi: 17
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "if (x) {} else {}"
+        lo: 0
+        hi: 17
   - Conditional:
       condition:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x+y {} else if x+z {} else {}\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x+y {} else if x+z {} else {}\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 4
-            col_stop: 7
-            path: ""
-            content: "if x+y {} else if x+z {} else {}"
+            lo: 3
+            hi: 6
       block:
         statements: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 8
-          col_stop: 10
-          path: ""
-          content: "if x+y {} else if x+z {} else {}"
+          lo: 7
+          hi: 9
       next:
         Conditional:
           condition:
             Binary:
               left:
-                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":19,\\\"col_stop\\\":20,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x+y {} else if x+z {} else {}\\\"}\"}"
+                Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
               right:
-                Identifier: "{\"name\":\"z\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x+y {} else if x+z {} else {}\\\"}\"}"
+                Identifier: "{\"name\":\"z\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
               op: Add
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 19
-                col_stop: 22
-                path: ""
-                content: "if x+y {} else if x+z {} else {}"
+                lo: 18
+                hi: 21
           block:
             statements: []
             span:
-              line_start: 1
-              line_stop: 1
-              col_start: 23
-              col_stop: 25
-              path: ""
-              content: "if x+y {} else if x+z {} else {}"
+              lo: 22
+              hi: 24
           next:
             Block:
               statements: []
               span:
-                line_start: 1
-                line_stop: 1
-                col_start: 31
-                col_stop: 33
-                path: ""
-                content: "if x+y {} else if x+z {} else {}"
+                lo: 30
+                hi: 32
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 16
-            col_stop: 33
-            path: ""
-            content: "if x+y {} else if x+z {} else {}"
+            lo: 15
+            hi: 32
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 33
-        path: ""
-        content: "if x+y {} else if x+z {} else {}"
+        lo: 0
+        hi: 32
   - Conditional:
       condition:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x+y {\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"if x+y {\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 4
-            col_stop: 7
-            path: ""
-            content: "if x+y {"
+            lo: 3
+            hi: 6
       block:
         statements:
           - Expression:
               expression:
-                Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":2,\\\"line_stop\\\":2,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"expr;\\\"}\"}"
+                Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":13}\"}"
               span:
-                line_start: 2
-                line_stop: 2
-                col_start: 1
-                col_stop: 5
-                path: ""
-                content: expr;
+                lo: 9
+                hi: 13
           - Return:
               expression:
                 Value:
@@ -218,31 +138,15 @@ outputs:
                     - U8
                     - "0"
                     - span:
-                        line_start: 3
-                        line_stop: 3
-                        col_start: 8
-                        col_stop: 11
-                        path: ""
-                        content: return 0u8;
+                        lo: 22
+                        hi: 25
               span:
-                line_start: 3
-                line_stop: 3
-                col_start: 1
-                col_stop: 11
-                path: ""
-                content: return 0u8;
+                lo: 15
+                hi: 25
         span:
-          line_start: 1
-          line_stop: 4
-          col_start: 8
-          col_stop: 2
-          path: ""
-          content: "if x+y {\n     ...\n     ...\n}"
+          lo: 7
+          hi: 28
       next: ~
       span:
-        line_start: 1
-        line_stop: 4
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "if x+y {\n     ...\n     ...\n}"
+        lo: 0
+        hi: 28
diff --git a/tests/expectations/parser/parser/statement/console.leo.out b/tests/expectations/parser/parser/statement/console.leo.out
index f9f8b91d93..cd46a0e5ce 100644
--- a/tests/expectations/parser/parser/statement/console.leo.out
+++ b/tests/expectations/parser/parser/statement/console.leo.out
@@ -5,145 +5,93 @@ outputs:
   - Console:
       function:
         Assert:
-          Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":16,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"console.assert(x);\\\"}\"}"
+          Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: console.assert(x);
+        lo: 0
+        hi: 16
   - Console:
       function:
         Error:
           string:
-            - Primitive: 123
-            - Primitive: 125
+            - Scalar: 123
+            - Scalar: 125
           parameters:
-            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"console.error(\\\\\\\"{}\\\\\\\", x);\\\"}\"}"
+            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 23
-            path: ""
-            content: "console.error(\"{}\", x);"
+            lo: 13
+            hi: 22
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 23
-        path: ""
-        content: "console.error(\"{}\", x);"
+        lo: 0
+        hi: 22
   - Console:
       function:
         Error:
           string:
-            - Primitive: 123
-            - Primitive: 125
-            - Primitive: 123
-            - Primitive: 125
+            - Scalar: 123
+            - Scalar: 125
+            - Scalar: 123
+            - Scalar: 125
           parameters:
-            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":23,\\\"col_stop\\\":24,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"console.error(\\\\\\\"{}{}\\\\\\\", x, y);\\\"}\"}"
-            - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":26,\\\"col_stop\\\":27,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"console.error(\\\\\\\"{}{}\\\\\\\", x, y);\\\"}\"}"
+            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":22,\\\"hi\\\":23}\"}"
+            - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":25,\\\"hi\\\":26}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 28
-            path: ""
-            content: "console.error(\"{}{}\", x, y);"
+            lo: 13
+            hi: 27
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 28
-        path: ""
-        content: "console.error(\"{}{}\", x, y);"
+        lo: 0
+        hi: 27
   - Console:
       function:
         Error:
           string:
-            - Primitive: 120
+            - Scalar: 120
           parameters: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 19
-            path: ""
-            content: "console.error(\"x\");"
+            lo: 13
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "console.error(\"x\");"
+        lo: 0
+        hi: 18
   - Console:
       function:
         Log:
           string:
-            - Primitive: 123
-            - Primitive: 125
+            - Scalar: 123
+            - Scalar: 125
           parameters:
-            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":19,\\\"col_stop\\\":20,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"console.log(\\\\\\\"{}\\\\\\\", x);\\\"}\"}"
+            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":18,\\\"hi\\\":19}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 12
-            col_stop: 21
-            path: ""
-            content: "console.log(\"{}\", x);"
+            lo: 11
+            hi: 20
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 21
-        path: ""
-        content: "console.log(\"{}\", x);"
+        lo: 0
+        hi: 20
   - Console:
       function:
         Log:
           string:
-            - Primitive: 123
-            - Primitive: 125
-            - Primitive: 123
-            - Primitive: 125
+            - Scalar: 123
+            - Scalar: 125
+            - Scalar: 123
+            - Scalar: 125
           parameters:
-            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":21,\\\"col_stop\\\":22,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"console.log(\\\\\\\"{}{}\\\\\\\", x, y);\\\"}\"}"
-            - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":24,\\\"col_stop\\\":25,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"console.log(\\\\\\\"{}{}\\\\\\\", x, y);\\\"}\"}"
+            - Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":21}\"}"
+            - Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":23,\\\"hi\\\":24}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 12
-            col_stop: 26
-            path: ""
-            content: "console.log(\"{}{}\", x, y);"
+            lo: 11
+            hi: 25
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 26
-        path: ""
-        content: "console.log(\"{}{}\", x, y);"
+        lo: 0
+        hi: 25
   - Console:
       function:
         Log:
           string:
-            - Primitive: 120
+            - Scalar: 120
           parameters: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 12
-            col_stop: 17
-            path: ""
-            content: "console.log(\"x\");"
+            lo: 11
+            hi: 16
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "console.log(\"x\");"
+        lo: 0
+        hi: 16
diff --git a/tests/expectations/parser/parser/statement/definition.leo.out b/tests/expectations/parser/parser/statement/definition.leo.out
index 7e5a3f1037..5d49004109 100644
--- a/tests/expectations/parser/parser/statement/definition.leo.out
+++ b/tests/expectations/parser/parser/statement/definition.leo.out
@@ -6,394 +6,254 @@ outputs:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = expr;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = expr;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = expr;\\\"}\"}"
+        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = expr;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u16 = x+y;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u16 = x+y;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U16
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":14,\\\"col_stop\\\":15,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u16 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":16,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u16 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 17
-            path: ""
-            content: "let x: u16 = x+y;"
+            lo: 13
+            hi: 16
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u16 = x+y;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = x();\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = x();"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = x();\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 16
-            path: ""
-            content: "let x: u8 = x();"
+            lo: 12
+            hi: 15
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: "let x: u8 = x();"
+        lo: 0
+        hi: 15
   - Definition:
       declaration_type: Const
       variable_names:
         - mutable: false
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: i8 = expr;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 7
-            col_stop: 8
-            path: ""
-            content: "const x: i8 = expr;"
+            lo: 6
+            hi: 7
       type_:
         IntegerType: I8
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":15,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: i8 = expr;\\\"}\"}"
+        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":18}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "const x: i8 = expr;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Const
       variable_names:
         - mutable: false
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: i16 = x+y;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 7
-            col_stop: 8
-            path: ""
-            content: "const x: i16 = x+y;"
+            lo: 6
+            hi: 7
       type_:
         IntegerType: I16
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":16,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: i16 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: i16 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 16
-            col_stop: 19
-            path: ""
-            content: "const x: i16 = x+y;"
+            lo: 15
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "const x: i16 = x+y;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Const
       variable_names:
         - mutable: false
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: i8 = x();\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 7
-            col_stop: 8
-            path: ""
-            content: "const x: i8 = x();"
+            lo: 6
+            hi: 7
       type_:
         IntegerType: I8
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":15,\\\"col_stop\\\":16,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: i8 = x();\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":14,\\\"hi\\\":15}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 15
-            col_stop: 18
-            path: ""
-            content: "const x: i8 = x();"
+            lo: 14
+            hi: 17
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "const x: i8 = x();"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u32 = expr;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u32 = expr;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U32
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":14,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u32 = expr;\\\"}\"}"
+        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u32 = expr;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u32 = x+y;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u32 = x+y;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U32
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":14,\\\"col_stop\\\":15,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u32 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":16,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u32 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 17
-            path: ""
-            content: "let x: u32 = x+y;"
+            lo: 13
+            hi: 16
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u32 = x+y;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u32 = x();\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u32 = x();"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U32
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":14,\\\"col_stop\\\":15,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u32 = x();\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":13,\\\"hi\\\":14}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 14
-            col_stop: 17
-            path: ""
-            content: "let x: u32 = x();"
+            lo: 13
+            hi: 16
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u32 = x();"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Const
       variable_names:
         - mutable: false
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: u32 = expr;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 7
-            col_stop: 8
-            path: ""
-            content: "const x: u32 = expr;"
+            lo: 6
+            hi: 7
       type_:
         IntegerType: U32
       value:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":16,\\\"col_stop\\\":20,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: u32 = expr;\\\"}\"}"
+        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":19}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 20
-        path: ""
-        content: "const x: u32 = expr;"
+        lo: 0
+        hi: 19
   - Definition:
       declaration_type: Const
       variable_names:
         - mutable: false
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: u32 = x+y;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 7
-            col_stop: 8
-            path: ""
-            content: "const x: u32 = x+y;"
+            lo: 6
+            hi: 7
       type_:
         IntegerType: U32
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":16,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: u32 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: u32 = x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 16
-            col_stop: 19
-            path: ""
-            content: "const x: u32 = x+y;"
+            lo: 15
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "const x: u32 = x+y;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Const
       variable_names:
         - mutable: false
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: u32 = x();\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 7
-            col_stop: 8
-            path: ""
-            content: "const x: u32 = x();"
+            lo: 6
+            hi: 7
       type_:
         IntegerType: U32
       value:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":16,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"const x: u32 = x();\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":15,\\\"hi\\\":16}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 16
-            col_stop: 19
-            path: ""
-            content: "const x: u32 = x();"
+            lo: 15
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "const x: u32 = x();"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: address = aleo15u4r0gzjtqzepkgurgn7p3u5kkhs9p74rx6aun3uh2s5std6759svgmg53;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: address = aleo15u4r0gzjtqzepkgurgn7p3u5kkhs9p74rx6aun3uh2s5std6759svgmg53;"
+            lo: 4
+            hi: 5
       type_: Address
       value:
         Value:
           Address:
             - aleo15u4r0gzjtqzepkgurgn7p3u5kkhs9p74rx6aun3uh2s5std6759svgmg53
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 18
-                col_stop: 81
-                path: ""
-                content: "let x: address = aleo15u4r0gzjtqzepkgurgn7p3u5kkhs9p74rx6aun3uh2s5std6759svgmg53;"
+                lo: 17
+                hi: 80
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 81
-        path: ""
-        content: "let x: address = aleo15u4r0gzjtqzepkgurgn7p3u5kkhs9p74rx6aun3uh2s5std6759svgmg53;"
+        lo: 0
+        hi: 80
diff --git a/tests/expectations/parser/parser/statement/expression.leo.out b/tests/expectations/parser/parser/statement/expression.leo.out
index 06cbb5ad23..d15843dd71 100644
--- a/tests/expectations/parser/parser/statement/expression.leo.out
+++ b/tests/expectations/parser/parser/statement/expression.leo.out
@@ -4,53 +4,33 @@ expectation: Pass
 outputs:
   - Expression:
       expression:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"expr;\\\"}\"}"
+        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: expr;
+        lo: 0
+        hi: 4
   - Expression:
       expression:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           right:
-            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":3,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x+y;\\\"}\"}"
+            Identifier: "{\"name\":\"y\",\"span\":\"{\\\"lo\\\":2,\\\"hi\\\":3}\"}"
           op: Add
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 4
-            path: ""
-            content: x+y;
+            lo: 0
+            hi: 3
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: x+y;
+        lo: 0
+        hi: 3
   - Expression:
       expression:
         Call:
           function:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x();\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           arguments: []
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 4
-            path: ""
-            content: x();
+            lo: 0
+            hi: 3
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: x();
+        lo: 0
+        hi: 3
diff --git a/tests/expectations/parser/parser/statement/iteration.leo.out b/tests/expectations/parser/parser/statement/iteration.leo.out
index 274ddb2488..77fab43fae 100644
--- a/tests/expectations/parser/parser/statement/iteration.leo.out
+++ b/tests/expectations/parser/parser/statement/iteration.leo.out
@@ -3,7 +3,7 @@ namespace: ParseStatement
 expectation: Pass
 outputs:
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"for x: u8 in 0u8..7u8 {}\\\"}\"}"
+      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         IntegerType: U8
       start:
@@ -12,43 +12,27 @@ outputs:
             - U8
             - "0"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 14
-                col_stop: 17
-                path: ""
-                content: "for x: u8 in 0u8..7u8 {}"
+                lo: 13
+                hi: 16
       stop:
         Value:
           Integer:
             - U8
             - "7"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 19
-                col_stop: 22
-                path: ""
-                content: "for x: u8 in 0u8..7u8 {}"
+                lo: 18
+                hi: 21
       inclusive: false
       block:
         statements: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 23
-          col_stop: 25
-          path: ""
-          content: "for x: u8 in 0u8..7u8 {}"
+          lo: 22
+          hi: 24
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 25
-        path: ""
-        content: "for x: u8 in 0u8..7u8 {}"
+        lo: 0
+        hi: 24
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"for x: i64 in 0i64..7i64 {\\\"}\"}"
+      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_:
         IntegerType: I64
       start:
@@ -57,24 +41,16 @@ outputs:
             - I64
             - "0"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 15
-                col_stop: 19
-                path: ""
-                content: "for x: i64 in 0i64..7i64 {"
+                lo: 14
+                hi: 18
       stop:
         Value:
           Integer:
             - I64
             - "7"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 21
-                col_stop: 25
-                path: ""
-                content: "for x: i64 in 0i64..7i64 {"
+                lo: 20
+                hi: 24
       inclusive: false
       block:
         statements:
@@ -85,59 +61,35 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 2
-                        line_stop: 2
-                        col_start: 8
-                        col_stop: 11
-                        path: ""
-                        content: return 1u8;
+                        lo: 34
+                        hi: 37
               span:
-                line_start: 2
-                line_stop: 2
-                col_start: 1
-                col_stop: 11
-                path: ""
-                content: return 1u8;
+                lo: 27
+                hi: 37
         span:
-          line_start: 1
-          line_stop: 3
-          col_start: 26
-          col_stop: 2
-          path: ""
-          content: "for x: i64 in 0i64..7i64 {\n     ...\n}"
+          lo: 25
+          hi: 40
       span:
-        line_start: 1
-        line_stop: 3
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "for x: i64 in 0i64..7i64 {\n     ...\n}"
+        lo: 0
+        hi: 40
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"for x: field in 0field..99u8 {\\\"}\"}"
+      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_: Field
       start:
         Value:
           Field:
             - "0"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 17
-                col_stop: 23
-                path: ""
-                content: "for x: field in 0field..99u8 {"
+                lo: 16
+                hi: 22
       stop:
         Value:
           Integer:
             - U8
             - "99"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 25
-                col_stop: 29
-                path: ""
-                content: "for x: field in 0field..99u8 {"
+                lo: 24
+                hi: 28
       inclusive: false
       block:
         statements:
@@ -148,35 +100,19 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 2
-                        line_stop: 2
-                        col_start: 8
-                        col_stop: 11
-                        path: ""
-                        content: return 1u8;
+                        lo: 38
+                        hi: 41
               span:
-                line_start: 2
-                line_stop: 2
-                col_start: 1
-                col_stop: 11
-                path: ""
-                content: return 1u8;
+                lo: 31
+                hi: 41
         span:
-          line_start: 1
-          line_stop: 3
-          col_start: 30
-          col_stop: 2
-          path: ""
-          content: "for x: field in 0field..99u8 {\n     ...\n}"
+          lo: 29
+          hi: 44
       span:
-        line_start: 1
-        line_stop: 3
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "for x: field in 0field..99u8 {\n     ...\n}"
+        lo: 0
+        hi: 44
   - Iteration:
-      variable: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"for x: bool in 0u8..Self {\\\"}\"}"
+      variable: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       type_: Boolean
       start:
         Value:
@@ -184,14 +120,10 @@ outputs:
             - U8
             - "0"
             - span:
-                line_start: 1
-                line_stop: 1
-                col_start: 16
-                col_stop: 19
-                path: ""
-                content: "for x: bool in 0u8..Self {"
+                lo: 15
+                hi: 18
       stop:
-        Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":21,\\\"col_stop\\\":25,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"for x: bool in 0u8..Self {\\\"}\"}"
+        Identifier: "{\"name\":\"Self\",\"span\":\"{\\\"lo\\\":20,\\\"hi\\\":24}\"}"
       inclusive: false
       block:
         statements:
@@ -202,30 +134,14 @@ outputs:
                     - U8
                     - "1"
                     - span:
-                        line_start: 2
-                        line_stop: 2
-                        col_start: 8
-                        col_stop: 11
-                        path: ""
-                        content: return 1u8;
+                        lo: 34
+                        hi: 37
               span:
-                line_start: 2
-                line_stop: 2
-                col_start: 1
-                col_stop: 11
-                path: ""
-                content: return 1u8;
+                lo: 27
+                hi: 37
         span:
-          line_start: 1
-          line_stop: 3
-          col_start: 26
-          col_stop: 2
-          path: ""
-          content: "for x: bool in 0u8..Self {\n     ...\n}"
+          lo: 25
+          hi: 40
       span:
-        line_start: 1
-        line_stop: 3
-        col_start: 1
-        col_stop: 2
-        path: ""
-        content: "for x: bool in 0u8..Self {\n     ...\n}"
+        lo: 0
+        hi: 40
diff --git a/tests/expectations/parser/parser/statement/return.leo.out b/tests/expectations/parser/parser/statement/return.leo.out
index 581eca080f..2356991aab 100644
--- a/tests/expectations/parser/parser/statement/return.leo.out
+++ b/tests/expectations/parser/parser/statement/return.leo.out
@@ -4,14 +4,10 @@ expectation: Pass
 outputs:
   - Return:
       expression:
-        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":8,\\\"col_stop\\\":12,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"return expr;\\\"}\"}"
+        Identifier: "{\"name\":\"expr\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":11}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 12
-        path: ""
-        content: return expr;
+        lo: 0
+        hi: 11
   - Return:
       expression:
         Value:
@@ -19,16 +15,8 @@ outputs:
             - U8
             - "5"
             - span:
-                line_start: 2
-                line_stop: 2
-                col_start: 1
-                col_stop: 4
-                path: ""
-                content: 5u8;
+                lo: 7
+                hi: 10
       span:
-        line_start: 1
-        line_stop: 2
-        col_start: 1
-        col_stop: 4
-        path: ""
-        content: "return\n5u8;"
+        lo: 0
+        hi: 10
diff --git a/tests/expectations/parser/parser/unreachable/math_op_pass.leo.out b/tests/expectations/parser/parser/unreachable/math_op_pass.leo.out
index 56e4be83a3..653e6c0ce5 100644
--- a/tests/expectations/parser/parser/unreachable/math_op_pass.leo.out
+++ b/tests/expectations/parser/parser/unreachable/math_op_pass.leo.out
@@ -6,795 +6,503 @@ outputs:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a == b;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a == b;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a == b;\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a == b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Eq
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 19
-            path: ""
-            content: "let x: u8 = a == b;"
+            lo: 12
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "let x: u8 = a == b;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a != b;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a != b;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a != b;\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a != b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Ne
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 19
-            path: ""
-            content: "let x: u8 = a != b;"
+            lo: 12
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "let x: u8 = a != b;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a > b;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a > b;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a > b;\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":17,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a > b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: Gt
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 18
-            path: ""
-            content: "let x: u8 = a > b;"
+            lo: 12
+            hi: 17
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = a > b;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a >= b;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a >= b;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a >= b;\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a >= b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Ge
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 19
-            path: ""
-            content: "let x: u8 = a >= b;"
+            lo: 12
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "let x: u8 = a >= b;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a < b;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a < b;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a < b;\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":17,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a < b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: Lt
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 18
-            path: ""
-            content: "let x: u8 = a < b;"
+            lo: 12
+            hi: 17
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = a < b;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a <= b;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a <= b;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a <= b;\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":18,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a <= b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":17,\\\"hi\\\":18}\"}"
           op: Le
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 19
-            path: ""
-            content: "let x: u8 = a <= b;"
+            lo: 12
+            hi: 18
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "let x: u8 = a <= b;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a > b;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a > b;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
         Binary:
           left:
-            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":14,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a > b;\\\"}\"}"
+            Identifier: "{\"name\":\"a\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":13}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":17,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a > b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":16,\\\"hi\\\":17}\"}"
           op: Gt
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 13
-            col_stop: 18
-            path: ""
-            content: "let x: u8 = a > b;"
+            lo: 12
+            hi: 17
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = a > b;"
+        lo: 0
+        hi: 17
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"x_\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x_=b;\\\"}\"}"
+        identifier: "{\"name\":\"x_\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 3
-          path: ""
-          content: x_=b;
+          lo: 0
+          hi: 2
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x_=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x_=b;
+        lo: 0
+        hi: 4
   - Expression:
       expression:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x==b;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x==b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           op: Eq
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 5
-            path: ""
-            content: x==b;
+            lo: 0
+            hi: 4
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x==b;
+        lo: 0
+        hi: 4
   - Expression:
       expression:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x!=b;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x!=b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           op: Ne
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 5
-            path: ""
-            content: x!=b;
+            lo: 0
+            hi: 4
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x!=b;
+        lo: 0
+        hi: 4
   - Expression:
       expression:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x>=b;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x>=b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           op: Ge
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 5
-            path: ""
-            content: x>=b;
+            lo: 0
+            hi: 4
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x>=b;
+        lo: 0
+        hi: 4
   - Expression:
       expression:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x<=b;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x<=b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           op: Le
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 5
-            path: ""
-            content: x<=b;
+            lo: 0
+            hi: 4
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x<=b;
+        lo: 0
+        hi: 4
   - Expression:
       expression:
         Binary:
           left:
-            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":2,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x>=b;\\\"}\"}"
+            Identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":1}\"}"
           right:
-            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x>=b;\\\"}\"}"
+            Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
           op: Ge
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 1
-            col_stop: 5
-            path: ""
-            content: x>=b;
+            lo: 0
+            hi: 4
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x>=b;
+        lo: 0
+        hi: 4
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xconsole\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xconsole=b;\\\"}\"}"
+        identifier: "{\"name\":\"xconsole\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":8}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 9
-          path: ""
-          content: xconsole=b;
+          lo: 0
+          hi: 8
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":10,\\\"col_stop\\\":11,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xconsole=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":9,\\\"hi\\\":10}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 11
-        path: ""
-        content: xconsole=b;
+        lo: 0
+        hi: 10
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xconst\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xconst=b;\\\"}\"}"
+        identifier: "{\"name\":\"xconst\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 7
-          path: ""
-          content: xconst=b;
+          lo: 0
+          hi: 6
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xconst=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 9
-        path: ""
-        content: xconst=b;
+        lo: 0
+        hi: 8
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xlet\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xlet=b;\\\"}\"}"
+        identifier: "{\"name\":\"xlet\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xlet=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xlet=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xlet=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xfor\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xfor=b;\\\"}\"}"
+        identifier: "{\"name\":\"xfor\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xfor=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xfor=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xfor=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xif\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xif=b;\\\"}\"}"
+        identifier: "{\"name\":\"xif\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 4
-          path: ""
-          content: xif=b;
+          lo: 0
+          hi: 3
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xif=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 6
-        path: ""
-        content: xif=b;
+        lo: 0
+        hi: 5
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xelse\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xelse=b;\\\"}\"}"
+        identifier: "{\"name\":\"xelse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 6
-          path: ""
-          content: xelse=b;
+          lo: 0
+          hi: 5
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xelse=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: xelse=b;
+        lo: 0
+        hi: 7
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xi8\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi8=b;\\\"}\"}"
+        identifier: "{\"name\":\"xi8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 4
-          path: ""
-          content: xi8=b;
+          lo: 0
+          hi: 3
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi8=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 6
-        path: ""
-        content: xi8=b;
+        lo: 0
+        hi: 5
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xi16\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi16=b;\\\"}\"}"
+        identifier: "{\"name\":\"xi16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xi16=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi16=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xi16=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xi32\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi32=b;\\\"}\"}"
+        identifier: "{\"name\":\"xi32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xi32=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi32=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xi32=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xi64\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi64=b;\\\"}\"}"
+        identifier: "{\"name\":\"xi64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xi64=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi64=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xi64=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xi128\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi128=b;\\\"}\"}"
+        identifier: "{\"name\":\"xi128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 6
-          path: ""
-          content: xi128=b;
+          lo: 0
+          hi: 5
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xi128=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: xi128=b;
+        lo: 0
+        hi: 7
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xu8\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":4,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu8=b;\\\"}\"}"
+        identifier: "{\"name\":\"xu8\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":3}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 4
-          path: ""
-          content: xu8=b;
+          lo: 0
+          hi: 3
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu8=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 6
-        path: ""
-        content: xu8=b;
+        lo: 0
+        hi: 5
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xu16\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu16=b;\\\"}\"}"
+        identifier: "{\"name\":\"xu16\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xu16=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu16=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xu16=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xu32\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu32=b;\\\"}\"}"
+        identifier: "{\"name\":\"xu32\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xu32=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu32=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xu32=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xu64\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu64=b;\\\"}\"}"
+        identifier: "{\"name\":\"xu64\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":4}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 5
-          path: ""
-          content: xu64=b;
+          lo: 0
+          hi: 4
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":6,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu64=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":5,\\\"hi\\\":6}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 7
-        path: ""
-        content: xu64=b;
+        lo: 0
+        hi: 6
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xu128\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu128=b;\\\"}\"}"
+        identifier: "{\"name\":\"xu128\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 6
-          path: ""
-          content: xu128=b;
+          lo: 0
+          hi: 5
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xu128=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: xu128=b;
+        lo: 0
+        hi: 7
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xreturn\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xreturn=b;\\\"}\"}"
+        identifier: "{\"name\":\"xreturn\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":7}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 8
-          path: ""
-          content: xreturn=b;
+          lo: 0
+          hi: 7
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":9,\\\"col_stop\\\":10,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xreturn=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":8,\\\"hi\\\":9}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 10
-        path: ""
-        content: xreturn=b;
+        lo: 0
+        hi: 9
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xtrue\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xtrue=b;\\\"}\"}"
+        identifier: "{\"name\":\"xtrue\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":5}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 6
-          path: ""
-          content: xtrue=b;
+          lo: 0
+          hi: 5
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":7,\\\"col_stop\\\":8,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xtrue=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":6,\\\"hi\\\":7}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 8
-        path: ""
-        content: xtrue=b;
+        lo: 0
+        hi: 7
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"xfalse\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":7,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xfalse=b;\\\"}\"}"
+        identifier: "{\"name\":\"xfalse\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":6}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 7
-          path: ""
-          content: xfalse=b;
+          lo: 0
+          hi: 6
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":8,\\\"col_stop\\\":9,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"xfalse=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":7,\\\"hi\\\":8}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 9
-        path: ""
-        content: xfalse=b;
+        lo: 0
+        hi: 8
   - Assign:
       operation: Assign
       assignee:
-        identifier: "{\"name\":\"x0\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":1,\\\"col_stop\\\":3,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x0=b;\\\"}\"}"
+        identifier: "{\"name\":\"x0\",\"span\":\"{\\\"lo\\\":0,\\\"hi\\\":2}\"}"
         accesses: []
         span:
-          line_start: 1
-          line_stop: 1
-          col_start: 1
-          col_stop: 3
-          path: ""
-          content: x0=b;
+          lo: 0
+          hi: 2
       value:
-        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":4,\\\"col_stop\\\":5,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"x0=b;\\\"}\"}"
+        Identifier: "{\"name\":\"b\",\"span\":\"{\\\"lo\\\":3,\\\"hi\\\":4}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 5
-        path: ""
-        content: x0=b;
+        lo: 0
+        hi: 4
diff --git a/tests/expectations/parser/parser/unreachable/postfix_pass.leo.out b/tests/expectations/parser/parser/unreachable/postfix_pass.leo.out
index f274e7c5f3..0f26bef9db 100644
--- a/tests/expectations/parser/parser/unreachable/postfix_pass.leo.out
+++ b/tests/expectations/parser/parser/unreachable/postfix_pass.leo.out
@@ -8,591 +8,383 @@ outputs:
           String:
             - []
             - span:
-                line_start: 0
-                line_stop: 0
-                col_start: 0
-                col_stop: 0
-                path: ""
-                content: ""
+                lo: 0
+                hi: 0
       span:
-        line_start: 0
-        line_stop: 0
-        col_start: 0
-        col_stop: 0
-        path: ""
-        content: ""
+        lo: 0
+        hi: 0
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aimport;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aimport;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aimport\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":20,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aimport;\\\"}\"}"
+        Identifier: "{\"name\":\"aimport\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 20
-        path: ""
-        content: "let x: u8 = aimport;"
+        lo: 0
+        hi: 19
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a_;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a_;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"a_\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":15,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a_;\\\"}\"}"
+        Identifier: "{\"name\":\"a_\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 15
-        path: ""
-        content: "let x: u8 = a_;"
+        lo: 0
+        hi: 14
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aas;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aas;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aas\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":16,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aas;\\\"}\"}"
+        Identifier: "{\"name\":\"aas\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: "let x: u8 = aas;"
+        lo: 0
+        hi: 15
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aconsole;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aconsole;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aconsole\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":21,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aconsole;\\\"}\"}"
+        Identifier: "{\"name\":\"aconsole\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":20}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 21
-        path: ""
-        content: "let x: u8 = aconsole;"
+        lo: 0
+        hi: 20
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aconst;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aconst;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aconst\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aconst;\\\"}\"}"
+        Identifier: "{\"name\":\"aconst\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "let x: u8 = aconst;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = alet;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = alet;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"alet\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = alet;\\\"}\"}"
+        Identifier: "{\"name\":\"alet\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = alet;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = afor;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = afor;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"afor\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = afor;\\\"}\"}"
+        Identifier: "{\"name\":\"afor\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = afor;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aif;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aif;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aif\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":16,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aif;\\\"}\"}"
+        Identifier: "{\"name\":\"aif\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: "let x: u8 = aif;"
+        lo: 0
+        hi: 15
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aelse;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aelse;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aelse\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aelse;\\\"}\"}"
+        Identifier: "{\"name\":\"aelse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = aelse;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai8;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = ai8;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"ai8\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":16,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai8;\\\"}\"}"
+        Identifier: "{\"name\":\"ai8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: "let x: u8 = ai8;"
+        lo: 0
+        hi: 15
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai16;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = ai16;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"ai16\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai16;\\\"}\"}"
+        Identifier: "{\"name\":\"ai16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = ai16;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai32;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = ai32;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"ai32\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai32;\\\"}\"}"
+        Identifier: "{\"name\":\"ai32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = ai32;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai64;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = ai64;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"ai64\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai64;\\\"}\"}"
+        Identifier: "{\"name\":\"ai64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = ai64;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai128;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = ai128;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"ai128\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = ai128;\\\"}\"}"
+        Identifier: "{\"name\":\"ai128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = ai128;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au8;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = au8;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"au8\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":16,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au8;\\\"}\"}"
+        Identifier: "{\"name\":\"au8\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":15}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 16
-        path: ""
-        content: "let x: u8 = au8;"
+        lo: 0
+        hi: 15
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au16;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = au16;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"au16\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au16;\\\"}\"}"
+        Identifier: "{\"name\":\"au16\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = au16;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au32;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = au32;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"au32\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au32;\\\"}\"}"
+        Identifier: "{\"name\":\"au32\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = au32;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au64;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = au64;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"au64\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":17,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au64;\\\"}\"}"
+        Identifier: "{\"name\":\"au64\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":16}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 17
-        path: ""
-        content: "let x: u8 = au64;"
+        lo: 0
+        hi: 16
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au128;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = au128;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"au128\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = au128;\\\"}\"}"
+        Identifier: "{\"name\":\"au128\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = au128;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = areturn;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = areturn;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"areturn\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":20,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = areturn;\\\"}\"}"
+        Identifier: "{\"name\":\"areturn\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":19}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 20
-        path: ""
-        content: "let x: u8 = areturn;"
+        lo: 0
+        hi: 19
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aself;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aself;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aself\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aself;\\\"}\"}"
+        Identifier: "{\"name\":\"aself\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = aself;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aSelf;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = aSelf;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"aSelf\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = aSelf;\\\"}\"}"
+        Identifier: "{\"name\":\"aSelf\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = aSelf;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = atrue;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = atrue;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"atrue\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":18,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = atrue;\\\"}\"}"
+        Identifier: "{\"name\":\"atrue\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":17}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 18
-        path: ""
-        content: "let x: u8 = atrue;"
+        lo: 0
+        hi: 17
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = afalse;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = afalse;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"afalse\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":19,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = afalse;\\\"}\"}"
+        Identifier: "{\"name\":\"afalse\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":18}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 19
-        path: ""
-        content: "let x: u8 = afalse;"
+        lo: 0
+        hi: 18
   - Definition:
       declaration_type: Let
       variable_names:
         - mutable: true
-          identifier: "{\"name\":\"x\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":5,\\\"col_stop\\\":6,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a0;\\\"}\"}"
+          identifier: "{\"name\":\"x\",\"span\":\"{\\\"lo\\\":4,\\\"hi\\\":5}\"}"
           span:
-            line_start: 1
-            line_stop: 1
-            col_start: 5
-            col_stop: 6
-            path: ""
-            content: "let x: u8 = a0;"
+            lo: 4
+            hi: 5
       type_:
         IntegerType: U8
       value:
-        Identifier: "{\"name\":\"a0\",\"span\":\"{\\\"line_start\\\":1,\\\"line_stop\\\":1,\\\"col_start\\\":13,\\\"col_stop\\\":15,\\\"path\\\":\\\"\\\",\\\"content\\\":\\\"let x: u8 = a0;\\\"}\"}"
+        Identifier: "{\"name\":\"a0\",\"span\":\"{\\\"lo\\\":12,\\\"hi\\\":14}\"}"
       span:
-        line_start: 1
-        line_stop: 1
-        col_start: 1
-        col_stop: 15
-        path: ""
-        content: "let x: u8 = a0;"
+        lo: 0
+        hi: 14