diff --git a/src/main/java/dk/camelot64/kickc/Compiler.java b/src/main/java/dk/camelot64/kickc/Compiler.java
index d219847c0..1aa32c90e 100644
--- a/src/main/java/dk/camelot64/kickc/Compiler.java
+++ b/src/main/java/dk/camelot64/kickc/Compiler.java
@@ -186,6 +186,7 @@ public class Compiler {
       new PassNAddBooleanCasts(program).execute();
       new PassNAddTypeConversionAssignment(program).execute();
       new Pass1EarlyConstantIdentification(program).execute();
+      new Pass1ProcedureInline(program).execute();
       new PassNStatementIndices(program).step();
       new PassNCallGraphAnalysis(program).step();
       new Pass1AssertNoRecursion(program).execute();
@@ -196,7 +197,6 @@ public class Compiler {
          getLog().append(program.getGraph().toString(program));
       }
 
-      new Pass1ProcedureInline(program).execute();
       new Pass1EliminateUncalledProcedures(program).execute();
       new PassNEliminateUnusedVars(program, false).execute();
       new Pass1ExtractInlineStrings(program).execute();
diff --git a/src/test/ref/bgblack.log b/src/test/ref/bgblack.log
index 886374798..5e2b3500c 100644
--- a/src/test/ref/bgblack.log
+++ b/src/test/ref/bgblack.log
@@ -42,7 +42,7 @@ Adding pointer type conversion cast (byte*) CIA2_PORT_B_DDR in (byte*) CIA2_PORT
 Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTERRUPT ← (number) $dd0d
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/c64dtv-8bppcharstretch.log b/src/test/ref/c64dtv-8bppcharstretch.log
index 7fe9d9d41..996d8a772 100644
--- a/src/test/ref/c64dtv-8bppcharstretch.log
+++ b/src/test/ref/c64dtv-8bppcharstretch.log
@@ -98,7 +98,7 @@ Adding pointer type conversion cast (byte*) CHARSET8 in (byte*) CHARSET8 ← (nu
 Adding pointer type conversion cast (byte*) gfx_init_plane_charset8::gfxa in (byte*) gfx_init_plane_charset8::gfxa ← (number~) gfx_init_plane_charset8::$5
 Identified constant variable (byte*) dtvSetCpuBankSegment1::cpuBank
 Identified constant variable (byte*) DTV_BLITTER_ALU
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/c64dtv-8bppchunkystretch.log b/src/test/ref/c64dtv-8bppchunkystretch.log
index 7ed880390..fef6a8168 100644
--- a/src/test/ref/c64dtv-8bppchunkystretch.log
+++ b/src/test/ref/c64dtv-8bppchunkystretch.log
@@ -98,7 +98,7 @@ Adding pointer type conversion cast (byte*) gfx_init_chunky::gfxb in (byte*) gfx
 Adding pointer type conversion cast (byte*) gfx_init_chunky::gfxb in (byte*) gfx_init_chunky::gfxb ← (number) $4000
 Identified constant variable (byte*) dtvSetCpuBankSegment1::cpuBank
 Identified constant variable (byte*) DTV_BLITTER_ALU
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/c64dtv-blitter-box.log b/src/test/ref/c64dtv-blitter-box.log
index 918c25377..ab48de61f 100644
--- a/src/test/ref/c64dtv-blitter-box.log
+++ b/src/test/ref/c64dtv-blitter-box.log
@@ -96,7 +96,7 @@ Adding pointer type conversion cast (byte*) DTV_BLITTER_CONTROL2 in (byte*) DTV_
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Identified constant variable (byte*) dtvSetCpuBankSegment1::cpuBank
 Identified constant variable (byte*) DTV_BLITTER_ALU
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/c64dtv-blittermin.log b/src/test/ref/c64dtv-blittermin.log
index 344a4ae2e..68698f39a 100644
--- a/src/test/ref/c64dtv-blittermin.log
+++ b/src/test/ref/c64dtv-blittermin.log
@@ -96,7 +96,7 @@ Adding pointer type conversion cast (byte*) DTV_BLITTER_CONTROL2 in (byte*) DTV_
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Identified constant variable (byte*) dtvSetCpuBankSegment1::cpuBank
 Identified constant variable (byte*) DTV_BLITTER_ALU
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/c64dtv-color.log b/src/test/ref/c64dtv-color.log
index 54615cd52..4a3e46d50 100644
--- a/src/test/ref/c64dtv-color.log
+++ b/src/test/ref/c64dtv-color.log
@@ -95,7 +95,7 @@ Adding pointer type conversion cast (byte*) DTV_BLITTER_ALU in (byte*) DTV_BLITT
 Adding pointer type conversion cast (byte*) DTV_BLITTER_CONTROL2 in (byte*) DTV_BLITTER_CONTROL2 ← (number) $d33f
 Identified constant variable (byte*) dtvSetCpuBankSegment1::cpuBank
 Identified constant variable (byte*) DTV_BLITTER_ALU
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/c64dtv-gfxexplorer.log b/src/test/ref/c64dtv-gfxexplorer.log
index a748d05ce..e3c5a58d6 100644
--- a/src/test/ref/c64dtv-gfxexplorer.log
+++ b/src/test/ref/c64dtv-gfxexplorer.log
@@ -118,7 +118,7 @@ Identified constant variable (byte*) dtvSetCpuBankSegment1::cpuBank
 Identified constant variable (byte*) DTV_BLITTER_ALU
 Identified constant variable (byte) form_fields_cnt
 Identified constant variable (byte) gfx_init_vic_bitmap::lines_cnt
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/c64dtv-gfxmodes.log b/src/test/ref/c64dtv-gfxmodes.log
index 994b80cb3..947e719c1 100644
--- a/src/test/ref/c64dtv-gfxmodes.log
+++ b/src/test/ref/c64dtv-gfxmodes.log
@@ -138,7 +138,7 @@ Identified constant variable (byte*) dtvSetCpuBankSegment1::cpuBank
 Identified constant variable (byte*) DTV_BLITTER_ALU
 Identified constant variable (byte) mode_stdbitmap::lines_cnt
 Identified constant variable (byte*) mode_8bpppixelcell::CHARGEN
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/cast-not-needed-2.log b/src/test/ref/cast-not-needed-2.log
index 51fb55281..cfc777d7d 100644
--- a/src/test/ref/cast-not-needed-2.log
+++ b/src/test/ref/cast-not-needed-2.log
@@ -1,6 +1,6 @@
 Fixing pointer array-indexing *((byte*[]) screens + (byte) getScreen::id)
-Inlined call [4] (byte*~) main::$0 ← call getScreen (number) 0 
-Inlined call [6] (byte*~) main::$1 ← call spritePtr (byte*) main::screen 
+Inlined call (byte*~) main::$0 ← call getScreen (number) 0 
+Inlined call (byte*~) main::$1 ← call spritePtr (byte*) main::screen 
 Culled Empty Block (label) main::getScreen1_@1
 Culled Empty Block (label) main::spritePtr1_@1
 Culled Empty Block (label) @1
diff --git a/src/test/ref/cast-not-needed-3.log b/src/test/ref/cast-not-needed-3.log
index 226801bb0..7f7862ecf 100644
--- a/src/test/ref/cast-not-needed-3.log
+++ b/src/test/ref/cast-not-needed-3.log
@@ -1,8 +1,8 @@
 Fixing pointer array-indexing *((byte*[]) screens + (byte) getScreen::id)
 Adding pointer type conversion cast (byte*) main::DSP in (byte*) main::DSP ← (number) $400
 Identified constant variable (byte*) main::DSP
-Inlined call [4] (byte*~) main::$0 ← call getScreen (number) 0 
-Inlined call [5] (byte~) main::$1 ← call spritePtr (byte*~) main::$0 
+Inlined call (byte*~) main::$0 ← call getScreen (number) 0 
+Inlined call (byte~) main::$1 ← call spritePtr (byte*~) main::$0 
 Culled Empty Block (label) main::getScreen1_@1
 Culled Empty Block (label) main::spritePtr1_@1
 Culled Empty Block (label) @1
diff --git a/src/test/ref/complex/blackhole/blackhole.log b/src/test/ref/complex/blackhole/blackhole.log
index 2a760a40b..3a79a87a9 100644
--- a/src/test/ref/complex/blackhole/blackhole.log
+++ b/src/test/ref/complex/blackhole/blackhole.log
@@ -136,7 +136,7 @@ Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWA
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Adding pointer type conversion cast (byte*) SPRITE_DATA in (byte*) SPRITE_DATA ← (number) $2000
 Adding pointer type conversion cast (byte*) *(main::$21 + main::$15) in *((byte**) main::$21 + (byte~) main::$15) ← (number) 0
-Inlined call [107] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/complex/tetris/test-sprites.log b/src/test/ref/complex/tetris/test-sprites.log
index f16c2c233..e7d51d51c 100644
--- a/src/test/ref/complex/tetris/test-sprites.log
+++ b/src/test/ref/complex/tetris/test-sprites.log
@@ -64,12 +64,12 @@ Identified constant variable (byte) level
 Identified constant variable (byte) game_over
 Identified constant variable (byte*) SIN
 Identified constant variable (byte*) SIN_SPRITE
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [159] (byte~) $5 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
-Inlined call [206] (byte~) sprites_irq::$5 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
-Inlined call [225] call vicSelectGfxBank (byte*) PLAYFIELD_SCREEN_1 
-Inlined call [226] (byte~) main::$1 ← call toD018 (byte*) PLAYFIELD_SCREEN_1 (byte*) PLAYFIELD_CHARSET 
-Inlined call [239] (byte~) main::$7 ← call toSpritePtr (byte*) SIN_SPRITE 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) $5 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
+Inlined call (byte~) sprites_irq::$5 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
+Inlined call call vicSelectGfxBank (byte*) PLAYFIELD_SCREEN_1 
+Inlined call (byte~) main::$1 ← call toD018 (byte*) PLAYFIELD_SCREEN_1 (byte*) PLAYFIELD_CHARSET 
+Inlined call (byte~) main::$7 ← call toSpritePtr (byte*) SIN_SPRITE 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/complex/tetris/tetris.log b/src/test/ref/complex/tetris/tetris.log
index c4c31d9e4..d92ae1d1a 100644
--- a/src/test/ref/complex/tetris/tetris.log
+++ b/src/test/ref/complex/tetris/tetris.log
@@ -81,13 +81,13 @@ Adding pointer type conversion cast (byte*) render_next::next_piece_gfx in (byte
 Adding pointer type conversion cast (byte*) current_piece in (byte*) current_piece ← (number) 0
 Adding pointer type conversion cast (byte*) current_piece in (byte*) current_piece ← *((word[]) PIECES + (byte~) play_spawn_current::$7)
 Identified constant variable (byte) render_screen_original::SPACE
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [341] call vicSelectGfxBank (byte*) PLAYFIELD_CHARSET 
-Inlined call [378] (byte~) render_show::$2 ← call toD018 (byte*) PLAYFIELD_SCREEN_1 (byte*) PLAYFIELD_CHARSET 
-Inlined call [380] (byte~) render_show::$1 ← call toD018 (byte*) PLAYFIELD_SCREEN_2 (byte*) PLAYFIELD_CHARSET 
-Inlined call [572] (byte~) $6 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
-Inlined call [619] (byte~) sprites_irq::$5 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
-Inlined call [879] (byte~) play_spawn_current::$5 ← call sid_rnd 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call vicSelectGfxBank (byte*) PLAYFIELD_CHARSET 
+Inlined call (byte~) render_show::$2 ← call toD018 (byte*) PLAYFIELD_SCREEN_1 (byte*) PLAYFIELD_CHARSET 
+Inlined call (byte~) render_show::$1 ← call toD018 (byte*) PLAYFIELD_SCREEN_2 (byte*) PLAYFIELD_CHARSET 
+Inlined call (byte~) $6 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
+Inlined call (byte~) sprites_irq::$5 ← call toSpritePtr (byte*) PLAYFIELD_SPRITES 
+Inlined call (byte~) play_spawn_current::$5 ← call sid_rnd 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/3d/3d.log b/src/test/ref/examples/3d/3d.log
index 617f06dea..ee3f5b840 100644
--- a/src/test/ref/examples/3d/3d.log
+++ b/src/test/ref/examples/3d/3d.log
@@ -177,19 +177,19 @@ Identified constant variable (byte*) SINH_LO
 Identified constant variable (byte*) SINH_HI
 Identified constant variable (byte*) SINQ_LO
 Identified constant variable (byte*) SINQ_HI
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [415] call print_sbyte_pos (signed byte) sx (number) 0 (number) $25 
-Inlined call [416] call print_sbyte_pos (signed byte) sy (number) 1 (number) $25 
-Inlined call [417] call print_sbyte_pos (signed byte) sz (number) 2 (number) $25 
-Inlined call [418] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 0) (number) 4 (number) $1d 
-Inlined call [419] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 1) (number) 4 (number) $21 
-Inlined call [420] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 2) (number) 4 (number) $25 
-Inlined call [421] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 3) (number) 5 (number) $1d 
-Inlined call [422] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 4) (number) 5 (number) $21 
-Inlined call [423] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 5) (number) 5 (number) $25 
-Inlined call [424] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 6) (number) 6 (number) $1d 
-Inlined call [425] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 7) (number) 6 (number) $21 
-Inlined call [426] call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 8) (number) 6 (number) $25 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call print_sbyte_pos (signed byte) sx (number) 0 (number) $25 
+Inlined call call print_sbyte_pos (signed byte) sy (number) 1 (number) $25 
+Inlined call call print_sbyte_pos (signed byte) sz (number) 2 (number) $25 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 0) (number) 4 (number) $1d 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 1) (number) 4 (number) $21 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 2) (number) 4 (number) $25 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 3) (number) 5 (number) $1d 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 4) (number) 5 (number) $21 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 5) (number) 5 (number) $25 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 6) (number) 6 (number) $1d 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 7) (number) 6 (number) $21 
+Inlined call call print_sbyte_pos *((signed byte[9]) rotation_matrix + (number) 8) (number) 6 (number) $25 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/3d/perspective.log b/src/test/ref/examples/3d/perspective.log
index 938cb6edf..714f530f1 100644
--- a/src/test/ref/examples/3d/perspective.log
+++ b/src/test/ref/examples/3d/perspective.log
@@ -58,7 +58,7 @@ Identified constant variable (signed byte*) zr
 Identified constant variable (word*) psp1
 Identified constant variable (word*) psp2
 Identified constant variable (signed byte*) PERSP_Z
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/bresenham/bitmap-bresenham.log b/src/test/ref/examples/bresenham/bitmap-bresenham.log
index 4cf096a2f..1da4b92b5 100644
--- a/src/test/ref/examples/bresenham/bitmap-bresenham.log
+++ b/src/test/ref/examples/bresenham/bitmap-bresenham.log
@@ -49,7 +49,7 @@ Adding pointer type conversion cast (byte*) bitmap_plot::plotter in (byte*) bitm
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Adding pointer type conversion cast (byte*) BITMAP in (byte*) BITMAP ← (number) $2000
 Identified constant variable (byte) lines_cnt
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/chargen/chargen-analysis.log b/src/test/ref/examples/chargen/chargen-analysis.log
index 6c24cd88d..f0f45b827 100644
--- a/src/test/ref/examples/chargen/chargen-analysis.log
+++ b/src/test/ref/examples/chargen/chargen-analysis.log
@@ -44,7 +44,7 @@ Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_I
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Identified constant variable (byte*) SCREEN
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/fire/fire.log b/src/test/ref/examples/fire/fire.log
index 1e60e043e..938266697 100644
--- a/src/test/ref/examples/fire/fire.log
+++ b/src/test/ref/examples/fire/fire.log
@@ -55,9 +55,9 @@ Identified constant variable (byte*) SCREEN1
 Identified constant variable (byte*) SCREEN2
 Identified constant variable (byte*) BUFFER
 Identified constant variable (byte*) CHARSET
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [142] (byte~) main::$7 ← call toD018 (byte*) SCREEN1 (byte*) CHARSET 
-Inlined call [145] (byte~) main::$9 ← call toD018 (byte*) SCREEN2 (byte*) CHARSET 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) main::$7 ← call toD018 (byte*) SCREEN1 (byte*) CHARSET 
+Inlined call (byte~) main::$9 ← call toD018 (byte*) SCREEN2 (byte*) CHARSET 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/irq/irq-hyperscreen.log b/src/test/ref/examples/irq/irq-hyperscreen.log
index 4ace49fe4..2e291a7f0 100644
--- a/src/test/ref/examples/irq/irq-hyperscreen.log
+++ b/src/test/ref/examples/irq/irq-hyperscreen.log
@@ -45,7 +45,7 @@ Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTER
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) GHOST_BYTE in (byte*) GHOST_BYTE ← (number) $3fff
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/multiplexer/simple-multiplexer.log b/src/test/ref/examples/multiplexer/simple-multiplexer.log
index e8f3e1d01..90196fc8c 100644
--- a/src/test/ref/examples/multiplexer/simple-multiplexer.log
+++ b/src/test/ref/examples/multiplexer/simple-multiplexer.log
@@ -52,11 +52,11 @@ Adding pointer type conversion cast (byte*) YSIN in (byte*) YSIN ← (number) $2
 Identified constant variable (byte*) SCREEN
 Identified constant variable (byte*) SPRITE
 Identified constant variable (byte*) YSIN
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [118] call plexSetScreen (byte*) plexInit::screen 
-Inlined call [153] call plexFreePrepare 
-Inlined call [159] call plexFreeAdd (byte) plexShowSprite::ypos 
-Inlined call [258] (byte~) loop::$7 ← call plexFreeNextYpos 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call plexSetScreen (byte*) plexInit::screen 
+Inlined call call plexFreePrepare 
+Inlined call call plexFreeAdd (byte) plexShowSprite::ypos 
+Inlined call (byte~) loop::$7 ← call plexFreeNextYpos 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/music/music.log b/src/test/ref/examples/music/music.log
index f60772d2e..70c66dda6 100644
--- a/src/test/ref/examples/music/music.log
+++ b/src/test/ref/examples/music/music.log
@@ -43,7 +43,7 @@ Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTER
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) MUSIC in (byte*) MUSIC ← (number) $1000
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/music/music_irq.log b/src/test/ref/examples/music/music_irq.log
index 1962113a8..37500e1eb 100644
--- a/src/test/ref/examples/music/music_irq.log
+++ b/src/test/ref/examples/music/music_irq.log
@@ -44,7 +44,7 @@ Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTER
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) MUSIC in (byte*) MUSIC ← (number) $1000
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/plasma/plasma-unroll.log b/src/test/ref/examples/plasma/plasma-unroll.log
index e8747dc43..c3ebb74cc 100644
--- a/src/test/ref/examples/plasma/plasma-unroll.log
+++ b/src/test/ref/examples/plasma/plasma-unroll.log
@@ -51,8 +51,8 @@ Adding pointer type conversion cast (byte*) SID_VOICE3_OSC in (byte*) SID_VOICE3
 Adding pointer type conversion cast (byte*) SCREEN1 in (byte*) SCREEN1 ← (number) $2800
 Adding pointer type conversion cast (byte*) CHARSET in (byte*) CHARSET ← (number) $2000
 Adding pointer type conversion cast (byte*) SINTABLE in (byte*) SINTABLE ← (number) $1f00
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [265] (byte~) main::$1 ← call toD018 (byte*) SCREEN1 (byte*) CHARSET 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) main::$1 ← call toD018 (byte*) SCREEN1 (byte*) CHARSET 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/plasma/plasma.log b/src/test/ref/examples/plasma/plasma.log
index bffea76bf..059b80c6d 100644
--- a/src/test/ref/examples/plasma/plasma.log
+++ b/src/test/ref/examples/plasma/plasma.log
@@ -52,9 +52,9 @@ Adding pointer type conversion cast (byte*) SCREEN1 in (byte*) SCREEN1 ← (numb
 Adding pointer type conversion cast (byte*) SCREEN2 in (byte*) SCREEN2 ← (number) $2c00
 Adding pointer type conversion cast (byte*) CHARSET in (byte*) CHARSET ← (number) $2000
 Adding pointer type conversion cast (byte*) SINTABLE in (byte*) SINTABLE ← (number) $1f00
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [268] (byte~) main::$4 ← call toD018 (byte*) SCREEN1 (byte*) CHARSET 
-Inlined call [271] (byte~) main::$6 ← call toD018 (byte*) SCREEN2 (byte*) CHARSET 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) main::$4 ← call toD018 (byte*) SCREEN1 (byte*) CHARSET 
+Inlined call (byte~) main::$6 ← call toD018 (byte*) SCREEN2 (byte*) CHARSET 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/rasterbars/raster-bars.log b/src/test/ref/examples/rasterbars/raster-bars.log
index 05ac2a9ee..9a1e65101 100644
--- a/src/test/ref/examples/rasterbars/raster-bars.log
+++ b/src/test/ref/examples/rasterbars/raster-bars.log
@@ -42,7 +42,7 @@ Adding pointer type conversion cast (byte*) CIA2_PORT_B_DDR in (byte*) CIA2_PORT
 Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTERRUPT ← (number) $dd0d
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/rotate/rotate.log b/src/test/ref/examples/rotate/rotate.log
index 15da88797..820b70656 100644
--- a/src/test/ref/examples/rotate/rotate.log
+++ b/src/test/ref/examples/rotate/rotate.log
@@ -57,10 +57,10 @@ Adding pointer type conversion cast (byte*) SPRITE in (byte*) SPRITE ← (number
 Identified constant variable (byte*) SCREEN
 Identified constant variable (byte*) COS
 Identified constant variable (byte*) SPRITE
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [205] call mulf8s_prepare (signed byte) mulf8s::a 
-Inlined call [280] call mulf8s_prepare (signed byte) anim::cos_a 
-Inlined call [287] call mulf8s_prepare (signed byte) anim::sin_a 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call mulf8s_prepare (signed byte) mulf8s::a 
+Inlined call call mulf8s_prepare (signed byte) anim::cos_a 
+Inlined call call mulf8s_prepare (signed byte) anim::sin_a 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/scrolllogo/scrolllogo.log b/src/test/ref/examples/scrolllogo/scrolllogo.log
index 2568a842f..8e4489e43 100644
--- a/src/test/ref/examples/scrolllogo/scrolllogo.log
+++ b/src/test/ref/examples/scrolllogo/scrolllogo.log
@@ -50,8 +50,8 @@ Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number
 Adding pointer type conversion cast (byte*) LOGO in (byte*) LOGO ← (number) $2000
 Identified constant variable (byte*) SCREEN
 Identified constant variable (byte*) LOGO
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [543] (byte~) main::$0 ← call toD018 (byte*) SCREEN (byte*) LOGO 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) main::$0 ← call toD018 (byte*) SCREEN (byte*) LOGO 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/showlogo/showlogo.log b/src/test/ref/examples/showlogo/showlogo.log
index dc187df9f..59b6dfb65 100644
--- a/src/test/ref/examples/showlogo/showlogo.log
+++ b/src/test/ref/examples/showlogo/showlogo.log
@@ -46,8 +46,8 @@ Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number
 Adding pointer type conversion cast (byte*) LOGO in (byte*) LOGO ← (number) $2000
 Identified constant variable (byte*) SCREEN
 Identified constant variable (byte*) LOGO
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [117] (byte~) main::$0 ← call toD018 (byte*) SCREEN (byte*) LOGO 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) main::$0 ← call toD018 (byte*) SCREEN (byte*) LOGO 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/sinplotter/sine-plotter.log b/src/test/ref/examples/sinplotter/sine-plotter.log
index 3f69924e6..13b0c8361 100644
--- a/src/test/ref/examples/sinplotter/sine-plotter.log
+++ b/src/test/ref/examples/sinplotter/sine-plotter.log
@@ -53,9 +53,9 @@ Adding pointer type conversion cast (signed word*) sin2 in (signed word*) sin2 
 Identified constant variable (byte*) SCREEN
 Identified constant variable (byte*) BITMAP
 Identified constant variable (signed word*) sin2
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [608] call vicSelectGfxBank (byte*) SCREEN 
-Inlined call [610] (byte~) main::$4 ← call toD018 (byte*) SCREEN (byte*) BITMAP 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call vicSelectGfxBank (byte*) SCREEN 
+Inlined call (byte~) main::$4 ← call toD018 (byte*) SCREEN (byte*) BITMAP 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/examples/sinsprites/sinus-sprites.log b/src/test/ref/examples/sinsprites/sinus-sprites.log
index 7a903c905..ff350aed7 100644
--- a/src/test/ref/examples/sinsprites/sinus-sprites.log
+++ b/src/test/ref/examples/sinsprites/sinus-sprites.log
@@ -50,7 +50,7 @@ Adding pointer type conversion cast (byte*) sprites in (byte*) sprites ← (numb
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Adding pointer type conversion cast (byte*) gen_sintab::f_2pi in (byte*) gen_sintab::f_2pi ← (number) $e2e5
 Identified constant variable (byte*) gen_sintab::f_2pi
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/gfxbank.log b/src/test/ref/gfxbank.log
index 644f40dca..f764832fb 100644
--- a/src/test/ref/gfxbank.log
+++ b/src/test/ref/gfxbank.log
@@ -43,8 +43,8 @@ Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTER
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) main::PLAYFIELD_CHARSET in (byte*) main::PLAYFIELD_CHARSET ← (number) $2800
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [109] call vicSelectGfxBank (byte*) main::PLAYFIELD_CHARSET 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call vicSelectGfxBank (byte*) main::PLAYFIELD_CHARSET 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/helloworld2-inline.log b/src/test/ref/helloworld2-inline.log
index c09175c9d..40048758a 100644
--- a/src/test/ref/helloworld2-inline.log
+++ b/src/test/ref/helloworld2-inline.log
@@ -1,8 +1,8 @@
 Adding pointer type conversion cast (byte*) screen in (byte*) screen ← (number) $400
 Identified constant variable (byte*) screen
 Identified constant variable (byte*) main::hello
-Inlined call [2] call print2 (byte*) screen (byte*) main::hello 
-Inlined call [4] call print2 (byte*~) main::$1 (byte*) main::hello 
+Inlined call call print2 (byte*) screen (byte*) main::hello 
+Inlined call call print2 (byte*~) main::$1 (byte*) main::hello 
 Culled Empty Block (label) main::print21_@2
 Culled Empty Block (label) main::print21_@return
 Culled Empty Block (label) main::print22_@2
diff --git a/src/test/ref/inline-function-if.log b/src/test/ref/inline-function-if.log
index d51142804..45adaf30b 100644
--- a/src/test/ref/inline-function-if.log
+++ b/src/test/ref/inline-function-if.log
@@ -1,7 +1,7 @@
 Adding pointer type conversion cast (byte*) screen in (byte*) screen ← (number) $400
 Identified constant variable (byte*) screen
-Inlined call [1] (byte~) main::$0 ← call toUpper (byte) 'c' true 
-Inlined call [3] (byte~) main::$1 ← call toUpper (byte) 'm' false 
+Inlined call (byte~) main::$0 ← call toUpper (byte) 'c' true 
+Inlined call (byte~) main::$1 ← call toUpper (byte) 'm' false 
 Culled Empty Block (label) main::toUpper1_@3
 Culled Empty Block (label) main::toUpper2_@3
 Culled Empty Block (label) @1
diff --git a/src/test/ref/inline-function-level2.log b/src/test/ref/inline-function-level2.log
index 444c1f853..b67bce36a 100644
--- a/src/test/ref/inline-function-level2.log
+++ b/src/test/ref/inline-function-level2.log
@@ -2,11 +2,11 @@ Adding pointer type conversion cast (byte*) main::sc in (byte*) main::sc ← (nu
 Adding pointer type conversion cast (byte*) cur_line in (byte*) cur_line ← (number) $400
 Adding pointer type conversion cast (byte*) cur_line in (byte*) cur_line ← (number) $400
 Identified literal word (word) { line::xpos, 0 } in (word) line::pos ← { (byte) line::xpos, (number) 0 }
-Inlined call [6] call line (number) 2 (number) $40 (number) $a (byte) '*' 
+Inlined call call line (number) 2 (number) $40 (number) $a (byte) '*' 
 Inlined call call plot (byte~) main::line1_$0 (byte) main::line1_ch 
-Inlined call [7] call line (number) 4 (number) $80 (number) $f (byte) '.' 
+Inlined call call line (number) 4 (number) $80 (number) $f (byte) '.' 
 Inlined call call plot (byte~) main::line2_$0 (byte) main::line2_ch 
-Inlined call [14] call plot (byte~) line::$0 (byte) line::ch 
+Inlined call call plot (byte~) line::$0 (byte) line::ch 
 Culled Empty Block (label) main::plot1_@return
 Culled Empty Block (label) main::line1_@2
 Culled Empty Block (label) main::line1_@return
diff --git a/src/test/ref/inline-function-min.log b/src/test/ref/inline-function-min.log
index 2974429ec..72d9297c2 100644
--- a/src/test/ref/inline-function-min.log
+++ b/src/test/ref/inline-function-min.log
@@ -1,8 +1,8 @@
 Adding pointer type conversion cast (byte*) screen in (byte*) screen ← (number) $400
 Identified constant variable (byte*) screen
-Inlined call [1] (byte~) main::$0 ← call sum (number) 2 (number) 1 
-Inlined call [3] (byte~) main::$1 ← call sum (number) $a (number) 3 
-Inlined call [5] (byte~) main::$2 ← call sum (number) 4 (number) 8 
+Inlined call (byte~) main::$0 ← call sum (number) 2 (number) 1 
+Inlined call (byte~) main::$1 ← call sum (number) $a (number) 3 
+Inlined call (byte~) main::$2 ← call sum (number) 4 (number) 8 
 Culled Empty Block (label) main::sum1_@1
 Culled Empty Block (label) main::sum2_@1
 Culled Empty Block (label) main::sum3_@1
diff --git a/src/test/ref/inline-function-print.log b/src/test/ref/inline-function-print.log
index 47215baa2..5c44c138c 100644
--- a/src/test/ref/inline-function-print.log
+++ b/src/test/ref/inline-function-print.log
@@ -1,8 +1,8 @@
 Adding pointer type conversion cast (byte*) screen in (byte*) screen ← (number) $400
 Identified constant variable (byte*) screen
 Identified constant variable (byte*) main::hello
-Inlined call [2] call print (byte*) screen (byte*) main::hello 
-Inlined call [5] call print (byte*~) main::$2 (byte*) main::hello 
+Inlined call call print (byte*) screen (byte*) main::hello 
+Inlined call call print (byte*~) main::$2 (byte*) main::hello 
 Culled Empty Block (label) main::print1_@2
 Culled Empty Block (label) main::print1_@return
 Culled Empty Block (label) main::print2_@2
diff --git a/src/test/ref/inline-function.log b/src/test/ref/inline-function.log
index 84698596f..9d7e3c7f9 100644
--- a/src/test/ref/inline-function.log
+++ b/src/test/ref/inline-function.log
@@ -10,8 +10,8 @@ Identified constant variable (byte*) BGCOL
 Identified constant variable (byte*) screen
 Identified constant variable (byte*) charset1
 Identified constant variable (byte*) charset2
-Inlined call [10] (byte~) main::$1 ← call toD018 (byte*) screen (byte*) charset1 
-Inlined call [15] (byte~) main::$3 ← call toD018 (byte*) screen (byte*) charset2 
+Inlined call (byte~) main::$1 ← call toD018 (byte*) screen (byte*) charset1 
+Inlined call (byte~) main::$3 ← call toD018 (byte*) screen (byte*) charset2 
 Culled Empty Block (label) main::@2
 Culled Empty Block (label) main::@17
 Culled Empty Block (label) main::@3
diff --git a/src/test/ref/irq-hardware-clobber-jsr.log b/src/test/ref/irq-hardware-clobber-jsr.log
index 4f542b26e..775c05bb7 100644
--- a/src/test/ref/irq-hardware-clobber-jsr.log
+++ b/src/test/ref/irq-hardware-clobber-jsr.log
@@ -43,7 +43,7 @@ Adding pointer type conversion cast (byte*) CIA2_PORT_B_DDR in (byte*) CIA2_PORT
 Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTERRUPT ← (number) $dd0d
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/irq-idx-problem.log b/src/test/ref/irq-idx-problem.log
index 1a7f51380..f60092383 100644
--- a/src/test/ref/irq-idx-problem.log
+++ b/src/test/ref/irq-idx-problem.log
@@ -45,7 +45,7 @@ Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_I
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Adding pointer type conversion cast (byte*) VIC_BASE in (byte*) VIC_BASE ← (number) $d000
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/irq-kernel-minimal.log b/src/test/ref/irq-kernel-minimal.log
index dbb5c7630..2c39005d6 100644
--- a/src/test/ref/irq-kernel-minimal.log
+++ b/src/test/ref/irq-kernel-minimal.log
@@ -43,7 +43,7 @@ Adding pointer type conversion cast (byte*) CIA2_PORT_B_DDR in (byte*) CIA2_PORT
 Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTERRUPT ← (number) $dd0d
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/keyboard-glitch.log b/src/test/ref/keyboard-glitch.log
index a93d7cf56..125937a67 100644
--- a/src/test/ref/keyboard-glitch.log
+++ b/src/test/ref/keyboard-glitch.log
@@ -44,7 +44,7 @@ Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_I
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Identified constant variable (byte*) SCREEN
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/line-anim.log b/src/test/ref/line-anim.log
index 4420ac3fe..56c1d8fbd 100644
--- a/src/test/ref/line-anim.log
+++ b/src/test/ref/line-anim.log
@@ -53,11 +53,11 @@ Adding pointer type conversion cast (byte*) BITMAP in (byte*) BITMAP ← (number
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $8800
 Identified constant variable (byte*) BITMAP
 Identified constant variable (byte*) SCREEN
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [290] call vicSelectGfxBank (byte*) SCREEN 
-Inlined call [291] (byte~) main::$4 ← call toD018 (byte*) SCREEN (byte*) BITMAP 
-Inlined call [319] (word~) point_init::$6 ← call abs16s (signed word) point_init::x_diff 
-Inlined call [320] (word~) point_init::$7 ← call abs16s (signed word) point_init::y_diff 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call vicSelectGfxBank (byte*) SCREEN 
+Inlined call (byte~) main::$4 ← call toD018 (byte*) SCREEN (byte*) BITMAP 
+Inlined call (word~) point_init::$6 ← call abs16s (signed word) point_init::x_diff 
+Inlined call (word~) point_init::$7 ← call abs16s (signed word) point_init::y_diff 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
index 1119d3d3e..d2fdf88a3 100644
--- a/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
+++ b/src/test/ref/multiplexer-irq/simple-multiplexer-irq.log
@@ -53,11 +53,11 @@ Adding pointer type conversion cast (byte*) YSIN in (byte*) YSIN ← (number) $2
 Identified constant variable (byte*) SCREEN
 Identified constant variable (byte*) SPRITE
 Identified constant variable (byte*) YSIN
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [118] call plexSetScreen (byte*) plexInit::screen 
-Inlined call [153] call plexFreePrepare 
-Inlined call [159] call plexFreeAdd (byte) plexShowSprite::ypos 
-Inlined call [246] (byte~) plex_irq::$2 ← call plexFreeNextYpos 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call call plexSetScreen (byte*) plexInit::screen 
+Inlined call call plexFreePrepare 
+Inlined call call plexFreeAdd (byte) plexShowSprite::ypos 
+Inlined call (byte~) plex_irq::$2 ← call plexFreeNextYpos 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/roll-sprite-msb.log b/src/test/ref/roll-sprite-msb.log
index 74cc9a749..a7c5189ad 100644
--- a/src/test/ref/roll-sprite-msb.log
+++ b/src/test/ref/roll-sprite-msb.log
@@ -42,7 +42,7 @@ Adding pointer type conversion cast (byte*) CIA2_PORT_B_DDR in (byte*) CIA2_PORT
 Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTERRUPT ← (number) $dd0d
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/scan-desire-problem.log b/src/test/ref/scan-desire-problem.log
index 9d6c7c1b2..e745e6408 100644
--- a/src/test/ref/scan-desire-problem.log
+++ b/src/test/ref/scan-desire-problem.log
@@ -47,8 +47,8 @@ Adding pointer type conversion cast (byte*) charset in (byte*) charset ← (numb
 Adding pointer type conversion cast (byte*) tileset in (byte*) tileset ← (number) $2800
 Adding pointer type conversion cast (byte*) colors in (byte*) colors ← (number) $d800
 Adding pointer type conversion cast (byte*) level_address in (byte*) level_address ← (number) $3000
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [409] (byte~) init::$3 ← call toD018 (byte*) screen (byte*) charset 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) init::$3 ← call toD018 (byte*) screen (byte*) charset 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/semi-struct-1.log b/src/test/ref/semi-struct-1.log
index 027099ab4..5c9927d74 100644
--- a/src/test/ref/semi-struct-1.log
+++ b/src/test/ref/semi-struct-1.log
@@ -1,10 +1,10 @@
 Adding pointer type conversion cast (byte*) print_screen in (byte*) print_screen ← (number) $400
-Inlined call [149] (byte*~) init_points::$1 ← call getPoint (byte) init_points::i 
-Inlined call [151] (byte*~) init_points::$2 ← call pointXpos (byte*) init_points::point 
-Inlined call [154] (byte*~) init_points::$3 ← call pointYpos (byte*) init_points::point 
-Inlined call [164] (byte*~) print_points::$2 ← call getPoint (byte) print_points::i 
-Inlined call [166] (byte*~) print_points::$3 ← call pointXpos (byte*) print_points::point 
-Inlined call [169] (byte*~) print_points::$6 ← call pointYpos (byte*) print_points::point 
+Inlined call (byte*~) init_points::$1 ← call getPoint (byte) init_points::i 
+Inlined call (byte*~) init_points::$2 ← call pointXpos (byte*) init_points::point 
+Inlined call (byte*~) init_points::$3 ← call pointYpos (byte*) init_points::point 
+Inlined call (byte*~) print_points::$2 ← call getPoint (byte) print_points::i 
+Inlined call (byte*~) print_points::$3 ← call pointXpos (byte*) print_points::point 
+Inlined call (byte*~) print_points::$6 ← call pointYpos (byte*) print_points::point 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) print_str::@4
diff --git a/src/test/ref/semi-struct-2.log b/src/test/ref/semi-struct-2.log
index 0f493db95..a6c4817aa 100644
--- a/src/test/ref/semi-struct-2.log
+++ b/src/test/ref/semi-struct-2.log
@@ -46,35 +46,35 @@ Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWA
 Adding pointer type conversion cast (byte*) *(initEntry::$0) in *((byte**~) initEntry::$0) ← (number~) initEntry::$1
 Adding pointer type conversion cast (byte*) *(initEntry::$2) in *((byte**~) initEntry::$2) ← (number~) initEntry::$3
 Adding pointer type conversion cast (word*) *(initEntry::$6) in *((word**~) initEntry::$6) ← (number~) initEntry::$7
-Inlined call [327] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
-Inlined call [577] (byte*~) main::$1 ← call fileEntry (number) 1 
-Inlined call [579] (byte*~) main::$2 ← call fileEntry (number) 2 
-Inlined call [605] (byte**~) initEntry::$0 ← call entryBufDisk (byte*) initEntry::entry 
-Inlined call [608] (byte**~) initEntry::$2 ← call entryBufEdit (byte*) initEntry::entry 
-Inlined call [611] (word*~) initEntry::$4 ← call entryTsLen (byte*) initEntry::entry 
-Inlined call [614] (word**~) initEntry::$6 ← call entryTsOrder (byte*) initEntry::entry 
-Inlined call [617] (byte*~) initEntry::$8 ← call entryTLastLink (byte*) initEntry::entry 
-Inlined call [620] (byte*~) initEntry::$10 ← call entrySLastLink (byte*) initEntry::entry 
-Inlined call [623] (byte*~) initEntry::$12 ← call entryBFlag (byte*) initEntry::entry 
-Inlined call [626] (byte*~) initEntry::$14 ← call entryBError (byte*) initEntry::entry 
-Inlined call [629] (word*~) initEntry::$16 ← call entryUCross (byte*) initEntry::entry 
-Inlined call [632] (byte*~) initEntry::$18 ← call entryBAddrLo (byte*) initEntry::entry 
-Inlined call [635] (byte*~) initEntry::$20 ← call entryBAddrHi (byte*) initEntry::entry 
-Inlined call [638] (byte*~) initEntry::$22 ← call entryTHi (byte*) initEntry::entry 
-Inlined call [641] (byte*~) initEntry::$24 ← call entryTLo (byte*) initEntry::entry 
-Inlined call [646] (byte**~) printEntry::$1 ← call entryBufDisk (byte*) printEntry::entry 
-Inlined call [651] (byte**~) printEntry::$6 ← call entryBufEdit (byte*) printEntry::entry 
-Inlined call [656] (word*~) printEntry::$11 ← call entryTsLen (byte*) printEntry::entry 
-Inlined call [660] (word**~) printEntry::$15 ← call entryTsOrder (byte*) printEntry::entry 
-Inlined call [665] (byte*~) printEntry::$20 ← call entryTLastLink (byte*) printEntry::entry 
-Inlined call [669] (byte*~) printEntry::$24 ← call entrySLastLink (byte*) printEntry::entry 
-Inlined call [673] (byte*~) printEntry::$28 ← call entryBFlag (byte*) printEntry::entry 
-Inlined call [677] (byte*~) printEntry::$32 ← call entryBError (byte*) printEntry::entry 
-Inlined call [681] (word*~) printEntry::$36 ← call entryUCross (byte*) printEntry::entry 
-Inlined call [685] (byte*~) printEntry::$40 ← call entryBAddrLo (byte*) printEntry::entry 
-Inlined call [689] (byte*~) printEntry::$44 ← call entryBAddrHi (byte*) printEntry::entry 
-Inlined call [693] (byte*~) printEntry::$48 ← call entryTHi (byte*) printEntry::entry 
-Inlined call [697] (byte*~) printEntry::$52 ← call entryTLo (byte*) printEntry::entry 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte*~) main::$1 ← call fileEntry (number) 1 
+Inlined call (byte*~) main::$2 ← call fileEntry (number) 2 
+Inlined call (byte**~) initEntry::$0 ← call entryBufDisk (byte*) initEntry::entry 
+Inlined call (byte**~) initEntry::$2 ← call entryBufEdit (byte*) initEntry::entry 
+Inlined call (word*~) initEntry::$4 ← call entryTsLen (byte*) initEntry::entry 
+Inlined call (word**~) initEntry::$6 ← call entryTsOrder (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$8 ← call entryTLastLink (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$10 ← call entrySLastLink (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$12 ← call entryBFlag (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$14 ← call entryBError (byte*) initEntry::entry 
+Inlined call (word*~) initEntry::$16 ← call entryUCross (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$18 ← call entryBAddrLo (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$20 ← call entryBAddrHi (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$22 ← call entryTHi (byte*) initEntry::entry 
+Inlined call (byte*~) initEntry::$24 ← call entryTLo (byte*) initEntry::entry 
+Inlined call (byte**~) printEntry::$1 ← call entryBufDisk (byte*) printEntry::entry 
+Inlined call (byte**~) printEntry::$6 ← call entryBufEdit (byte*) printEntry::entry 
+Inlined call (word*~) printEntry::$11 ← call entryTsLen (byte*) printEntry::entry 
+Inlined call (word**~) printEntry::$15 ← call entryTsOrder (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$20 ← call entryTLastLink (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$24 ← call entrySLastLink (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$28 ← call entryBFlag (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$32 ← call entryBError (byte*) printEntry::entry 
+Inlined call (word*~) printEntry::$36 ← call entryUCross (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$40 ← call entryBAddrLo (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$44 ← call entryBAddrHi (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$48 ← call entryTHi (byte*) printEntry::entry 
+Inlined call (byte*~) printEntry::$52 ← call entryTLo (byte*) printEntry::entry 
 Culled Empty Block (label) mul8u::@5
 Culled Empty Block (label) mul8u::@6
 Culled Empty Block (label) mul8u::@8
diff --git a/src/test/ref/signed-words.log b/src/test/ref/signed-words.log
index f6ab0f68f..65dd7ff7d 100644
--- a/src/test/ref/signed-words.log
+++ b/src/test/ref/signed-words.log
@@ -44,7 +44,7 @@ Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_I
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) SCREEN in (byte*) SCREEN ← (number) $400
 Adding pointer type conversion cast (byte*) SPRITE in (byte*) SPRITE ← (number) $2000
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/test-comparisons-sword.log b/src/test/ref/test-comparisons-sword.log
index 5fdfb45eb..f00ee17bc 100644
--- a/src/test/ref/test-comparisons-sword.log
+++ b/src/test/ref/test-comparisons-sword.log
@@ -45,7 +45,7 @@ Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTER
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) print_screen in (byte*) print_screen ← (number) $400
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/test-comparisons-word.log b/src/test/ref/test-comparisons-word.log
index ea636730a..a3bc2398d 100644
--- a/src/test/ref/test-comparisons-word.log
+++ b/src/test/ref/test-comparisons-word.log
@@ -45,7 +45,7 @@ Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTER
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) print_screen in (byte*) print_screen ← (number) $400
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/test-keyboard-space.log b/src/test/ref/test-keyboard-space.log
index 5b1a55f63..c4c7feb3b 100644
--- a/src/test/ref/test-keyboard-space.log
+++ b/src/test/ref/test-keyboard-space.log
@@ -42,7 +42,7 @@ Adding pointer type conversion cast (byte*) CIA2_PORT_B_DDR in (byte*) CIA2_PORT
 Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTERRUPT ← (number) $dd0d
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/test-keyboard.log b/src/test/ref/test-keyboard.log
index ec795e155..66eb0b865 100644
--- a/src/test/ref/test-keyboard.log
+++ b/src/test/ref/test-keyboard.log
@@ -44,7 +44,7 @@ Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_I
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) main::sc in (byte*) main::sc ← (number) $400
 Adding pointer type conversion cast (byte*) main::screen in (byte*) main::screen ← (number) $400
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3
diff --git a/src/test/ref/test-multiply-16bit.log b/src/test/ref/test-multiply-16bit.log
index ea456a4a8..dc93601b1 100644
--- a/src/test/ref/test-multiply-16bit.log
+++ b/src/test/ref/test-multiply-16bit.log
@@ -9,7 +9,7 @@ Adding pointer type conversion cast (word*) mulf16u::memB in (word*) mulf16u::me
 Adding pointer type conversion cast (dword*) mulf16u::memR in (dword*) mulf16u::memR ← (number) $fc
 Adding pointer type conversion cast (byte*) BGCOL in (byte*) BGCOL ← (number) $d021
 Identified constant variable (byte*) BGCOL
-Inlined call [319] call mulf8s_prepare (signed byte) mulf8s::a 
+Inlined call call mulf8s_prepare (signed byte) mulf8s::a 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) print_str::@4
diff --git a/src/test/ref/test-multiply-8bit.log b/src/test/ref/test-multiply-8bit.log
index 8236af166..da869b5db 100644
--- a/src/test/ref/test-multiply-8bit.log
+++ b/src/test/ref/test-multiply-8bit.log
@@ -11,7 +11,7 @@ Adding pointer type conversion cast (byte*) BGCOL in (byte*) BGCOL ← (number)
 Adding pointer type conversion cast (byte*) mulf_init_asm::mem in (byte*) mulf_init_asm::mem ← (number) $ff
 Identified constant variable (byte*) BGCOL
 Identified constant variable (byte*) mulf_init_asm::mem
-Inlined call [319] call mulf8s_prepare (signed byte) mulf8s::a 
+Inlined call call mulf8s_prepare (signed byte) mulf8s::a 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) print_str::@4
diff --git a/src/test/ref/textbox.log b/src/test/ref/textbox.log
index 3f9185389..40ba862f4 100644
--- a/src/test/ref/textbox.log
+++ b/src/test/ref/textbox.log
@@ -43,7 +43,7 @@ Adding pointer type conversion cast (byte*) CIA2_INTERRUPT in (byte*) CIA2_INTER
 Adding pointer type conversion cast (void()**) KERNEL_IRQ in (void()**) KERNEL_IRQ ← (number) $314
 Adding pointer type conversion cast (void()**) HARDWARE_IRQ in (void()**) HARDWARE_IRQ ← (number) $fffe
 Adding pointer type conversion cast (byte*) screen in (byte*) screen ← (number) $400
-Inlined call [105] (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
+Inlined call (byte~) vicSelectGfxBank::$0 ← call toDd00 (byte*) vicSelectGfxBank::gfx 
 Culled Empty Block (label) @1
 Culled Empty Block (label) @2
 Culled Empty Block (label) @3