diff --git a/src/protocol/parser/pass_rewriting.rs b/src/protocol/parser/pass_rewriting.rs
index 640f4cf286afc7a09790dae0f3539cb163000cb5..724f9d0c42354424329169b1510e4520b4720c19 100644
--- a/src/protocol/parser/pass_rewriting.rs
+++ b/src/protocol/parser/pass_rewriting.rs
@@ -308,7 +308,6 @@ impl PassRewriting {
             arguments,
             procedure: ProcedureDefinitionId::new_invalid(),
             parent: ExpressionParent::None,
-            unique_id_in_definition: -1,
         });
         let call_stmt_id = ctx.heap.alloc_expression_statement(|this| ExpressionStatement{
             this,
@@ -353,7 +352,7 @@ fn create_ast_variable_expr(ctx: &mut Ctx, variable_id: VariableId) -> VariableE
         declaration: Some(variable_id),
         used_as_binding_target: false,
         parent: ExpressionParent::None,
-        unique_id_in_definition: -1
+        type_index: -1
     });
 }
 
@@ -371,7 +370,7 @@ fn create_ast_call_expr(ctx: &mut Ctx, method: Method, buffer: &mut ScopedBuffer
         arguments,
         procedure: ProcedureDefinitionId::new_invalid(),
         parent: ExpressionParent::None,
-        unique_id_in_definition: -1,
+        type_index: -1,
     });
 
     for argument_index in 0..expression_ids.len() {
@@ -392,7 +391,7 @@ fn create_ast_literal_integer_expr(ctx: &mut Ctx, unsigned_value: u64) -> Litera
             negated: false,
         }),
         parent: ExpressionParent::None,
-        unique_id_in_definition: -1
+        type_index: -1
     });
 }
 
@@ -407,7 +406,7 @@ fn create_ast_equality_comparison_expr(ctx: &mut Ctx, variable_id: VariableId, v
         operation: BinaryOperator::Equality,
         right: int_expr_id.upcast(),
         parent: ExpressionParent::None,
-        unique_id_in_definition: -1,
+        type_index: -1,
     });
 
     let var_expr = &mut ctx.heap[var_expr_id];
@@ -443,7 +442,7 @@ fn create_ast_variable_declaration_stmt(ctx: &mut Ctx, variable_id: VariableId,
         operation: AssignmentOperator::Set,
         right: initial_value_expr_id,
         parent: ExpressionParent::None,
-        unique_id_in_definition: -1,
+        type_index: -1,
     });
 
     // Create the memory statement