diff --git a/src/protocol/parser/pass_rewriting.rs b/src/protocol/parser/pass_rewriting.rs
index 54b7c3b8d91feaafe05f565a28351992e0fffe24..640f4cf286afc7a09790dae0f3539cb163000cb5 100644
--- a/src/protocol/parser/pass_rewriting.rs
+++ b/src/protocol/parser/pass_rewriting.rs
@@ -45,17 +45,10 @@ impl Visitor for PassRewriting {
 
     // --- Visiting procedures
 
-    fn visit_component_definition(&mut self, ctx: &mut Ctx, id: ComponentDefinitionId) -> VisitorResult {
-        let def = &ctx.heap[id];
-        let body_id = def.body;
-        self.current_scope = def.scope;
-        return self.visit_block_stmt(ctx, body_id);
-    }
-
-    fn visit_function_definition(&mut self, ctx: &mut Ctx, id: FunctionDefinitionId) -> VisitorResult {
-        let def = &ctx.heap[id];
-        let body_id = def.body;
-        self.current_scope = def.scope;
+    fn visit_procedure_definition(&mut self, ctx: &mut Ctx, id: ProcedureDefinitionId) -> VisitorResult {
+        let definition = &ctx.heap[id];
+        let body_id = definition.body;
+        self.current_scope = definition.scope;
         return self.visit_block_stmt(ctx, body_id);
     }
 
@@ -162,7 +155,7 @@ impl Visitor for PassRewriting {
         let total_num_cases = select_stmt.cases.len();
         let mut total_num_ports = 0;
         let end_select_stmt_id = select_stmt.end_select;
-        let end_select = &ctx.heap[end_select_stmt_id];
+        let _end_select = &ctx.heap[end_select_stmt_id];
 
         // Put heap IDs into temporary buffers to handle borrowing rules
         let mut call_id_section = self.call_expr_buffer.start_section();
@@ -313,7 +306,7 @@ impl PassRewriting {
             },
             method,
             arguments,
-            definition: DefinitionId::new_invalid(),
+            procedure: ProcedureDefinitionId::new_invalid(),
             parent: ExpressionParent::None,
             unique_id_in_definition: -1,
         });
@@ -376,7 +369,7 @@ fn create_ast_call_expr(ctx: &mut Ctx, method: Method, buffer: &mut ScopedBuffer
         },
         method,
         arguments,
-        definition: DefinitionId::new_invalid(),
+        procedure: ProcedureDefinitionId::new_invalid(),
         parent: ExpressionParent::None,
         unique_id_in_definition: -1,
     });